mieqProcessInputEvents: Check custom event handlers first.
This commit is contained in:
parent
8b8e0aea6f
commit
c9ac2f5753
21
mi/mieq.c
21
mi/mieq.c
|
@ -214,23 +214,22 @@ mieqProcessInputEvents(void)
|
|||
e = &miEventQueue.events[miEventQueue.head];
|
||||
miEventQueue.head = (miEventQueue.head + 1) % QUEUE_SIZE;
|
||||
|
||||
/* Assumption - screen switching can only occur on motion events. */
|
||||
if (e->pScreen != miEventQueue.pDequeueScreen) {
|
||||
if (miEventQueue.handlers[e->event->u.u.type]) {
|
||||
/* If someone's registered a custom event handler, let them
|
||||
* steal it. */
|
||||
miEventQueue.handlers[e->event->u.u.type](miEventQueue.pDequeueScreen->myNum,
|
||||
e->event, dev,
|
||||
e->nevents);
|
||||
return;
|
||||
}
|
||||
else if (e->pScreen != miEventQueue.pDequeueScreen) {
|
||||
/* Assumption - screen switching can only occur on motion events. */
|
||||
miEventQueue.pDequeueScreen = e->pScreen;
|
||||
x = e->event[0].u.keyButtonPointer.rootX;
|
||||
y = e->event[0].u.keyButtonPointer.rootY;
|
||||
NewCurrentScreen (miEventQueue.pDequeueScreen, x, y);
|
||||
}
|
||||
else {
|
||||
/* If someone's registered a custom event handler, let them
|
||||
* steal it. */
|
||||
if (miEventQueue.handlers[e->event->u.u.type]) {
|
||||
miEventQueue.handlers[e->event->u.u.type](miEventQueue.pDequeueScreen->myNum,
|
||||
e->event, dev,
|
||||
e->nevents);
|
||||
return;
|
||||
}
|
||||
|
||||
/* If this is a core event, make sure our keymap, et al, is
|
||||
* changed to suit. */
|
||||
if (e->event[0].u.u.type == KeyPress ||
|
||||
|
|
Loading…
Reference in New Issue
Block a user