From 9808c66ec37d5d99f58bdb6136ae96381cb9cfc8 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 29 Jun 2018 22:34:32 +0200 Subject: Lift xkb to XORG-1.2.0 state --- nx-X11/programs/Xserver/xkb/xkbInit.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbInit.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index f39e47a87..a45906568 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -54,13 +54,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) -#if defined(ultrix) || defined(__alpha) || defined(__alpha__) -#define LED_COMPOSE 2 -#define LED_CAPS 3 -#define LED_SCROLL 4 -#define LED_NUM 5 -#define PHYS_LEDS 0x1f -#else #ifdef sun #define LED_NUM 1 #define LED_SCROLL 2 @@ -73,7 +66,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #define LED_SCROLL 3 #define PHYS_LEDS 0x07 #endif -#endif #define MAX_TOC 16 typedef struct _SrvXkmInfo { -- cgit v1.2.3 From 3fbef7da756b15640d1bd7828da68b5ddb0ca848 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 7 Jul 2018 23:51:27 +0200 Subject: Lift xkb to XORG-1.3.0.0 state --- nx-X11/programs/Xserver/xkb/xkbInit.c | 1 + 1 file changed, 1 insertion(+) (limited to 'nx-X11/programs/Xserver/xkb/xkbInit.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index a45906568..ab457c7ce 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -107,6 +107,7 @@ typedef struct _SrvXkmInfo { char * XkbBaseDirectory= XKB_BASE_DIRECTORY; char * XkbBinDirectory= XKB_BIN_DIRECTORY; + static int XkbWantAccessX= 0; static XkbFileInfo * _XkbInitFileInfo= NULL; -- cgit v1.2.3 From 3c1b1efad2ca42154789f09e2519630c5471ed41 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 18 Jul 2018 23:54:46 +0200 Subject: XKB: Remove unused DDX functions commit 7c4c00649cae855e141ec9a3667bfe399e3156d0 Author: Daniel Stone Date: Thu Jan 1 05:25:52 2009 +1100 XKB: Remove unused DDX functions They were complete no-ops anyway. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer Backported-to-nx-by: Ulrich Sibiller --- nx-X11/programs/Xserver/xkb/xkbInit.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs/Xserver/xkb/xkbInit.c') diff --git a/nx-X11/programs/Xserver/xkb/xkbInit.c b/nx-X11/programs/Xserver/xkb/xkbInit.c index ab457c7ce..2f7fa475d 100644 --- a/nx-X11/programs/Xserver/xkb/xkbInit.c +++ b/nx-X11/programs/Xserver/xkb/xkbInit.c @@ -543,8 +543,6 @@ XkbEventCauseRec cause; XkbInitIndicatorMap(xkbi,&file); - XkbDDXInitDevice(pXDev); - if (!(file.xkbinfo.defined&XkmSymbolsMask)) { XkbUpdateKeyTypesFromCore(pXDev,xkb->min_key_code,XkbNumKeys(xkb), &changes); -- cgit v1.2.3