diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-13 23:07:19 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-03-13 23:07:19 +0100 |
| commit | 6ac805ab4411d3045c99e3ceefe8495ac95d8e15 (patch) | |
| tree | 387628976fc6778cc3f77a037643b037ef685891 /nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | |
| parent | 320cece2e97035665d4df5e382ea45e5a7f07efa (diff) | |
| parent | 6f4eb15408c9b7f13ff9e2765a7a50bace0dfae1 (diff) | |
| download | nx-libs-6ac805ab4411d3045c99e3ceefe8495ac95d8e15.tar.gz nx-libs-6ac805ab4411d3045c99e3ceefe8495ac95d8e15.tar.bz2 nx-libs-6ac805ab4411d3045c99e3ceefe8495ac95d8e15.zip | |
Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.x
Attributes GH PR #392: https://github.com/ArcticaProject/nx-libs/pull/392
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Keyboard.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 208ae0653..5fc01c976 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -202,6 +202,8 @@ extern char *nxagentKeyboard; static char *nxagentXkbGetRules(void); unsigned int nxagentAltMetaMask; +unsigned int nxagentAltMask; +unsigned int nxagentMetaMask; static void nxagentCheckAltMetaKeys(CARD8, int); @@ -788,6 +790,8 @@ N/A #endif /* #ifdef _XSERVER64 */ nxagentAltMetaMask = 0; + nxagentAltMask = 0; + nxagentMetaMask = 0; for (i = 0; i < 256; i++) modmap[i] = 0; @@ -1378,21 +1382,25 @@ void nxagentCheckAltMetaKeys(CARD8 keycode, int j) if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_L)) { nxagentAltMetaMask |= 1 << j; + nxagentMetaMask |= 1 << j; } if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_R)) { nxagentAltMetaMask |= 1 << j; + nxagentMetaMask |= 1 << j; } if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Alt_L)) { nxagentAltMetaMask |= 1 << j; + nxagentAltMask |= 1 << j; } if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Alt_R)) { nxagentAltMetaMask |= 1 << j; + nxagentAltMask |= 1 << j; } } |