diff options
| author | Keith Packard <keithp@keithp.com> | 2015-01-10 14:51:57 +1300 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-01-10 14:51:57 +1300 |
| commit | 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1 (patch) | |
| tree | fa7b56cdbbfefbfcf84fb9ab2e66d21dc319a46d /hw | |
| parent | 4e12d7b6f4489fa06475465993a3e1e1d896390b (diff) | |
| parent | 43014795087a0a8774dd9687f5967329b15f06a2 (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/kdrive/ephyr/ephyr.c | 8 | ||||
| -rw-r--r-- | hw/xnest/Keyboard.c | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index 907bbebae..164ebdcba 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -806,7 +806,11 @@ ephyrUpdateModifierState(unsigned int state) for (key = 0; key < MAP_LENGTH; key++) if (keyc->xkbInfo->desc->map->modmap[key] & mask) { - if (key_is_down(pDev, key, KEY_PROCESSED)) + if (mask == XCB_MOD_MASK_LOCK) { + KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE); + KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); + } + else if (key_is_down(pDev, key, KEY_PROCESSED)) KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); if (--count == 0) @@ -820,6 +824,8 @@ ephyrUpdateModifierState(unsigned int state) for (key = 0; key < MAP_LENGTH; key++) if (keyc->xkbInfo->desc->map->modmap[key] & mask) { KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE); + if (mask == XCB_MOD_MASK_LOCK) + KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); break; } } diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 2cf16246b..ee3f68e3f 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -18,6 +18,7 @@ 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" @@ -247,7 +248,11 @@ xnestUpdateModifierState(unsigned int state) for (key = 0; key < MAP_LENGTH; key++) if (keyc->xkbInfo->desc->map->modmap[key] & mask) { - if (key_is_down(pDev, key, KEY_PROCESSED)) + if (mask == XCB_MOD_MASK_LOCK) { + xnestQueueKeyEvent(KeyPress, key); + xnestQueueKeyEvent(KeyRelease, key); + } + else if (key_is_down(pDev, key, KEY_PROCESSED)) xnestQueueKeyEvent(KeyRelease, key); if (--count == 0) @@ -261,6 +266,8 @@ 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) + xnestQueueKeyEvent(KeyRelease, key); break; } } |