diff options
author | Peter Hutterer <peter.hutterer@redhat.com> | 2008-12-01 21:20:48 +1000 |
---|---|---|
committer | Peter Hutterer <peter.hutterer@who-t.net> | 2008-12-10 12:42:45 +1000 |
commit | d281866b74f7067f2704c278fe9720eafc0ee5ef (patch) | |
tree | 9ed2038b179537e549957661ae28afbe7486a6f1 | |
parent | 0b4fef6337d88ae8ef05b8b73941350a9007565c (diff) |
mi: Clean up CopyGetMasterEvent, re-use the memory.
Alloc an EventList once and then re-use instead of allocing a new event each
time we need a master event.
There's a trick included: because all the event processing handlers only take
an xEvent, init a size 1 EventList and squash the events into this one.
Events that have count > 1 must be squished into an xEvent array anyway before
passing into the event handlers, so we don't lose anything here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Daniel Stone <daniel@fooishbar.org>
-rw-r--r-- | mi/mieq.c | 60 | ||||
-rw-r--r-- | xkb/ddxDevBtn.c | 15 |
2 files changed, 40 insertions, 35 deletions
@@ -77,12 +77,13 @@ typedef struct _EventQueue { int lastMotion; /* device ID if last event motion? */ EventRec events[QUEUE_SIZE]; /* static allocation for signals */ mieqHandler handlers[128]; /* custom event handler */ } EventQueueRec, *EventQueuePtr; static EventQueueRec miEventQueue; +static EventListPtr masterEvents; /* for use in mieqProcessInputEvents */ Bool mieqInit(void) { int i; @@ -95,12 +96,23 @@ mieqInit(void) { EventListPtr evlist = InitEventList(1 + MAX_VALUATOR_EVENTS); if (!evlist) FatalError("Could not allocate event queue.\n"); miEventQueue.events[i].events = evlist; } + + /* XXX: mE is just 1 event long, if we have Motion + Valuator they are + * squashed into the first event to make passing it into the event + * processing handlers easier. This should be fixed when the processing + * handlers switch to EventListPtr instead of xEvent */ + masterEvents = InitEventList(1); + if (!masterEvents) + FatalError("Could not allocated MD event queue.\n"); + SetMinimumEventSize(masterEvents, 1, + (1 + MAX_VALUATOR_EVENTS) * sizeof(xEvent)); + SetInputCheck(&miEventQueue.head, &miEventQueue.tail); return TRUE; } /* Ensure all events in the EQ are at least size bytes. */ void @@ -272,47 +284,39 @@ ChangeDeviceID(DeviceIntPtr dev, xEvent* event) * @param original The event as it came from the EQ * @param master The event after being copied * @param count Number of events in original. */ void CopyGetMasterEvent(DeviceIntPtr mdev, xEvent* original, - xEvent** master, int count) + EventListPtr master, int count) { - if (count > 1) { - *master = xcalloc(count, sizeof(xEvent)); - if (!*master) - FatalError("[mi] No memory left for master event.\n"); - while(count--) - { - memcpy(&(*master)[count], &original[count], sizeof(xEvent)); - ChangeDeviceID(mdev, &(*master)[count]); - } - } else - { - int len = sizeof(xEvent); - if (original->u.u.type == GenericEvent) - len += GEV(original)->length * 4; - *master = xalloc(len); - if (!*master) - FatalError("[mi] No memory left for master event.\n"); - memcpy(*master, original, len); - ChangeDeviceID(mdev, *master); - } + int len = count * sizeof(xEvent); + + /* Assumption: GenericEvents always have count 1 */ + + if (GEV(original)->type == GenericEvent) + len += GEV(original)->length * 4; + + if (master->evlen < len) + SetMinimumEventSize(master, 1, len); + + memcpy(master->event, original, len); + while (count--) + ChangeDeviceID(mdev, &master->event[count]); } /* Call this from ProcessInputEvents(). */ void mieqProcessInputEvents(void) { mieqHandler handler; EventRec *e = NULL; int x = 0, y = 0; int type, nevents, evlen, i; ScreenPtr screen; - xEvent *event, - *master_event = NULL; + xEvent *event; DeviceIntPtr dev = NULL, master = NULL; while (miEventQueue.head != miEventQueue.tail) { e = &miEventQueue.events[miEventQueue.head]; @@ -355,37 +359,33 @@ mieqProcessInputEvents(void) x = event->u.keyButtonPointer.rootX; y = event->u.keyButtonPointer.rootY; NewCurrentScreen (dev, DequeueScreen(dev), x, y); } else { if (master) - CopyGetMasterEvent(master, event, - &master_event, nevents); - else - master_event = NULL; + CopyGetMasterEvent(master, event, masterEvents, nevents); /* If someone's registered a custom event handler, let them * steal it. */ if (handler) { handler(DequeueScreen(dev)->myNum, event, dev, nevents); if (master) handler(DequeueScreen(master)->myNum, - master_event, master, nevents); + masterEvents->event, master, nevents); } else { /* process slave first, then master */ dev->public.processInputProc(event, dev, nevents); if (master) - master->public.processInputProc(master_event, master, + master->public.processInputProc(masterEvents->event, master, nevents); } xfree(event); - xfree(master_event); } /* Update the sprite now. Next event may be from different device. */ if (type == DeviceMotionNotify && (master || dev->isMaster)) miPointerUpdateSprite(dev); } diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c index b68a28b2a..585ad198e 100644 --- a/xkb/ddxDevBtn.c +++ b/xkb/ddxDevBtn.c @@ -39,19 +39,20 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <xkbsrv.h> #include <X11/extensions/XI.h> #include <X11/extensions/XIproto.h> extern int DeviceValuator; +static EventListPtr masterEvents = NULL; + void XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) { int * devVal; INT32 * evVal; -xEvent events[2], - *m_events = NULL; /* master dev */ +xEvent events[2]; deviceKeyButtonPointer *btn; deviceValuator * val; int x,y; int nAxes, i, count; DeviceIntPtr master = NULL; @@ -104,21 +105,25 @@ DeviceIntPtr master = NULL; * pointer paired with the master. * * Note:the DeviceButtonEvent on the SD itself will do nothing in most * cases, unless dev is both a keyboard and a mouse. */ if (!dev->isMaster && dev->u.master) { + if (!masterEvents) + { + masterEvents = InitEventList(1); + SetMinimumEventSize(masterEvents, 1, (1 + MAX_VALUATOR_EVENTS) * sizeof(xEvent)); + } master = dev->u.master; if (!IsPointerDevice(master)) master = GetPairedDevice(dev->u.master); - CopyGetMasterEvent(master, &events, &m_events, count); + CopyGetMasterEvent(master, &events, masterEvents, count); } (*dev->public.processInputProc)((xEventPtr)btn, dev, count); if (master) { - (*master->public.processInputProc)(m_events, master, count); - xfree(m_events); + (*master->public.processInputProc)(masterEvents->event, master, count); } return; } |