diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2018-07-07 23:51:27 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:31:57 +0100 |
| commit | 3fbef7da756b15640d1bd7828da68b5ddb0ca848 (patch) | |
| tree | e01c4a1746c181a104b3a2a7baf6d30024c4dcc4 /nx-X11/programs/Xserver | |
| parent | 4ed8145f7be80f162970e25cf960aa7d24b3dafb (diff) | |
| download | nx-libs-3fbef7da756b15640d1bd7828da68b5ddb0ca848.tar.gz nx-libs-3fbef7da756b15640d1bd7828da68b5ddb0ca848.tar.bz2 nx-libs-3fbef7da756b15640d1bd7828da68b5ddb0ca848.zip | |
Lift xkb to XORG-1.3.0.0 state
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbInit.c | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbLEDs.c | 6 |
2 files changed, 4 insertions, 3 deletions
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; diff --git a/nx-X11/programs/Xserver/xkb/xkbLEDs.c b/nx-X11/programs/Xserver/xkb/xkbLEDs.c index 2383bdd99..0fccd0913 100644 --- a/nx-X11/programs/Xserver/xkb/xkbLEDs.c +++ b/nx-X11/programs/Xserver/xkb/xkbLEDs.c @@ -274,13 +274,13 @@ unsigned oldState; changes->indicators.state_changes|= affected; } - ed->reason|= (XkbXI_IndicatorStateMask&(~XkbXIUnsupported)); + ed->reason|= (XkbXI_IndicatorStateMask&(~XkbXI_KeyboardsMask)); ed->ledClass= sli->class; ed->ledID= sli->id; ed->ledsDefined= sli->namesPresent|sli->mapsPresent; ed->ledState= sli->effectiveState; - ed->unsupported|= XkbXIUnsupported&XkbXI_IndicatorStateMask; - ed->supported= XkbXI_AllFeaturesMask&(~XkbXIUnsupported); + ed->unsupported|= XkbXI_KeyboardsMask&XkbXI_IndicatorStateMask; + ed->supported= XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask); if (changes!=&my_changes) changes= NULL; if (ed!=&my_ed) ed= NULL; |