[X2Go-Commits] [nx-libs] 21/51: Keyboard.c: reformat nxagentKeycodeConversionSetup
git-admin at x2go.org
git-admin at x2go.org
Fri Feb 8 05:40:06 CET 2019
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository nx-libs.
commit fb31220f248e82a36ae49be5c5d3abef5a791373
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Sat Dec 1 18:17:40 2018 +0100
Keyboard.c: reformat nxagentKeycodeConversionSetup
---
nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 37 +++++++++++++--------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
index 0871a58..dcb58de 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -1644,35 +1644,34 @@ void nxagentKeycodeConversionSetup(char * rules, char * model)
{
fprintf(stderr, "Info: Keycode conversion is off\n");
nxagentKeycodeConversion = False;
- return;
}
else if (nxagentOption(KeycodeConversion) == KeycodeConversionOn)
{
fprintf(stderr, "Info: Keycode conversion is on\n");
nxagentKeycodeConversion = True;
- return;
- }
-
- if (rules && model &&
- (strcmp(rules, "evdev") == 0 ||
- strcmp(model, "evdev") == 0))
- {
- #ifdef DEBUG
- fprintf(stderr, "%s: Activating KeyCode conversion.\n", __func__);
- #endif
-
- fprintf(stderr, "Info: Keycode conversion auto-determined as on\n");
- nxagentKeycodeConversion = True;
}
else
{
- #ifdef DEBUG
- fprintf(stderr, "%s: Deactivating KeyCode conversion.\n", __func__);
- #endif
+ if (rules && model &&
+ (strcmp(rules, "evdev") == 0 ||
+ strcmp(model, "evdev") == 0))
+ {
+ #ifdef DEBUG
+ fprintf(stderr, "%s: Activating KeyCode conversion.\n", __func__);
+ #endif
- fprintf(stderr, "Info: Keycode conversion auto-determined as off\n");
+ fprintf(stderr, "Info: Keycode conversion auto-determined as on\n");
+ nxagentKeycodeConversion = True;
+ }
+ else
+ {
+ #ifdef DEBUG
+ fprintf(stderr, "%s: Deactivating KeyCode conversion.\n", __func__);
+ #endif
- nxagentKeycodeConversion = False;
+ fprintf(stderr, "Info: Keycode conversion auto-determined as off\n");
+ nxagentKeycodeConversion = False;
+ }
}
}
--
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