diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-11-02 04:18:33 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-11-02 04:18:33 +0200 |
| commit | de5a4c63747a417cdece919f4fb5a4004a3ee7bb (patch) | |
| tree | 82fdad58212e98c4e6344c19ee772b98950c33bf /xkb | |
| parent | 1d65429a9e03871969552d0c31b022546cc46b12 (diff) | |
xkb: note that we allow full xi interaction
We now allow maps to be set (etc) on different keyboards, so stop putting
XkbXI_KeyboardsMask in unsupported.
Diffstat (limited to 'xkb')
| -rw-r--r-- | xkb/xkb.c | 7 | ||||
| -rw-r--r-- | xkb/xkbLEDs.c | 24 |
2 files changed, 15 insertions, 16 deletions
@@ -5720,7 +5720,6 @@ char * str; wanted&= ~XkbXI_ButtonActionsMask; if ((!dev->kbdfeed)&&(!dev->leds)) wanted&= ~XkbXI_IndicatorsMask; - wanted&= ~XkbXI_KeyboardsMask; nameLen= XkbSizeCountedString(dev->name); bzero((char *)&rep,SIZEOF(xkbGetDeviceInfoReply)); @@ -5729,8 +5728,8 @@ char * str; rep.sequenceNumber = client->sequence; rep.length = nameLen/4; rep.present = wanted; - rep.supported = XkbXI_AllDeviceFeaturesMask&(~XkbXI_KeyboardsMask); - rep.unsupported = XkbXI_KeyboardsMask; + rep.supported = XkbXI_AllDeviceFeaturesMask; + rep.unsupported = 0; rep.firstBtnWanted = rep.nBtnsWanted = 0; rep.firstBtnRtrn = rep.nBtnsRtrn = 0; if (dev->button) @@ -6044,7 +6043,7 @@ xkbExtensionDeviceNotify ed; change= stuff->change; CHK_ANY_DEVICE(dev,stuff->deviceSpec); - CHK_MASK_LEGAL(0x01,change,(XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask))); + CHK_MASK_LEGAL(0x01,change,XkbXI_AllFeaturesMask); wire= (char *)&stuff[1]; if (change&XkbXI_ButtonActionsMask) { diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c index ec8e7b14a..e94e0bff4 100644 --- a/xkb/xkbLEDs.c +++ b/xkb/xkbLEDs.c @@ -675,13 +675,13 @@ xkbExtensionDeviceNotify my_ed; changes->names.changed_indicators|= changed_names; } - ed->reason|= (XkbXI_IndicatorNamesMask&(~XkbXI_KeyboardsMask)); + ed->reason|= XkbXI_IndicatorNamesMask; ed->ledClass= sli->class; ed->ledID= sli->id; ed->ledsDefined= sli->namesPresent|sli->mapsPresent; ed->ledState= sli->effectiveState; - ed->unsupported= XkbXI_KeyboardsMask; - ed->supported= XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask); + ed->unsupported= 0; + ed->supported= XkbXI_AllFeaturesMask; if (changes!=&my_changes) changes= NULL; if (ed!=&my_ed) ed= NULL; @@ -753,13 +753,13 @@ xkbExtensionDeviceNotify my_ed; XkbCheckIndicatorMaps(dev,sli,changed_maps); - ed->reason|= (XkbXI_IndicatorMapsMask&(~XkbXI_KeyboardsMask)); + ed->reason|= XkbXI_IndicatorMapsMask; ed->ledClass= sli->class; ed->ledID= sli->id; ed->ledsDefined= sli->namesPresent|sli->mapsPresent; ed->ledState= sli->effectiveState; - ed->unsupported|= XkbXI_KeyboardsMask&XkbXI_IndicatorMapsMask; - ed->supported= XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask); + ed->unsupported|= XkbXI_IndicatorMapsMask; + ed->supported= XkbXI_AllFeaturesMask; XkbUpdateLedAutoState(dev,sli,changed_maps,ed,changes,cause); @@ -834,13 +834,13 @@ Bool kb_changed; if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) changes->indicators.state_changes|= affected; if (affected) { - ed->reason|= (XkbXI_IndicatorStateMask&(~XkbXI_KeyboardsMask)); + ed->reason|= XkbXI_IndicatorStateMask; ed->ledClass= sli->class; ed->ledID= sli->id; ed->ledsDefined= sli->namesPresent|sli->mapsPresent; ed->ledState= sli->effectiveState; - ed->unsupported|= XkbXI_KeyboardsMask&XkbXI_IndicatorStateMask; - ed->supported= XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask); + ed->unsupported|= XkbXI_IndicatorStateMask; + ed->supported= XkbXI_AllFeaturesMask; } if (kb_changed) { @@ -918,13 +918,13 @@ unsigned oldState; changes->indicators.state_changes|= affected; } - ed->reason|= (XkbXI_IndicatorStateMask&(~XkbXI_KeyboardsMask)); + ed->reason|= XkbXI_IndicatorStateMask; ed->ledClass= sli->class; ed->ledID= sli->id; ed->ledsDefined= sli->namesPresent|sli->mapsPresent; ed->ledState= sli->effectiveState; - ed->unsupported|= XkbXI_KeyboardsMask&XkbXI_IndicatorStateMask; - ed->supported= XkbXI_AllFeaturesMask&(~XkbXI_KeyboardsMask); + ed->unsupported|= XkbXI_IndicatorStateMask; + ed->supported= XkbXI_AllFeaturesMask; if (changes!=&my_changes) changes= NULL; if (ed!=&my_ed) ed= NULL; |