diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2016-10-27 01:00:23 +0200 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-11-08 07:33:48 +0100 |
| commit | 2f2ade61a8823bad012737b2b388dcc168cccbbf (patch) | |
| tree | 546ee82fe70cf9af80dc80598fde106a0687de46 | |
| parent | 926e90abca82bebcd18b142f824d434e1c1b6992 (diff) | |
| download | nx-libs-2f2ade61a8823bad012737b2b388dcc168cccbbf.tar.gz nx-libs-2f2ade61a8823bad012737b2b388dcc168cccbbf.tar.bz2 nx-libs-2f2ade61a8823bad012737b2b388dcc168cccbbf.zip | |
Keyboard.c: evdev is only existing on Linux
Remove check for the remote side operating system because the evdev
check will only succeed on Linux (and in future FreeBSD?) anyway.
Besides, this makes keycode conversion work when using nxagent without
nx transport (as an xnest replacement) or when not providing
client=linux in the options.
This fixes the second issue mentioned in ArcticaProject/nx-libs#239
(keyboard not working correctly).
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c index 35a09958e..2fd42d3cf 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c @@ -1863,10 +1863,9 @@ void nxagentKeycodeConversionSetup(void) fprintf(stderr, "Failed to create the keyboard file\n"); } - if (nxagentOption(ClientOs) == ClientOsLinux && - drules != NULL && dmodel != NULL && - (strcmp(drules, "evdev") == 0 || - strcmp(dmodel, "evdev") == 0)) + if (drules != NULL && dmodel != NULL && + (strcmp(drules, "evdev") == 0 || + strcmp(dmodel, "evdev") == 0)) { #ifdef DEBUG fprintf(stderr, "nxagentKeycodeConversionSetup: " |