[X2Go-Commits] [nx-libs] 91/108: Keyboard.c: greatly simplify the code in nxagentKeyboardProc
git-admin at x2go.org
git-admin at x2go.org
Fri Nov 9 20:35:57 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 05e03b965855e13557745d25eabe63698cb61bc1
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Mon Jul 16 22:23:56 2018 +0200
Keyboard.c: greatly simplify the code in nxagentKeyboardProc
most of the code was existing twice
---
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 44 ++++++++-------------------
1 file changed, 13 insertions(+), 31 deletions(-)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 84121c1..ff23ba2 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -828,39 +828,16 @@ XkbError:
nxagentKeycodeConversionSetup();
- if (xkb == NULL || xkb->geom == NULL)
+ if (xkb && xkb->geom)
{
- #ifdef TEST
- fprintf(stderr, "nxagentKeyboardProc: No current keyboard.\n");
- if (xkb == NULL)
- {
- fprintf(stderr, "nxagentKeyboardProc: xkb is null.\n");
- }
- else
- {
- fprintf(stderr, "nxagentKeyboardProc: xkb->geom is null.\n");
- }
- fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device.\n");
- #endif
- #ifdef DEBUG
- fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device: "
- "[rules='%s',model='%s',layout='%s',variants='%s',options='%s'].\n",
- rules, model, layout, variants, options);
- #endif
-
- XkbSetRulesDflts(rules, model, layout, variants, options);
- XkbInitKeyboardDeviceStruct((void *)pDev, &names, &keySyms, modmap,
- nxagentBell, nxagentChangeKeyboardControl);
-
- if (!nxagentKeyboard || strcmp(nxagentKeyboard, "query") == 0)
- {
- goto XkbError;
- }
-
- goto XkbEnd;
+ XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
}
-
- XkbGetControls(nxagentDisplay, XkbAllControlsMask, xkb);
+#ifdef TEST
+ else
+ {
+ fprintf(stderr, "nxagentKeyboardProc: No current keyboard.\n");
+ }
+#endif
#ifdef DEBUG
fprintf(stderr, "nxagentKeyboardProc: Going to set rules and init device: "
@@ -877,6 +854,11 @@ XkbError:
goto XkbError;
}
+ if (xkb && xkb->geom)
+ {
+ XkbDDXChangeControls(pDev, xkb->ctrls, xkb->ctrls);
+ }
+
if (nxagentOption(Shadow) == 1 && pDev && pDev->key)
{
NXShadowInitKeymap(&(pDev->key->curKeySyms));
--
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