diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:33:02 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-09 15:33:02 +0100 |
| commit | fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b (patch) | |
| tree | 2afaa1a03cf49ef01796a4013513f01bdaf58eca /nx-X11/programs/Xserver/xkb/xkbUtils.c | |
| parent | 122db3fde2b934df206567abc0c8b431962ce4b3 (diff) | |
| parent | 3965f24befb21f469b887d4c69b9defc861831fb (diff) | |
| download | nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.tar.gz nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.tar.bz2 nx-libs-fccef5fc5794c3aab5c28dbe354c3dc3a86cc07b.zip | |
Merge branch 'uli42-pr/xkb_1.3.0.0' into 3.6.x
Attributes GH PR #717: https://github.com/ArcticaProject/nx-libs/pull/717
Diffstat (limited to 'nx-X11/programs/Xserver/xkb/xkbUtils.c')
| -rw-r--r-- | nx-X11/programs/Xserver/xkb/xkbUtils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xkb/xkbUtils.c b/nx-X11/programs/Xserver/xkb/xkbUtils.c index bf88458be..028f32454 100644 --- a/nx-X11/programs/Xserver/xkb/xkbUtils.c +++ b/nx-X11/programs/Xserver/xkb/xkbUtils.c @@ -711,11 +711,11 @@ unsigned char grp; grp= state->locked_group; if (grp>=ctrls->num_groups) - state->locked_group= XkbAdjustGroup(grp,ctrls); + state->locked_group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); grp= state->locked_group+state->base_group+state->latched_group; if (grp>=ctrls->num_groups) - state->group= XkbAdjustGroup(grp,ctrls); + state->group= XkbAdjustGroup(XkbCharToInt(grp),ctrls); else state->group= grp; XkbComputeCompatState(xkbi); return; @@ -763,7 +763,7 @@ XkbSrvLedInfoPtr sli; if (cause!=NULL) { xkbControlsNotify cn; cn.numGroups= ctrls->num_groups; - cn.changedControls|= XkbControlsEnabledMask; + cn.changedControls= XkbControlsEnabledMask; cn.enabledControls= ctrls->enabled_ctrls; cn.enabledControlChanges= (ctrls->enabled_ctrls^old); cn.keycode= cause->kc; |