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

memcpy() events in

Browse Source 
memcpy events into our event structure instead of doing pointer assignment.
This commit is contained in:
Daniel Stone 2006-08-07 16:51:09 +03:00 committed by Daniel Stone
parent c85e64cba1
commit 5c7001fef8
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mi/mieq.c
View File

@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
#define QUEUE_SIZE 256 #define QUEUE_SIZE 256
typedef struct _Event { typedef struct _Event {
xEvent event[2]; xEvent event[7];
int nevents; int nevents;
ScreenPtr pScreen; ScreenPtr pScreen;
DeviceIntPtr pDev; DeviceIntPtr pDev;
@ -101,6 +101,7 @@ mieqEnqueue (xEvent *e)
#ifdef DEBUG #ifdef DEBUG
ErrorF("mieqEnqueue: slamming an event on to the queue from %d\n", kbp->deviceid & DEVICE_BITS); ErrorF("mieqEnqueue: slamming an event on to the queue from %d\n", kbp->deviceid & DEVICE_BITS);
ErrorF(" type %d, detail %d\n", e->u.u.type, e->u.u.detail);
#endif #endif
if (e->u.u.type == MotionNotify) { if (e->u.u.type == MotionNotify) {
@ -122,9 +123,8 @@ mieqEnqueue (xEvent *e)
/* We silently steal valuator events: just tack them on to the last /* We silently steal valuator events: just tack them on to the last
* motion event they need to be attached to. Sigh. */ * motion event they need to be attached to. Sigh. */
if (e->u.u.type == DeviceValuator) { if (e->u.u.type == DeviceValuator) {
if (laste->nevents >= 6) { if (laste->nevents > 6) {
ErrorF("mieqEnqueue: more than six valuator events; dropping.\n"); ErrorF("mieqEnqueue: more than six valuator events; dropping.\n");
free(e);
return; return;
} }
if (oldtail == miEventQueue.head || if (oldtail == miEventQueue.head ||
@ -134,10 +134,9 @@ mieqEnqueue (xEvent *e)
((lastkbp->deviceid & DEVICE_BITS) != ((lastkbp->deviceid & DEVICE_BITS) !=
(v->deviceid & DEVICE_BITS))) { (v->deviceid & DEVICE_BITS))) {
ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n"); ErrorF("mieqEnequeue: out-of-order valuator event; dropping.\n");
free(e);
return; return;
} }
laste->event[laste->nevents++] = *e; memcpy(&(laste->event[laste->nevents++]), e, sizeof(xEvent));
return; return;
} }
else if (e->u.u.type == DeviceMotionNotify) { else if (e->u.u.type == DeviceMotionNotify) {
@ -161,13 +160,12 @@ mieqEnqueue (xEvent *e)
/* Toss events which come in late */ /* Toss events which come in late */
if (newtail == miEventQueue.head) { if (newtail == miEventQueue.head) {
ErrorF("tossed event which came in late\n"); ErrorF("tossed event which came in late\n");
free(e);
return; return;
} }
miEventQueue.tail = newtail; miEventQueue.tail = newtail;
} }
miEventQueue.events[oldtail].event[0] = *e; memcpy(&(miEventQueue.events[oldtail].event[0]), e, sizeof(xEvent));
miEventQueue.events[oldtail].nevents = 1; miEventQueue.events[oldtail].nevents = 1;
/* /*
@ -238,7 +236,5 @@ void mieqProcessInputEvents ()
++miEventQueue.head; ++miEventQueue.head;
(*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents); (*e->pDev->public.processInputProc)(e->event, e->pDev, e->nevents);
} }
free(e->event);
} }
} }