frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xnest: Fix needless build dependency on xcb-util-keysyms 

This was added in:

    commit 4301479508
    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>
This commit is contained in:
Adam Jackson 2015-11-19 12:21:08 -05:00
parent fee0827a9a
commit 4affa75a90
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xnest/Keyboard.c
View File

@ -22,7 +22,6 @@ is" without express or implied warranty.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <xcb/xcb_keysyms.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "screenint.h" #include "screenint.h"
#include "inputstr.h" #include "inputstr.h"
@ -252,7 +251,7 @@ xnestUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++) for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) { if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
if (mask == XCB_MOD_MASK_LOCK) { if (mask == LockMask) {
xnestQueueKeyEvent(KeyPress, key); xnestQueueKeyEvent(KeyPress, key);
xnestQueueKeyEvent(KeyRelease, key); xnestQueueKeyEvent(KeyRelease, key);
} }
@ -270,7 +269,7 @@ xnestUpdateModifierState(unsigned int state)
for (key = 0; key < MAP_LENGTH; key++) for (key = 0; key < MAP_LENGTH; key++)
if (keyc->xkbInfo->desc->map->modmap[key] & mask) { if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
xnestQueueKeyEvent(KeyPress, key); xnestQueueKeyEvent(KeyPress, key);
if (mask == XCB_MOD_MASK_LOCK) if (mask == LockMask)
xnestQueueKeyEvent(KeyRelease, key); xnestQueueKeyEvent(KeyRelease, key);
break; break;
} }