This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from 0b19489 Add build support against X.Org server in Ubuntu xenial (16.04). new 3a30f5a Get X2Go KDrive to build (and run!) against X.Org server versions below 1.19.99.901. new 2541b0b Revert "x2gokdriveinit.c: Unifdef KDRIVE_EVDEV." new 0e84756 x2gokdriveinit.c: Only provide KDRIVE_EVDEV code for builds against X.Org server << 1.19.99.901. new b70a5a5 x2gokdrive*.c: Include kdrive-config.h when building against X.Org server before 1.19.99.901. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: remote.c | 5 ++++ x2gokdrive.c | 34 ++++++++++++++++++++++++++ x2gokdrive.h | 4 +++ x2gokdrivecursor.c | 5 ++++ x2gokdriveinit.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ x2gokdriveselection.c | 5 ++++ 6 files changed, 120 insertions(+) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 3a30f5aa177e1768da0b89f7bfc2fba14a1f8185 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 15 17:54:39 2019 +0200 Get X2Go KDrive to build (and run!) against X.Org server versions below 1.19.99.901. --- x2gokdrive.c | 29 +++++++++++++++++++++++++++++ x2gokdrive.h | 4 ++++ x2gokdriveinit.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/x2gokdrive.c b/x2gokdrive.c index 96c80c3..38ecc6a 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -976,6 +976,35 @@ ephyrCreateResources(ScreenPtr pScreen) } } +#if XORG_VERSION_CURRENT < 11999901 +void +ephyrPreserve(KdCardInfo * card) +{ +} + +Bool +ephyrEnable(ScreenPtr pScreen) +{ + return TRUE; +} + +Bool +ephyrDPMS(ScreenPtr pScreen, int mode) +{ + return TRUE; +} + +void +ephyrDisable(ScreenPtr pScreen) +{ +} + +void +ephyrRestore(KdCardInfo * card) +{ +} +#endif /* XORG_VERSION_CURRENT */ + void ephyrScreenFini(KdScreenInfo * screen) { diff --git a/x2gokdrive.h b/x2gokdrive.h index 1942165..6415de2 100644 --- a/x2gokdrive.h +++ b/x2gokdrive.h @@ -207,6 +207,10 @@ extern KdPointerDriver EphyrMouseDriver; extern KdKeyboardDriver EphyrKeyboardDriver; +#if XORG_VERSION_CURRENT < 11999901 +extern KdOsFuncs EphyrOsFuncs; +#endif /* XORG_VERSION_CURRENT */ + extern Bool ephyrCursorInit(ScreenPtr pScreen); extern int ephyrBufferHeight(KdScreenInfo * screen); diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 60f4240..b8793f6 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -61,9 +61,30 @@ InitCard(char *name) KdCardInfoAdd(&ephyrFuncs, 0); } +#if XORG_VERSION_CURRENT < 11999901 + +static const ExtensionModule ephyrExtensions[] = { +#ifdef GLXEXT + { GlxExtensionInit, "GLX", &noGlxExtension }, +#endif +}; + +static +void ephyrExtensionInit(void) +{ + LoadExtensionList(ephyrExtensions, ARRAY_SIZE(ephyrExtensions), TRUE); +} + +#endif /* XORG_VERSION_CURRENT */ + void InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) { +#if XORG_VERSION_CURRENT < 11999901 + if (serverGeneration == 1) + ephyrExtensionInit(); +#endif /* XORG_VERSION_CURRENT */ + if (serverGeneration == 1) { remote_selection_init(); @@ -228,6 +249,9 @@ OsVendorInit(void) // if (hostx_want_host_cursor()) ephyrFuncs.initCursor = &ephyrCursorInit; +#if XORG_VERSION_CURRENT < 11999901 + KdOsInit(&EphyrOsFuncs); +#endif if (serverGeneration == 1) { if (!KdCardInfoLast()) { processScreenArg("800x600", NULL); @@ -242,10 +266,23 @@ KdCardFuncs ephyrFuncs = { ephyrInitScreen, /* initScreen */ ephyrFinishInitScreen, /* finishInitScreen */ ephyrCreateResources, /* createRes */ +#if XORG_VERSION_CURRENT < 11999901 + ephyrPreserve, /* preserve */ + ephyrEnable, /* enable */ + ephyrDPMS, /* dpms */ + ephyrDisable, /* disable */ + ephyrRestore, /* restore */ +#endif /* XORG_VERSION_CURRENT */ ephyrScreenFini, /* scrfini */ ephyrCardFini, /* cardfini */ 0, /* initCursor */ +#if XORG_VERSION_CURRENT < 11999901 + 0, /* enableCursor */ + 0, /* disableCursor */ + 0, /* finiCursor */ + 0, /* recolorCursor */ +#endif /* XORG_VERSION_CURRENT */ 0, /* initAccel */ 0, /* enableAccel */ @@ -257,3 +294,15 @@ KdCardFuncs ephyrFuncs = { ephyrCloseScreen, /* closeScreen */ }; + +#if XORG_VERSION_CURRENT < 11999901 +/* + * Fake nearly empty EphyrOsFuncs for builds against X.Org << 1.19.99.901 + */ +int +ephyrInitFake(void) { return 1; } + +KdOsFuncs EphyrOsFuncs = { + .Init = ephyrInitFake, +}; +#endif /* XORG_VERSION_CURRENT */ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 2541b0b74e075e65f3b49b3d6a2ebb9ee6025b75 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 15 19:17:55 2019 +0000 Revert "x2gokdriveinit.c: Unifdef KDRIVE_EVDEV." This reverts commit 404591f5bd96257050b5af0bf3eaabcb60edcb16. We need this bit of code for building against "older" X.Org versions. --- x2gokdriveinit.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index b8793f6..1c20bbe 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -42,6 +42,11 @@ extern Bool kdHasPointer; extern Bool kdHasKbd; +#ifdef KDRIVE_EVDEV +extern KdPointerDriver LinuxEvdevMouseDriver; +extern KdKeyboardDriver LinuxEvdevKeyboardDriver; +#endif + void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id); void processOutputArg(const char *output, char *parent_id); void processScreenArg(const char *screen_size, char *parent_id); @@ -99,6 +104,11 @@ InitInput(int argc, char **argv) KdKeyboardInfo *ki; KdPointerInfo *pi; +#ifdef KDRIVE_EVDEV + KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver); + KdAddPointerDriver(&LinuxEvdevMouseDriver); +#endif + if (!SeatId) { KdAddKeyboardDriver(&EphyrKeyboardDriver); KdAddPointerDriver(&EphyrMouseDriver); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 0e847566bbdc70780cd556216f229819be1d5d61 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 15 21:22:32 2019 +0200 x2gokdriveinit.c: Only provide KDRIVE_EVDEV code for builds against X.Org server << 1.19.99.901. --- x2gokdriveinit.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 1c20bbe..6a3f615 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -41,11 +41,12 @@ extern Bool EphyrWantNoHostGrab; extern Bool kdHasPointer; extern Bool kdHasKbd; - +#if XORG_VERSION_CURRENT < 11999901 #ifdef KDRIVE_EVDEV extern KdPointerDriver LinuxEvdevMouseDriver; extern KdKeyboardDriver LinuxEvdevKeyboardDriver; -#endif +#endif /* KDRIVE_EVDEV */ +#endif /* XORG_VERSION_CURRENT */ void processScreenOrOutputArg(const char *screen_size, const char *output, char *parent_id); void processOutputArg(const char *output, char *parent_id); @@ -104,10 +105,12 @@ InitInput(int argc, char **argv) KdKeyboardInfo *ki; KdPointerInfo *pi; +#if XORG_VERSION_CURRENT < 11999901 #ifdef KDRIVE_EVDEV KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver); KdAddPointerDriver(&LinuxEvdevMouseDriver); -#endif +#endif /* KDRIVE_EVDEV */ +#endif /* XORG_VERSION_CURRENT */ if (!SeatId) { KdAddKeyboardDriver(&EphyrKeyboardDriver); -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit b70a5a58a2009925e18b2122d4027415fa25f2e4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Jul 15 21:47:04 2019 +0200 x2gokdrive*.c: Include kdrive-config.h when building against X.Org server before 1.19.99.901. --- remote.c | 5 +++++ x2gokdrive.c | 5 +++++ x2gokdrivecursor.c | 5 +++++ x2gokdriveinit.c | 5 +++++ x2gokdriveselection.c | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/remote.c b/remote.c index cfbef1b..9bbd4ac 100644 --- a/remote.c +++ b/remote.c @@ -28,6 +28,11 @@ #ifdef HAVE_CONFIG_H #include <dix-config.h> + +#if XORG_VERSION_CURRENT < 11999901 +#include <kdrive-config.h> +#endif /* XORG_VERSION_CURRENT */ + #endif #include "remote.h" diff --git a/x2gokdrive.c b/x2gokdrive.c index 38ecc6a..004a3dd 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -29,6 +29,11 @@ #ifdef HAVE_CONFIG_H #include <dix-config.h> + +#if XORG_VERSION_CURRENT < 11999901 +#include <kdrive-config.h> +#endif /* XORG_VERSION_CURRENT */ + #endif #include <xcb/xcb_keysyms.h> diff --git a/x2gokdrivecursor.c b/x2gokdrivecursor.c index a9a3388..e491f34 100644 --- a/x2gokdrivecursor.c +++ b/x2gokdrivecursor.c @@ -27,6 +27,11 @@ #ifdef HAVE_CONFIG_H #include <dix-config.h> + +#if XORG_VERSION_CURRENT < 11999901 +#include <kdrive-config.h> +#endif /* XORG_VERSION_CURRENT */ + #endif #include "x2gokdrive.h" #include "x2gokdrivelog.h" diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 6a3f615..b7b3767 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -28,6 +28,11 @@ #ifdef HAVE_CONFIG_H #include <dix-config.h> + +#if XORG_VERSION_CURRENT < 11999901 +#include <kdrive-config.h> +#endif /* XORG_VERSION_CURRENT */ + #endif #include "x2gokdrive.h" #include "x2gokdrivelog.h" diff --git a/x2gokdriveselection.c b/x2gokdriveselection.c index 2da604b..adb3095 100644 --- a/x2gokdriveselection.c +++ b/x2gokdriveselection.c @@ -27,6 +27,11 @@ #ifdef HAVE_CONFIG_H #include <dix-config.h> + +#if XORG_VERSION_CURRENT < 11999901 +#include <kdrive-config.h> +#endif /* XORG_VERSION_CURRENT */ + #endif #include "x2gokdriveselection.h" -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git
-
git-admin＠x2go.org