[X2Go-Commits] [x2gokdrive] 02/04: Revert "x2gokdriveinit.c: Unifdef KDRIVE_EVDEV."

git-admin at x2go.org git-admin at x2go.org
Mon Jul 15 22:09:24 CEST 2019


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 at 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


More information about the x2go-commits mailing list