From 2f2ade61a8823bad012737b2b388dcc168cccbbf Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 27 Oct 2016 01:00:23 +0200 Subject: 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). --- nx-X11/programs/Xserver/hw/nxagent/Keyboard.c | 7 +++---- 1 file 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: " -- cgit v1.2.3