diff options
| author | Adam Jackson <ajax@redhat.com> | 2015-11-19 12:21:08 -0500 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-11-24 10:41:14 -0500 |
| commit | 4affa75a90d2455c81087b930126ad7adfd019f0 (patch) | |
| tree | 1a6d57153e1a0b02f6f559d8cbfdb17953824d97 | |
| parent | fee0827a9a695600765f3d04376fc9babe497401 (diff) | |
xnest: Fix needless build dependency on xcb-util-keysyms
This was added in:
commit 43014795087a0a8774dd9687f5967329b15f06a2
Author: Olivier Fourdan <ofourdan@redhat.com>
Date: Mon Jan 5 16:44:22 2015 +0100
Synchronize capslock in Xnest and Xephyr
Which is fine if you're building both, but if you don't happen to have
xcb-util-keysyms' headers installed Xnest will configure as enabled but
fail to build.
Fortunately <X11/X.h> has a corresponding #define, so use that instead.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
| -rw-r--r-- | hw/xnest/Keyboard.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 7ee7a7c3c..85deabab4 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -22,7 +22,6 @@ is" without express or implied warranty. #include <X11/X.h> #include <X11/Xproto.h> -#include <xcb/xcb_keysyms.h> #include <X11/keysym.h> #include "screenint.h" #include "inputstr.h" @@ -252,7 +251,7 @@ xnestUpdateModifierState(unsigned int state) for (key = 0; key < MAP_LENGTH; key++) if (keyc->xkbInfo->desc->map->modmap[key] & mask) { - if (mask == XCB_MOD_MASK_LOCK) { + if (mask == LockMask) { xnestQueueKeyEvent(KeyPress, key); xnestQueueKeyEvent(KeyRelease, key); } @@ -270,7 +269,7 @@ xnestUpdateModifierState(unsigned int state) for (key = 0; key < MAP_LENGTH; key++) if (keyc->xkbInfo->desc->map->modmap[key] & mask) { xnestQueueKeyEvent(KeyPress, key); - if (mask == XCB_MOD_MASK_LOCK) + if (mask == LockMask) xnestQueueKeyEvent(KeyRelease, key); break; } |