Revision: 5079
          http://tigervnc.svn.sourceforge.net/tigervnc/?rev=5079&view=rev
Author:   ossman_
Date:     2013-04-11 13:50:32 +0000 (Thu, 11 Apr 2013)
Log Message:
-----------
Add support for older Xorg releases.

Modified Paths:
--------------
    trunk/unix/xserver/hw/vnc/InputXKB.cc

Modified: trunk/unix/xserver/hw/vnc/InputXKB.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/InputXKB.cc       2013-04-11 10:48:27 UTC (rev 
5078)
+++ trunk/unix/xserver/hw/vnc/InputXKB.cc       2013-04-11 13:50:32 UTC (rev 
5079)
@@ -42,12 +42,21 @@
 #undef class
 }
 
+#if XORG < 19
+static DevPrivateKey vncXkbScreenPrivateKey = &vncXkbScreenPrivateKey;
+#else
 static DevPrivateKeyRec vncXkbPrivateKeyRec;
 #define vncXkbScreenPrivateKey (&vncXkbPrivateKeyRec)
+#endif
+
 #define vncXkbScreenPrivate(pScreen) \
        (*(InputDevice**) dixLookupPrivate(&(pScreen)->devPrivates, \
                                           vncXkbScreenPrivateKey))
 
+#ifndef KEYBOARD_OR_FLOAT
+#define KEYBOARD_OR_FLOAT MASTER_KEYBOARD
+#endif
+
 /* Stolen from libX11 */
 static Bool
 XkbTranslateKeyCode(register XkbDescPtr xkb, KeyCode key,

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits

Reply via email to