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

gut darwinEQEnqueue, and make it just call mieqEnqueue (for the moment)

Browse Source 
(cherry picked from commit a9e081a60c)
This commit is contained in:
Ben Byer 2008-03-31 17:48:09 -07:00 committed by Jeremy Huddleston
parent 5b6c273eaa
commit c6f0d5d1e5
1 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/xquartz/darwinEvents.c
View File

@ -199,7 +199,11 @@ void DarwinEventHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int neven
int i;
DEBUG_LOG("DarwinEventHandler(%d, %p, %p, %d)\n", screenNum, xe, dev, nevents);
for (i=0; i<nevents; i++) QuartzProcessEvent(&xe[i]);
for (i=0; i<nevents; i++) {
if (xe[i].u.u.type == kXquartzDeactivate)
DarwinReleaseModifiers();
QuartzProcessEvent(&xe[i]);
}
}
Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr) {
@ -242,40 +246,10 @@ Bool DarwinEQInit(DevicePtr pKbd, DevicePtr pPtr) {
* This should be deprecated in favor of miEQEnqueue -- BB
*/
void DarwinEQEnqueue(const xEventPtr e) {
HWEventQueueType oldtail, newtail;
oldtail = darwinEventQueue.tail;
// mieqEnqueue() collapses successive motion events into one event.
// This is difficult to do in a thread-safe way and rarely useful.
newtail = oldtail + 1;
if (newtail == QUEUE_SIZE) newtail = 0;
/* Toss events which come in late */
if (newtail == darwinEventQueue.head) return;
darwinEventQueue.events[oldtail].event = *e;
/*
* Make sure that event times don't go backwards - this
* is "unnecessary", but very useful
*/
if (e->u.keyButtonPointer.time < darwinEventQueue.lastEventTime &&
darwinEventQueue.lastEventTime - e->u.keyButtonPointer.time < 10000)
{
darwinEventQueue.events[oldtail].event.u.keyButtonPointer.time =
darwinEventQueue.lastEventTime;
}
darwinEventQueue.events[oldtail].pScreen = darwinEventQueue.pEnqueueScreen;
// Update the tail after the event is prepared
darwinEventQueue.tail = newtail;
// Signal there is an event ready to handle
DarwinPokeEQ();
mieqEnqueue(NULL, e);
DarwinPokeEQ();
}
/*
* DarwinEQPointerPost
* Post a pointer event. Used by the mipointer.c routines.