merge ^/branches/released .

1 files changed, 5 insertions, 18 deletions

diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 4b4d424d4..36bfc8574 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -66,8 +66,6 @@ static struct KdConfigDevice *kdConfigPointers    = NULL;
 static KdKeyboardDriver *kdKeyboardDrivers = NULL;

 static KdPointerDriver  *kdPointerDrivers  = NULL;

 

-static EventListPtr     kdEvents = NULL;

-

 static Bool		kdInputEnabled;

 static Bool		kdOffScreen;

 static unsigned long	kdOffScreenTime;

@@ -1816,7 +1814,7 @@ void
 KdReleaseAllKeys (void)

 {

 #if 0

-    int	key, nEvents, i;

+    int	key;

     KdKeyboardInfo *ki;

 

     KdBlockSigio ();

@@ -1826,10 +1824,7 @@ KdReleaseAllKeys (void)
              key++) {

             if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {

                 KdHandleKeyboardEvent(ki, KeyRelease, key);

-                GetEventList(&kdEvents);

-                nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key, NULL);

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

-                    KdQueueEvent (ki->dixdev, (kdEvents + i)->event);

+                QueueGetKeyboardEvents(ki->dixdev, KeyRelease, key, NULL);

             }

         }

     }

@@ -1865,7 +1860,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
     unsigned char key_code;

     KeyClassPtr	keyc = NULL;

     KeybdCtrl *ctrl = NULL;

-    int type, nEvents, i;

+    int type;

 

     if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)

 	return;

@@ -1885,11 +1880,7 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
 	else

 	    type = KeyPress;

 

-        GetEventList(&kdEvents);

-

-        nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code, NULL);

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

-            KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));

+        QueueKeyboardEvents(ki->dixdev, type, key_code, NULL);

     }

     else {

         ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",

@@ -1988,7 +1979,6 @@ void
 _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,

                         int b, int absrel, Bool force)

 {

-    int nEvents = 0, i = 0;

     int valuators[3] = { x, y, z };

     ValuatorMask mask;

 

@@ -1998,10 +1988,7 @@ _KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
 

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

 

-    GetEventList(&kdEvents);

-    nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel, &mask);

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

-        KdQueueEvent(pi->dixdev, (InternalEvent *)((kdEvents + i)->event));

+    QueuePointerEvents(pi->dixdev, type, b, absrel, &mask);

 }

 

 void