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

mi: don't call SwitchCoreKeyboard, we switch during event processing now.

This commit is contained in:
Peter Hutterer 2007-11-15 10:42:29 +10:30
parent 64711a0948
commit a08665d4d3
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mi/mieq.c
View File

@ -331,23 +331,13 @@ mieqProcessInputEvents(void)
return; return;
} }
/* Make sure our keymap, et al, is changed to suit. */
if ((e->events->event[0].u.u.type == DeviceKeyPress ||
e->events->event[0].u.u.type == DeviceKeyRelease ||
e->events->event[0].u.u.type == KeyPress ||
e->events->event[0].u.u.type == KeyRelease) &&
!e->pDev->isMaster)
{
SwitchCoreKeyboard(e->pDev);
}
/* FIXME: Bad hack. The only event where we actually get multiple /* FIXME: Bad hack. The only event where we actually get multiple
* events at once is a DeviceMotionNotify followed by * events at once is a DeviceMotionNotify followed by
* DeviceValuators. For now it's save enough to just take the * DeviceValuators. For now it's save enough to just take the
* event directly or copy the bunch of events and pass in the * event directly or copy the bunch of events and pass in the
* copy. Eventually the interface for the processInputProc needs * copy. Eventually the interface for the processInputProc needs
* to be changed. (whot) * to be changed. (whot)
*/ */
if (e->nevents > 1) if (e->nevents > 1)
{ {
int i; int i;
@ -372,7 +362,7 @@ mieqProcessInputEvents(void)
if (!e->pDev->isMaster && e->pDev->u.master) if (!e->pDev->isMaster && e->pDev->u.master)
{ {
e->pDev->u.master->public.processInputProc(master_event, e->pDev->u.master->public.processInputProc(master_event,
e->pDev->u.master, e->nevents); e->pDev->u.master, e->nevents);
} }
@ -382,7 +372,7 @@ mieqProcessInputEvents(void)
} }
/* Update the sprite now. Next event may be from different device. */ /* Update the sprite now. Next event may be from different device. */
if (e->events->event[0].u.u.type == DeviceMotionNotify if (e->events->event[0].u.u.type == DeviceMotionNotify
&& e->pDev->coreEvents) && e->pDev->coreEvents)
{ {
miPointerUpdateSprite(e->pDev); miPointerUpdateSprite(e->pDev);