mi: call the custom event handlers for both MD and SD.
This commit is contained in:
parent
ec2fca7e6f
commit
ff36753755
25
mi/mieq.c
25
mi/mieq.c
|
@ -313,16 +313,7 @@ mieqProcessInputEvents(void)
|
||||||
NewCurrentScreen (e->pDev, DequeueScreen(e->pDev), x, y);
|
NewCurrentScreen (e->pDev, DequeueScreen(e->pDev), x, y);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
/* If someone's registered a custom event handler, let them
|
mieqHandler handler;
|
||||||
* steal it. */
|
|
||||||
if (miEventQueue.handlers[e->events->event->u.u.type]) {
|
|
||||||
miEventQueue.handlers[e->events->event->u.u.type](
|
|
||||||
DequeueScreen(e->pDev)->myNum,
|
|
||||||
e->events->event,
|
|
||||||
e->pDev,
|
|
||||||
e->nevents);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 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
|
||||||
|
@ -350,6 +341,19 @@ mieqProcessInputEvents(void)
|
||||||
} else
|
} else
|
||||||
master_event = NULL;
|
master_event = NULL;
|
||||||
|
|
||||||
|
/* If someone's registered a custom event handler, let them
|
||||||
|
* steal it. */
|
||||||
|
if ((handler = miEventQueue.handlers[e->events->event->u.u.type]))
|
||||||
|
{
|
||||||
|
handler(DequeueScreen(e->pDev)->myNum, e->events->event,
|
||||||
|
e->pDev, e->nevents);
|
||||||
|
if (!e->pDev->isMaster && e->pDev->u.master)
|
||||||
|
{
|
||||||
|
handler(DequeueScreen(e->pDev->u.master)->myNum,
|
||||||
|
e->events->event, e->pDev->u.master, e->nevents);
|
||||||
|
}
|
||||||
|
} else
|
||||||
|
{
|
||||||
/* process slave first, then master */
|
/* process slave first, then master */
|
||||||
e->pDev->public.processInputProc(event, e->pDev, e->nevents);
|
e->pDev->public.processInputProc(event, e->pDev, e->nevents);
|
||||||
|
|
||||||
|
@ -358,6 +362,7 @@ mieqProcessInputEvents(void)
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (e->nevents > 1)
|
if (e->nevents > 1)
|
||||||
xfree(event);
|
xfree(event);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user