diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2017-11-05 02:02:58 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-28 00:40:45 +0100 |
| commit | 9e6f87e20d8a9145be9faca0502b23de7809c5e4 (patch) | |
| tree | b6fc1a6f3e8496b0e57cb5ebfc8a8be878b82b64 /nx-X11/programs/Xserver/xkb/ddxKillSrv.c | |
| parent | a6cb8583adb16f299e968be4a8e99e903966e1d8 (diff) | |
| download | nx-libs-9e6f87e20d8a9145be9faca0502b23de7809c5e4.tar.gz nx-libs-9e6f87e20d8a9145be9faca0502b23de7809c5e4.tar.bz2 nx-libs-9e6f87e20d8a9145be9faca0502b23de7809c5e4.zip | |
Lift xkb to xorg-xserver-7.1/1.1.0 state
In XORG-7_1 xkbconfig.c had been dropped. We must keep this file
because it is used by hw/nxagent/Keyboard.c to load the xkb
configuration file. Maybe we should move the relevant code to there or
drop xkb configuration file support from nxagent.
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/ddxKillSrv.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/ddxKillSrv.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c index b61c4529b..c581d4201 100644 --- a/nx-X11/programs/Xserver/xkb/ddxKillSrv.c +++ b/nx-X11/programs/Xserver/xkb/ddxKillSrv.c @@ -42,25 +42,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include <nx-X11/extensions/XI.h> -#ifdef XF86DDXACTIONS -#include "xf86.h" -#endif - int XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) { -#ifdef NXAGENT_SERVER - - return 0; - -#else - -#ifdef XF86DDXACTIONS - xf86ProcessActionEvent(ACTION_TERMINATE, NULL); -#else +#ifndef NXAGENT_SERVER GiveUp(1); -#endif - return 0; - #endif /* NXAGENT_SERVER */ + return 0; } |