From 9e6f87e20d8a9145be9faca0502b23de7809c5e4 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 5 Nov 2017 02:02:58 +0100 Subject: 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. --- nx-X11/programs/Xserver/xkb/ddxPrivate.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/ddxPrivate.c') diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c index 8fdc8c91f..92dc6a03d 100644 --- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c +++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c @@ -12,32 +12,9 @@ #include "windowstr.h" #include -#ifdef XF86DDXACTIONS -#include "xf86.h" -#endif - int XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) { -#ifdef XF86DDXACTIONS - XkbAnyAction *xf86act = &(act->any); - char msgbuf[XkbAnyActionDataSize+1]; - - if (xf86act->type == XkbSA_XFree86Private) { - memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize); - msgbuf[XkbAnyActionDataSize]= '\0'; - if (_XkbStrCaseCmp(msgbuf, "-vmode")==0) - xf86ProcessActionEvent(ACTION_PREV_MODE, NULL); - else if (_XkbStrCaseCmp(msgbuf, "+vmode")==0) - xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL); - else if (_XkbStrCaseCmp(msgbuf, "ungrab")==0) - xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL); - else if (_XkbStrCaseCmp(msgbuf, "clsgrb")==0) - xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL); - else - xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf); - } -#endif return 0; } -- cgit v1.2.3 From 00e3e95e5f40de2aaf5bb920bc51a311404889fc Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 28 Feb 2018 00:52:10 +0100 Subject: Lift xkb to xorg-xserver-7.1/1.1.0 state - non-functional changes only --- nx-X11/programs/Xserver/xkb/ddxPrivate.c | 1 - 1 file changed, 1 deletion(-) (limited to 'nx-X11/programs/Xserver/xkb/ddxPrivate.c') diff --git a/nx-X11/programs/Xserver/xkb/ddxPrivate.c b/nx-X11/programs/Xserver/xkb/ddxPrivate.c index 92dc6a03d..0064cabde 100644 --- a/nx-X11/programs/Xserver/xkb/ddxPrivate.c +++ b/nx-X11/programs/Xserver/xkb/ddxPrivate.c @@ -17,4 +17,3 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) { return 0; } - -- cgit v1.2.3