xserver: Branch 'mpx' - 6 commits
Peter Hutterer
whot at kemper.freedesktop.org
Tue Nov 20 22:49:43 PST 2007
Xext/EVI.c | 4 +-
Xext/appgroup.c | 36 ++++++++++++------------
Xext/bigreq.c | 4 +-
Xext/cup.c | 22 +++++++-------
Xext/dpms.c | 60 ++++++++++++++++++++--------------------
Xext/fontcache.c | 28 +++++++++---------
Xext/mbuf.c | 76 +++++++++++++++++++++++++--------------------------
Xext/mbufbf.c | 8 ++---
Xext/mitmisc.c | 18 ++++++------
Xext/panoramiX.c | 12 ++++----
Xext/panoramiXSwap.c | 12 ++++----
Xext/sampleEVI.c | 2 -
Xext/saver.c | 10 +++---
Xext/security.c | 10 +++---
Xext/shape.c | 74 ++++++++++++++++++++++++-------------------------
Xext/shm.c | 42 ++++++++++++++--------------
Xext/sync.c | 38 ++++++++++++-------------
Xext/xcmisc.c | 28 +++++++++---------
Xext/xevie.c | 28 +++++++++---------
Xext/xprint.c | 16 +++++-----
Xext/xres.c | 4 +-
Xext/xtest.c | 59 ++++++++++++++++++++-------------------
Xext/xvdisp.c | 68 ++++++++++++++++++++++-----------------------
Xext/xvmc.c | 4 +-
Xi/extinit.c | 3 +-
Xi/setcptr.c | 15 +++++++---
dix/devices.c | 4 ++
dix/getevents.c | 22 +++++++-------
28 files changed, 360 insertions(+), 347 deletions(-)
New commits:
commit 9ed43eff48201520797f89a12bb3b2f5819bd99f
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Wed Nov 21 17:16:27 2007 +1030
Xi: allow clients to specify pure client id in SetClientPointer.
If no window was found with the given ID, try if there's a client with the ID.
Allows us to set the CP for apps that don't open windows (e.g. x2x).
diff --git a/Xi/setcptr.c b/Xi/setcptr.c
index ad8f571..a3bd9c2 100644
--- a/Xi/setcptr.c
+++ b/Xi/setcptr.c
@@ -89,10 +89,17 @@ ProcXSetClientPointer(ClientPtr client)
err = dixLookupWindow(&pWin, stuff->win, client, DixReadWriteAccess);
if (err != Success)
{
- client->errorValue = stuff->win;
- return err;
- }
- targetClient= wClient(pWin);
+ /* window could not be found. maybe the window ID given was a pure
+ client id? */
+ err = dixLookupClient(&targetClient, stuff->win,
+ client, DixReadWriteAccess);
+ if (err != Success)
+ {
+ client->errorValue = stuff->win;
+ return err;
+ }
+ } else
+ targetClient= wClient(pWin);
} else
targetClient = client;
commit 33f15689922ad9f1193f803bc1636c82c23ab99e
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Wed Nov 21 16:06:44 2007 +1030
xtest: switch an inputInfo.pointer over to PickPointer.
Couple of whitespace fixes too.
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 711b57c..bd203b1 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -124,7 +124,7 @@ ProcXTestGetVersion(client)
rep.majorVersion = XTestMajorVersion;
rep.minorVersion = XTestMinorVersion;
if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
+ swaps(&rep.sequenceNumber, n);
swaps(&rep.minorVersion, n);
}
WriteToClient(client, sizeof(xXTestGetVersionReply), (char *)&rep);
@@ -139,7 +139,8 @@ ProcXTestCompareCursor(client)
xXTestCompareCursorReply rep;
WindowPtr pWin;
CursorPtr pCursor;
- int n, rc;
+ int n, rc;
+ DeviceIntPtr pointer = PickPointer(client);
REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -148,10 +149,10 @@ ProcXTestCompareCursor(client)
if (stuff->cursor == None)
pCursor = NullCursor;
else if (stuff->cursor == XTestCurrentCursor)
- pCursor = GetSpriteCursor(inputInfo.pointer);
+ pCursor = GetSpriteCursor(pointer);
else {
pCursor = (CursorPtr)LookupIDByType(stuff->cursor, RT_CURSOR);
- if (!pCursor)
+ if (!pCursor)
{
client->errorValue = stuff->cursor;
return (BadCursor);
@@ -162,7 +163,7 @@ ProcXTestCompareCursor(client)
rep.sequenceNumber = client->sequence;
rep.same = (wCursor(pWin) == pCursor);
if (client->swapped) {
- swaps(&rep.sequenceNumber, n);
+ swaps(&rep.sequenceNumber, n);
}
WriteToClient(client, sizeof(xXTestCompareCursorReply), (char *)&rep);
return(client->noClientException);
@@ -276,7 +277,7 @@ ProcXTestFakeInput(client)
/* swap the request back so we can simply re-execute it */
if (client->swapped)
{
- (void) XTestSwapFakeInput(client, (xReq *)stuff);
+ (void) XTestSwapFakeInput(client, (xReq *)stuff);
swaps(&stuff->length, n);
}
ResetCurrentRequest (client);
@@ -426,7 +427,7 @@ ProcXTestFakeInput(client)
#ifdef PANORAMIX
if ((!noPanoramiXExtension
- && root->drawable.pScreen->myNum
+ && root->drawable.pScreen->myNum
!= XineramaGetCursorScreen(dev))
|| (noPanoramiXExtension && root != GetCurrentRootWindow(dev)))
@@ -545,14 +546,14 @@ XTestSwapFakeInput(client, req)
nev = ((req->length << 2) - sizeof(xReq)) / sizeof(xEvent);
for (ev = (xEvent *)&req[1]; --nev >= 0; ev++)
{
- /* Swap event */
- proc = EventSwapVector[ev->u.u.type & 0177];
+ /* Swap event */
+ proc = EventSwapVector[ev->u.u.type & 0177];
/* no swapping proc; invalid event type? */
- if (!proc || proc == NotImplemented) {
+ if (!proc || proc == NotImplemented) {
client->errorValue = ev->u.u.type;
return BadValue;
}
- (*proc)(ev, &sev);
+ (*proc)(ev, &sev);
*ev = sev;
}
return Success;
commit e5dd7a95791748c57cab75c0d8ba9d37f72edccf
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Wed Nov 21 15:59:31 2007 +1030
Xext: Scruffy the janitor don't like no "register" keywords.
diff --git a/Xext/EVI.c b/Xext/EVI.c
index 8fe3481..edf8d66 100644
--- a/Xext/EVI.c
+++ b/Xext/EVI.c
@@ -45,7 +45,7 @@ ProcEVIQueryVersion(ClientPtr client)
{
/* REQUEST(xEVIQueryVersionReq); */
xEVIQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xEVIQueryVersionReq);
rep.type = X_Reply;
rep.length = 0;
@@ -144,7 +144,7 @@ SProcEVIQueryVersion(ClientPtr client)
static int
SProcEVIGetVisualInfo(ClientPtr client)
{
- register int n;
+ int n;
REQUEST(xEVIGetVisualInfoReq);
swaps(&stuff->length, n);
return ProcEVIGetVisualInfo(client);
diff --git a/Xext/appgroup.c b/Xext/appgroup.c
index 7bd2055..d721afc 100644
--- a/Xext/appgroup.c
+++ b/Xext/appgroup.c
@@ -183,11 +183,11 @@ void XagResetProc(
static
int ProcXagQueryVersion(
- register ClientPtr client)
+ ClientPtr client)
{
/* REQUEST (xXagQueryVersionReq); */
xXagQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xXagQueryVersionReq);
rep.type = X_Reply;
@@ -378,7 +378,7 @@ int AttrValidate(
}
static int ProcXagCreate (
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST (xXagCreateReq);
AppGroupPtr pAppGrp;
@@ -409,7 +409,7 @@ static int ProcXagCreate (
}
static int ProcXagDestroy(
- register ClientPtr client)
+ ClientPtr client)
{
AppGroupPtr pAppGrp;
REQUEST (xXagDestroyReq);
@@ -426,7 +426,7 @@ static int ProcXagDestroy(
static
int ProcXagGetAttr(
- register ClientPtr client)
+ ClientPtr client)
{
AppGroupPtr pAppGrp;
REQUEST (xXagGetAttrReq);
@@ -462,7 +462,7 @@ int ProcXagGetAttr(
static
int ProcXagQuery(
- register ClientPtr client)
+ ClientPtr client)
{
ClientPtr pClient;
AppGroupPtr pAppGrp;
@@ -497,7 +497,7 @@ int ProcXagQuery(
static
int ProcXagCreateAssoc(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST (xXagCreateAssocReq);
@@ -520,7 +520,7 @@ int ProcXagCreateAssoc(
static
int ProcXagDestroyAssoc(
- register ClientPtr client)
+ ClientPtr client)
{
/* REQUEST (xXagDestroyAssocReq); */
@@ -531,7 +531,7 @@ int ProcXagDestroyAssoc(
static
int ProcXagDispatch (
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
@@ -557,9 +557,9 @@ int ProcXagDispatch (
static
int SProcXagQueryVersion(
- register ClientPtr client)
+ ClientPtr client)
{
- register int n;
+ int n;
REQUEST(xXagQueryVersionReq);
swaps(&stuff->length, n);
return ProcXagQueryVersion(client);
@@ -569,7 +569,7 @@ static
int SProcXagCreate(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXagCreateReq);
swaps (&stuff->length, n);
REQUEST_AT_LEAST_SIZE (xXagCreateReq);
@@ -583,7 +583,7 @@ static
int SProcXagDestroy(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXagDestroyReq);
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXagDestroyReq);
@@ -595,7 +595,7 @@ static
int SProcXagGetAttr(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXagGetAttrReq);
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXagGetAttrReq);
@@ -607,7 +607,7 @@ static
int SProcXagQuery(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXagQueryReq);
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXagQueryReq);
@@ -619,7 +619,7 @@ static
int SProcXagCreateAssoc(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXagCreateAssocReq);
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXagCreateAssocReq);
@@ -633,7 +633,7 @@ static
int SProcXagDestroyAssoc(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXagDestroyAssocReq);
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH (xXagDestroyAssocReq);
@@ -643,7 +643,7 @@ int SProcXagDestroyAssoc(
static
int SProcXagDispatch(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index fcd848a..f1f85f9 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -79,11 +79,11 @@ BigReqResetProc (extEntry)
static int
ProcBigReqDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xBigReqEnableReq);
xBigReqEnableReply rep;
- register int n;
+ int n;
if (client->swapped) {
swaps(&stuff->length, n);
diff --git a/Xext/cup.c b/Xext/cup.c
index 6bfa278..d146959 100644
--- a/Xext/cup.c
+++ b/Xext/cup.c
@@ -163,11 +163,11 @@ void ResetProc(
static
int ProcQueryVersion(
- register ClientPtr client)
+ ClientPtr client)
{
/* REQUEST (xXcupQueryVersionReq); */
xXcupQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xXcupQueryVersionReq);
rep.type = X_Reply;
@@ -187,12 +187,12 @@ int ProcQueryVersion(
static
int ProcGetReservedColormapEntries(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST (xXcupGetReservedColormapEntriesReq);
xXcupGetReservedColormapEntriesReply rep;
xColorItem* cptr;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xXcupGetReservedColormapEntriesReq);
@@ -220,7 +220,7 @@ int ProcGetReservedColormapEntries(
static
int ProcStoreColors(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST (xXcupStoreColorsReq);
ColormapPtr pcmp;
@@ -279,7 +279,7 @@ int ProcStoreColors(
static
int ProcDispatch(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
@@ -297,9 +297,9 @@ int ProcDispatch(
static
int SProcQueryVersion(
- register ClientPtr client)
+ ClientPtr client)
{
- register int n;
+ int n;
REQUEST(xXcupQueryVersionReq);
swaps(&stuff->length, n);
@@ -310,7 +310,7 @@ static
int SProcGetReservedColormapEntries(
ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXcupGetReservedColormapEntriesReq);
swaps (&stuff->length, n);
@@ -323,7 +323,7 @@ static
int SProcXcupStoreColors(
ClientPtr client)
{
- register int n;
+ int n;
int count;
xColorItem* pItem;
@@ -339,7 +339,7 @@ int SProcXcupStoreColors(
static
int SProcDispatch(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/dpms.c b/Xext/dpms.c
index aced406..edd9ff7 100644
--- a/Xext/dpms.c
+++ b/Xext/dpms.c
@@ -99,11 +99,11 @@ DPMSResetProc (extEntry)
static int
ProcDPMSGetVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
/* REQUEST(xDPMSGetVersionReq); */
xDPMSGetVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xDPMSGetVersionReq);
@@ -122,11 +122,11 @@ ProcDPMSGetVersion(client)
}
static int
-ProcDPMSCapable(register ClientPtr client)
+ProcDPMSCapable(ClientPtr client)
{
/* REQUEST(xDPMSCapableReq); */
xDPMSCapableReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xDPMSCapableReq);
@@ -144,11 +144,11 @@ ProcDPMSCapable(register ClientPtr client)
static int
ProcDPMSGetTimeouts(client)
- register ClientPtr client;
+ ClientPtr client;
{
/* REQUEST(xDPMSGetTimeoutsReq); */
xDPMSGetTimeoutsReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
@@ -171,7 +171,7 @@ ProcDPMSGetTimeouts(client)
static int
ProcDPMSSetTimeouts(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSSetTimeoutsReq);
@@ -198,7 +198,7 @@ ProcDPMSSetTimeouts(client)
static int
ProcDPMSEnable(client)
- register ClientPtr client;
+ ClientPtr client;
{
/* REQUEST(xDPMSEnableReq); */
@@ -212,7 +212,7 @@ ProcDPMSEnable(client)
static int
ProcDPMSDisable(client)
- register ClientPtr client;
+ ClientPtr client;
{
/* REQUEST(xDPMSDisableReq); */
@@ -227,7 +227,7 @@ ProcDPMSDisable(client)
static int
ProcDPMSForceLevel(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSForceLevelReq);
@@ -259,11 +259,11 @@ ProcDPMSForceLevel(client)
}
static int
-ProcDPMSInfo(register ClientPtr client)
+ProcDPMSInfo(ClientPtr client)
{
/* REQUEST(xDPMSInfoReq); */
xDPMSInfoReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xDPMSInfoReq);
@@ -283,7 +283,7 @@ ProcDPMSInfo(register ClientPtr client)
static int
ProcDPMSDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
@@ -312,9 +312,9 @@ ProcDPMSDispatch (client)
static int
SProcDPMSGetVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xDPMSGetVersionReq);
swaps(&stuff->length, n);
@@ -325,10 +325,10 @@ SProcDPMSGetVersion(client)
}
static int
-SProcDPMSCapable(register ClientPtr client)
+SProcDPMSCapable(ClientPtr client)
{
REQUEST(xDPMSCapableReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSCapableReq);
@@ -338,10 +338,10 @@ SProcDPMSCapable(register ClientPtr client)
static int
SProcDPMSGetTimeouts(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSGetTimeoutsReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSGetTimeoutsReq);
@@ -351,10 +351,10 @@ SProcDPMSGetTimeouts(client)
static int
SProcDPMSSetTimeouts(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSSetTimeoutsReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSSetTimeoutsReq);
@@ -367,10 +367,10 @@ SProcDPMSSetTimeouts(client)
static int
SProcDPMSEnable(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSEnableReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSEnableReq);
@@ -380,10 +380,10 @@ SProcDPMSEnable(client)
static int
SProcDPMSDisable(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSDisableReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSDisableReq);
@@ -393,10 +393,10 @@ SProcDPMSDisable(client)
static int
SProcDPMSForceLevel(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSForceLevelReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSForceLevelReq);
@@ -408,10 +408,10 @@ SProcDPMSForceLevel(client)
static int
SProcDPMSInfo(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xDPMSInfoReq);
- register int n;
+ int n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDPMSInfoReq);
@@ -421,7 +421,7 @@ SProcDPMSInfo(client)
static int
SProcDPMSDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/fontcache.c b/Xext/fontcache.c
index c54340b..1b1ca41 100644
--- a/Xext/fontcache.c
+++ b/Xext/fontcache.c
@@ -100,10 +100,10 @@ FontCacheResetProc (extEntry)
static int
ProcFontCacheQueryVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
xFontCacheQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xFontCacheQueryVersionReq);
rep.type = X_Reply;
@@ -123,11 +123,11 @@ ProcFontCacheQueryVersion(client)
static int
ProcFontCacheGetCacheSettings(client)
- register ClientPtr client;
+ ClientPtr client;
{
xFontCacheGetCacheSettingsReply rep;
FontCacheSettings cinfo;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xFontCacheGetCacheSettingsReq);
rep.type = X_Reply;
@@ -161,11 +161,11 @@ ProcFontCacheGetCacheSettings(client)
static int
ProcFontCacheGetCacheStatistics(client)
- register ClientPtr client;
+ ClientPtr client;
{
xFontCacheGetCacheStatisticsReply rep;
FontCacheStatistics cstats;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xFontCacheGetCacheStatisticsReq);
rep.type = X_Reply;
@@ -214,7 +214,7 @@ ProcFontCacheGetCacheStatistics(client)
static int
ProcFontCacheChangeCacheSettings(client)
- register ClientPtr client;
+ ClientPtr client;
{
FontCacheSettings cs;
@@ -243,7 +243,7 @@ ProcFontCacheChangeCacheSettings(client)
static int
ProcFontCacheDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
@@ -263,9 +263,9 @@ ProcFontCacheDispatch (client)
static int
SProcFontCacheQueryVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xFontCacheQueryVersionReq);
swaps(&stuff->length, n);
return ProcFontCacheQueryVersion(client);
@@ -275,7 +275,7 @@ static int
SProcFontCacheGetCacheSettings(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xFontCacheGetCacheSettingsReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xFontCacheGetCacheSettingsReq);
@@ -286,7 +286,7 @@ static int
SProcFontCacheGetCacheStatistics(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xFontCacheGetCacheStatisticsReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xFontCacheGetCacheStatisticsReq);
@@ -297,7 +297,7 @@ static int
SProcFontCacheChangeCacheSettings(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xFontCacheChangeCacheSettingsReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xFontCacheChangeCacheSettingsReq);
@@ -311,7 +311,7 @@ SProcFontCacheChangeCacheSettings(client)
static int
SProcFontCacheDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index 7296560..348a18d 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -282,10 +282,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;
@@ -441,11 +441,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;
@@ -506,7 +506,7 @@ ProcCreateImageBuffers (client)
static int
ProcDisplayImageBuffers (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xMbufDisplayImageBuffersReq);
MultibufferPtr *pMultibuffer;
@@ -579,7 +579,7 @@ MultibufferResType);
static int
ProcDestroyImageBuffers (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST (xMbufDestroyImageBuffersReq);
WindowPtr pWin;
@@ -595,7 +595,7 @@ ProcDestroyImageBuffers (client)
static int
ProcSetMBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST (xMbufSetMBufferAttributesReq);
WindowPtr pWin;
@@ -694,7 +694,7 @@ ProcGetMBufferAttributes (client)
static int
ProcSetBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xMbufSetBufferAttributesReq);
MultibufferPtr pMultibuffer;
@@ -736,7 +736,7 @@ ProcSetBufferAttributes (client)
int
ProcGetBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xMbufGetBufferAttributesReq);
MultibufferPtr pMultibuffer;
@@ -780,7 +780,7 @@ ProcGetBufferAttributes (client)
static int
ProcGetBufferInfo (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST (xMbufGetBufferInfoReq);
DrawablePtr pDrawable;
@@ -845,7 +845,7 @@ ProcGetBufferInfo (client)
static int
ProcClearImageBufferArea (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST (xMbufClearImageBufferAreaReq);
MultibufferPtr pMultibuffer;
@@ -907,7 +907,7 @@ ProcClearImageBufferArea (client)
static int
ProcMultibufferDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data) {
@@ -938,9 +938,9 @@ ProcMultibufferDispatch (client)
static int
SProcGetBufferVersion (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufGetBufferVersionReq);
swaps (&stuff->length, n);
@@ -949,9 +949,9 @@ SProcGetBufferVersion (client)
static int
SProcCreateImageBuffers (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufCreateImageBuffersReq);
swaps (&stuff->length, n);
@@ -963,9 +963,9 @@ SProcCreateImageBuffers (client)
static int
SProcDisplayImageBuffers (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufDisplayImageBuffersReq);
swaps (&stuff->length, n);
@@ -978,9 +978,9 @@ SProcDisplayImageBuffers (client)
static int
SProcDestroyImageBuffers (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufDestroyImageBuffersReq);
swaps (&stuff->length, n);
@@ -991,9 +991,9 @@ SProcDestroyImageBuffers (client)
static int
SProcSetMBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufSetMBufferAttributesReq);
swaps (&stuff->length, n);
@@ -1006,9 +1006,9 @@ SProcSetMBufferAttributes (client)
static int
SProcGetMBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufGetMBufferAttributesReq);
swaps (&stuff->length, n);
@@ -1019,9 +1019,9 @@ SProcGetMBufferAttributes (client)
static int
SProcSetBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufSetBufferAttributesReq);
swaps (&stuff->length, n);
@@ -1034,9 +1034,9 @@ SProcSetBufferAttributes (client)
static int
SProcGetBufferAttributes (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufGetBufferAttributesReq);
swaps (&stuff->length, n);
@@ -1047,9 +1047,9 @@ SProcGetBufferAttributes (client)
static int
SProcGetBufferInfo (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xMbufGetBufferInfoReq);
swaps (&stuff->length, n);
@@ -1060,9 +1060,9 @@ SProcGetBufferInfo (client)
static int
SProcClearImageBufferArea(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST(xMbufClearImageBufferAreaReq);
swaps(&stuff->length, n);
@@ -1077,7 +1077,7 @@ SProcClearImageBufferArea(client)
static int
SProcMultibufferDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data) {
@@ -1297,7 +1297,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);
@@ -1370,9 +1370,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;
@@ -1682,7 +1682,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)
diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c
index a3b3de7..afa6177 100644
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@@ -600,9 +600,9 @@ bufDrawSelectPlane(pScreen, selectPlane, prgn, bufferNum)
{
DrawablePtr pDrawable;
GCPtr pGC;
- register int i;
- register BoxPtr pbox;
- register xRectangle *prect;
+ int i;
+ BoxPtr pbox;
+ xRectangle *prect;
int numRects;
XID value;
@@ -882,7 +882,7 @@ bufChangeWindowAttributes(pWin, mask)
static void
bufWindowExposures(pWin, prgn, other_exposed)
WindowPtr pWin;
- register RegionPtr prgn, other_exposed;
+ RegionPtr prgn, other_exposed;
{
ScreenPtr pScreen = pWin->drawable.pScreen;
mbufWindowPtr pMBWindow = MB_WINDOW_PRIV(pWin);
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index 924b880..365c7e6 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -83,7 +83,7 @@ ExtensionEntry *extEntry;
static int
ProcMITSetBugMode(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xMITSetBugModeReq);
@@ -95,10 +95,10 @@ ProcMITSetBugMode(client)
static int
ProcMITGetBugMode(client)
- register ClientPtr client;
+ ClientPtr client;
{
xMITGetBugModeReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xMITGetBugModeReq);
rep.type = X_Reply;
@@ -115,7 +115,7 @@ ProcMITGetBugMode(client)
static int
ProcMITDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
@@ -131,9 +131,9 @@ ProcMITDispatch (client)
static int
SProcMITSetBugMode(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xMITSetBugModeReq);
swaps(&stuff->length, n);
@@ -142,9 +142,9 @@ SProcMITSetBugMode(client)
static int
SProcMITGetBugMode(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xMITGetBugModeReq);
swaps(&stuff->length, n);
@@ -153,7 +153,7 @@ SProcMITGetBugMode(client)
static int
SProcMITDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 95df043..93c6fb4 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -916,7 +916,7 @@ ProcPanoramiXGetState(ClientPtr client)
REQUEST(xPanoramiXGetStateReq);
WindowPtr pWin;
xPanoramiXGetStateReply rep;
- register int n, rc;
+ int n, rc;
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -943,7 +943,7 @@ ProcPanoramiXGetScreenCount(ClientPtr client)
REQUEST(xPanoramiXGetScreenCountReq);
WindowPtr pWin;
xPanoramiXGetScreenCountReply rep;
- register int n, rc;
+ int n, rc;
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -969,7 +969,7 @@ ProcPanoramiXGetScreenSize(ClientPtr client)
REQUEST(xPanoramiXGetScreenSizeReq);
WindowPtr pWin;
xPanoramiXGetScreenSizeReply rep;
- register int n, rc;
+ int n, rc;
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -1014,7 +1014,7 @@ ProcXineramaIsActive(ClientPtr client)
rep.state = !noPanoramiXExtension;
#endif
if (client->swapped) {
- register int n;
+ int n;
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swapl (&rep.state, n);
@@ -1037,7 +1037,7 @@ ProcXineramaQueryScreens(ClientPtr client)
rep.number = (noPanoramiXExtension) ? 0 : PanoramiXNumScreens;
rep.length = rep.number * sz_XineramaScreenInfo >> 2;
if (client->swapped) {
- register int n;
+ int n;
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swapl (&rep.number, n);
@@ -1055,7 +1055,7 @@ ProcXineramaQueryScreens(ClientPtr client)
scratch.height = panoramiXdataPtr[i].height;
if(client->swapped) {
- register int n;
+ int n;
swaps (&scratch.x_org, n);
swaps (&scratch.y_org, n);
swaps (&scratch.width, n);
diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index da445ff..dabab1f 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -55,7 +55,7 @@ static int
SProcPanoramiXQueryVersion (ClientPtr client)
{
REQUEST(xPanoramiXQueryVersionReq);
- register int n;
+ int n;
swaps(&stuff->length,n);
REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
@@ -66,7 +66,7 @@ static int
SProcPanoramiXGetState(ClientPtr client)
{
REQUEST(xPanoramiXGetStateReq);
- register int n;
+ int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
@@ -77,7 +77,7 @@ static int
SProcPanoramiXGetScreenCount(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenCountReq);
- register int n;
+ int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
@@ -88,7 +88,7 @@ static int
SProcPanoramiXGetScreenSize(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenSizeReq);
- register int n;
+ int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
@@ -100,7 +100,7 @@ static int
SProcXineramaIsActive(ClientPtr client)
{
REQUEST(xXineramaIsActiveReq);
- register int n;
+ int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
@@ -112,7 +112,7 @@ static int
SProcXineramaQueryScreens(ClientPtr client)
{
REQUEST(xXineramaQueryScreensReq);
- register int n;
+ int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
diff --git a/Xext/sampleEVI.c b/Xext/sampleEVI.c
index 7508aa7..5dd6e45 100644
--- a/Xext/sampleEVI.c
+++ b/Xext/sampleEVI.c
@@ -46,7 +46,7 @@ static int sampleGetVisualInfo(
VisualID32 *temp_conflict;
xExtendedVisualInfo *evi;
int max_visuals = 0, max_sz_conflict, sz_conflict = 0;
- register int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
+ int visualI, scrI, sz_evi = 0, conflictI, n_conflict;
*evi_rn = evi = (xExtendedVisualInfo *)xalloc(max_sz_evi);
if (!*evi_rn)
return BadAlloc;
diff --git a/Xext/saver.c b/Xext/saver.c
index a590583..99b87aa 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -755,10 +755,10 @@ ScreenSaverHandle (pScreen, xstate, force)
static int
ProcScreenSaverQueryVersion (client)
- register ClientPtr client;
+ ClientPtr client;
{
xScreenSaverQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xScreenSaverQueryVersionReq);
rep.type = X_Reply;
@@ -776,11 +776,11 @@ ProcScreenSaverQueryVersion (client)
static int
ProcScreenSaverQueryInfo (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xScreenSaverQueryInfoReq);
xScreenSaverQueryInfoReply rep;
- register int n, rc;
+ int n, rc;
ScreenSaverStuffPtr pSaver;
DrawablePtr pDraw;
CARD32 lastInput;
@@ -849,7 +849,7 @@ ProcScreenSaverQueryInfo (client)
static int
ProcScreenSaverSelectInput (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xScreenSaverSelectInputReq);
DrawablePtr pDraw;
diff --git a/Xext/security.c b/Xext/security.c
index a8b4690..231ea51 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -336,7 +336,7 @@ ProcSecurityQueryVersion(
rep.minorVersion = SECURITY_MINOR_VERSION;
if(client->swapped)
{
- register char n;
+ char n;
swaps(&rep.sequenceNumber, n);
swaps(&rep.majorVersion, n);
swaps(&rep.minorVersion, n);
@@ -554,7 +554,7 @@ ProcSecurityGenerateAuthorization(
if (client->swapped)
{
- register char n;
+ char n;
swapl(&rep.length, n);
swaps(&rep.sequenceNumber, n);
swapl(&rep.authId, n);
@@ -633,7 +633,7 @@ SProcSecurityQueryVersion(
ClientPtr client)
{
REQUEST(xSecurityQueryVersionReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xSecurityQueryVersionReq);
@@ -648,7 +648,7 @@ SProcSecurityGenerateAuthorization(
ClientPtr client)
{
REQUEST(xSecurityGenerateAuthorizationReq);
- register char n;
+ char n;
CARD32 *values;
unsigned long nvalues;
@@ -671,7 +671,7 @@ SProcSecurityRevokeAuthorization(
ClientPtr client)
{
REQUEST(xSecurityRevokeAuthorizationReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xSecurityRevokeAuthorizationReq);
diff --git a/Xext/shape.c b/Xext/shape.c
index 6515a10..2425eeb 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -282,10 +282,10 @@ CreateClipShape (pWin)
static int
ProcShapeQueryVersion (client)
- register ClientPtr client;
+ ClientPtr client;
{
xShapeQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xShapeQueryVersionReq);
rep.type = X_Reply;
@@ -310,7 +310,7 @@ ProcShapeQueryVersion (client)
static int
ProcShapeRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -381,7 +381,7 @@ ProcShapeRectangles (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeRectangles(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeRectanglesReq);
PanoramiXRes *win;
@@ -410,7 +410,7 @@ ProcPanoramiXShapeRectangles(
static int
ProcShapeMask (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -480,7 +480,7 @@ ProcShapeMask (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeMask(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeMaskReq);
PanoramiXRes *win, *pmap;
@@ -517,7 +517,7 @@ ProcPanoramiXShapeMask(
static int
ProcShapeCombine (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pSrcWin, pDestWin;
ScreenPtr pScreen;
@@ -609,7 +609,7 @@ ProcShapeCombine (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeCombine(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeCombineReq);
PanoramiXRes *win, *win2;
@@ -641,7 +641,7 @@ ProcPanoramiXShapeCombine(
static int
ProcShapeOffset (client)
- register ClientPtr client;
+ ClientPtr client;
{
WindowPtr pWin;
ScreenPtr pScreen;
@@ -682,7 +682,7 @@ ProcShapeOffset (client)
#ifdef PANORAMIX
static int
ProcPanoramiXShapeOffset(
- register ClientPtr client)
+ ClientPtr client)
{
REQUEST(xShapeOffsetReq);
PanoramiXRes *win;
@@ -706,13 +706,13 @@ ProcPanoramiXShapeOffset(
static int
ProcShapeQueryExtents (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeQueryExtentsReq);
WindowPtr pWin;
xShapeQueryExtentsReply rep;
BoxRec extents, *pExtents;
- register int n, rc;
+ int n, rc;
RegionPtr region;
REQUEST_SIZE_MATCH (xShapeQueryExtentsReq);
@@ -817,7 +817,7 @@ ShapeFreeEvents (data, id)
static int
ProcShapeSelectInput (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeSelectInputReq);
WindowPtr pWin;
@@ -989,14 +989,14 @@ SendShapeNotify (pWin, which)
static int
ProcShapeInputSelected (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeInputSelectedReq);
WindowPtr pWin;
ShapeEventPtr pShapeEvent, *pHead;
int enabled, rc;
xShapeInputSelectedReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH (xShapeInputSelectedReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -1030,7 +1030,7 @@ ProcShapeInputSelected (client)
static int
ProcShapeGetRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeGetRectanglesReq);
WindowPtr pWin;
@@ -1038,7 +1038,7 @@ ProcShapeGetRectangles (client)
xRectangle *rects;
int nrects, i, rc;
RegionPtr region;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -1116,7 +1116,7 @@ ProcShapeGetRectangles (client)
static int
ProcShapeDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data) {
@@ -1181,9 +1181,9 @@ SShapeNotifyEvent(from, to)
static int
SProcShapeQueryVersion (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xShapeQueryVersionReq);
swaps (&stuff->length, n);
@@ -1192,9 +1192,9 @@ SProcShapeQueryVersion (client)
static int
SProcShapeRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeRectanglesReq);
swaps (&stuff->length, n);
@@ -1208,9 +1208,9 @@ SProcShapeRectangles (client)
static int
SProcShapeMask (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeMaskReq);
swaps (&stuff->length, n);
@@ -1224,9 +1224,9 @@ SProcShapeMask (client)
static int
SProcShapeCombine (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeCombineReq);
swaps (&stuff->length, n);
@@ -1240,9 +1240,9 @@ SProcShapeCombine (client)
static int
SProcShapeOffset (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeOffsetReq);
swaps (&stuff->length, n);
@@ -1255,9 +1255,9 @@ SProcShapeOffset (client)
static int
SProcShapeQueryExtents (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeQueryExtentsReq);
swaps (&stuff->length, n);
@@ -1268,9 +1268,9 @@ SProcShapeQueryExtents (client)
static int
SProcShapeSelectInput (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register char n;
+ char n;
REQUEST (xShapeSelectInputReq);
swaps (&stuff->length, n);
@@ -1281,9 +1281,9 @@ SProcShapeSelectInput (client)
static int
SProcShapeInputSelected (client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST (xShapeInputSelectedReq);
swaps (&stuff->length, n);
@@ -1294,10 +1294,10 @@ SProcShapeInputSelected (client)
static int
SProcShapeGetRectangles (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xShapeGetRectanglesReq);
- register char n;
+ char n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xShapeGetRectanglesReq);
@@ -1307,7 +1307,7 @@ SProcShapeGetRectangles (client)
static int
SProcShapeDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data) {
diff --git a/Xext/shm.c b/Xext/shm.c
index 5937a03..97a48cd 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -343,10 +343,10 @@ ShmRegisterFbFuncs(pScreen)
static int
ProcShmQueryVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
xShmQueryVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xShmQueryVersionReq);
rep.type = X_Reply;
@@ -438,7 +438,7 @@ shm_access(ClientPtr client, SHMPERM_TYPE *perm, int readonly)
static int
ProcShmAttach(client)
- register ClientPtr client;
+ ClientPtr client;
{
SHMSTAT_TYPE buf;
ShmDescPtr shmdesc;
@@ -518,7 +518,7 @@ ShmDetachSegment(value, shmseg)
static int
ProcShmDetach(client)
- register ClientPtr client;
+ ClientPtr client;
{
ShmDescPtr shmdesc;
REQUEST(xShmDetachReq);
@@ -595,7 +595,7 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
#ifdef PANORAMIX
static int
-ProcPanoramiXShmPutImage(register ClientPtr client)
+ProcPanoramiXShmPutImage(ClientPtr client)
{
int j, result = 0, orig_x, orig_y;
PanoramiXRes *draw, *gc;
@@ -742,7 +742,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
}
if (client->swapped) {
- register int n;
+ int n;
swaps(&xgi.sequenceNumber, n);
swapl(&xgi.length, n);
swapl(&xgi.visual, n);
@@ -755,7 +755,7 @@ ProcPanoramiXShmGetImage(ClientPtr client)
static int
ProcPanoramiXShmCreatePixmap(
- register ClientPtr client)
+ ClientPtr client)
{
ScreenPtr pScreen = NULL;
PixmapPtr pMap = NULL;
@@ -846,7 +846,7 @@ CreatePmap:
static int
ProcShmPutImage(client)
- register ClientPtr client;
+ ClientPtr client;
{
GCPtr pGC;
DrawablePtr pDraw;
@@ -950,7 +950,7 @@ ProcShmPutImage(client)
static int
ProcShmGetImage(client)
- register ClientPtr client;
+ ClientPtr client;
{
DrawablePtr pDraw;
long lenPer = 0, length;
@@ -1069,7 +1069,7 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
int depth;
char *addr;
{
- register PixmapPtr pPixmap;
+ PixmapPtr pPixmap;
pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, pScreen->rootDepth, 0);
if (!pPixmap)
@@ -1085,12 +1085,12 @@ fbShmCreatePixmap (pScreen, width, height, depth, addr)
static int
ProcShmCreatePixmap(client)
- register ClientPtr client;
+ ClientPtr client;
{
PixmapPtr pMap;
DrawablePtr pDraw;
DepthPtr pDepth;
- register int i, rc;
+ int i, rc;
ShmDescPtr shmdesc;
REQUEST(xShmCreatePixmapReq);
@@ -1143,7 +1143,7 @@ CreatePmap:
static int
ProcShmDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
@@ -1192,9 +1192,9 @@ SShmCompletionEvent(from, to)
static int
SProcShmQueryVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xShmQueryVersionReq);
swaps(&stuff->length, n);
@@ -1205,7 +1205,7 @@ static int
SProcShmAttach(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xShmAttachReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xShmAttachReq);
@@ -1218,7 +1218,7 @@ static int
SProcShmDetach(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xShmDetachReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xShmDetachReq);
@@ -1230,7 +1230,7 @@ static int
SProcShmPutImage(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xShmPutImageReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xShmPutImageReq);
@@ -1253,7 +1253,7 @@ static int
SProcShmGetImage(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xShmGetImageReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xShmGetImageReq);
@@ -1272,7 +1272,7 @@ static int
SProcShmCreatePixmap(client)
ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xShmCreatePixmapReq);
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
@@ -1287,7 +1287,7 @@ SProcShmCreatePixmap(client)
static int
SProcShmDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/sync.c b/Xext/sync.c
index e87e0bd..cea8f0a 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -1405,7 +1405,7 @@ ProcSyncListSystemCounters(client)
if (client->swapped)
{
- register char n;
+ char n;
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
swapl(&rep.nCounters, n);
@@ -1425,7 +1425,7 @@ ProcSyncListSystemCounters(client)
if (client->swapped)
{
- register char n;
+ char n;
swapl(&walklist->counter, n);
swapl(&walklist->resolution_hi, n);
swapl(&walklist->resolution_lo, n);
@@ -1514,7 +1514,7 @@ ProcSyncGetPriority(client)
if (client->swapped)
{
- register char n;
+ char n;
swaps(&rep.sequenceNumber, n);
swapl(&rep.priority, n);
}
@@ -1799,7 +1799,7 @@ ProcSyncQueryCounter(client)
rep.value_lo = XSyncValueLow32(pCounter->value);
if (client->swapped)
{
- register char n;
+ char n;
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
swapl(&rep.value_hi, n);
@@ -1981,7 +1981,7 @@ ProcSyncQueryAlarm(client)
if (client->swapped)
{
- register char n;
+ char n;
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
swapl(&rep.counter, n);
@@ -2070,7 +2070,7 @@ SProcSyncInitialize(client)
ClientPtr client;
{
REQUEST(xSyncInitializeReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncInitializeReq);
@@ -2083,7 +2083,7 @@ SProcSyncListSystemCounters(client)
ClientPtr client;
{
REQUEST(xSyncListSystemCountersReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncListSystemCountersReq);
@@ -2096,7 +2096,7 @@ SProcSyncCreateCounter(client)
ClientPtr client;
{
REQUEST(xSyncCreateCounterReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncCreateCounterReq);
@@ -2112,7 +2112,7 @@ SProcSyncSetCounter(client)
ClientPtr client;
{
REQUEST(xSyncSetCounterReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncSetCounterReq);
@@ -2128,7 +2128,7 @@ SProcSyncChangeCounter(client)
ClientPtr client;
{
REQUEST(xSyncChangeCounterReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncChangeCounterReq);
@@ -2144,7 +2144,7 @@ SProcSyncQueryCounter(client)
ClientPtr client;
{
REQUEST(xSyncQueryCounterReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncQueryCounterReq);
@@ -2158,7 +2158,7 @@ SProcSyncDestroyCounter(client)
ClientPtr client;
{
REQUEST(xSyncDestroyCounterReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncDestroyCounterReq);
@@ -2172,7 +2172,7 @@ SProcSyncAwait(client)
ClientPtr client;
{
REQUEST(xSyncAwaitReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xSyncAwaitReq);
@@ -2187,7 +2187,7 @@ SProcSyncCreateAlarm(client)
ClientPtr client;
{
REQUEST(xSyncCreateAlarmReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xSyncCreateAlarmReq);
@@ -2203,7 +2203,7 @@ SProcSyncChangeAlarm(client)
ClientPtr client;
{
REQUEST(xSyncChangeAlarmReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xSyncChangeAlarmReq);
@@ -2218,7 +2218,7 @@ SProcSyncQueryAlarm(client)
ClientPtr client;
{
REQUEST(xSyncQueryAlarmReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncQueryAlarmReq);
@@ -2232,7 +2232,7 @@ SProcSyncDestroyAlarm(client)
ClientPtr client;
{
REQUEST(xSyncDestroyAlarmReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncDestroyAlarmReq);
@@ -2246,7 +2246,7 @@ SProcSyncSetPriority(client)
ClientPtr client;
{
REQUEST(xSyncSetPriorityReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncSetPriorityReq);
@@ -2261,7 +2261,7 @@ SProcSyncGetPriority(client)
ClientPtr client;
{
REQUEST(xSyncGetPriorityReq);
- register char n;
+ char n;
swaps(&stuff->length, n);
REQUEST_SIZE_MATCH (xSyncGetPriorityReq);
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 8c7a86e..45450ef 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -93,10 +93,10 @@ XCMiscResetProc (extEntry)
static int
ProcXCMiscGetVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
xXCMiscGetVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xXCMiscGetVersionReq);
rep.type = X_Reply;
@@ -115,10 +115,10 @@ ProcXCMiscGetVersion(client)
static int
ProcXCMiscGetXIDRange(client)
- register ClientPtr client;
+ ClientPtr client;
{
xXCMiscGetXIDRangeReply rep;
- register int n;
+ int n;
XID min_id, max_id;
REQUEST_SIZE_MATCH(xXCMiscGetXIDRangeReq);
@@ -139,11 +139,11 @@ ProcXCMiscGetXIDRange(client)
static int
ProcXCMiscGetXIDList(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xXCMiscGetXIDListReq);
xXCMiscGetXIDListReply rep;
- register int n;
+ int n;
XID *pids;
unsigned int count;
@@ -179,7 +179,7 @@ ProcXCMiscGetXIDList(client)
static int
ProcXCMiscDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
@@ -197,9 +197,9 @@ ProcXCMiscDispatch (client)
static int
SProcXCMiscGetVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xXCMiscGetVersionReq);
swaps(&stuff->length, n);
@@ -211,9 +211,9 @@ SProcXCMiscGetVersion(client)
static int
SProcXCMiscGetXIDRange(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xReq);
swaps(&stuff->length, n);
@@ -222,9 +222,9 @@ SProcXCMiscGetXIDRange(client)
static int
SProcXCMiscGetXIDList(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xXCMiscGetXIDListReq);
swaps(&stuff->length, n);
@@ -234,7 +234,7 @@ SProcXCMiscGetXIDList(client)
static int
SProcXCMiscDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/xevie.c b/Xext/xevie.c
index 0feb4d7..5016255 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -63,7 +63,7 @@ extern Bool noXkbExtension;
#endif
extern int xeviegrabState;
-static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
+static int ProcDispatch (ClientPtr client), SProcDispatch (ClientPtr client);
static void ResetProc (ExtensionEntry *extEntry);
static unsigned char ReqCode = 0;
@@ -164,7 +164,7 @@ void ResetProc (ExtensionEntry *extEntry)
}
static
-int ProcQueryVersion (register ClientPtr client)
+int ProcQueryVersion (ClientPtr client)
{
xXevieQueryVersionReply rep;
@@ -179,7 +179,7 @@ int ProcQueryVersion (register ClientPtr client)
}
static
-int ProcStart (register ClientPtr client)
+int ProcStart (ClientPtr client)
{
xXevieStartReply rep;
@@ -220,7 +220,7 @@ int ProcStart (register ClientPtr client)
}
static
-int ProcEnd (register ClientPtr client)
+int ProcEnd (ClientPtr client)
{
xXevieEndReply rep;
@@ -239,7 +239,7 @@ int ProcEnd (register ClientPtr client)
}
static
-int ProcSend (register ClientPtr client)
+int ProcSend (ClientPtr client)
{
REQUEST (xXevieSendReq);
xXevieSendReply rep;
@@ -285,7 +285,7 @@ int ProcSend (register ClientPtr client)
}
static
-int ProcSelectInput (register ClientPtr client)
+int ProcSelectInput (ClientPtr client)
{
REQUEST (xXevieSelectInputReq);
xXevieSelectInputReply rep;
@@ -301,7 +301,7 @@ int ProcSelectInput (register ClientPtr client)
}
static
-int ProcDispatch (register ClientPtr client)
+int ProcDispatch (ClientPtr client)
{
REQUEST (xReq);
switch (stuff->data)
@@ -322,9 +322,9 @@ int ProcDispatch (register ClientPtr client)
}
static
-int SProcQueryVersion (register ClientPtr client)
+int SProcQueryVersion (ClientPtr client)
{
- register int n;
+ int n;
REQUEST(xXevieQueryVersionReq);
swaps(&stuff->length, n);
@@ -334,7 +334,7 @@ int SProcQueryVersion (register ClientPtr client)
static
int SProcStart (ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXevieStartReq);
swaps (&stuff->length, n);
@@ -346,7 +346,7 @@ int SProcStart (ClientPtr client)
static
int SProcEnd (ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXevieEndReq);
swaps (&stuff->length, n);
@@ -358,7 +358,7 @@ int SProcEnd (ClientPtr client)
static
int SProcSend (ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXevieSendReq);
swaps (&stuff->length, n);
@@ -370,7 +370,7 @@ int SProcSend (ClientPtr client)
static
int SProcSelectInput (ClientPtr client)
{
- register int n;
+ int n;
REQUEST (xXevieSelectInputReq);
swaps (&stuff->length, n);
@@ -381,7 +381,7 @@ int SProcSelectInput (ClientPtr client)
static
-int SProcDispatch (register ClientPtr client)
+int SProcDispatch (ClientPtr client)
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/xprint.c b/Xext/xprint.c
index 4ac13e6..df189a1 100644
--- a/Xext/xprint.c
+++ b/Xext/xprint.c
@@ -570,7 +570,7 @@ ProcXpQueryVersion(ClientPtr client)
{
/* REQUEST(xPrintQueryVersionReq); */
xPrintQueryVersionReply rep;
- register int n;
+ int n;
long l;
REQUEST_SIZE_MATCH(xPrintQueryVersionReq);
@@ -1101,8 +1101,8 @@ ProcXpGetContext(ClientPtr client)
xPrintGetContextReply rep;
XpContextPtr pContext;
- register int n;
- register long l;
+ int n;
+ long l;
REQUEST_SIZE_MATCH(xPrintGetContextReq);
@@ -1383,11 +1383,11 @@ XpFreePage(pointer data, XID id)
static void
InitContextPrivates(XpContextPtr context)
{
- register char *ptr;
+ char *ptr;
DevUnion *ppriv;
- register unsigned *sizes;
- register unsigned size;
- register int i;
+ unsigned *sizes;
+ unsigned size;
+ int i;
if (totalContextSize == sizeof(XpContextRec))
ppriv = (DevUnion *)NULL;
@@ -2330,7 +2330,7 @@ ProcXpInputSelected(ClientPtr client)
{
REQUEST(xPrintInputSelectedReq);
xPrintInputSelectedReply rep;
- register int n;
+ int n;
long l;
XpClientPtr pXpClient;
XpContextPtr pContext;
diff --git a/Xext/xres.c b/Xext/xres.c
index 32cc903..9bbf0a4 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -93,7 +93,7 @@ ProcXResQueryClients (ClientPtr client)
scratch.resource_mask = RESOURCE_ID_MASK;
if(client->swapped) {
- register int n;
+ int n;
swapl (&scratch.resource_base, n);
swapl (&scratch.resource_mask, n);
}
@@ -175,7 +175,7 @@ ProcXResQueryClientResources (ClientPtr client)
scratch.count = counts[i];
if(client->swapped) {
- register int n;
+ int n;
swapl (&scratch.resource_type, n);
swapl (&scratch.count, n);
}
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 963029c..711b57c 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -112,10 +112,10 @@ ExtensionEntry *extEntry;
static int
ProcXTestGetVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
xXTestGetVersionReply rep;
- register int n;
+ int n;
REQUEST_SIZE_MATCH(xXTestGetVersionReq);
rep.type = X_Reply;
@@ -133,13 +133,13 @@ ProcXTestGetVersion(client)
static int
ProcXTestCompareCursor(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xXTestCompareCursorReq);
xXTestCompareCursorReply rep;
WindowPtr pWin;
CursorPtr pCursor;
- register int n, rc;
+ int n, rc;
REQUEST_SIZE_MATCH(xXTestCompareCursorReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixUnknownAccess);
@@ -170,7 +170,7 @@ ProcXTestCompareCursor(client)
static int
ProcXTestFakeInput(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xXTestFakeInputReq);
int nev, n, type, rc;
@@ -468,7 +468,7 @@ ProcXTestFakeInput(client)
static int
ProcXTestGrabControl(client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xXTestGrabControlReq);
@@ -487,7 +487,7 @@ ProcXTestGrabControl(client)
static int
ProcXTestDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
@@ -507,9 +507,9 @@ ProcXTestDispatch (client)
static int
SProcXTestGetVersion(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xXTestGetVersionReq);
swaps(&stuff->length, n);
@@ -520,9 +520,9 @@ SProcXTestGetVersion(client)
static int
SProcXTestCompareCursor(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xXTestCompareCursorReq);
swaps(&stuff->length, n);
@@ -534,11 +534,11 @@ SProcXTestCompareCursor(client)
static int
XTestSwapFakeInput(client, req)
- register ClientPtr client;
+ ClientPtr client;
xReq *req;
{
- register int nev;
- register xEvent *ev;
+ int nev;
+ xEvent *ev;
xEvent sev;
EventSwapPtr proc;
@@ -560,9 +560,9 @@ XTestSwapFakeInput(client, req)
static int
SProcXTestFakeInput(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xReq);
swaps(&stuff->length, n);
@@ -574,9 +574,9 @@ SProcXTestFakeInput(client)
static int
SProcXTestGrabControl(client)
- register ClientPtr client;
+ ClientPtr client;
{
- register int n;
+ int n;
REQUEST(xXTestGrabControlReq);
swaps(&stuff->length, n);
@@ -586,7 +586,7 @@ SProcXTestGrabControl(client)
static int
SProcXTestDispatch (client)
- register ClientPtr client;
+ ClientPtr client;
{
REQUEST(xReq);
switch (stuff->data)
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index 21d00aa..5465e25 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1334,7 +1334,7 @@ ProcXvListImageFormats(ClientPtr client)
static int
SProcXvQueryExtension(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvQueryExtensionReq);
swaps(&stuff->length, n);
return ProcXvQueryExtension(client);
@@ -1343,7 +1343,7 @@ SProcXvQueryExtension(ClientPtr client)
static int
SProcXvQueryAdaptors(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvQueryAdaptorsReq);
swaps(&stuff->length, n);
swapl(&stuff->window, n);
@@ -1353,7 +1353,7 @@ SProcXvQueryAdaptors(ClientPtr client)
static int
SProcXvQueryEncodings(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvQueryEncodingsReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1363,7 +1363,7 @@ SProcXvQueryEncodings(ClientPtr client)
static int
SProcXvGrabPort(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvGrabPortReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1374,7 +1374,7 @@ SProcXvGrabPort(ClientPtr client)
static int
SProcXvUngrabPort(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvUngrabPortReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1385,7 +1385,7 @@ SProcXvUngrabPort(ClientPtr client)
static int
SProcXvPutVideo(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvPutVideoReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1405,7 +1405,7 @@ SProcXvPutVideo(ClientPtr client)
static int
SProcXvPutStill(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvPutStillReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1425,7 +1425,7 @@ SProcXvPutStill(ClientPtr client)
static int
SProcXvGetVideo(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvGetVideoReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1445,7 +1445,7 @@ SProcXvGetVideo(ClientPtr client)
static int
SProcXvGetStill(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvGetStillReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1465,7 +1465,7 @@ SProcXvGetStill(ClientPtr client)
static int
SProcXvPutImage(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvPutImageReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1489,7 +1489,7 @@ SProcXvPutImage(ClientPtr client)
static int
SProcXvShmPutImage(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvShmPutImageReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1516,7 +1516,7 @@ SProcXvShmPutImage(ClientPtr client)
static int
SProcXvSelectVideoNotify(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvSelectVideoNotifyReq);
swaps(&stuff->length, n);
swapl(&stuff->drawable, n);
@@ -1526,7 +1526,7 @@ SProcXvSelectVideoNotify(ClientPtr client)
static int
SProcXvSelectPortNotify(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvSelectPortNotifyReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1536,7 +1536,7 @@ SProcXvSelectPortNotify(ClientPtr client)
static int
SProcXvStopVideo(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvStopVideoReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1547,7 +1547,7 @@ SProcXvStopVideo(ClientPtr client)
static int
SProcXvSetPortAttribute(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvSetPortAttributeReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1558,7 +1558,7 @@ SProcXvSetPortAttribute(ClientPtr client)
static int
SProcXvGetPortAttribute(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvGetPortAttributeReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1569,7 +1569,7 @@ SProcXvGetPortAttribute(ClientPtr client)
static int
SProcXvQueryBestSize(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvQueryBestSizeReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1583,7 +1583,7 @@ SProcXvQueryBestSize(ClientPtr client)
static int
SProcXvQueryPortAttributes(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvQueryPortAttributesReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1593,7 +1593,7 @@ SProcXvQueryPortAttributes(ClientPtr client)
static int
SProcXvQueryImageAttributes(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvQueryImageAttributesReq);
swaps(&stuff->length, n);
swapl(&stuff->id, n);
@@ -1605,7 +1605,7 @@ SProcXvQueryImageAttributes(ClientPtr client)
static int
SProcXvListImageFormats(ClientPtr client)
{
- register char n;
+ char n;
REQUEST(xvListImageFormatsReq);
swaps(&stuff->length, n);
swapl(&stuff->port, n);
@@ -1618,7 +1618,7 @@ SWriteQueryExtensionReply(
ClientPtr client,
xvQueryExtensionReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1635,7 +1635,7 @@ SWriteQueryAdaptorsReply(
ClientPtr client,
xvQueryAdaptorsReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1651,7 +1651,7 @@ SWriteQueryEncodingsReply(
ClientPtr client,
xvQueryEncodingsReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1667,7 +1667,7 @@ SWriteAdaptorInfo(
ClientPtr client,
xvAdaptorInfo *pAdaptor
){
- register char n;
+ char n;
swapl(&pAdaptor->base_id, n);
swaps(&pAdaptor->name_size, n);
@@ -1684,7 +1684,7 @@ SWriteEncodingInfo(
ClientPtr client,
xvEncodingInfo *pEncoding
){
- register char n;
+ char n;
swapl(&pEncoding->encoding, n);
swaps(&pEncoding->name_size, n);
@@ -1702,7 +1702,7 @@ SWriteFormat(
ClientPtr client,
xvFormat *pFormat
){
- register char n;
+ char n;
swapl(&pFormat->visual, n);
(void)WriteToClient(client, sz_xvFormat, (char *)pFormat);
@@ -1715,7 +1715,7 @@ SWriteAttributeInfo(
ClientPtr client,
xvAttributeInfo *pAtt
){
- register char n;
+ char n;
swapl(&pAtt->flags, n);
swapl(&pAtt->size, n);
@@ -1731,7 +1731,7 @@ SWriteImageFormatInfo(
ClientPtr client,
xvImageFormatInfo *pImage
){
- register char n;
+ char n;
swapl(&pImage->id, n);
swapl(&pImage->red_mask, n);
@@ -1759,7 +1759,7 @@ SWriteGrabPortReply(
ClientPtr client,
xvGrabPortReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1774,7 +1774,7 @@ SWriteGetPortAttributeReply(
ClientPtr client,
xvGetPortAttributeReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1790,7 +1790,7 @@ SWriteQueryBestSizeReply(
ClientPtr client,
xvQueryBestSizeReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1807,7 +1807,7 @@ SWriteQueryPortAttributesReply(
ClientPtr client,
xvQueryPortAttributesReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1824,7 +1824,7 @@ SWriteQueryImageAttributesReply(
ClientPtr client,
xvQueryImageAttributesReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
@@ -1844,7 +1844,7 @@ SWriteListImageFormatsReply(
ClientPtr client,
xvListImageFormatsReply *rep
){
- register char n;
+ char n;
swaps(&rep->sequenceNumber, n);
swapl(&rep->length, n);
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index ae35893..97a02c1 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -613,8 +613,8 @@ ProcXvMCGetDRInfo(ClientPtr client)
#ifdef HAS_XVMCSHM
patternP = (CARD32 *)shmat( stuff->shmKey, NULL, SHM_RDONLY );
if ( -1 != (long) patternP) {
- register volatile CARD32 *patternC = patternP;
- register int i;
+ volatile CARD32 *patternC = patternP;
+ int i;
CARD32 magic = stuff->magic;
rep.isLocal = 1;
commit bad96e5a864e40fbd47265d7fb6eaa67c55fac11
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Sun Nov 18 15:02:24 2007 +1030
dix: getevents.c remove trailing whitespaces.
diff --git a/dix/getevents.c b/dix/getevents.c
index 20beff3..585fddd 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -23,7 +23,7 @@
*
* Author: Daniel Stone <daniel at fooishbar.org>
*/
- /*
+ /*
* MPX additions:
* Copyright © 2006 Peter Hutterer
* Author: Peter Hutterer <peter at cs.unisa.edu.au>
@@ -263,7 +263,7 @@ updateMotionHistory(DeviceIntPtr pDev, CARD32 ms, int first_valuator,
_X_EXPORT int
GetMaximumEventsNum(void) {
/* Three base events -- raw event and device, plus valuator events.
- * Multiply by two if we're doing key repeats.
+ * Multiply by two if we're doing key repeats.
*/
int ret = 2 + MAX_VALUATOR_EVENTS;
@@ -567,7 +567,7 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
}
/**
- * Initialize an event list and fill with 32 byte sized events.
+ * Initialize an event list and fill with 32 byte sized events.
* This event list is to be passed into GetPointerEvents() and
* GetKeyboardEvents().
*
@@ -653,7 +653,7 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
if ((type == ButtonPress || type == ButtonRelease) && !pDev->button)
return 0;
-
+
/* FIXME: I guess it should, in theory, be possible to post button events
* from devices without valuators. */
if (!pDev->valuator)
@@ -693,12 +693,12 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons,
return 0;
/* fill up the raw event, after checking that it is large enough to
- * accommodate all valuators.
+ * accommodate all valuators.
*/
- if (events->evlen <
+ if (events->evlen <
(sizeof(xEvent) + ((num_valuators - 4) * sizeof(CARD32))))
{
- events->evlen = sizeof(xEvent) +
+ events->evlen = sizeof(xEvent) +
((num_valuators - 4) * sizeof(CARD32));
events->event = realloc(events->event, events->evlen);
if (!events->event)
@@ -886,11 +886,11 @@ SwitchCorePointer(DeviceIntPtr pDev)
* to shift the pointer to get it inside the new bounds.
*/
void
-PostSyntheticMotion(DeviceIntPtr pDev,
- int x,
- int y,
+PostSyntheticMotion(DeviceIntPtr pDev,
+ int x,
+ int y,
int screen,
- unsigned long time)
+ unsigned long time)
{
xEvent xE;
commit 75e5e9f88c5f974d996dd81e672cd3709d361a44
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Sat Nov 17 13:46:01 2007 +1030
Xi: add missing XI_DeviceClassesChangedMask to XI filters array.
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 07ef266..2d077b2 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -135,8 +135,9 @@ Mask ExtExclusiveMasks[EMASKSIZE];
* Filters for various generic events.
* Evtype is index, mask is value at index.
*/
-static Mask xi_filters[3] = {
+static Mask xi_filters[4] = {
XI_DeviceHierarchyChangedMask,
+ XI_DeviceClassesChangedMask,
XI_RawDeviceEventMask,
};
commit 12dd6e9911de187e0ebee86434e8c24a67c990f9
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date: Fri Nov 16 17:23:09 2007 +1030
dix: reset MD's devPrivate classes to NULL before device initialisation.
XkbInitKeyboardDefviceStruct may call FatalError if it fails. FatalError then
cleans up all the devices, resulting in a segfault if the pointer is
uninitialised.
diff --git a/dix/devices.c b/dix/devices.c
index 7512529..7d889a2 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -396,6 +396,8 @@ CoreKeyboardProc(DeviceIntPtr pDev, int what)
if (!AllocateDevicePrivate(pDev, MasterDevClassesPrivIdx) ||
!(classes = xcalloc(1, sizeof(ClassesRec))))
+ pDev->devPrivates[MasterDevClassesPrivIdx].ptr = NULL;
+
keySyms.minKeyCode = 8;
keySyms.maxKeyCode = 255;
keySyms.mapWidth = 4;
@@ -495,6 +497,8 @@ CorePointerProc(DeviceIntPtr pDev, int what)
!(classes = xcalloc(1, sizeof(ClassesRec))))
return BadAlloc;
+ pDev->devPrivates[MasterDevClassesPrivIdx].ptr = NULL;
+
for (i = 1; i <= 32; i++)
map[i] = i;
InitPointerDeviceStruct((DevicePtr)pDev, map, 32,
More information about the xorg-commit
mailing list