aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-07-16 22:07:26 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2018-11-09 15:31:57 +0100
commitb891e5f6859298c3482067752c9e4b2fd19ed617 (patch)
tree82a04db3a2cae6910b0aea2965d7dc3dedc9dd0b /nx-X11/programs/Xserver/hw/nxagent
parent3fbef7da756b15640d1bd7828da68b5ddb0ca848 (diff)
downloadnx-libs-b891e5f6859298c3482067752c9e4b2fd19ed617.tar.gz
nx-libs-b891e5f6859298c3482067752c9e4b2fd19ed617.tar.bz2
nx-libs-b891e5f6859298c3482067752c9e4b2fd19ed617.zip
Keyboard.c: always ask for remote XKB
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Keyboard.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 2ffdde1c2..103a817dd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -693,6 +693,18 @@ N/A
keySyms.mapWidth = mapWidth;
keySyms.map = keymap;
+ if (XkbQueryExtension(nxagentDisplay,
+ &nxagentXkbInfo.Opcode,
+ &nxagentXkbInfo.EventBase,
+ &nxagentXkbInfo.ErrorBase,
+ &nxagentXkbInfo.MajorVersion,
+ &nxagentXkbInfo.MinorVersion) == 0)
+ {
+ ErrorF("Unable to initialize XKEYBOARD extension.\n");
+ goto XkbError;
+ }
+
+
#ifdef XKB
/*
@@ -828,18 +840,6 @@ XkbError:
fprintf(stderr, "nxagentKeyboardProc: Init XKB extension.\n");
#endif
- if (XkbQueryExtension(nxagentDisplay,
- &nxagentXkbInfo.Opcode,
- &nxagentXkbInfo.EventBase,
- &nxagentXkbInfo.ErrorBase,
- &nxagentXkbInfo.MajorVersion,
- &nxagentXkbInfo.MinorVersion) == 0)
- {
- ErrorF("Unable to initialize XKEYBOARD extension.\n");
-
- goto XkbError;
- }
-
xkb = XkbGetKeyboard(nxagentDisplay, XkbGBN_AllComponentsMask, XkbUseCoreKbd);
nxagentKeycodeConversionSetup();