From 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 25 Jul 2009 19:39:46 +0000 Subject: Added xorg-server-1.6.2.tar.gz --- xorg-server/Xext/mbuf.c | 88 +++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 43 deletions(-) (limited to 'xorg-server/Xext/mbuf.c') diff --git a/xorg-server/Xext/mbuf.c b/xorg-server/Xext/mbuf.c index 0b5b91ea9..39b8ba11e 100644 --- a/xorg-server/Xext/mbuf.c +++ b/xorg-server/Xext/mbuf.c @@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group. #include #include -#if !defined(WIN32) && !defined(Lynx) +#if !defined(WIN32) #include #endif @@ -61,8 +61,10 @@ in this Software without prior written authorization from The Open Group. static int MultibufferEventBase; static int MultibufferErrorBase; -static DevPrivateKey MultibufferScreenPrivKey = &MultibufferScreenPrivKey; -static DevPrivateKey MultibufferWindowPrivKey = &MultibufferWindowPrivKey; +static int MultibufferScreenPrivKeyIndex; +static DevPrivateKey MultibufferScreenPrivKey = &MultibufferScreenPrivKeyIndex; +static int MultibufferWindowPrivKeyIndex; +static DevPrivateKey MultibufferWindowPrivKey = &MultibufferWindowPrivKeyIndex; static void PerformDisplayRequest ( MultibuffersPtr * /* ppMultibuffers */, @@ -262,10 +264,10 @@ ExtensionEntry *extEntry; static int ProcGetBufferVersion (client) - register ClientPtr client; + ClientPtr client; { xMbufGetBufferVersionReply rep; - register int n; + int n; REQUEST_SIZE_MATCH (xMbufGetBufferVersionReq); rep.type = X_Reply; @@ -421,11 +423,11 @@ CreateImageBuffers (pWin, nbuf, ids, action, hint) static int ProcCreateImageBuffers (client) - register ClientPtr client; + ClientPtr client; { REQUEST(xMbufCreateImageBuffersReq); xMbufCreateImageBuffersReply rep; - register int n; + int n; WindowPtr pWin; XID *ids; int len, nbuf, i, err, rc; @@ -486,7 +488,7 @@ ProcCreateImageBuffers (client) static int ProcDisplayImageBuffers (client) - register ClientPtr client; + ClientPtr client; { REQUEST(xMbufDisplayImageBuffersReq); MultibufferPtr *pMultibuffer; @@ -559,7 +561,7 @@ MultibufferResType); static int ProcDestroyImageBuffers (client) - register ClientPtr client; + ClientPtr client; { REQUEST (xMbufDestroyImageBuffersReq); WindowPtr pWin; @@ -575,7 +577,7 @@ ProcDestroyImageBuffers (client) static int ProcSetMBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { REQUEST (xMbufSetMBufferAttributesReq); WindowPtr pWin; @@ -674,7 +676,7 @@ ProcGetMBufferAttributes (client) static int ProcSetBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { REQUEST(xMbufSetBufferAttributesReq); MultibufferPtr pMultibuffer; @@ -716,7 +718,7 @@ ProcSetBufferAttributes (client) int ProcGetBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { REQUEST(xMbufGetBufferAttributesReq); MultibufferPtr pMultibuffer; @@ -760,7 +762,7 @@ ProcGetBufferAttributes (client) static int ProcGetBufferInfo (client) - register ClientPtr client; + ClientPtr client; { REQUEST (xMbufGetBufferInfoReq); DrawablePtr pDrawable; @@ -825,7 +827,7 @@ ProcGetBufferInfo (client) static int ProcClearImageBufferArea (client) - register ClientPtr client; + ClientPtr client; { REQUEST (xMbufClearImageBufferAreaReq); MultibufferPtr pMultibuffer; @@ -887,7 +889,7 @@ ProcClearImageBufferArea (client) static int ProcMultibufferDispatch (client) - register ClientPtr client; + ClientPtr client; { REQUEST(xReq); switch (stuff->data) { @@ -918,9 +920,9 @@ ProcMultibufferDispatch (client) static int SProcGetBufferVersion (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufGetBufferVersionReq); swaps (&stuff->length, n); @@ -929,9 +931,9 @@ SProcGetBufferVersion (client) static int SProcCreateImageBuffers (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufCreateImageBuffersReq); swaps (&stuff->length, n); @@ -943,9 +945,9 @@ SProcCreateImageBuffers (client) static int SProcDisplayImageBuffers (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufDisplayImageBuffersReq); swaps (&stuff->length, n); @@ -958,9 +960,9 @@ SProcDisplayImageBuffers (client) static int SProcDestroyImageBuffers (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufDestroyImageBuffersReq); swaps (&stuff->length, n); @@ -971,9 +973,9 @@ SProcDestroyImageBuffers (client) static int SProcSetMBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufSetMBufferAttributesReq); swaps (&stuff->length, n); @@ -986,9 +988,9 @@ SProcSetMBufferAttributes (client) static int SProcGetMBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufGetMBufferAttributesReq); swaps (&stuff->length, n); @@ -999,9 +1001,9 @@ SProcGetMBufferAttributes (client) static int SProcSetBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufSetBufferAttributesReq); swaps (&stuff->length, n); @@ -1014,9 +1016,9 @@ SProcSetBufferAttributes (client) static int SProcGetBufferAttributes (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufGetBufferAttributesReq); swaps (&stuff->length, n); @@ -1027,9 +1029,9 @@ SProcGetBufferAttributes (client) static int SProcGetBufferInfo (client) - register ClientPtr client; + ClientPtr client; { - register int n; + int n; REQUEST (xMbufGetBufferInfoReq); swaps (&stuff->length, n); @@ -1040,9 +1042,9 @@ SProcGetBufferInfo (client) static int SProcClearImageBufferArea(client) - register ClientPtr client; + ClientPtr client; { - register char n; + char n; REQUEST(xMbufClearImageBufferAreaReq); swaps(&stuff->length, n); @@ -1057,7 +1059,7 @@ SProcClearImageBufferArea(client) static int SProcMultibufferDispatch (client) - register ClientPtr client; + ClientPtr client; { REQUEST(xReq); switch (stuff->data) { @@ -1277,7 +1279,7 @@ QueueDisplayRequest (client, activateTime) /* swap the request back so we can simply re-execute it */ if (client->swapped) { - register int n; + int n; REQUEST (xMbufDisplayImageBuffersReq); SwapRestL(stuff); @@ -1312,7 +1314,7 @@ DeliverEventsToMultibuffer (pMultibuffer, pEvents, count, filter) /* maybe send event to owner */ if ((attempt = TryClientEvents( - bClient(pMultibuffer), pEvents, count, pMultibuffer->eventMask, filter, (GrabPtr) 0)) != 0) + bClient(pMultibuffer), NULL, pEvents, count, pMultibuffer->eventMask, filter, (GrabPtr) 0)) != 0) { if (attempt > 0) deliveries++; @@ -1324,7 +1326,7 @@ DeliverEventsToMultibuffer (pMultibuffer, pEvents, count, filter) for (other = pMultibuffer->otherClients; other; other=other->next) { if ((attempt = TryClientEvents( - rClient(other), pEvents, count, other->mask, filter, (GrabPtr) 0)) != 0) + rClient(other), NULL, pEvents, count, other->mask, filter, (GrabPtr) 0)) != 0) { if (attempt > 0) deliveries++; @@ -1350,9 +1352,9 @@ MultibufferExpose (pMultibuffer, pRegion) { xEvent *pEvent; PixmapPtr pPixmap; - register xEvent *pe; - register BoxPtr pBox; - register int i; + xEvent *pe; + BoxPtr pBox; + int i; int numRects; pPixmap = pMultibuffer->pPixmap; @@ -1662,7 +1664,7 @@ OtherClientDelete (value, id) XID id; { MultibufferPtr pMultibuffer = (MultibufferPtr)value; - register OtherClientsPtr other, prev; + OtherClientsPtr other, prev; prev = 0; for (other = pMultibuffer->otherClients; other; other = other->next) -- cgit v1.2.3