Commit d2c81156 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Keyboard.c: Introduce separate masks for Alt and Meta

Unclear why they have been merged at all.
parent 5595e3d1
...@@ -202,6 +202,8 @@ extern char *nxagentKeyboard; ...@@ -202,6 +202,8 @@ extern char *nxagentKeyboard;
static char *nxagentXkbGetRules(void); static char *nxagentXkbGetRules(void);
unsigned int nxagentAltMetaMask; unsigned int nxagentAltMetaMask;
unsigned int nxagentAltMask;
unsigned int nxagentMetaMask;
static void nxagentCheckAltMetaKeys(CARD8, int); static void nxagentCheckAltMetaKeys(CARD8, int);
...@@ -788,6 +790,8 @@ N/A ...@@ -788,6 +790,8 @@ N/A
#endif /* #ifdef _XSERVER64 */ #endif /* #ifdef _XSERVER64 */
nxagentAltMetaMask = 0; nxagentAltMetaMask = 0;
nxagentAltMask = 0;
nxagentMetaMask = 0;
for (i = 0; i < 256; i++) for (i = 0; i < 256; i++)
modmap[i] = 0; modmap[i] = 0;
...@@ -1378,21 +1382,25 @@ void nxagentCheckAltMetaKeys(CARD8 keycode, int j) ...@@ -1378,21 +1382,25 @@ void nxagentCheckAltMetaKeys(CARD8 keycode, int j)
if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_L)) if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_L))
{ {
nxagentAltMetaMask |= 1 << j; nxagentAltMetaMask |= 1 << j;
nxagentMetaMask |= 1 << j;
} }
if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_R)) if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Meta_R))
{ {
nxagentAltMetaMask |= 1 << j; nxagentAltMetaMask |= 1 << j;
nxagentMetaMask |= 1 << j;
} }
if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Alt_L)) if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Alt_L))
{ {
nxagentAltMetaMask |= 1 << j; nxagentAltMetaMask |= 1 << j;
nxagentAltMask |= 1 << j;
} }
if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Alt_R)) if (keycode == XKeysymToKeycode(nxagentDisplay, XK_Alt_R))
{ {
nxagentAltMetaMask |= 1 << j; nxagentAltMetaMask |= 1 << j;
nxagentAltMask |= 1 << j;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment