WPrefs: Added XKeycodeToKeysym work-around to all other usage places

To ensure proper behaviour with X servers that do not support the
Xkb extension, implemented call to the fall-back legacy function
to the other places where it is being used, to ensure proper
behaviour in any case.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS authored and Carlos R. Mafra committed 2013-06-16 18:53:05 +01:00
1 parent 0382dd5dd7
commit 39ecbc1084
2 files changed
+15 -2

No files matched your search

+11 -1
View File
@@ -162,7 +162,17 @@ static void x_reset_modifier_mapping(Display * display)
for (column = 0; column < 4; column += 2) {
KeyCode code = x_modifier_keymap->modifiermap[modifier_index * mkpm
+ modifier_key];
KeySym sym = (code ? XkbKeycodeToKeysym(display, code, 0, column) : 0);
KeySym sym;
if (code) {
if (xext_xkb_supported)
sym = XkbKeycodeToKeysym(display, code, 0, column);
else
sym = XKeycodeToKeysym(display, code, column);
} else {
sym = NoSymbol;
}
if (sym == last_sym)
continue;
last_sym = sym;