frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xkb: remove oldState from XkbHandleActions. 

I really don't know what the purpose of this variable is or was, aside from
potentially clobbering up our key state since there's a path where it may be
used uninitialised.

Also, this means that xkbi->prev_state is now accessible from the DIX with
meaningful data.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-05-05 16:51:59 +10:00
parent d523fbe428
commit 35a4b8e7f4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xkb/xkbActions.c
View File

@ -1075,7 +1075,6 @@ XkbSrvInfoPtr xkbi;
KeyClassPtr keyc; KeyClassPtr keyc;
int changed,sendEvent; int changed,sendEvent;
Bool genStateNotify; Bool genStateNotify;
XkbStateRec oldState;
XkbAction act; XkbAction act;
XkbFilterPtr filter; XkbFilterPtr filter;
Bool keyEvent; Bool keyEvent;
@ -1090,7 +1089,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
/* The state may change, so if we're not in the middle of sending a state /* The state may change, so if we're not in the middle of sending a state
* notify, prepare for it */ * notify, prepare for it */
if ((xkbi->flags&_XkbStateNotifyInProgress)==0) { if ((xkbi->flags&_XkbStateNotifyInProgress)==0) {
oldState= xkbi->state; xkbi->prev_state = xkbi->state;
xkbi->flags|= _XkbStateNotifyInProgress; xkbi->flags|= _XkbStateNotifyInProgress;
genStateNotify= True; genStateNotify= True;
} }
@ -1220,9 +1219,8 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
FixKeyState(event, dev); FixKeyState(event, dev);
} }
xkbi->prev_state= oldState;
XkbComputeDerivedState(xkbi); XkbComputeDerivedState(xkbi);
changed = XkbStateChangedFlags(&oldState,&xkbi->state); changed = XkbStateChangedFlags(&xkbi->prev_state,&xkbi->state);
if (genStateNotify) { if (genStateNotify) {
if (changed) { if (changed) {
xkbStateNotify sn; xkbStateNotify sn;