[X2Go-Commits] [nx-libs] 87/108: Keyboard.c: always ask for remote XKB
git-admin at x2go.org
git-admin at x2go.org
Fri Nov 9 20:35:56 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit b891e5f6859298c3482067752c9e4b2fd19ed617
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Mon Jul 16 22:07:26 2018 +0200
Keyboard.c: always ask for remote XKB
---
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 24 ++++++++++++------------
1 file 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 2ffdde1..103a817 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();
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list