andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

XKB: Only Xi events are processed

Browse Source 
Core events aren't run through these functions, so don't bother testing
for them.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Daniel Stone 2009-01-04 16:40:46 +11:00
parent 2762cafc32
commit 27ea1a7e4e
2 changed files with 28 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xkb/xkbAccessX.c
View File

@ -33,6 +33,8 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include "exglobals.h"
#include <X11/extensions/XIproto.h>
#include "inputstr.h" #include "inputstr.h"
#include <xkbsrv.h> #include <xkbsrv.h>
#if !defined(WIN32) #if !defined(WIN32)
@ -691,15 +693,16 @@ XkbSrvInfoPtr xkbi = dev->key->xkbInfo;
unsigned changed = 0; unsigned changed = 0;
ProcessInputProc backupproc; ProcessInputProc backupproc;
xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse); xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
deviceKeyButtonPointer *kbp = xE;
xkbi->shiftKeyCount = 0; xkbi->shiftKeyCount = 0;
xkbi->lastPtrEventTime= xE->u.keyButtonPointer.time; xkbi->lastPtrEventTime= kbp->time;
if (xE->u.u.type==ButtonPress) { if (xE->u.u.type==DeviceButtonPress) {
changed |= XkbPointerButtonMask; changed |= XkbPointerButtonMask;
} }
else if (xE->u.u.type==ButtonRelease) { else if (xE->u.u.type==DeviceButtonRelease) {
xkbi->lockedPtrButtons&= ~(1<<(xE->u.u.detail&0x7)); xkbi->lockedPtrButtons&= ~(1<<(kbp->detail&0x7));
changed |= XkbPointerButtonMask; changed |= XkbPointerButtonMask;
} }
@ -726,7 +729,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
xkbi->state.ptr_buttons = mouse->button->state; xkbi->state.ptr_buttons = mouse->button->state;
/* clear any latched modifiers */ /* clear any latched modifiers */
if ( xkbi->state.latched_mods && (xE->u.u.type==ButtonRelease) ) { if ( xkbi->state.latched_mods && (kbp->type==DeviceButtonRelease) ) {
unsigned changed_leds; unsigned changed_leds;
XkbStateRec oldState; XkbStateRec oldState;
XkbSrvLedInfoPtr sli; XkbSrvLedInfoPtr sli;
@ -741,7 +744,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
changed_leds= XkbIndicatorsToUpdate(dev,changed,False); changed_leds= XkbIndicatorsToUpdate(dev,changed,False);
if (changed_leds) { if (changed_leds) {
XkbEventCauseRec cause; XkbEventCauseRec cause;
XkbSetCauseKey(&cause,(xE->u.u.detail&0x7),xE->u.u.type); XkbSetCauseKey(&cause,(kbp->detail&0x7),kbp->type);
XkbUpdateIndicators(dev,changed_leds,True,NULL,&cause); XkbUpdateIndicators(dev,changed_leds,True,NULL,&cause);
} }
} }
@ -750,8 +753,8 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
if (((xkbi->flags&_XkbStateNotifyInProgress)==0)&&(changed!=0)) { if (((xkbi->flags&_XkbStateNotifyInProgress)==0)&&(changed!=0)) {
xkbStateNotify sn; xkbStateNotify sn;
sn.keycode= xE->u.u.detail; sn.keycode= kbp->detail;
sn.eventType= xE->u.u.type; sn.eventType= kbp->type;
sn.requestMajor = sn.requestMinor = 0; sn.requestMajor = sn.requestMinor = 0;
sn.changed= changed; sn.changed= changed;
XkbSendStateNotify(dev,&sn); XkbSendStateNotify(dev,&sn);

62
xkb/xkbPrKeyEv.c
View File

@ -49,16 +49,14 @@ XkbSrvInfoPtr xkbi;
int key; int key;
XkbBehavior behavior; XkbBehavior behavior;
unsigned ndx; unsigned ndx;
int xiEvent;
xkbi= keyc->xkbInfo; xkbi= keyc->xkbInfo;
key= xE->u.u.detail; key= xE->u.u.detail;
xiEvent= (xE->u.u.type & EXTENSION_EVENT_BASE);
if (xkbDebugFlags&0x8) { if (xkbDebugFlags&0x8) {
DebugF("[xkb] XkbPKE: Key %d %s\n",key,(xE->u.u.type==KeyPress?"down":"up")); DebugF("[xkb] XkbPKE: Key %d %s\n",key,(xE->u.u.type==DeviceKeyPress?"down":"up"));
} }
if ( (xkbi->repeatKey==key) && (xE->u.u.type==KeyRelease) && if ( (xkbi->repeatKey==key) && (xE->u.u.type==DeviceKeyRelease) &&
((xkbi->desc->ctrls->enabled_ctrls&XkbRepeatKeysMask)==0) ) { ((xkbi->desc->ctrls->enabled_ctrls&XkbRepeatKeysMask)==0) ) {
AccessXCancelRepeatKey(xkbi,key); AccessXCancelRepeatKey(xkbi,key);
} }
@ -72,55 +70,37 @@ int xiEvent;
if ((behavior.type&XkbKB_Permanent)==0) { if ((behavior.type&XkbKB_Permanent)==0) {
switch (behavior.type) { switch (behavior.type) {
case XkbKB_Default: case XkbKB_Default:
if (( xE->u.u.type == KeyPress || if (xE->u.u.type == DeviceKeyPress &&
xE->u.u.type == DeviceKeyPress) &&
(keyc->down[key>>3] & (1<<(key&7)))) { (keyc->down[key>>3] & (1<<(key&7)))) {
XkbLastRepeatEvent= (pointer)xE; XkbLastRepeatEvent= (pointer)xE;
if (xiEvent) xE->u.u.type = DeviceKeyRelease;
xE->u.u.type = DeviceKeyRelease;
else
xE->u.u.type = KeyRelease;
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);
if (xiEvent) xE->u.u.type = DeviceKeyPress;
xE->u.u.type = DeviceKeyPress;
else
xE->u.u.type = KeyPress;
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);
XkbLastRepeatEvent= NULL; XkbLastRepeatEvent= NULL;
return; return;
} }
else if ((xE->u.u.type==KeyRelease || else if (xE->u.u.type==DeviceKeyRelease &&
xE->u.u.type == DeviceKeyRelease) &&
(!(keyc->down[key>>3]&(1<<(key&7))))) { (!(keyc->down[key>>3]&(1<<(key&7))))) {
XkbLastRepeatEvent= (pointer)&xE; XkbLastRepeatEvent= (pointer)&xE;
if (xiEvent) xE->u.u.type = DeviceKeyPress;
xE->u.u.type = DeviceKeyPress;
else
xE->u.u.type = KeyPress;
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);
if (xiEvent) xE->u.u.type = DeviceKeyRelease;
xE->u.u.type = DeviceKeyRelease;
else
xE->u.u.type = KeyRelease;
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);
XkbLastRepeatEvent= NULL; XkbLastRepeatEvent= NULL;
return; return;
} }
break; break;
case XkbKB_Lock: case XkbKB_Lock:
if ( xE->u.u.type == KeyRelease || if (xE->u.u.type == DeviceKeyRelease) {
xE->u.u.type == DeviceKeyRelease) {
return; return;
} }
else { else {
int bit= 1<<(key&7); int bit= 1<<(key&7);
if ( keyc->down[key>>3]&bit ) { if ( keyc->down[key>>3]&bit ) {
if (xiEvent) xE->u.u.type = DeviceKeyRelease;
xE->u.u.type = DeviceKeyRelease;
else
xE->u.u.type= KeyRelease;
} }
} }
break; break;
@ -129,14 +109,13 @@ int xiEvent;
if ( ndx<xkbi->nRadioGroups ) { if ( ndx<xkbi->nRadioGroups ) {
XkbRadioGroupPtr rg; XkbRadioGroupPtr rg;
if ( xE->u.u.type == KeyRelease || if (xE->u.u.type == DeviceKeyRelease)
xE->u.u.type == DeviceKeyRelease)
return; return;
rg = &xkbi->radioGroups[ndx]; rg = &xkbi->radioGroups[ndx];
if ( rg->currentDown == xE->u.u.detail ) { if ( rg->currentDown == xE->u.u.detail ) {
if (behavior.data&XkbKB_RGAllowNone) { if (behavior.data&XkbKB_RGAllowNone) {
xE->u.u.type = KeyRelease; xE->u.u.type = DeviceKeyRelease;
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);
rg->currentDown= 0; rg->currentDown= 0;
} }
@ -144,16 +123,10 @@ int xiEvent;
} }
if ( rg->currentDown!=0 ) { if ( rg->currentDown!=0 ) {
int key = xE->u.u.detail; int key = xE->u.u.detail;
if (xiEvent) xE->u.u.type = DeviceKeyRelease;
xE->u.u.type = DeviceKeyRelease;
else
xE->u.u.type= KeyRelease;
xE->u.u.detail= rg->currentDown; xE->u.u.detail= rg->currentDown;
XkbHandleActions(keybd,keybd,xE,count); XkbHandleActions(keybd,keybd,xE,count);
if (xiEvent) xE->u.u.type = DeviceKeyPress;
xE->u.u.type = DeviceKeyPress;
else
xE->u.u.type= KeyPress;
xE->u.u.detail= key; xE->u.u.detail= key;
} }
rg->currentDown= key; rg->currentDown= key;
@ -194,9 +167,8 @@ ProcessKeyboardEvent(xEvent *xE,DeviceIntPtr keybd,int count)
XkbSrvInfoPtr xkbi = NULL; XkbSrvInfoPtr xkbi = NULL;
ProcessInputProc backup_proc; ProcessInputProc backup_proc;
xkbDeviceInfoPtr xkb_priv = XKBDEVICEINFO(keybd); xkbDeviceInfoPtr xkb_priv = XKBDEVICEINFO(keybd);
int is_press = (xE->u.u.type == KeyPress || xE->u.u.type == DeviceKeyPress); int is_press = (xE->u.u.type == DeviceKeyPress);
int is_release = (xE->u.u.type == KeyRelease || int is_release = (xE->u.u.type == DeviceKeyRelease);
xE->u.u.type == DeviceKeyRelease);
if (keyc) if (keyc)
xkbi = keyc->xkbInfo; xkbi = keyc->xkbInfo;
@ -225,6 +197,6 @@ ProcessKeyboardEvent(xEvent *xE,DeviceIntPtr keybd,int count)
} else { } else {
XkbProcessKeyboardEvent(xE, keybd, count); XkbProcessKeyboardEvent(xE, keybd, count);
} }
return; return;
} }