merge ^/branches/released .

1 files changed, 16 insertions, 50 deletions

diff --git a/xorg-server/hw/dmx/input/dmxevents.c b/xorg-server/hw/dmx/input/dmxevents.c
index c8dd92e47..4e1238c9f 100644
--- a/xorg-server/hw/dmx/input/dmxevents.c
+++ b/xorg-server/hw/dmx/input/dmxevents.c
@@ -176,19 +176,15 @@ static void enqueueMotion(DevicePtr pDev, int x, int y)
 {

     GETDMXLOCALFROMPDEV;

     DeviceIntPtr p = dmxLocal->pDevice;

-    int i, nevents, valuators[3];

-    EventListPtr events;

+    int valuators[3];

     int detail = 0;  /* XXX should this be mask of pressed buttons? */

     ValuatorMask mask;

     valuators[0] = x;

     valuators[1] = y;

 

     valuator_mask_set_range(&mask, 0, 2, valuators);

-    GetEventList(&events);

-    nevents = GetPointerEvents(events, p, MotionNotify, detail,

-                               POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

-    for (i = 0; i < nevents; i++)

-       mieqEnqueue(p, (InternalEvent*)(events + i)->event);

+    QueuePointerEvents(p, MotionNotify, detail,

+                       POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

     return;

 }

 

@@ -291,10 +287,7 @@ static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
     deviceValuator         *xv     = (deviceValuator *)xev+1;

     int                    thisX   = 0;

     int                    thisY   = 0;

-    int                    i;

     int                    count;

-    EventListPtr           events;

-    int                    nevents;

     ValuatorMask           mask;

 

     memset(xE, 0, sizeof(xE));

@@ -348,6 +341,7 @@ static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
             }

             count              = 2;

     } else {

+        int i;

         for (i = 0, count = 0; i < axesCount; i += 6) {

             xev->time          = GetTimeInMillis();

             xev->type          = DeviceMotionNotify;

@@ -375,11 +369,8 @@ static void dmxExtMotion(DMXLocalInputInfoPtr dmxLocal,
     if (block)

         dmxSigioBlock();

     valuator_mask_set_range(&mask, firstAxis, axesCount, v);

-    GetEventList(&events);

-    nevents = GetPointerEvents(events, pDevice, MotionNotify, 0,

-                               POINTER_ABSOLUTE, &mask);

-    for (i = 0; i < nevents; i++)

-        mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event);

+    QueuePointerEvents(pDevice, MotionNotify, 0,

+                       POINTER_ABSOLUTE, &mask);

 

     if (block)

         dmxSigioUnblock();

@@ -394,8 +385,6 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
     XDeviceMotionEvent     *me     = (XDeviceMotionEvent *)e;

     DeviceIntPtr           pDevice = dmxLocal->pDevice;

     int                    valuators[MAX_VALUATORS];

-    EventListPtr           events;

-    int                    nevents, i;

     ValuatorMask           mask;

 

     if (!e)

@@ -452,12 +441,7 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
         valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count, valuators);

         if (block)

             dmxSigioBlock();

-        GetEventList(&events);

-        nevents = GetKeyboardEvents(events, pDevice, event,

-                                    ke->keycode, &mask);

-        for (i = 0; i < nevents; i++)

-            mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event);

-

+        QueueKeyboardEvents(pDevice, event, ke->keycode, &mask);

         if (block)

             dmxSigioUnblock();

         break;

@@ -467,12 +451,8 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
         valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count, valuators);

         if (block)

             dmxSigioBlock();

-        GetEventList(&events);

-        nevents = GetPointerEvents(events, pDevice, event, ke->keycode,

-                                   POINTER_ABSOLUTE, &mask);

-        for (i = 0; i < nevents; i++)

-            mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event);

-

+        QueuePointerEvents(pDevice, event, ke->keycode,

+                           POINTER_ABSOLUTE, &mask);

         if (block)

             dmxSigioUnblock();

         break;

@@ -482,11 +462,7 @@ static int dmxTranslateAndEnqueueExtEvent(DMXLocalInputInfoPtr dmxLocal,
         valuator_mask_set_range(&mask, ke->first_axis, ke->axes_count, valuators);

         if (block)

             dmxSigioBlock();

-        GetEventList(&events);

-        nevents = GetProximityEvents(events, pDevice, event, &mask);

-        for (i = 0; i < nevents; i++)

-            mieqEnqueue(pDevice, (InternalEvent*)(events + i)->event);

-

+        QueueProximityEvents(pDevice, event, &mask);

         if (block)

             dmxSigioUnblock();

         break;

@@ -667,8 +643,7 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
     GETDMXINPUTFROMPDEV;

     xEvent xE;

     DeviceIntPtr p = dmxLocal->pDevice;

-    int i, nevents, valuators[3];

-    EventListPtr events;

+    int valuators[3];

     ValuatorMask mask;

 

     DMXDBG2("dmxEnqueue: Enqueuing type=%d detail=0x%0x\n", type, detail);

@@ -683,34 +658,25 @@ void dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
         if (dmxLocal->sendsCore && dmxLocal != dmxLocalCoreKeyboard)

             xE.u.u.detail = dmxFixup(pDev, detail, keySym);

 

-        GetEventList(&events);

         /*ErrorF("KEY %d  sym %d\n", detail, (int) keySym);*/

-        nevents = GetKeyboardEvents(events, p, type, detail, NULL);

-        for (i = 0; i < nevents; i++)

-            mieqEnqueue(p, (InternalEvent*)(events + i)->event);

+        QueueKeyboardEvents(p, type, detail, NULL);

         return;

 

     case ButtonPress:

     case ButtonRelease:

         detail = dmxGetButtonMapping(dmxLocal, detail);

         valuator_mask_zero(&mask);

-        GetEventList(&events);

-        nevents = GetPointerEvents(events, p, type, detail,

-                                   POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

-        for (i = 0; i < nevents; i++)

-            mieqEnqueue(p, (InternalEvent*)(events + i)->event);

+        QueuePointerEvents(p, type, detail,

+                           POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

         return;

 

     case MotionNotify:

-        GetEventList(&events);

         valuators[0] = e->xmotion.x;

         valuators[1] = e->xmotion.y;

         valuators[2] = e->xmotion.state; /* FIXME: WTF?? */

         valuator_mask_set_range(&mask, 0, 3, valuators);

-        nevents = GetPointerEvents(events, p, type, detail, 

-                                   POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

-        for (i = 0; i < nevents; i++)

-            mieqEnqueue(p, (InternalEvent*)(events + i)->event);

+        QueuePointerEvents(p, type, detail,

+                           POINTER_ABSOLUTE | POINTER_SCREEN, &mask);

         return;

 

     case EnterNotify: