This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gokdrive. from faa056d Recent X.org loads GLX via the mi path new fd51dfe x2gokdrive: free driverPrivates on Fini new d5e27fa Make that initialization only happen on startup (i.e. when serverGeneration == 1). new cf630fd x2gokdrive: Adapt to dead slots removal from KdCardFuncs new 404591f x2gokdriveinit.c: Unifdef KDRIVE_EVDEV. 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: x2gokdrive.c | 29 ++--------------------------- x2gokdriveinit.c | 27 +++++---------------------- 2 files changed, 7 insertions(+), 49 deletions(-) -- 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 fd51dfe2bb45c16e12ad69296af0ee7a7cd8fb60 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 12 19:18:10 2019 +0200 x2gokdrive: free driverPrivates on Fini Backported from X.Org: commit 6828645916505a5925db5c2c2e816fee4e1050e5 Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Date: Sat Nov 4 23:06:28 2017 +0100 Xephyr: free driverPrivates on Fini Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> --- x2gokdrive.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x2gokdrive.c b/x2gokdrive.c index 14f3419..d520a4a 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -1439,6 +1439,7 @@ MouseDisable(KdPointerInfo * pi) static void MouseFini(KdPointerInfo * pi) { + free(pi->driverPrivate); ephyrMouse = NULL; return; } @@ -1508,6 +1509,7 @@ EphyrKeyboardDisable(KdKeyboardInfo * ki) static void EphyrKeyboardFini(KdKeyboardInfo * ki) { + free(ki->driverPrivate); ephyrKbd = NULL; return; } -- 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 d5e27fa09156f7abce4db8b857f7fd53075ed94b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 12 19:21:25 2019 +0200 Make that initialization only happen on startup (i.e. when serverGeneration == 1). This relates to X.Org commit: commit 0848390d51f93ecfb9342cffe1cda46a65cfc07b Author: Adam Jackson <ajax@redhat.com> Date: Wed May 10 11:14:57 2017 -0400 xephyr: Fix regeneration I had said: commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1 Author: Adam Jackson <ajax@redhat.com> Date: Fri Mar 24 15:58:54 2017 -0400 kdrive: Remove KdOsFuncs Only the Init slot was used, and Xephyr can just as easily do that initialization directly. And I'd've been right, but I forgot to make that initialization only happen on startup (i.e. when serverGeneration == 1). Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Adam Jackson <ajax@redhat.com> The above referenced X.Org commit had earlier been backported to x2gokdrive: commit d2434d7c3d9d70c5fc002699a77471cb7c42f71a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jun 13 16:33:01 2019 +0200 kdrive: Remove KdOsFuncs (X.org backport) Backported from X.org: commit c42311a9d7d2e5a67bdb7f4fa32032b4feba59b1 Author: Adam Jackson <ajax@redhat.com> Date: Fri Mar 24 15:58:54 2017 -0400 kdrive: Remove KdOsFuncs Only the Init slot was used, and Xephyr can just as easily do that initialization directly. Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Adam Jackson <ajax@redhat.com> Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> --- x2gokdriveinit.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index e88f194..a73ffe1 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -235,10 +235,12 @@ OsVendorInit(void) // if (hostx_want_host_cursor()) ephyrFuncs.initCursor = &ephyrCursorInit; - if (!KdCardInfoLast()) { - processScreenArg("800x600", NULL); + if (serverGeneration == 1) { + if (!KdCardInfoLast()) { + processScreenArg("800x600", NULL); + } + remote_init(); } - remote_init(); } KdCardFuncs ephyrFuncs = { -- 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 cf630fd2796fc30b262ca8f23d5ece8b83b48d23 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 12 20:38:23 2019 +0200 x2gokdrive: Adapt to dead slots removal from KdCardFuncs This related to this X.Org server commit: commit b7376fb933ac1b0c1771535c14cf77029eccb7f5 Author: Adam Jackson <ajax@redhat.com> Date: Fri Mar 24 15:58:55 2017 -0400 kdrive: Remove dead slots from KdCardFuncs Signed-off-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net> Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> --- x2gokdrive.c | 27 --------------------------- x2gokdriveinit.c | 9 --------- 2 files changed, 36 deletions(-) diff --git a/x2gokdrive.c b/x2gokdrive.c index d520a4a..96c80c3 100644 --- a/x2gokdrive.c +++ b/x2gokdrive.c @@ -977,33 +977,6 @@ ephyrCreateResources(ScreenPtr pScreen) } 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) -{ -} - -void ephyrScreenFini(KdScreenInfo * screen) { EphyrScrPriv *scrpriv = screen->driver; diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index a73ffe1..56edcfd 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -249,19 +249,10 @@ KdCardFuncs ephyrFuncs = { ephyrInitScreen, /* initScreen */ ephyrFinishInitScreen, /* finishInitScreen */ ephyrCreateResources, /* createRes */ - ephyrPreserve, /* preserve */ - ephyrEnable, /* enable */ - ephyrDPMS, /* dpms */ - ephyrDisable, /* disable */ - ephyrRestore, /* restore */ ephyrScreenFini, /* scrfini */ ephyrCardFini, /* cardfini */ 0, /* initCursor */ - 0, /* enableCursor */ - 0, /* disableCursor */ - 0, /* finiCursor */ - 0, /* recolorCursor */ 0, /* initAccel */ 0, /* enableAccel */ -- 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 404591f5bd96257050b5af0bf3eaabcb60edcb16 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Jul 12 20:44:12 2019 +0200 x2gokdriveinit.c: Unifdef KDRIVE_EVDEV. Backported from X.Org: commit 1b1a8c481773e15142202a7b761d614b33f12577 Author: Eric Anholt <eric@anholt.net> Date: Wed Mar 22 15:11:30 2017 -0700 kdrive: Unifdef KDRIVE_EVDEV. ajax deleted the evdev driver in the removal of fbdev and the linux backend. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniels@collabora.com> Signed-off-by: Eric Anholt <eric@anholt.net> Backported-to-X2GoKdrive-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> --- x2gokdriveinit.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 56edcfd..c449b13 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -42,11 +42,6 @@ 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); @@ -80,11 +75,6 @@ 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
-
git-admin＠x2go.org