diff options
| author | Pierre Ossman <ossman@cendio.se> | 2013-04-11 13:50:32 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2013-04-11 13:50:32 +0000 |
| commit | c8f3d5518c03f5779fca7f70978685e3eb1879c0 (patch) | |
| tree | f7f6b5f603d5fd79b3f9e611a48b8c8e31145749 | |
| parent | 98914846b3723ddbc1f4de9955b730b7291f9425 (diff) | |
| download | tigervnc-c8f3d5518c03f5779fca7f70978685e3eb1879c0.tar.gz tigervnc-c8f3d5518c03f5779fca7f70978685e3eb1879c0.zip | |
Add support for older Xorg releases.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@5079 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | unix/xserver/hw/vnc/InputXKB.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/unix/xserver/hw/vnc/InputXKB.cc b/unix/xserver/hw/vnc/InputXKB.cc index 39d9252c..65c44009 100644 --- a/unix/xserver/hw/vnc/InputXKB.cc +++ b/unix/xserver/hw/vnc/InputXKB.cc @@ -42,12 +42,21 @@ extern "C" { #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, |