xserver git update 20/5/2010

2 files changed, 3 insertions, 15 deletions

diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index b0f811750..64851e791 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -341,7 +341,6 @@ ProcAppleWMSelectInput (register ClientPtr client)
 void

 AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {

     WMEventPtr      *pHead, pEvent;

-    ClientPtr       client;

     xAppleWMNotifyEvent se;

     int             i;

 

@@ -349,18 +348,13 @@ AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
     if (i != Success || !pHead)

         return;

     for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {

-        client = pEvent->client;

-        if ((pEvent->mask & mask) == 0

-            || client == serverClient || client->clientGone)

-        {

+        if ((pEvent->mask & mask) == 0)

             continue;

-        }

         se.type = type + WMEventBase;

         se.kind = which;

         se.arg = arg;

-        se.sequenceNumber = client->sequence;

         se.time = currentTime.milliseconds;

-        WriteEventsToClient (client, 1, (xEvent *) &se);

+        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);

     }

 }

 

diff --git a/xorg-server/hw/xquartz/xpr/appledri.c b/xorg-server/hw/xquartz/xpr/appledri.c
index 87cb9016a..1fceb525c 100644
--- a/xorg-server/hw/xquartz/xpr/appledri.c
+++ b/xorg-server/hw/xquartz/xpr/appledri.c
@@ -192,22 +192,16 @@ static void surface_notify(
 {

     DRISurfaceNotifyArg *arg = _arg;

     int client_index = (int) x_cvt_vptr_to_uint(data);

-    ClientPtr client;

     xAppleDRINotifyEvent se;

 

     if (client_index < 0 || client_index >= currentMaxClients)

         return;

 

-    client = clients[client_index];

-    if (client == NULL || client == serverClient || client->clientGone)

-        return;

-

     se.type = DRIEventBase + AppleDRISurfaceNotify;

     se.kind = arg->kind;

     se.arg = arg->id;

-    se.sequenceNumber = client->sequence;

     se.time = currentTime.milliseconds;

-    WriteEventsToClient (client, 1, (xEvent *) &se);

+    WriteEventsToClient (clients[client_index], 1, (xEvent *) &se);

 }

 

 static int