diff options
| author | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
|---|---|---|
| committer | Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> | 2008-04-07 07:56:41 +0930 |
| commit | fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab (patch) | |
| tree | fda1a9d90f4a3e99af9da656939ff8c112cfeb33 /xkb/xkbInit.c | |
| parent | b46a00918691cbd5ca80b6d3acae7614f93e073b (diff) | |
| parent | 6c0cfe3d43b177c4cfaf7e228f32c655f9a98459 (diff) | |
Merge branch 'master' into dcdc_rework
Conflicts:
Xext/xevie.c
dix/dispatch.c
Diffstat (limited to 'xkb/xkbInit.c')
| -rw-r--r-- | xkb/xkbInit.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index 09317e943..ce5de077e 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -222,8 +222,8 @@ char * pval; ErrorF("[xkb] Internal Error! bad size (%d!=%d) for _XKB_RULES_NAMES\n", out,len); } - ChangeWindowProperty(WindowTable[0],name,XA_STRING,8,PropModeReplace, - len,pval,True); + dixChangeWindowProperty(serverClient, WindowTable[0], name, XA_STRING, 8, + PropModeReplace, len, pval, True); xfree(pval); return True; } @@ -375,7 +375,8 @@ Atom unknown; names->vmods[vmod_AltGr]= CREATE_ATOM("ModeSwitch"); } - if (!(xkb->defined & XkmIndicatorsMask)) { + if (!(xkb->defined & XkmIndicatorsMask) || + !(xkb->defined & XkmGeometryMask)) { initIndicatorNames(NULL,xkb); if (names->indicators[LED_CAPS-1]==None) names->indicators[LED_CAPS-1] = CREATE_ATOM("Caps Lock"); @@ -531,10 +532,10 @@ XkbEventCauseRec cause; XkbDDXInitDevice(pXDev); if (xkb->defined & XkmSymbolsMask) + XkbUpdateCoreDescription(pXDev, True); + else XkbUpdateKeyTypesFromCore(pXDev, xkb->min_key_code, XkbNumKeys(xkb), &changes); - else - XkbUpdateCoreDescription(pXDev, True); XkbSetCauseUnknown(&cause); XkbUpdateActions(pXDev,xkb->min_key_code, XkbNumKeys(xkb),&changes, |