xnest: switch to using EventList rather than xEvents.
This commit is contained in:
parent
34429d16d3
commit
c68ca0c7b2
|
@ -43,7 +43,7 @@ is" without express or implied warranty.
|
|||
|
||||
CARD32 lastEventTime = 0;
|
||||
|
||||
extern xEvent *xnestEvents;
|
||||
extern EventList *xnestEvents;
|
||||
|
||||
void
|
||||
ProcessInputEvents()
|
||||
|
@ -106,10 +106,11 @@ xnestQueueKeyEvent(int type, unsigned int keycode)
|
|||
{
|
||||
int i, n;
|
||||
|
||||
GetEventList(&xnestEvents);
|
||||
lastEventTime = GetTimeInMillis();
|
||||
n = GetKeyboardEvents(xnestEvents, xnestKeyboardDevice, type, keycode);
|
||||
for (i = 0; i < n; i++)
|
||||
mieqEnqueue(xnestKeyboardDevice, xnestEvents + i);
|
||||
mieqEnqueue(xnestKeyboardDevice, (xnestEvents + i)->event);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -119,6 +120,7 @@ xnestCollectEvents(void)
|
|||
xEvent x;
|
||||
int i, n, valuators[2];
|
||||
ScreenPtr pScreen;
|
||||
GetEventList(&xnestEvents);
|
||||
|
||||
while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) {
|
||||
switch (X.type) {
|
||||
|
@ -138,7 +140,7 @@ xnestCollectEvents(void)
|
|||
n = GetPointerEvents(xnestEvents, xnestPointerDevice, ButtonPress,
|
||||
X.xbutton.button, POINTER_RELATIVE, 0, 0, NULL);
|
||||
for (i = 0; i < n; i++)
|
||||
mieqEnqueue(xnestPointerDevice, xnestEvents + i);
|
||||
mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
|
||||
break;
|
||||
|
||||
case ButtonRelease:
|
||||
|
@ -147,7 +149,7 @@ xnestCollectEvents(void)
|
|||
n = GetPointerEvents(xnestEvents, xnestPointerDevice, ButtonRelease,
|
||||
X.xbutton.button, POINTER_RELATIVE, 0, 0, NULL);
|
||||
for (i = 0; i < n; i++)
|
||||
mieqEnqueue(xnestPointerDevice, xnestEvents + i);
|
||||
mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
|
||||
break;
|
||||
|
||||
case MotionNotify:
|
||||
|
@ -157,7 +159,7 @@ xnestCollectEvents(void)
|
|||
n = GetPointerEvents(xnestEvents, xnestPointerDevice, MotionNotify,
|
||||
0, POINTER_ABSOLUTE, 0, 2, valuators);
|
||||
for (i = 0; i < n; i++)
|
||||
mieqEnqueue(xnestPointerDevice, xnestEvents + i);
|
||||
mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
|
||||
break;
|
||||
|
||||
case FocusIn:
|
||||
|
@ -190,7 +192,7 @@ xnestCollectEvents(void)
|
|||
n = GetPointerEvents(xnestEvents, xnestPointerDevice, MotionNotify,
|
||||
0, POINTER_ABSOLUTE, 0, 2, valuators);
|
||||
for (i = 0; i < n; i++)
|
||||
mieqEnqueue(xnestPointerDevice, xnestEvents + i);
|
||||
mieqEnqueue(xnestPointerDevice, (xnestEvents + i)->event);
|
||||
xnestDirectInstallColormaps(pScreen);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,7 +45,7 @@ is" without express or implied warranty.
|
|||
|
||||
Bool xnestDoFullGeneration = True;
|
||||
|
||||
xEvent *xnestEvents = NULL;
|
||||
EventList *xnestEvents = NULL;
|
||||
|
||||
void
|
||||
InitOutput(ScreenInfo *screenInfo, int argc, char *argv[])
|
||||
|
@ -92,10 +92,7 @@ InitInput(int argc, char *argv[])
|
|||
xnestPointerDevice = AddInputDevice(serverClient, xnestPointerProc, TRUE);
|
||||
xnestKeyboardDevice = AddInputDevice(serverClient, xnestKeyboardProc, TRUE);
|
||||
|
||||
if (!xnestEvents)
|
||||
xnestEvents = (xEvent *) xcalloc(sizeof(xEvent), GetMaximumEventsNum());
|
||||
if (!xnestEvents)
|
||||
FatalError("couldn't allocate room for events\n");
|
||||
GetEventList(&xnestEvents);
|
||||
|
||||
RegisterPointerDevice(xnestPointerDevice);
|
||||
RegisterKeyboardDevice(xnestKeyboardDevice);
|
||||
|
|
Loading…
Reference in New Issue
Block a user