Skip to content

N
nx-libs
Commit 3fbef7da authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Lift xkb to XORG-1.3.0.0 state

parent 4ed8145f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
nx-X11/programs/Xserver/xkb/xkbInit.c
View file @ 3fbef7da
...@@ -107,6 +107,7 @@ typedef struct _SrvXkmInfo { ...@@ -107,6 +107,7 @@ typedef struct _SrvXkmInfo {
char * XkbBaseDirectory= XKB_BASE_DIRECTORY; char * XkbBaseDirectory= XKB_BASE_DIRECTORY;
char * XkbBinDirectory= XKB_BIN_DIRECTORY; char * XkbBinDirectory= XKB_BIN_DIRECTORY;
static int XkbWantAccessX= 0; static int XkbWantAccessX= 0;
static XkbFileInfo * _XkbInitFileInfo= NULL; static XkbFileInfo * _XkbInitFileInfo= NULL;
......
nx-X11/programs/Xserver/xkb/xkbLEDs.c
View file @ 3fbef7da
...@@ -274,13 +274,13 @@ unsigned oldState; ...@@ -274,13 +274,13 @@ unsigned oldState;
changes->indicators.state_changes|= affected; changes->indicators.state_changes|= affected;
} }
ed->reason|= (XkbXI_IndicatorStateMask&(~XkbXIUnsupported)); ed->reason|= (XkbXI_IndicatorStateMask&(~XkbXI_KeyboardsMask));
ed->ledClass= sli->class; ed->ledClass= sli->class;
ed->ledID= sli->id; ed->ledID= sli->id;
ed->ledsDefined= sli->namesPresent|sli->mapsPresent; ed->ledsDefined= sli->namesPresent|sli->mapsPresent;
ed->ledState= sli->effectiveState; ed->ledState= sli->effectiveState;
ed->unsupported|= XkbXIUnsupported&XkbXI_IndicatorStateMask; ed->unsupported|= XkbXI_KeyboardsMask&XkbXI_IndicatorStateMask;
ed->supported= XkbXI_AllFeaturesMask&(~XkbXIUnsupported); ed->supported= XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask);
if (changes!=&my_changes) changes= NULL; if (changes!=&my_changes) changes= NULL;
if (ed!=&my_ed) ed= NULL; if (ed!=&my_ed) ed= NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment