1
0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-20 22:14:19 +01:00

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
2013-06-15 14:38:44 +02:00
committed by Carlos R. Mafra
parent 0382dd5dd7
commit 39ecbc1084
2 changed files with 15 additions and 2 deletions

View File

@@ -273,7 +273,10 @@ char *capture_shortcut(Display *dpy, Bool *capturing, Bool convert_case)
XAllowEvents(dpy, AsyncKeyboard, CurrentTime);
WMNextEvent(dpy, &ev);
if (ev.type == KeyPress && ev.xkey.keycode != 0) {
ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
if (xext_xkb_supported)
ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
else
ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0);
if (!IsModifierKey(ksym)) {
if (convert_case) {
XConvertCase(ksym, &lksym, &uksym);