frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: remove 'register' keyword for all variables.

This commit is contained in:
Peter Hutterer 2007-03-08 17:50:19 +10:30
parent 40ae4f246d
commit 63169ce52d
18 changed files with 672 additions and 673 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dix/atom.c
View File

@ -77,10 +77,10 @@ void FreeAtom(NodePtr patom);
_X_EXPORT Atom _X_EXPORT Atom
MakeAtom(char *string, unsigned len, Bool makeit) MakeAtom(char *string, unsigned len, Bool makeit)
{ {
register NodePtr * np; NodePtr * np;
unsigned i; unsigned i;
int comp; int comp;
register unsigned int fp = 0; unsigned int fp = 0;
np = &atomRoot; np = &atomRoot;
for (i = 0; i < (len+1)/2; i++) for (i = 0; i < (len+1)/2; i++)
@ -107,7 +107,7 @@ MakeAtom(char *string, unsigned len, Bool makeit)
} }
if (makeit) if (makeit)
{ {
register NodePtr nd; NodePtr nd;
nd = (NodePtr) xalloc(sizeof(NodeRec)); nd = (NodePtr) xalloc(sizeof(NodeRec));
if (!nd) if (!nd)

42
dix/colormap.c
View File

@ -95,8 +95,8 @@ static int BlueComp(
); );
static void FreePixels( static void FreePixels(
register ColormapPtr /*pmap*/, ColormapPtr /*pmap*/,
register int /*client*/ int /*client*/
); );
static void CopyFree( static void CopyFree(
@ -259,9 +259,9 @@ CreateColormap (Colormap mid, ScreenPtr pScreen, VisualPtr pVisual,
int class, size; int class, size;
unsigned long sizebytes; unsigned long sizebytes;
ColormapPtr pmap; ColormapPtr pmap;
register EntryPtr pent; EntryPtr pent;
int i; int i;
register Pixel *ppix, **pptr; Pixel *ppix, **pptr;
class = pVisual->class; class = pVisual->class;
if(!(class & DynamicClass) && (alloc != AllocNone) && (client != SERVER_ID)) if(!(class & DynamicClass) && (alloc != AllocNone) && (client != SERVER_ID))
@ -429,7 +429,7 @@ int
FreeColormap (pointer value, XID mid) FreeColormap (pointer value, XID mid)
{ {
int i; int i;
register EntryPtr pent; EntryPtr pent;
ColormapPtr pmap = (ColormapPtr)value; ColormapPtr pmap = (ColormapPtr)value;
if(CLIENT_ID(mid) != SERVER_ID) if(CLIENT_ID(mid) != SERVER_ID)
@ -744,9 +744,9 @@ static void
UpdateColors (ColormapPtr pmap) UpdateColors (ColormapPtr pmap)
{ {
xColorItem *defs; xColorItem *defs;
register xColorItem *pdef; xColorItem *pdef;
register EntryPtr pent; EntryPtr pent;
register VisualPtr pVisual; VisualPtr pVisual;
int i, n, size; int i, n, size;
pVisual = pmap->pVisual; pVisual = pmap->pVisual;
@ -993,14 +993,14 @@ AllocColor (ColormapPtr pmap,
*/ */
_X_EXPORT void _X_EXPORT void
FakeAllocColor (register ColormapPtr pmap, register xColorItem *item) FakeAllocColor (ColormapPtr pmap, xColorItem *item)
{ {
Pixel pixR, pixG, pixB; Pixel pixR, pixG, pixB;
Pixel temp; Pixel temp;
int entries; int entries;
xrgb rgb; xrgb rgb;
int class; int class;
register VisualPtr pVisual; VisualPtr pVisual;
pVisual = pmap->pVisual; pVisual = pmap->pVisual;
rgb.red = item->red; rgb.red = item->red;
@ -1059,9 +1059,9 @@ FakeAllocColor (register ColormapPtr pmap, register xColorItem *item)
/* free a pixel value obtained from FakeAllocColor */ /* free a pixel value obtained from FakeAllocColor */
_X_EXPORT void _X_EXPORT void
FakeFreeColor(register ColormapPtr pmap, Pixel pixel) FakeFreeColor(ColormapPtr pmap, Pixel pixel)
{ {
register VisualPtr pVisual; VisualPtr pVisual;
Pixel pixR, pixG, pixB; Pixel pixR, pixG, pixB;
switch (pmap->class) { switch (pmap->class) {
@ -1507,10 +1507,10 @@ QueryColors (ColormapPtr pmap, int count, Pixel *ppixIn, xrgb *prgbList)
} }
static void static void
FreePixels(register ColormapPtr pmap, register int client) FreePixels(ColormapPtr pmap, int client)
{ {
register Pixel *ppix, *ppixStart; Pixel *ppix, *ppixStart;
register int n; int n;
int class; int class;
class = pmap->class; class = pmap->class;
@ -1646,8 +1646,8 @@ AllocColorPlanes (int client, ColormapPtr pmap, int colors,
{ {
int ok; int ok;
Pixel mask, *ppixFirst; Pixel mask, *ppixFirst;
register Pixel shift; Pixel shift;
register int i; int i;
int class; int class;
int oldcount; int oldcount;
colorResource *pcr = (colorResource *)NULL; colorResource *pcr = (colorResource *)NULL;
@ -2409,10 +2409,10 @@ FreeCo (ColormapPtr pmap, int client, int color, int npixIn, Pixel *ppixIn, Pixe
_X_EXPORT int _X_EXPORT int
StoreColors (ColormapPtr pmap, int count, xColorItem *defs) StoreColors (ColormapPtr pmap, int count, xColorItem *defs)
{ {
register Pixel pix; Pixel pix;
register xColorItem *pdef; xColorItem *pdef;
register EntryPtr pent, pentT, pentLast; EntryPtr pent, pentT, pentLast;
register VisualPtr pVisual; VisualPtr pVisual;
SHAREDCOLOR *pred, *pgreen, *pblue; SHAREDCOLOR *pred, *pgreen, *pblue;
int n, ChgRed, ChgGreen, ChgBlue, idef; int n, ChgRed, ChgGreen, ChgBlue, idef;
int class, errVal = Success; int class, errVal = Success;

8
dix/cursor.c
View File

@ -86,7 +86,7 @@ FreeCursorBits(CursorBitsPtr bits)
#endif #endif
if (bits->refcnt == 0) if (bits->refcnt == 0)
{ {
register GlyphSharePtr *prev, this; GlyphSharePtr *prev, this;
for (prev = &sharedGlyphs; for (prev = &sharedGlyphs;
(this = *prev) && (this->bits != bits); (this = *prev) && (this->bits != bits);
@ -135,7 +135,7 @@ FreeCursor(pointer value, XID cid)
static void static void
CheckForEmptyMask(CursorBitsPtr bits) CheckForEmptyMask(CursorBitsPtr bits)
{ {
register unsigned char *msk = bits->mask; unsigned char *msk = bits->mask;
int n = BitmapBytePad(bits->width) * bits->height; int n = BitmapBytePad(bits->width) * bits->height;
bits->emptyMask = FALSE; bits->emptyMask = FALSE;
@ -305,8 +305,8 @@ AllocGlyphCursor(Font source, unsigned sourceChar, Font mask, unsigned maskChar,
} }
if (!maskfont) if (!maskfont)
{ {
register long n; long n;
register unsigned char *mskptr; unsigned char *mskptr;
n = BitmapBytePad(cm.width)*(long)cm.height; n = BitmapBytePad(cm.width)*(long)cm.height;
mskptr = mskbits = (unsigned char *)xalloc(n); mskptr = mskbits = (unsigned char *)xalloc(n);

70
dix/devices.c
View File

@ -84,7 +84,7 @@ int CoreDevicePrivatesIndex = 0, CoreDevicePrivatesGeneration = -1;
DeviceIntPtr DeviceIntPtr
AddInputDevice(DeviceProc deviceProc, Bool autoStart) AddInputDevice(DeviceProc deviceProc, Bool autoStart)
{ {
register DeviceIntPtr dev, *prev; /* not a typo */ DeviceIntPtr dev, *prev; /* not a typo */
if (inputInfo.numDevices >= MAX_DEVICES) if (inputInfo.numDevices >= MAX_DEVICES)
return (DeviceIntPtr)NULL; return (DeviceIntPtr)NULL;
@ -140,9 +140,9 @@ AddInputDevice(DeviceProc deviceProc, Bool autoStart)
} }
Bool Bool
EnableDevice(register DeviceIntPtr dev) EnableDevice(DeviceIntPtr dev)
{ {
register DeviceIntPtr *prev; DeviceIntPtr *prev;
int ret; int ret;
for (prev = &inputInfo.off_devices; for (prev = &inputInfo.off_devices;
@ -166,9 +166,9 @@ EnableDevice(register DeviceIntPtr dev)
} }
Bool Bool
DisableDevice(register DeviceIntPtr dev) DisableDevice(DeviceIntPtr dev)
{ {
register DeviceIntPtr *prev; DeviceIntPtr *prev;
for (prev = &inputInfo.devices; for (prev = &inputInfo.devices;
*prev && (*prev != dev); *prev && (*prev != dev);
@ -315,7 +315,7 @@ CorePointerProc(DeviceIntPtr pDev, int what)
void void
InitCoreDevices() InitCoreDevices()
{ {
register DeviceIntPtr dev; DeviceIntPtr dev;
if (CoreDevicePrivatesGeneration != serverGeneration) { if (CoreDevicePrivatesGeneration != serverGeneration) {
CoreDevicePrivatesIndex = AllocateDevicePrivateIndex(); CoreDevicePrivatesIndex = AllocateDevicePrivateIndex();
@ -374,7 +374,7 @@ InitCoreDevices()
int int
InitAndStartDevices() InitAndStartDevices()
{ {
register DeviceIntPtr dev, next; DeviceIntPtr dev, next;
for (dev = inputInfo.off_devices; dev; dev = dev->next) { for (dev = inputInfo.off_devices; dev; dev = dev->next) {
DebugF("(dix) initialising device %d\n", dev->id); DebugF("(dix) initialising device %d\n", dev->id);
@ -406,7 +406,7 @@ InitAndStartDevices()
} }
static void static void
CloseDevice(register DeviceIntPtr dev) CloseDevice(DeviceIntPtr dev)
{ {
KbdFeedbackPtr k, knext; KbdFeedbackPtr k, knext;
PtrFeedbackPtr p, pnext; PtrFeedbackPtr p, pnext;
@ -504,7 +504,7 @@ CloseDevice(register DeviceIntPtr dev)
void void
CloseDownDevices() CloseDownDevices()
{ {
register DeviceIntPtr dev, next; DeviceIntPtr dev, next;
for (dev = inputInfo.devices; dev; dev = next) for (dev = inputInfo.devices; dev; dev = next)
{ {
@ -634,7 +634,7 @@ QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
} }
Bool Bool
SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src) SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
{ {
int i, j; int i, j;
int rowDif = src->minKeyCode - dst->minKeyCode; int rowDif = src->minKeyCode - dst->minKeyCode;
@ -683,7 +683,7 @@ SetKeySymsMap(register KeySymsPtr dst, register KeySymsPtr src)
} }
static Bool static Bool
InitModMap(register KeyClassPtr keyc) InitModMap(KeyClassPtr keyc)
{ {
int i, j; int i, j;
CARD8 keysPerModifier[8]; CARD8 keysPerModifier[8];
@ -728,7 +728,7 @@ _X_EXPORT Bool
InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[]) InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers[])
{ {
int i; int i;
register KeyClassPtr keyc; KeyClassPtr keyc;
keyc = (KeyClassPtr)xalloc(sizeof(KeyClassRec)); keyc = (KeyClassPtr)xalloc(sizeof(KeyClassRec));
if (!keyc) if (!keyc)
@ -763,10 +763,10 @@ InitKeyClassDeviceStruct(DeviceIntPtr dev, KeySymsPtr pKeySyms, CARD8 pModifiers
} }
_X_EXPORT Bool _X_EXPORT Bool
InitButtonClassDeviceStruct(register DeviceIntPtr dev, int numButtons, InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons,
CARD8 *map) CARD8 *map)
{ {
register ButtonClassPtr butc; ButtonClassPtr butc;
int i; int i;
butc = (ButtonClassPtr)xalloc(sizeof(ButtonClassRec)); butc = (ButtonClassPtr)xalloc(sizeof(ButtonClassRec));
@ -792,7 +792,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
int numMotionEvents, int mode) int numMotionEvents, int mode)
{ {
int i; int i;
register ValuatorClassPtr valc; ValuatorClassPtr valc;
if (!dev) if (!dev)
return FALSE; return FALSE;
@ -834,7 +834,7 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes,
_X_EXPORT Bool _X_EXPORT Bool
InitAbsoluteClassDeviceStruct(DeviceIntPtr dev) InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
{ {
register AbsoluteClassPtr abs; AbsoluteClassPtr abs;
abs = (AbsoluteClassPtr)xalloc(sizeof(AbsoluteClassRec)); abs = (AbsoluteClassPtr)xalloc(sizeof(AbsoluteClassRec));
if (!abs) if (!abs)
@ -864,7 +864,7 @@ InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
_X_EXPORT Bool _X_EXPORT Bool
InitFocusClassDeviceStruct(DeviceIntPtr dev) InitFocusClassDeviceStruct(DeviceIntPtr dev)
{ {
register FocusClassPtr focc; FocusClassPtr focc;
focc = (FocusClassPtr)xalloc(sizeof(FocusClassRec)); focc = (FocusClassPtr)xalloc(sizeof(FocusClassRec));
if (!focc) if (!focc)
@ -883,7 +883,7 @@ _X_EXPORT Bool
InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc, InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
KbdCtrlProcPtr controlProc) KbdCtrlProcPtr controlProc)
{ {
register KbdFeedbackPtr feedc; KbdFeedbackPtr feedc;
feedc = (KbdFeedbackPtr)xalloc(sizeof(KbdFeedbackClassRec)); feedc = (KbdFeedbackPtr)xalloc(sizeof(KbdFeedbackClassRec));
if (!feedc) if (!feedc)
@ -910,7 +910,7 @@ InitKbdFeedbackClassDeviceStruct(DeviceIntPtr dev, BellProcPtr bellProc,
_X_EXPORT Bool _X_EXPORT Bool
InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc) InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
{ {
register PtrFeedbackPtr feedc; PtrFeedbackPtr feedc;
feedc = (PtrFeedbackPtr)xalloc(sizeof(PtrFeedbackClassRec)); feedc = (PtrFeedbackPtr)xalloc(sizeof(PtrFeedbackClassRec));
if (!feedc) if (!feedc)
@ -948,7 +948,7 @@ InitStringFeedbackClassDeviceStruct (
int max_symbols, int num_symbols_supported, KeySym *symbols) int max_symbols, int num_symbols_supported, KeySym *symbols)
{ {
int i; int i;
register StringFeedbackPtr feedc; StringFeedbackPtr feedc;
feedc = (StringFeedbackPtr)xalloc(sizeof(StringFeedbackClassRec)); feedc = (StringFeedbackPtr)xalloc(sizeof(StringFeedbackClassRec));
if (!feedc) if (!feedc)
@ -986,7 +986,7 @@ _X_EXPORT Bool
InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc, InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
BellCtrlProcPtr controlProc) BellCtrlProcPtr controlProc)
{ {
register BellFeedbackPtr feedc; BellFeedbackPtr feedc;
feedc = (BellFeedbackPtr)xalloc(sizeof(BellFeedbackClassRec)); feedc = (BellFeedbackPtr)xalloc(sizeof(BellFeedbackClassRec));
if (!feedc) if (!feedc)
@ -1005,7 +1005,7 @@ InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
_X_EXPORT Bool _X_EXPORT Bool
InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc) InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
{ {
register LedFeedbackPtr feedc; LedFeedbackPtr feedc;
feedc = (LedFeedbackPtr)xalloc(sizeof(LedFeedbackClassRec)); feedc = (LedFeedbackPtr)xalloc(sizeof(LedFeedbackClassRec));
if (!feedc) if (!feedc)
@ -1026,7 +1026,7 @@ InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
_X_EXPORT Bool _X_EXPORT Bool
InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc) InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc)
{ {
register IntegerFeedbackPtr feedc; IntegerFeedbackPtr feedc;
feedc = (IntegerFeedbackPtr)xalloc(sizeof(IntegerFeedbackClassRec)); feedc = (IntegerFeedbackPtr)xalloc(sizeof(IntegerFeedbackClassRec));
if (!feedc) if (!feedc)
@ -1112,9 +1112,9 @@ SendMappingNotify(unsigned request, unsigned firstKeyCode, unsigned count,
* sort it to do the checking. How often is it called? Just being lazy? * sort it to do the checking. How often is it called? Just being lazy?
*/ */
Bool Bool
BadDeviceMap(register BYTE *buff, int length, unsigned low, unsigned high, XID *errval) BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
{ {
register int i, j; int i, j;
for (i = 0; i < length; i++) for (i = 0; i < length; i++)
if (buff[i]) /* only check non-zero elements */ if (buff[i]) /* only check non-zero elements */
@ -1136,12 +1136,12 @@ BadDeviceMap(register BYTE *buff, int length, unsigned low, unsigned high, XID *
Bool Bool
AllModifierKeysAreUp(dev, map1, per1, map2, per2) AllModifierKeysAreUp(dev, map1, per1, map2, per2)
register DeviceIntPtr dev; DeviceIntPtr dev;
register CARD8 *map1, *map2; CARD8 *map1, *map2;
int per1, per2; int per1, per2;
{ {
register int i, j, k; int i, j, k;
register CARD8 *down = dev->key->down; CARD8 *down = dev->key->down;
for (i = 8; --i >= 0; map2 += per2) for (i = 8; --i >= 0; map2 += per2)
{ {
@ -1258,7 +1258,7 @@ int
ProcGetModifierMapping(ClientPtr client) ProcGetModifierMapping(ClientPtr client)
{ {
xGetModifierMappingReply rep; xGetModifierMappingReply rep;
register KeyClassPtr keyc = inputInfo.keyboard->key; KeyClassPtr keyc = inputInfo.keyboard->key;
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
rep.type = X_Reply; rep.type = X_Reply;
@ -1459,7 +1459,7 @@ NoteLedState(DeviceIntPtr keybd, int led, Bool on)
_X_EXPORT int _X_EXPORT int
Ones(unsigned long mask) /* HACKMEM 169 */ Ones(unsigned long mask) /* HACKMEM 169 */
{ {
register unsigned long y; unsigned long y;
y = (mask >> 1) &033333333333; y = (mask >> 1) &033333333333;
y = mask - y - ((y >>1) & 033333333333); y = mask - y - ((y >>1) & 033333333333);
@ -1676,7 +1676,7 @@ int
ProcGetKeyboardControl (ClientPtr client) ProcGetKeyboardControl (ClientPtr client)
{ {
int i; int i;
register KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl; KeybdCtrl *ctrl = &inputInfo.keyboard->kbdfeed->ctrl;
xGetKeyboardControlReply rep; xGetKeyboardControlReply rep;
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
@ -1698,7 +1698,7 @@ ProcGetKeyboardControl (ClientPtr client)
int int
ProcBell(ClientPtr client) ProcBell(ClientPtr client)
{ {
register DeviceIntPtr keybd = inputInfo.keyboard; DeviceIntPtr keybd = inputInfo.keyboard;
int base = keybd->kbdfeed->ctrl.bell; int base = keybd->kbdfeed->ctrl.bell;
int newpercent; int newpercent;
REQUEST(xBellReq); REQUEST(xBellReq);
@ -1807,7 +1807,7 @@ ProcChangePointerControl(ClientPtr client)
int int
ProcGetPointerControl(ClientPtr client) ProcGetPointerControl(ClientPtr client)
{ {
register PtrCtrl *ctrl = &inputInfo.pointer->ptrfeed->ctrl; PtrCtrl *ctrl = &inputInfo.pointer->ptrfeed->ctrl;
xGetPointerControlReply rep; xGetPointerControlReply rep;
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
@ -1822,7 +1822,7 @@ ProcGetPointerControl(ClientPtr client)
} }
void void
MaybeStopHint(register DeviceIntPtr dev, ClientPtr client) MaybeStopHint(DeviceIntPtr dev, ClientPtr client)
{ {
GrabPtr grab = dev->grab; GrabPtr grab = dev->grab;

241
dix/dispatch.c
View File

@ -262,7 +262,7 @@ void
FlushClientCaches(XID id) FlushClientCaches(XID id)
{ {
int i; int i;
register ClientPtr client; ClientPtr client;
client = clients[CLIENT_ID(id)]; client = clients[CLIENT_ID(id)];
if (client == NullClient) if (client == NullClient)
@ -394,11 +394,11 @@ SmartScheduleClient (int *clientReady, int nready)
void void
Dispatch(void) Dispatch(void)
{ {
register int *clientReady; /* array of request ready clients */ int *clientReady; /* array of request ready clients */
register int result; int result;
register ClientPtr client; ClientPtr client;
register int nready; int nready;
register HWEventQueuePtr* icheck = checkForInput; HWEventQueuePtr* icheck = checkForInput;
#ifdef SMART_SCHEDULE #ifdef SMART_SCHEDULE
long start_tick; long start_tick;
#endif #endif
@ -594,11 +594,11 @@ ProcCreateWindow(ClientPtr client)
} }
int int
ProcChangeWindowAttributes(register ClientPtr client) ProcChangeWindowAttributes(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xChangeWindowAttributesReq); REQUEST(xChangeWindowAttributesReq);
register int result; int result;
int len, rc; int len, rc;
REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq); REQUEST_AT_LEAST_SIZE(xChangeWindowAttributesReq);
@ -619,7 +619,7 @@ ProcChangeWindowAttributes(register ClientPtr client)
} }
int int
ProcGetWindowAttributes(register ClientPtr client) ProcGetWindowAttributes(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -636,7 +636,7 @@ ProcGetWindowAttributes(register ClientPtr client)
} }
int int
ProcDestroyWindow(register ClientPtr client) ProcDestroyWindow(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -652,7 +652,7 @@ ProcDestroyWindow(register ClientPtr client)
} }
int int
ProcDestroySubwindows(register ClientPtr client) ProcDestroySubwindows(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -667,11 +667,11 @@ ProcDestroySubwindows(register ClientPtr client)
} }
int int
ProcChangeSaveSet(register ClientPtr client) ProcChangeSaveSet(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xChangeSaveSetReq); REQUEST(xChangeSaveSetReq);
register int result, rc; int result, rc;
REQUEST_SIZE_MATCH(xChangeSaveSetReq); REQUEST_SIZE_MATCH(xChangeSaveSetReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess);
@ -695,11 +695,11 @@ ProcChangeSaveSet(register ClientPtr client)
} }
int int
ProcReparentWindow(register ClientPtr client) ProcReparentWindow(ClientPtr client)
{ {
WindowPtr pWin, pParent; WindowPtr pWin, pParent;
REQUEST(xReparentWindowReq); REQUEST(xReparentWindowReq);
register int result, rc; int result, rc;
REQUEST_SIZE_MATCH(xReparentWindowReq); REQUEST_SIZE_MATCH(xReparentWindowReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess); rc = dixLookupWindow(&pWin, stuff->window, client, DixWriteAccess);
@ -728,7 +728,7 @@ ProcReparentWindow(register ClientPtr client)
} }
int int
ProcMapWindow(register ClientPtr client) ProcMapWindow(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -744,7 +744,7 @@ ProcMapWindow(register ClientPtr client)
} }
int int
ProcMapSubwindows(register ClientPtr client) ProcMapSubwindows(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -760,7 +760,7 @@ ProcMapSubwindows(register ClientPtr client)
} }
int int
ProcUnmapWindow(register ClientPtr client) ProcUnmapWindow(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -776,7 +776,7 @@ ProcUnmapWindow(register ClientPtr client)
} }
int int
ProcUnmapSubwindows(register ClientPtr client) ProcUnmapSubwindows(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -791,11 +791,11 @@ ProcUnmapSubwindows(register ClientPtr client)
} }
int int
ProcConfigureWindow(register ClientPtr client) ProcConfigureWindow(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xConfigureWindowReq); REQUEST(xConfigureWindowReq);
register int result; int result;
int len, rc; int len, rc;
REQUEST_AT_LEAST_SIZE(xConfigureWindowReq); REQUEST_AT_LEAST_SIZE(xConfigureWindowReq);
@ -814,7 +814,7 @@ ProcConfigureWindow(register ClientPtr client)
} }
int int
ProcCirculateWindow(register ClientPtr client) ProcCirculateWindow(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xCirculateWindowReq); REQUEST(xCirculateWindowReq);
@ -835,7 +835,7 @@ ProcCirculateWindow(register ClientPtr client)
} }
int int
GetGeometry(register ClientPtr client, xGetGeometryReply *rep) GetGeometry(ClientPtr client, xGetGeometryReply *rep)
{ {
DrawablePtr pDraw; DrawablePtr pDraw;
int rc; int rc;
@ -865,7 +865,7 @@ GetGeometry(register ClientPtr client, xGetGeometryReply *rep)
if ((pDraw->type == UNDRAWABLE_WINDOW) || if ((pDraw->type == UNDRAWABLE_WINDOW) ||
((pDraw->type == DRAWABLE_WINDOW) && (stuff->id == pDraw->id))) ((pDraw->type == DRAWABLE_WINDOW) && (stuff->id == pDraw->id)))
{ {
register WindowPtr pWin = (WindowPtr)pDraw; WindowPtr pWin = (WindowPtr)pDraw;
rep->x = pWin->origin.x - wBorderWidth (pWin); rep->x = pWin->origin.x - wBorderWidth (pWin);
rep->y = pWin->origin.y - wBorderWidth (pWin); rep->y = pWin->origin.y - wBorderWidth (pWin);
rep->borderWidth = pWin->borderWidth; rep->borderWidth = pWin->borderWidth;
@ -880,7 +880,7 @@ GetGeometry(register ClientPtr client, xGetGeometryReply *rep)
int int
ProcGetGeometry(register ClientPtr client) ProcGetGeometry(ClientPtr client)
{ {
xGetGeometryReply rep; xGetGeometryReply rep;
int status; int status;
@ -894,7 +894,7 @@ ProcGetGeometry(register ClientPtr client)
int int
ProcQueryTree(register ClientPtr client) ProcQueryTree(ClientPtr client)
{ {
xQueryTreeReply reply; xQueryTreeReply reply;
int rc, numChildren = 0; int rc, numChildren = 0;
@ -942,7 +942,7 @@ ProcQueryTree(register ClientPtr client)
} }
int int
ProcInternAtom(register ClientPtr client) ProcInternAtom(ClientPtr client)
{ {
Atom atom; Atom atom;
char *tchar; char *tchar;
@ -971,7 +971,7 @@ ProcInternAtom(register ClientPtr client)
} }
int int
ProcGetAtomName(register ClientPtr client) ProcGetAtomName(ClientPtr client)
{ {
char *str; char *str;
xGetAtomNameReply reply; xGetAtomNameReply reply;
@ -1002,7 +1002,7 @@ extern int k5_bad();
#endif #endif
int int
ProcSetSelectionOwner(register ClientPtr client) ProcSetSelectionOwner(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
TimeStamp time; TimeStamp time;
@ -1097,7 +1097,7 @@ ProcSetSelectionOwner(register ClientPtr client)
} }
int int
ProcGetSelectionOwner(register ClientPtr client) ProcGetSelectionOwner(ClientPtr client)
{ {
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -1128,7 +1128,7 @@ ProcGetSelectionOwner(register ClientPtr client)
} }
int int
ProcConvertSelection(register ClientPtr client) ProcConvertSelection(ClientPtr client)
{ {
Bool paramsOkay; Bool paramsOkay;
xEvent event; xEvent event;
@ -1188,7 +1188,7 @@ ProcConvertSelection(register ClientPtr client)
} }
int int
ProcGrabServer(register ClientPtr client) ProcGrabServer(ClientPtr client)
{ {
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
if (grabState != GrabNone && client != grabClient) if (grabState != GrabNone && client != grabClient)
@ -1242,7 +1242,7 @@ UngrabServer(ClientPtr client)
} }
int int
ProcUngrabServer(register ClientPtr client) ProcUngrabServer(ClientPtr client)
{ {
REQUEST_SIZE_MATCH(xReq); REQUEST_SIZE_MATCH(xReq);
UngrabServer(client); UngrabServer(client);
@ -1250,7 +1250,7 @@ ProcUngrabServer(register ClientPtr client)
} }
int int
ProcTranslateCoords(register ClientPtr client) ProcTranslateCoords(ClientPtr client)
{ {
REQUEST(xTranslateCoordsReq); REQUEST(xTranslateCoordsReq);
@ -1327,7 +1327,7 @@ ProcTranslateCoords(register ClientPtr client)
} }
int int
ProcOpenFont(register ClientPtr client) ProcOpenFont(ClientPtr client)
{ {
int err; int err;
REQUEST(xOpenFontReq); REQUEST(xOpenFontReq);
@ -1346,7 +1346,7 @@ ProcOpenFont(register ClientPtr client)
} }
int int
ProcCloseFont(register ClientPtr client) ProcCloseFont(ClientPtr client)
{ {
FontPtr pFont; FontPtr pFont;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -1367,11 +1367,11 @@ ProcCloseFont(register ClientPtr client)
} }
int int
ProcQueryFont(register ClientPtr client) ProcQueryFont(ClientPtr client)
{ {
xQueryFontReply *reply; xQueryFontReply *reply;
FontPtr pFont; FontPtr pFont;
register GC *pGC; GC *pGC;
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
@ -1425,7 +1425,7 @@ ProcQueryFont(register ClientPtr client)
} }
int int
ProcQueryTextExtents(register ClientPtr client) ProcQueryTextExtents(ClientPtr client)
{ {
REQUEST(xQueryTextExtentsReq); REQUEST(xQueryTextExtentsReq);
xQueryTextExtentsReply reply; xQueryTextExtentsReply reply;
@ -1475,7 +1475,7 @@ ProcQueryTextExtents(register ClientPtr client)
} }
int int
ProcListFonts(register ClientPtr client) ProcListFonts(ClientPtr client)
{ {
REQUEST(xListFontsReq); REQUEST(xListFontsReq);
@ -1486,7 +1486,7 @@ ProcListFonts(register ClientPtr client)
} }
int int
ProcListFontsWithInfo(register ClientPtr client) ProcListFontsWithInfo(ClientPtr client)
{ {
REQUEST(xListFontsWithInfoReq); REQUEST(xListFontsWithInfoReq);
@ -1508,13 +1508,13 @@ dixDestroyPixmap(pointer value, XID pid)
} }
int int
ProcCreatePixmap(register ClientPtr client) ProcCreatePixmap(ClientPtr client)
{ {
PixmapPtr pMap; PixmapPtr pMap;
DrawablePtr pDraw; DrawablePtr pDraw;
REQUEST(xCreatePixmapReq); REQUEST(xCreatePixmapReq);
DepthPtr pDepth; DepthPtr pDepth;
register int i, rc; int i, rc;
REQUEST_SIZE_MATCH(xCreatePixmapReq); REQUEST_SIZE_MATCH(xCreatePixmapReq);
client->errorValue = stuff->pid; client->errorValue = stuff->pid;
@ -1571,7 +1571,7 @@ CreatePmap:
} }
int int
ProcFreePixmap(register ClientPtr client) ProcFreePixmap(ClientPtr client)
{ {
PixmapPtr pMap; PixmapPtr pMap;
@ -1593,7 +1593,7 @@ ProcFreePixmap(register ClientPtr client)
} }
int int
ProcCreateGC(register ClientPtr client) ProcCreateGC(ClientPtr client)
{ {
int error, rc; int error, rc;
GC *pGC; GC *pGC;
@ -1621,7 +1621,7 @@ ProcCreateGC(register ClientPtr client)
} }
int int
ProcChangeGC(register ClientPtr client) ProcChangeGC(ClientPtr client)
{ {
GC *pGC; GC *pGC;
int result; int result;
@ -1648,7 +1648,7 @@ ProcChangeGC(register ClientPtr client)
} }
int int
ProcCopyGC(register ClientPtr client) ProcCopyGC(ClientPtr client)
{ {
GC *dstGC; GC *dstGC;
GC *pGC; GC *pGC;
@ -1675,7 +1675,7 @@ ProcCopyGC(register ClientPtr client)
} }
int int
ProcSetDashes(register ClientPtr client) ProcSetDashes(ClientPtr client)
{ {
GC *pGC; GC *pGC;
int result; int result;
@ -1704,7 +1704,7 @@ ProcSetDashes(register ClientPtr client)
} }
int int
ProcSetClipRectangles(register ClientPtr client) ProcSetClipRectangles(ClientPtr client)
{ {
int nr, result; int nr, result;
GC *pGC; GC *pGC;
@ -1734,7 +1734,7 @@ ProcSetClipRectangles(register ClientPtr client)
} }
int int
ProcFreeGC(register ClientPtr client) ProcFreeGC(ClientPtr client)
{ {
GC *pGC; GC *pGC;
int rc; int rc;
@ -1750,7 +1750,7 @@ ProcFreeGC(register ClientPtr client)
} }
int int
ProcClearToBackground(register ClientPtr client) ProcClearToBackground(ClientPtr client)
{ {
REQUEST(xClearAreaReq); REQUEST(xClearAreaReq);
WindowPtr pWin; WindowPtr pWin;
@ -1777,7 +1777,7 @@ ProcClearToBackground(register ClientPtr client)
} }
int int
ProcCopyArea(register ClientPtr client) ProcCopyArea(ClientPtr client)
{ {
DrawablePtr pDst; DrawablePtr pDst;
DrawablePtr pSrc; DrawablePtr pSrc;
@ -1821,7 +1821,7 @@ ProcCopyArea(register ClientPtr client)
} }
int int
ProcCopyPlane(register ClientPtr client) ProcCopyPlane(ClientPtr client)
{ {
DrawablePtr psrcDraw, pdstDraw; DrawablePtr psrcDraw, pdstDraw;
GC *pGC; GC *pGC;
@ -1872,7 +1872,7 @@ ProcCopyPlane(register ClientPtr client)
} }
int int
ProcPolyPoint(register ClientPtr client) ProcPolyPoint(ClientPtr client)
{ {
int npoint; int npoint;
GC *pGC; GC *pGC;
@ -1895,7 +1895,7 @@ ProcPolyPoint(register ClientPtr client)
} }
int int
ProcPolyLine(register ClientPtr client) ProcPolyLine(ClientPtr client)
{ {
int npoint; int npoint;
GC *pGC; GC *pGC;
@ -1918,7 +1918,7 @@ ProcPolyLine(register ClientPtr client)
} }
int int
ProcPolySegment(register ClientPtr client) ProcPolySegment(ClientPtr client)
{ {
int nsegs; int nsegs;
GC *pGC; GC *pGC;
@ -1937,7 +1937,7 @@ ProcPolySegment(register ClientPtr client)
} }
int int
ProcPolyRectangle (register ClientPtr client) ProcPolyRectangle (ClientPtr client)
{ {
int nrects; int nrects;
GC *pGC; GC *pGC;
@ -1957,7 +1957,7 @@ ProcPolyRectangle (register ClientPtr client)
} }
int int
ProcPolyArc(register ClientPtr client) ProcPolyArc(ClientPtr client)
{ {
int narcs; int narcs;
GC *pGC; GC *pGC;
@ -1976,7 +1976,7 @@ ProcPolyArc(register ClientPtr client)
} }
int int
ProcFillPoly(register ClientPtr client) ProcFillPoly(ClientPtr client)
{ {
int things; int things;
GC *pGC; GC *pGC;
@ -2007,7 +2007,7 @@ ProcFillPoly(register ClientPtr client)
} }
int int
ProcPolyFillRectangle(register ClientPtr client) ProcPolyFillRectangle(ClientPtr client)
{ {
int things; int things;
GC *pGC; GC *pGC;
@ -2028,7 +2028,7 @@ ProcPolyFillRectangle(register ClientPtr client)
} }
int int
ProcPolyFillArc(register ClientPtr client) ProcPolyFillArc(ClientPtr client)
{ {
int narcs; int narcs;
GC *pGC; GC *pGC;
@ -2101,7 +2101,7 @@ ReformatImage (char *base, int nbytes, int bpp, int order)
* boundary, even if the scanlines are padded to our satisfaction. * boundary, even if the scanlines are padded to our satisfaction.
*/ */
int int
ProcPutImage(register ClientPtr client) ProcPutImage(ClientPtr client)
{ {
GC *pGC; GC *pGC;
DrawablePtr pDraw; DrawablePtr pDraw;
@ -2159,13 +2159,13 @@ ProcPutImage(register ClientPtr client)
int int
DoGetImage(register ClientPtr client, int format, Drawable drawable, DoGetImage(ClientPtr client, int format, Drawable drawable,
int x, int y, int width, int height, int x, int y, int width, int height,
Mask planemask, xGetImageReply **im_return) Mask planemask, xGetImageReply **im_return)
{ {
DrawablePtr pDraw; DrawablePtr pDraw;
int nlines, linesPerBuf, rc; int nlines, linesPerBuf, rc;
register int linesDone; int linesDone;
long widthBytesLine, length; long widthBytesLine, length;
Mask plane = 0; Mask plane = 0;
char *pBuf; char *pBuf;
@ -2379,7 +2379,7 @@ DoGetImage(register ClientPtr client, int format, Drawable drawable,
} }
int int
ProcGetImage(register ClientPtr client) ProcGetImage(ClientPtr client)
{ {
REQUEST(xGetImageReq); REQUEST(xGetImageReq);
@ -2392,7 +2392,7 @@ ProcGetImage(register ClientPtr client)
} }
int int
ProcPolyText(register ClientPtr client) ProcPolyText(ClientPtr client)
{ {
int err; int err;
REQUEST(xPolyTextReq); REQUEST(xPolyTextReq);
@ -2421,7 +2421,7 @@ ProcPolyText(register ClientPtr client)
} }
int int
ProcImageText8(register ClientPtr client) ProcImageText8(ClientPtr client)
{ {
int err; int err;
DrawablePtr pDraw; DrawablePtr pDraw;
@ -2451,7 +2451,7 @@ ProcImageText8(register ClientPtr client)
} }
int int
ProcImageText16(register ClientPtr client) ProcImageText16(ClientPtr client)
{ {
int err; int err;
DrawablePtr pDraw; DrawablePtr pDraw;
@ -2482,7 +2482,7 @@ ProcImageText16(register ClientPtr client)
int int
ProcCreateColormap(register ClientPtr client) ProcCreateColormap(ClientPtr client)
{ {
VisualPtr pVisual; VisualPtr pVisual;
ColormapPtr pmap; ColormapPtr pmap;
@ -2524,7 +2524,7 @@ ProcCreateColormap(register ClientPtr client)
} }
int int
ProcFreeColormap(register ClientPtr client) ProcFreeColormap(ClientPtr client)
{ {
ColormapPtr pmap; ColormapPtr pmap;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -2548,7 +2548,7 @@ ProcFreeColormap(register ClientPtr client)
int int
ProcCopyColormapAndFree(register ClientPtr client) ProcCopyColormapAndFree(ClientPtr client)
{ {
Colormap mid; Colormap mid;
ColormapPtr pSrcMap; ColormapPtr pSrcMap;
@ -2575,7 +2575,7 @@ ProcCopyColormapAndFree(register ClientPtr client)
} }
int int
ProcInstallColormap(register ClientPtr client) ProcInstallColormap(ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -2596,7 +2596,7 @@ ProcInstallColormap(register ClientPtr client)
} }
int int
ProcUninstallColormap(register ClientPtr client) ProcUninstallColormap(ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -2618,7 +2618,7 @@ ProcUninstallColormap(register ClientPtr client)
} }
int int
ProcListInstalledColormaps(register ClientPtr client) ProcListInstalledColormaps(ClientPtr client)
{ {
xListInstalledColormapsReply *preply; xListInstalledColormapsReply *preply;
int nummaps, rc; int nummaps, rc;
@ -2651,7 +2651,7 @@ ProcListInstalledColormaps(register ClientPtr client)
} }
int int
ProcAllocColor (register ClientPtr client) ProcAllocColor (ClientPtr client)
{ {
ColormapPtr pmap; ColormapPtr pmap;
int retval; int retval;
@ -2693,7 +2693,7 @@ ProcAllocColor (register ClientPtr client)
} }
int int
ProcAllocNamedColor (register ClientPtr client) ProcAllocNamedColor (ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xAllocNamedColorReq); REQUEST(xAllocNamedColorReq);
@ -2745,7 +2745,7 @@ ProcAllocNamedColor (register ClientPtr client)
} }
int int
ProcAllocColorCells (register ClientPtr client) ProcAllocColorCells (ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xAllocColorCellsReq); REQUEST(xAllocColorCellsReq);
@ -2811,7 +2811,7 @@ ProcAllocColorCells (register ClientPtr client)
} }
int int
ProcAllocColorPlanes(register ClientPtr client) ProcAllocColorPlanes(ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xAllocColorPlanesReq); REQUEST(xAllocColorPlanesReq);
@ -2875,7 +2875,7 @@ ProcAllocColorPlanes(register ClientPtr client)
} }
int int
ProcFreeColors(register ClientPtr client) ProcFreeColors(ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xFreeColorsReq); REQUEST(xFreeColorsReq);
@ -2944,7 +2944,7 @@ ProcStoreColors (ClientPtr client)
} }
int int
ProcStoreNamedColor (register ClientPtr client) ProcStoreNamedColor (ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xStoreNamedColorReq); REQUEST(xStoreNamedColorReq);
@ -2978,7 +2978,7 @@ ProcStoreNamedColor (register ClientPtr client)
} }
int int
ProcQueryColors(register ClientPtr client) ProcQueryColors(ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xQueryColorsReq); REQUEST(xQueryColorsReq);
@ -3029,7 +3029,7 @@ ProcQueryColors(register ClientPtr client)
} }
int int
ProcLookupColor(register ClientPtr client) ProcLookupColor(ClientPtr client)
{ {
ColormapPtr pcmp; ColormapPtr pcmp;
REQUEST(xLookupColorReq); REQUEST(xLookupColorReq);
@ -3067,12 +3067,11 @@ ProcLookupColor(register ClientPtr client)
} }
int int
ProcCreateCursor (register ClientPtr client) ProcCreateCursor (ClientPtr client)
{ {
CursorPtr pCursor; CursorPtr pCursor;
PixmapPtr src;
register PixmapPtr src; PixmapPtr msk;
register PixmapPtr msk;
unsigned char * srcbits; unsigned char * srcbits;
unsigned char * mskbits; unsigned char * mskbits;
unsigned short width, height; unsigned short width, height;
@ -3132,7 +3131,7 @@ ProcCreateCursor (register ClientPtr client)
XYPixmap, 1, (pointer)srcbits); XYPixmap, 1, (pointer)srcbits);
if ( msk == (PixmapPtr)NULL) if ( msk == (PixmapPtr)NULL)
{ {
register unsigned char *bits = mskbits; unsigned char *bits = mskbits;
while (--n >= 0) while (--n >= 0)
*bits++ = ~0; *bits++ = ~0;
} }
@ -3157,7 +3156,7 @@ ProcCreateCursor (register ClientPtr client)
} }
int int
ProcCreateGlyphCursor (register ClientPtr client) ProcCreateGlyphCursor (ClientPtr client)
{ {
CursorPtr pCursor; CursorPtr pCursor;
int res; int res;
@ -3181,7 +3180,7 @@ ProcCreateGlyphCursor (register ClientPtr client)
int int
ProcFreeCursor (register ClientPtr client) ProcFreeCursor (ClientPtr client)
{ {
CursorPtr pCursor; CursorPtr pCursor;
REQUEST(xResourceReq); REQUEST(xResourceReq);
@ -3202,7 +3201,7 @@ ProcFreeCursor (register ClientPtr client)
} }
int int
ProcQueryBestSize (register ClientPtr client) ProcQueryBestSize (ClientPtr client)
{ {
xQueryBestSizeReply reply; xQueryBestSizeReply reply;
DrawablePtr pDraw; DrawablePtr pDraw;
@ -3239,7 +3238,7 @@ ProcQueryBestSize (register ClientPtr client)
int int
ProcSetScreenSaver (register ClientPtr client) ProcSetScreenSaver (ClientPtr client)
{ {
int blankingOption, exposureOption; int blankingOption, exposureOption;
REQUEST(xSetScreenSaverReq); REQUEST(xSetScreenSaverReq);
@ -3295,7 +3294,7 @@ ProcSetScreenSaver (register ClientPtr client)
} }
int int
ProcGetScreenSaver(register ClientPtr client) ProcGetScreenSaver(ClientPtr client)
{ {
xGetScreenSaverReply rep; xGetScreenSaverReply rep;
@ -3312,7 +3311,7 @@ ProcGetScreenSaver(register ClientPtr client)
} }
int int
ProcChangeHosts(register ClientPtr client) ProcChangeHosts(ClientPtr client)
{ {
REQUEST(xChangeHostsReq); REQUEST(xChangeHostsReq);
int result; int result;
@ -3336,7 +3335,7 @@ ProcChangeHosts(register ClientPtr client)
} }
int int
ProcListHosts(register ClientPtr client) ProcListHosts(ClientPtr client)
{ {
xListHostsReply reply; xListHostsReply reply;
int len, nHosts, result; int len, nHosts, result;
@ -3367,7 +3366,7 @@ ProcListHosts(register ClientPtr client)
} }
int int
ProcChangeAccessControl(register ClientPtr client) ProcChangeAccessControl(ClientPtr client)
{ {
int result; int result;
REQUEST(xSetAccessControlReq); REQUEST(xSetAccessControlReq);
@ -3385,7 +3384,7 @@ ProcChangeAccessControl(register ClientPtr client)
} }
int int
ProcKillClient(register ClientPtr client) ProcKillClient(ClientPtr client)
{ {
REQUEST(xResourceReq); REQUEST(xResourceReq);
ClientPtr killclient; ClientPtr killclient;
@ -3417,7 +3416,7 @@ ProcKillClient(register ClientPtr client)
} }
int int
ProcSetFontPath(register ClientPtr client) ProcSetFontPath(ClientPtr client)
{ {
unsigned char *ptr; unsigned char *ptr;
unsigned long nbytes, total; unsigned long nbytes, total;
@ -3452,7 +3451,7 @@ ProcSetFontPath(register ClientPtr client)
} }
int int
ProcGetFontPath(register ClientPtr client) ProcGetFontPath(ClientPtr client)
{ {
xGetFontPathReply reply; xGetFontPathReply reply;
int stringLens, numpaths; int stringLens, numpaths;
@ -3474,7 +3473,7 @@ ProcGetFontPath(register ClientPtr client)
} }
int int
ProcChangeCloseDownMode(register ClientPtr client) ProcChangeCloseDownMode(ClientPtr client)
{ {
REQUEST(xSetCloseDownModeReq); REQUEST(xSetCloseDownModeReq);
@ -3493,7 +3492,7 @@ ProcChangeCloseDownMode(register ClientPtr client)
} }
} }
int ProcForceScreenSaver(register ClientPtr client) int ProcForceScreenSaver(ClientPtr client)
{ {
REQUEST(xForceScreenSaverReq); REQUEST(xForceScreenSaverReq);
@ -3509,7 +3508,7 @@ int ProcForceScreenSaver(register ClientPtr client)
return client->noClientException; return client->noClientException;
} }
int ProcNoOperation(register ClientPtr client) int ProcNoOperation(ClientPtr client)
{ {
REQUEST_AT_LEAST_SIZE(xReq); REQUEST_AT_LEAST_SIZE(xReq);
@ -3552,7 +3551,7 @@ InitProcVectors(void)
char dispatchExceptionAtReset = DE_RESET; char dispatchExceptionAtReset = DE_RESET;
void void
CloseDownClient(register ClientPtr client) CloseDownClient(ClientPtr client)
{ {
Bool really_close_down = client->clientGone || Bool really_close_down = client->clientGone ||
client->closeDownMode == DestroyAll; client->closeDownMode == DestroyAll;
@ -3662,8 +3661,8 @@ KillAllClients()
void void
CloseDownRetainedResources() CloseDownRetainedResources()
{ {
register int i; int i;
register ClientPtr client; ClientPtr client;
for (i=1; i<currentMaxClients; i++) for (i=1; i<currentMaxClients; i++)
{ {
@ -3733,11 +3732,11 @@ void InitClient(ClientPtr client, int i, pointer ospriv)
int int
InitClientPrivates(ClientPtr client) InitClientPrivates(ClientPtr client)
{ {
register char *ptr; char *ptr;
DevUnion *ppriv; DevUnion *ppriv;
register unsigned *sizes; unsigned *sizes;
register unsigned size; unsigned size;
register int i; int i;
if (totalClientSize == sizeof(ClientRec)) if (totalClientSize == sizeof(ClientRec))
ppriv = (DevUnion *)NULL; ppriv = (DevUnion *)NULL;
@ -3787,8 +3786,8 @@ InitClientPrivates(ClientPtr client)
ClientPtr NextAvailableClient(pointer ospriv) ClientPtr NextAvailableClient(pointer ospriv)
{ {
register int i; int i;
register ClientPtr client; ClientPtr client;
xReq data; xReq data;
i = nextFreeClientID; i = nextFreeClientID;
@ -3829,10 +3828,10 @@ ClientPtr NextAvailableClient(pointer ospriv)
} }
int int
ProcInitialConnection(register ClientPtr client) ProcInitialConnection(ClientPtr client)
{ {
REQUEST(xReq); REQUEST(xReq);
register xConnClientPrefix *prefix; xConnClientPrefix *prefix;
int whichbyte = 1; int whichbyte = 1;
prefix = (xConnClientPrefix *)((char *)stuff + sz_xReq); prefix = (xConnClientPrefix *)((char *)stuff + sz_xReq);
@ -3856,10 +3855,10 @@ ProcInitialConnection(register ClientPtr client)
} }
int int
SendConnSetup(register ClientPtr client, char *reason) SendConnSetup(ClientPtr client, char *reason)
{ {
register xWindowRoot *root; xWindowRoot *root;
register int i; int i;
int numScreens; int numScreens;
char* lConnectionInfo; char* lConnectionInfo;
xConnSetupPrefix* lconnSetupPrefix; xConnSetupPrefix* lconnSetupPrefix;
@ -3914,8 +3913,8 @@ SendConnSetup(register ClientPtr client, char *reason)
for (i=0; i<numScreens; i++) for (i=0; i<numScreens; i++)
{ {
register unsigned int j; unsigned int j;
register xDepth *pDepth; xDepth *pDepth;
root->currentInputMask = WindowTable[i]->eventMask | root->currentInputMask = WindowTable[i]->eventMask |
wOtherEventMasks (WindowTable[i]); wOtherEventMasks (WindowTable[i]);
@ -3956,10 +3955,10 @@ SendConnSetup(register ClientPtr client, char *reason)
} }
int int
ProcEstablishConnection(register ClientPtr client) ProcEstablishConnection(ClientPtr client)
{ {
char *reason, *auth_proto, *auth_string; char *reason, *auth_proto, *auth_string;
register xConnClientPrefix *prefix; xConnClientPrefix *prefix;
REQUEST(xReq); REQUEST(xReq);
prefix = (xConnClientPrefix *)((char *)stuff + sz_xReq); prefix = (xConnClientPrefix *)((char *)stuff + sz_xReq);
@ -4008,7 +4007,7 @@ SendErrorToClient(ClientPtr client, unsigned majorCode, unsigned minorCode,
void void
DeleteWindowFromAnySelections(WindowPtr pWin) DeleteWindowFromAnySelections(WindowPtr pWin)
{ {
register int i; int i;
for (i = 0; i< NumCurrentSelections; i++) for (i = 0; i< NumCurrentSelections; i++)
if (CurrentSelections[i].pWin == pWin) if (CurrentSelections[i].pWin == pWin)
@ -4030,7 +4029,7 @@ DeleteWindowFromAnySelections(WindowPtr pWin)
static void static void
DeleteClientFromAnySelections(ClientPtr client) DeleteClientFromAnySelections(ClientPtr client)
{ {
register int i; int i;
for (i = 0; i< NumCurrentSelections; i++) for (i = 0; i< NumCurrentSelections; i++)
if (CurrentSelections[i].client == client) if (CurrentSelections[i].client == client)

6
dix/dixfonts.c
View File

@ -1145,9 +1145,9 @@ static XID clearGC[] = { CT_NONE };
#define clearGCmask (GCClipMask) #define clearGCmask (GCClipMask)
int int
doPolyText(ClientPtr client, register PTclosurePtr c) doPolyText(ClientPtr client, PTclosurePtr c)
{ {
register FontPtr pFont = c->pGC->font, oldpFont; FontPtr pFont = c->pGC->font, oldpFont;
Font fid, oldfid; Font fid, oldfid;
int err = Success, lgerr; /* err is in X error, not font error, space */ int err = Success, lgerr; /* err is in X error, not font error, space */
enum { NEVER_SLEPT, START_SLEEP, SLEEPING } client_state = NEVER_SLEPT; enum { NEVER_SLEPT, START_SLEEP, SLEEPING } client_state = NEVER_SLEPT;
@ -1447,7 +1447,7 @@ PolyText(ClientPtr client, DrawablePtr pDraw, GC *pGC, unsigned char *pElt,
#undef FontShiftSize #undef FontShiftSize
int int
doImageText(ClientPtr client, register ITclosurePtr c) doImageText(ClientPtr client, ITclosurePtr c)
{ {
int err = Success, lgerr; /* err is in X error, not font error, space */ int err = Success, lgerr; /* err is in X error, not font error, space */
FontPathElementPtr fpe; FontPathElementPtr fpe;

10
dix/dixutils.c
View File

@ -168,7 +168,7 @@ ISOLatin1ToLower (unsigned char source)
_X_EXPORT void _X_EXPORT void
CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length) CopyISOLatin1Lowered(unsigned char *dest, unsigned char *source, int length)
{ {
register int i; int i;
for (i = 0; i < length; i++, source++, dest++) for (i = 0; i < length; i++, source++, dest++)
*dest = ISOLatin1ToLower (*source); *dest = ISOLatin1ToLower (*source);
@ -392,8 +392,8 @@ AlterSaveSetForClient(ClientPtr client, WindowPtr pWin, unsigned mode,
void void
DeleteWindowFromAnySaveSet(WindowPtr pWin) DeleteWindowFromAnySaveSet(WindowPtr pWin)
{ {
register int i; int i;
register ClientPtr client; ClientPtr client;
for (i = 0; i< currentMaxClients; i++) for (i = 0; i< currentMaxClients; i++)
{ {
@ -434,7 +434,7 @@ static Bool handlerDeleted;
void void
BlockHandler(pointer pTimeout, pointer pReadmask) BlockHandler(pointer pTimeout, pointer pReadmask)
{ {
register int i, j; int i, j;
++inHandler; ++inHandler;
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
@ -468,7 +468,7 @@ BlockHandler(pointer pTimeout, pointer pReadmask)
void void
WakeupHandler(int result, pointer pReadmask) WakeupHandler(int result, pointer pReadmask)
{ {
register int i, j; int i, j;
++inHandler; ++inHandler;
for (i = numHandlers - 1; i >= 0; i--) for (i = numHandlers - 1; i >= 0; i--)

188
dix/events.c
View File

@ -761,8 +761,8 @@ CheckPhysLimits(
static void static void
CheckVirtualMotion( CheckVirtualMotion(
register QdEventPtr qe, QdEventPtr qe,
register WindowPtr pWin) WindowPtr pWin)
{ {
#ifdef PANORAMIX #ifdef PANORAMIX
if(!noPanoramiXExtension) { if(!noPanoramiXExtension) {
@ -875,7 +875,7 @@ ChangeToCursor(CursorPtr cursor)
/* returns true if b is a descendent of a */ /* returns true if b is a descendent of a */
Bool Bool
IsParent(register WindowPtr a, register WindowPtr b) IsParent(WindowPtr a, WindowPtr b)
{ {
for (b = b->parent; b; b = b->parent) for (b = b->parent; b; b = b->parent)
if (b == a) return TRUE; if (b == a) return TRUE;
@ -885,8 +885,8 @@ IsParent(register WindowPtr a, register WindowPtr b)
static void static void
PostNewCursor(void) PostNewCursor(void)
{ {
register WindowPtr win; WindowPtr win;
register GrabPtr grab = inputInfo.pointer->grab; GrabPtr grab = inputInfo.pointer->grab;
if (syncEvents.playingEvents) if (syncEvents.playingEvents)
return; return;
@ -952,7 +952,7 @@ XineramaGetCursorScreen()
#define TIMESLOP (5 * 60 * 1000) /* 5 minutes */ #define TIMESLOP (5 * 60 * 1000) /* 5 minutes */
static void static void
MonthChangedOrBadTime(register xEvent *xE) MonthChangedOrBadTime(xEvent *xE)
{ {
/* If the ddx/OS is careless about not processing timestamped events from /* If the ddx/OS is careless about not processing timestamped events from
* different sources in sorted order, then it's possible for time to go * different sources in sorted order, then it's possible for time to go
@ -971,7 +971,7 @@ MonthChangedOrBadTime(register xEvent *xE)
lastDeviceEventTime = currentTime; } lastDeviceEventTime = currentTime; }
void void
NoticeEventTime(register xEvent *xE) NoticeEventTime(xEvent *xE)
{ {
if (!syncEvents.playingEvents) if (!syncEvents.playingEvents)
NoticeTime(xE); NoticeTime(xE);
@ -984,8 +984,8 @@ NoticeEventTime(register xEvent *xE)
void void
EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count) EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
{ {
register QdEventPtr tail = *syncEvents.pendtail; QdEventPtr tail = *syncEvents.pendtail;
register QdEventPtr qe; QdEventPtr qe;
xEvent *qxE; xEvent *qxE;
NoticeTime(xE); NoticeTime(xE);
@ -1059,8 +1059,8 @@ EnqueueEvent(xEvent *xE, DeviceIntPtr device, int count)
static void static void
PlayReleasedEvents(void) PlayReleasedEvents(void)
{ {
register QdEventPtr *prev, qe; QdEventPtr *prev, qe;
register DeviceIntPtr dev; DeviceIntPtr dev;
prev = &syncEvents.pending; prev = &syncEvents.pending;
while ( (qe = *prev) ) while ( (qe = *prev) )
@ -1104,7 +1104,7 @@ PlayReleasedEvents(void)
} }
static void static void
FreezeThaw(register DeviceIntPtr dev, Bool frozen) FreezeThaw(DeviceIntPtr dev, Bool frozen)
{ {
dev->sync.frozen = frozen; dev->sync.frozen = frozen;
if (frozen) if (frozen)
@ -1116,13 +1116,13 @@ FreezeThaw(register DeviceIntPtr dev, Bool frozen)
void void
ComputeFreezes() ComputeFreezes()
{ {
register DeviceIntPtr replayDev = syncEvents.replayDev; DeviceIntPtr replayDev = syncEvents.replayDev;
register int i; int i;
WindowPtr w; WindowPtr w;
register xEvent *xE; xEvent *xE;
int count; int count;
GrabPtr grab; GrabPtr grab;
register DeviceIntPtr dev; DeviceIntPtr dev;
for (dev = inputInfo.devices; dev; dev = dev->next) for (dev = inputInfo.devices; dev; dev = dev->next)
FreezeThaw(dev, dev->sync.other || (dev->sync.state >= FROZEN)); FreezeThaw(dev, dev->sync.other || (dev->sync.state >= FROZEN));
@ -1198,10 +1198,10 @@ ScreenRestructured (ScreenPtr pScreen)
#endif #endif
void void
CheckGrabForSyncs(register DeviceIntPtr thisDev, Bool thisMode, Bool otherMode) CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
{ {
register GrabPtr grab = thisDev->grab; GrabPtr grab = thisDev->grab;
register DeviceIntPtr dev; DeviceIntPtr dev;
if (thisMode == GrabModeSync) if (thisMode == GrabModeSync)
thisDev->sync.state = FROZEN_NO_EVENT; thisDev->sync.state = FROZEN_NO_EVENT;
@ -1232,7 +1232,7 @@ CheckGrabForSyncs(register DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
} }
void void
ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab, ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
TimeStamp time, Bool autoGrab) TimeStamp time, Bool autoGrab)
{ {
WindowPtr oldWin = (mouse->grab) ? mouse->grab->window WindowPtr oldWin = (mouse->grab) ? mouse->grab->window
@ -1260,10 +1260,10 @@ ActivatePointerGrab(register DeviceIntPtr mouse, register GrabPtr grab,
} }
void void
DeactivatePointerGrab(register DeviceIntPtr mouse) DeactivatePointerGrab(DeviceIntPtr mouse)
{ {
register GrabPtr grab = mouse->grab; GrabPtr grab = mouse->grab;
register DeviceIntPtr dev; DeviceIntPtr dev;
mouse->valuator->motionHintWindow = NullWindow; mouse->valuator->motionHintWindow = NullWindow;
mouse->grab = NullGrab; mouse->grab = NullGrab;
@ -1284,7 +1284,7 @@ DeactivatePointerGrab(register DeviceIntPtr mouse)
} }
void void
ActivateKeyboardGrab(register DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive) ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool passive)
{ {
WindowPtr oldWin; WindowPtr oldWin;
@ -1310,11 +1310,11 @@ ActivateKeyboardGrab(register DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
} }
void void
DeactivateKeyboardGrab(register DeviceIntPtr keybd) DeactivateKeyboardGrab(DeviceIntPtr keybd)
{ {
register GrabPtr grab = keybd->grab; GrabPtr grab = keybd->grab;
register DeviceIntPtr dev; DeviceIntPtr dev;
register WindowPtr focusWin = keybd->focus ? keybd->focus->win WindowPtr focusWin = keybd->focus ? keybd->focus->win
: sprite.win; : sprite.win;
if (focusWin == FollowKeyboardWin) if (focusWin == FollowKeyboardWin)
@ -1338,7 +1338,7 @@ AllowSome(ClientPtr client, TimeStamp time, DeviceIntPtr thisDev, int newState)
{ {
Bool thisGrabbed, otherGrabbed, othersFrozen, thisSynced; Bool thisGrabbed, otherGrabbed, othersFrozen, thisSynced;
TimeStamp grabTime; TimeStamp grabTime;
register DeviceIntPtr dev; DeviceIntPtr dev;
thisGrabbed = thisDev->grab && SameClient(thisDev->grab, client); thisGrabbed = thisDev->grab && SameClient(thisDev->grab, client);
thisSynced = FALSE; thisSynced = FALSE;
@ -1442,7 +1442,7 @@ AllowSome(ClientPtr client, TimeStamp time, DeviceIntPtr thisDev, int newState)
} }
int int
ProcAllowEvents(register ClientPtr client) ProcAllowEvents(ClientPtr client)
{ {
TimeStamp time; TimeStamp time;
DeviceIntPtr mouse = inputInfo.pointer; DeviceIntPtr mouse = inputInfo.pointer;
@ -1487,7 +1487,7 @@ ProcAllowEvents(register ClientPtr client)
void void
ReleaseActiveGrabs(ClientPtr client) ReleaseActiveGrabs(ClientPtr client)
{ {
register DeviceIntPtr dev; DeviceIntPtr dev;
Bool done; Bool done;
/* XXX CloseDownClient should remove passive grabs before /* XXX CloseDownClient should remove passive grabs before
@ -1589,12 +1589,12 @@ TryClientEvents (ClientPtr client, xEvent *pEvents, int count, Mask mask,
} }
int int
DeliverEventsToWindow(register WindowPtr pWin, xEvent *pEvents, int count, DeliverEventsToWindow(WindowPtr pWin, xEvent *pEvents, int count,
Mask filter, GrabPtr grab, int mskidx) Mask filter, GrabPtr grab, int mskidx)
{ {
int deliveries = 0, nondeliveries = 0; int deliveries = 0, nondeliveries = 0;
int attempt; int attempt;
register InputClients *other; InputClients *other;
ClientPtr client = NullClient; ClientPtr client = NullClient;
Mask deliveryMask = 0; /* If a grab occurs due to a button press, then Mask deliveryMask = 0; /* If a grab occurs due to a button press, then
this mask is the mask of the grab. */ this mask is the mask of the grab. */
@ -1708,10 +1708,10 @@ XineramaTryClientEventsResult(
#endif #endif
int int
MaybeDeliverEventsToClient(register WindowPtr pWin, xEvent *pEvents, MaybeDeliverEventsToClient(WindowPtr pWin, xEvent *pEvents,
int count, Mask filter, ClientPtr dontClient) int count, Mask filter, ClientPtr dontClient)
{ {
register OtherClients *other; OtherClients *other;
if (pWin->eventMask & filter) if (pWin->eventMask & filter)
@ -1799,8 +1799,8 @@ FixUpEventFromWindow(
} }
int int
DeliverDeviceEvents(register WindowPtr pWin, register xEvent *xE, GrabPtr grab, DeliverDeviceEvents(WindowPtr pWin, xEvent *xE, GrabPtr grab,
register WindowPtr stopAt, DeviceIntPtr dev, int count) WindowPtr stopAt, DeviceIntPtr dev, int count)
{ {
Window child = None; Window child = None;
int type = xE->u.u.type; int type = xE->u.u.type;
@ -1809,7 +1809,7 @@ DeliverDeviceEvents(register WindowPtr pWin, register xEvent *xE, GrabPtr grab,
if (type & EXTENSION_EVENT_BASE) if (type & EXTENSION_EVENT_BASE)
{ {
register OtherInputMasks *inputMasks; OtherInputMasks *inputMasks;
int mskidx = dev->id; int mskidx = dev->id;
inputMasks = wOtherInputMasks(pWin); inputMasks = wOtherInputMasks(pWin);
@ -1863,8 +1863,8 @@ DeliverDeviceEvents(register WindowPtr pWin, register xEvent *xE, GrabPtr grab,
/* not useful for events that propagate up the tree or extension events */ /* not useful for events that propagate up the tree or extension events */
_X_EXPORT int _X_EXPORT int
DeliverEvents(register WindowPtr pWin, register xEvent *xE, int count, DeliverEvents(WindowPtr pWin, xEvent *xE, int count,
register WindowPtr otherParent) WindowPtr otherParent)
{ {
Mask filter; Mask filter;
int deliveries; int deliveries;
@ -1929,7 +1929,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
static WindowPtr static WindowPtr
XYToWindow(int x, int y) XYToWindow(int x, int y)
{ {
register WindowPtr pWin; WindowPtr pWin;
BoxRec box; BoxRec box;
spriteTraceGood = 1; /* root window still there */ spriteTraceGood = 1; /* root window still there */
@ -2092,9 +2092,9 @@ void ReinitializeRootWindow(WindowPtr win, int xoff, int yoff)
#endif #endif
void void
DefineInitialRootWindow(register WindowPtr win) DefineInitialRootWindow(WindowPtr win)
{ {
register ScreenPtr pScreen = win->drawable.pScreen; ScreenPtr pScreen = win->drawable.pScreen;
sprite.hotPhys.pScreen = pScreen; sprite.hotPhys.pScreen = pScreen;
sprite.hotPhys.x = pScreen->width / 2; sprite.hotPhys.x = pScreen->width / 2;
@ -2411,13 +2411,13 @@ BorderSizeNotEmpty(WindowPtr pWin)
static Bool static Bool
CheckPassiveGrabsOnWindow( CheckPassiveGrabsOnWindow(
WindowPtr pWin, WindowPtr pWin,
register DeviceIntPtr device, DeviceIntPtr device,
register xEvent *xE, xEvent *xE,
int count) int count)
{ {
register GrabPtr grab = wPassiveGrabs(pWin); GrabPtr grab = wPassiveGrabs(pWin);
GrabRec tempGrab; GrabRec tempGrab;
register xEvent *dxE; xEvent *dxE;
if (!grab) if (!grab)
return FALSE; return FALSE;
@ -2513,12 +2513,12 @@ tried. PRH
*/ */
Bool Bool
CheckDeviceGrabs(register DeviceIntPtr device, register xEvent *xE, CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE,
int checkFirst, int count) int checkFirst, int count)
{ {
register int i; int i;
register WindowPtr pWin = NULL; WindowPtr pWin = NULL;
register FocusClassPtr focus = device->focus; FocusClassPtr focus = device->focus;
if (((xE->u.u.type == ButtonPress) if (((xE->u.u.type == ButtonPress)
#if defined(XINPUT) && defined(XKB) #if defined(XINPUT) && defined(XKB)
@ -2585,13 +2585,13 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
} }
void void
DeliverGrabbedEvent(register xEvent *xE, register DeviceIntPtr thisDev, DeliverGrabbedEvent(xEvent *xE, DeviceIntPtr thisDev,
Bool deactivateGrab, int count) Bool deactivateGrab, int count)
{ {
register GrabPtr grab = thisDev->grab; GrabPtr grab = thisDev->grab;
int deliveries = 0; int deliveries = 0;
register DeviceIntPtr dev; DeviceIntPtr dev;
register xEvent *dxE; xEvent *dxE;
if (grab->ownerEvents) if (grab->ownerEvents)
{ {
@ -2668,19 +2668,19 @@ DeliverGrabbedEvent(register xEvent *xE, register DeviceIntPtr thisDev,
void void
#ifdef XKB #ifdef XKB
CoreProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int count) CoreProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
#else #else
ProcessKeyboardEvent (register xEvent *xE, register DeviceIntPtr keybd, int count) ProcessKeyboardEvent (xEvent *xE, DeviceIntPtr keybd, int count)
#endif #endif
{ {
int key, bit; int key, bit;
register BYTE *kptr; BYTE *kptr;
register int i; int i;
register CARD8 modifiers; CARD8 modifiers;
register CARD16 mask; CARD16 mask;
GrabPtr grab = keybd->grab; GrabPtr grab = keybd->grab;
Bool deactivateGrab = FALSE; Bool deactivateGrab = FALSE;
register KeyClassPtr keyc = keybd->key; KeyClassPtr keyc = keybd->key;
#ifdef XEVIE #ifdef XEVIE
static Window rootWin = 0; static Window rootWin = 0;
@ -2832,11 +2832,11 @@ drawable.id:0;
CoreProcessKeyEvent to be called, as in for example Mouse Keys. CoreProcessKeyEvent to be called, as in for example Mouse Keys.
*/ */
void void
FixKeyState (register xEvent *xE, register DeviceIntPtr keybd) FixKeyState (xEvent *xE, DeviceIntPtr keybd)
{ {
int key, bit; int key, bit;
register BYTE *kptr; BYTE *kptr;
register KeyClassPtr keyc = keybd->key; KeyClassPtr keyc = keybd->key;
key = xE->u.u.detail; key = xE->u.u.detail;
kptr = &keyc->down[key >> 3]; kptr = &keyc->down[key >> 3];
@ -2863,14 +2863,14 @@ FixKeyState (register xEvent *xE, register DeviceIntPtr keybd)
void void
#ifdef XKB #ifdef XKB
CoreProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count) CoreProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
#else #else
ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count) ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
#endif #endif
{ {
register GrabPtr grab = mouse->grab; GrabPtr grab = mouse->grab;
Bool deactivateGrab = FALSE; Bool deactivateGrab = FALSE;
register ButtonClassPtr butc = mouse->button; ButtonClassPtr butc = mouse->button;
#ifdef XKB #ifdef XKB
XkbSrvInfoPtr xkbi= inputInfo.keyboard->key->xkbInfo; XkbSrvInfoPtr xkbi= inputInfo.keyboard->key->xkbInfo;
#endif #endif
@ -2914,8 +2914,8 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
} }
if (xE->u.u.type != MotionNotify) if (xE->u.u.type != MotionNotify)
{ {
register int key; int key;
register BYTE *kptr; BYTE *kptr;
int bit; int bit;
XE_KBPTR.rootX = sprite.hot.x; XE_KBPTR.rootX = sprite.hot.x;
@ -2976,10 +2976,10 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
void void
RecalculateDeliverableEvents(pWin) RecalculateDeliverableEvents(pWin)
register WindowPtr pWin; WindowPtr pWin;
{ {
register OtherClients *others; OtherClients *others;
register WindowPtr pChild; WindowPtr pChild;
pChild = pWin; pChild = pWin;
while (1) while (1)
@ -3018,8 +3018,8 @@ RecalculateDeliverableEvents(pWin)
int int
OtherClientGone(pointer value, XID id) OtherClientGone(pointer value, XID id)
{ {
register OtherClientsPtr other, prev; OtherClientsPtr other, prev;
register WindowPtr pWin = (WindowPtr)value; WindowPtr pWin = (WindowPtr)value;
prev = 0; prev = 0;
for (other = wOtherClients(pWin); other; other = other->next) for (other = wOtherClients(pWin); other; other = other->next)
@ -3045,7 +3045,7 @@ OtherClientGone(pointer value, XID id)
} }
int int
EventSelectForWindow(register WindowPtr pWin, register ClientPtr client, Mask mask) EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask)
{ {
Mask check; Mask check;
OtherClients * others; OtherClients * others;
@ -3117,10 +3117,10 @@ maskSet:
} }
int int
EventSuppressForWindow(register WindowPtr pWin, register ClientPtr client, EventSuppressForWindow(WindowPtr pWin, ClientPtr client,
Mask mask, Bool *checkOptional) Mask mask, Bool *checkOptional)
{ {
register int i, free; int i, free;
if (mask & ~PropagateMask) if (mask & ~PropagateMask)
{ {
@ -3174,8 +3174,8 @@ EventSuppressForWindow(register WindowPtr pWin, register ClientPtr client,
static WindowPtr static WindowPtr
CommonAncestor( CommonAncestor(
register WindowPtr a, WindowPtr a,
register WindowPtr b) WindowPtr b)
{ {
for (b = b->parent; b; b = b->parent) for (b = b->parent; b; b = b->parent)
if (IsParent(b, a)) return b; if (IsParent(b, a)) return b;
@ -3187,14 +3187,14 @@ EnterLeaveEvent(
int type, int type,
int mode, int mode,
int detail, int detail,
register WindowPtr pWin, WindowPtr pWin,
Window child) Window child)
{ {
xEvent event; xEvent event;
register DeviceIntPtr keybd = inputInfo.keyboard; DeviceIntPtr keybd = inputInfo.keyboard;
WindowPtr focus; WindowPtr focus;
register DeviceIntPtr mouse = inputInfo.pointer; DeviceIntPtr mouse = inputInfo.pointer;
register GrabPtr grab = mouse->grab; GrabPtr grab = mouse->grab;
Mask mask; Mask mask;
if ((pWin == mouse->valuator->motionHintWindow) && if ((pWin == mouse->valuator->motionHintWindow) &&
@ -3278,7 +3278,7 @@ EnterNotifies(WindowPtr ancestor, WindowPtr child, int mode, int detail)
static void static void
LeaveNotifies(WindowPtr child, WindowPtr ancestor, int mode, int detail) LeaveNotifies(WindowPtr child, WindowPtr ancestor, int mode, int detail)
{ {
register WindowPtr pWin; WindowPtr pWin;
if (ancestor == child) if (ancestor == child)
return; return;
@ -3318,7 +3318,7 @@ DoEnterLeaveEvents(WindowPtr fromWin, WindowPtr toWin, int mode)
} }
static void static void
FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, register WindowPtr pWin) FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
{ {
xEvent event; xEvent event;
@ -3388,7 +3388,7 @@ FocusOutEvents(
int mode, int detail, int mode, int detail,
Bool doAncestor) Bool doAncestor)
{ {
register WindowPtr pWin; WindowPtr pWin;
for (pWin = child; pWin != ancestor; pWin = pWin->parent) for (pWin = child; pWin != ancestor; pWin = pWin->parent)
FocusEvent(dev, FocusOut, mode, detail, pWin); FocusEvent(dev, FocusOut, mode, detail, pWin);
@ -3531,7 +3531,7 @@ SetInputFocus(
Time ctime, Time ctime,
Bool followOK) Bool followOK)
{ {
register FocusClassPtr focus; FocusClassPtr focus;
WindowPtr focusWin; WindowPtr focusWin;
int mode, rc; int mode, rc;
TimeStamp time; TimeStamp time;
@ -3579,7 +3579,7 @@ SetInputFocus(
else else
{ {
int depth = 0; int depth = 0;
register WindowPtr pWin; WindowPtr pWin;
for (pWin = focusWin; pWin; pWin = pWin->parent) depth++; for (pWin = focusWin; pWin; pWin = pWin->parent) depth++;
if (depth > focus->traceSize) if (depth > focus->traceSize)
@ -3745,7 +3745,7 @@ int
ProcChangeActivePointerGrab(ClientPtr client) ProcChangeActivePointerGrab(ClientPtr client)
{ {
DeviceIntPtr device = inputInfo.pointer; DeviceIntPtr device = inputInfo.pointer;
register GrabPtr grab = device->grab; GrabPtr grab = device->grab;
CursorPtr newCursor, oldCursor; CursorPtr newCursor, oldCursor;
REQUEST(xChangeActivePointerGrabReq); REQUEST(xChangeActivePointerGrabReq);
TimeStamp time; TimeStamp time;
@ -3807,12 +3807,12 @@ ProcUngrabPointer(ClientPtr client)
} }
int int
GrabDevice(register ClientPtr client, register DeviceIntPtr dev, GrabDevice(ClientPtr client, DeviceIntPtr dev,
unsigned this_mode, unsigned other_mode, Window grabWindow, unsigned this_mode, unsigned other_mode, Window grabWindow,
unsigned ownerEvents, Time ctime, Mask mask, CARD8 *status) unsigned ownerEvents, Time ctime, Mask mask, CARD8 *status)
{ {
WindowPtr pWin; WindowPtr pWin;
register GrabPtr grab; GrabPtr grab;
TimeStamp time; TimeStamp time;
int rc; int rc;
@ -4433,7 +4433,7 @@ CheckCursorConfinement(WindowPtr pWin)
Mask Mask
EventMaskForClient(WindowPtr pWin, ClientPtr client) EventMaskForClient(WindowPtr pWin, ClientPtr client)
{ {
register OtherClientsPtr other; OtherClientsPtr other;
if (wClient (pWin) == client) if (wClient (pWin) == client)
return pWin->eventMask; return pWin->eventMask;

24
dix/extension.c
View File

@ -81,11 +81,11 @@ extern unsigned totalExtensionSize;
static void static void
InitExtensionPrivates(ExtensionEntry *ext) InitExtensionPrivates(ExtensionEntry *ext)
{ {
register char *ptr; char *ptr;
DevUnion *ppriv; DevUnion *ppriv;
register unsigned *sizes; unsigned *sizes;
register unsigned size; unsigned size;
register int i; int i;
if (totalExtensionSize == sizeof(ExtensionEntry)) if (totalExtensionSize == sizeof(ExtensionEntry))
ppriv = (DevUnion *)NULL; ppriv = (DevUnion *)NULL;
@ -115,7 +115,7 @@ AddExtension(char *name, int NumEvents, int NumErrors,
unsigned short (*MinorOpcodeProc)(ClientPtr c3)) unsigned short (*MinorOpcodeProc)(ClientPtr c3))
{ {
int i; int i;
register ExtensionEntry *ext, **newexts; ExtensionEntry *ext, **newexts;
if (!MainProc || !SwappedMainProc || !CloseDownProc || !MinorOpcodeProc) if (!MainProc || !SwappedMainProc || !CloseDownProc || !MinorOpcodeProc)
return((ExtensionEntry *) NULL); return((ExtensionEntry *) NULL);
@ -282,7 +282,7 @@ MinorOpcodeOfRequest(ClientPtr client)
void void
CloseDownExtensions() CloseDownExtensions()
{ {
register int i,j; int i,j;
for (i = NumExtensions - 1; i >= 0; i--) for (i = NumExtensions - 1; i >= 0; i--)
{ {
@ -300,7 +300,7 @@ CloseDownExtensions()
lastError = FirstExtensionError; lastError = FirstExtensionError;
for (i=0; i<MAXSCREENS; i++) for (i=0; i<MAXSCREENS; i++)
{ {
register ScreenProcEntry *spentry = &AuxillaryScreenProcs[i]; ScreenProcEntry *spentry = &AuxillaryScreenProcs[i];
while (spentry->num) while (spentry->num)
{ {
@ -363,7 +363,7 @@ ProcListExtensions(ClientPtr client)
if ( NumExtensions ) if ( NumExtensions )
{ {
register int i, j; int i, j;
for (i=0; i<NumExtensions; i++) for (i=0; i<NumExtensions; i++)
{ {
@ -410,8 +410,8 @@ ProcListExtensions(ClientPtr client)
ExtensionLookupProc ExtensionLookupProc
LookupProc(char *name, GCPtr pGC) LookupProc(char *name, GCPtr pGC)
{ {
register int i; int i;
register ScreenProcEntry *spentry; ScreenProcEntry *spentry;
spentry = &AuxillaryScreenProcs[pGC->pScreen->myNum]; spentry = &AuxillaryScreenProcs[pGC->pScreen->myNum];
if (spentry->num) if (spentry->num)
{ {
@ -431,8 +431,8 @@ RegisterProc(char *name, GC *pGC, ExtensionLookupProc proc)
Bool Bool
RegisterScreenProc(char *name, ScreenPtr pScreen, ExtensionLookupProc proc) RegisterScreenProc(char *name, ScreenPtr pScreen, ExtensionLookupProc proc)
{ {
register ScreenProcEntry *spentry; ScreenProcEntry *spentry;
register ProcEntryPtr procEntry = (ProcEntryPtr)NULL; ProcEntryPtr procEntry = (ProcEntryPtr)NULL;
char *newname; char *newname;
int i; int i;

60
dix/gc.c
View File

@ -144,10 +144,10 @@ ValidateGC(DrawablePtr pDraw, GC *pGC)
assert(pUnion); _var = (_type)pUnion->ptr; pUnion++; } assert(pUnion); _var = (_type)pUnion->ptr; pUnion++; }
_X_EXPORT int _X_EXPORT int
dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC32, ChangeGCValPtr pUnion) dixChangeGC(ClientPtr client, GC *pGC, BITS32 mask, CARD32 *pC32, ChangeGCValPtr pUnion)
{ {
register BITS32 index2; BITS32 index2;
register int error = 0; int error = 0;
PixmapPtr pPixmap; PixmapPtr pPixmap;
BITS32 maskQ; BITS32 maskQ;
@ -522,7 +522,7 @@ dixChangeGC(ClientPtr client, register GC *pGC, register BITS32 mask, CARD32 *pC
/* Publically defined entry to ChangeGC. Just calls dixChangeGC and tells /* Publically defined entry to ChangeGC. Just calls dixChangeGC and tells
* it that all of the entries are constants or IDs */ * it that all of the entries are constants or IDs */
_X_EXPORT int _X_EXPORT int
ChangeGC(register GC *pGC, register BITS32 mask, XID *pval) ChangeGC(GC *pGC, BITS32 mask, XID *pval)
{ {
return (dixChangeGC(NullClient, pGC, mask, pval, NULL)); return (dixChangeGC(NullClient, pGC, mask, pval, NULL));
} }
@ -548,7 +548,7 @@ NOTE:
32 bits long 32 bits long
*/ */
_X_EXPORT int _X_EXPORT int
DoChangeGC(register GC *pGC, register BITS32 mask, XID *pval, int fPointer) DoChangeGC(GC *pGC, BITS32 mask, XID *pval, int fPointer)
{ {
if (fPointer) if (fPointer)
/* XXX might be a problem on 64 bit big-endian servers */ /* XXX might be a problem on 64 bit big-endian servers */
@ -572,11 +572,11 @@ static GCPtr
AllocateGC(ScreenPtr pScreen) AllocateGC(ScreenPtr pScreen)
{ {
GCPtr pGC; GCPtr pGC;
register char *ptr; char *ptr;
register DevUnion *ppriv; DevUnion *ppriv;
register unsigned *sizes; unsigned *sizes;
register unsigned size; unsigned size;
register int i; int i;
pGC = (GCPtr)xalloc(pScreen->totalGCSize); pGC = (GCPtr)xalloc(pScreen->totalGCSize);
if (pGC) if (pGC)
@ -602,7 +602,7 @@ AllocateGC(ScreenPtr pScreen)
_X_EXPORT GCPtr _X_EXPORT GCPtr
CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus) CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus)
{ {
register GCPtr pGC; GCPtr pGC;
pGC = AllocateGC(pDrawable->pScreen); pGC = AllocateGC(pDrawable->pScreen);
if (!pGC) if (!pGC)
@ -724,9 +724,9 @@ CreateDefaultTile (GCPtr pGC)
} }
_X_EXPORT int _X_EXPORT int
CopyGC(register GC *pgcSrc, register GC *pgcDst, register BITS32 mask) CopyGC(GC *pgcSrc, GC *pgcDst, BITS32 mask)
{ {
register BITS32 index2; BITS32 index2;
BITS32 maskQ; BITS32 maskQ;
int error = 0; int error = 0;
@ -934,7 +934,7 @@ go with CreateGC() or ChangeGC().)
_X_EXPORT GCPtr _X_EXPORT GCPtr
CreateScratchGC(ScreenPtr pScreen, unsigned depth) CreateScratchGC(ScreenPtr pScreen, unsigned depth)
{ {
register GCPtr pGC; GCPtr pGC;
pGC = AllocateGC(pScreen); pGC = AllocateGC(pScreen);
if (!pGC) if (!pGC)
@ -986,8 +986,8 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
void void
FreeGCperDepth(int screenNum) FreeGCperDepth(int screenNum)
{ {
register int i; int i;
register ScreenPtr pScreen; ScreenPtr pScreen;
GCPtr *ppGC; GCPtr *ppGC;
pScreen = screenInfo.screens[screenNum]; pScreen = screenInfo.screens[screenNum];
@ -1002,8 +1002,8 @@ FreeGCperDepth(int screenNum)
Bool Bool
CreateGCperDepth(int screenNum) CreateGCperDepth(int screenNum)
{ {
register int i; int i;
register ScreenPtr pScreen; ScreenPtr pScreen;
DepthPtr pDepth; DepthPtr pDepth;
GCPtr *ppGC; GCPtr *ppGC;
@ -1035,7 +1035,7 @@ CreateGCperDepth(int screenNum)
Bool Bool
CreateDefaultStipple(int screenNum) CreateDefaultStipple(int screenNum)
{ {
register ScreenPtr pScreen; ScreenPtr pScreen;
XID tmpval[3]; XID tmpval[3];
xRectangle rect; xRectangle rect;
CARD16 w, h; CARD16 w, h;
@ -1077,10 +1077,10 @@ FreeDefaultStipple(int screenNum)
} }
_X_EXPORT int _X_EXPORT int
SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash) SetDashes(GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pdash)
{ {
register long i; long i;
register unsigned char *p, *indash; unsigned char *p, *indash;
BITS32 maskQ = 0; BITS32 maskQ = 0;
i = ndash; i = ndash;
@ -1135,8 +1135,8 @@ SetDashes(register GCPtr pGC, unsigned offset, unsigned ndash, unsigned char *pd
_X_EXPORT int _X_EXPORT int
VerifyRectOrder(int nrects, xRectangle *prects, int ordering) VerifyRectOrder(int nrects, xRectangle *prects, int ordering)
{ {
register xRectangle *prectP, *prectN; xRectangle *prectP, *prectN;
register int i; int i;
switch(ordering) switch(ordering)
{ {
@ -1220,10 +1220,10 @@ SetClipRects(GCPtr pGC, int xOrigin, int yOrigin, int nrects,
you use it often enough it will become real.) you use it often enough it will become real.)
*/ */
_X_EXPORT GCPtr _X_EXPORT GCPtr
GetScratchGC(register unsigned depth, register ScreenPtr pScreen) GetScratchGC(unsigned depth, ScreenPtr pScreen)
{ {
register int i; int i;
register GCPtr pGC; GCPtr pGC;
for (i=0; i<=pScreen->numDepths; i++) for (i=0; i<=pScreen->numDepths; i++)
if ( pScreen->GCperDepth[i]->depth == depth && if ( pScreen->GCperDepth[i]->depth == depth &&
@ -1269,10 +1269,10 @@ mark it as available.
if not, free it for real if not, free it for real
*/ */
_X_EXPORT void _X_EXPORT void
FreeScratchGC(register GCPtr pGC) FreeScratchGC(GCPtr pGC)
{ {
register ScreenPtr pScreen = pGC->pScreen; ScreenPtr pScreen = pGC->pScreen;
register int i; int i;
for (i=0; i<=pScreen->numDepths; i++) for (i=0; i<=pScreen->numDepths; i++)
{ {

8
dix/glyphcurs.c
View File

@ -74,10 +74,10 @@ cursor metrics.
*/ */
int int
ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, unsigned char **ppbits) ServerBitsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm, unsigned char **ppbits)
{ {
register ScreenPtr pScreen; ScreenPtr pScreen;
register GCPtr pGC; GCPtr pGC;
xRectangle rect; xRectangle rect;
PixmapPtr ppix; PixmapPtr ppix;
long nby; long nby;
@ -140,7 +140,7 @@ ServerBitsFromGlyph(FontPtr pfont, unsigned ch, register CursorMetricPtr cm, uns
Bool Bool
CursorMetricsFromGlyph(register FontPtr pfont, unsigned ch, register CursorMetricPtr cm) CursorMetricsFromGlyph(FontPtr pfont, unsigned ch, CursorMetricPtr cm)
{ {
CharInfoPtr pci; CharInfoPtr pci;
unsigned long nglyphs; unsigned long nglyphs;

8
dix/grabs.c
View File

@ -128,7 +128,7 @@ FreeGrab(GrabPtr pGrab)
int int
DeletePassiveGrab(pointer value, XID id) DeletePassiveGrab(pointer value, XID id)
{ {
register GrabPtr g, prev; GrabPtr g, prev;
GrabPtr pGrab = (GrabPtr)value; GrabPtr pGrab = (GrabPtr)value;
/* it is OK if the grab isn't found */ /* it is OK if the grab isn't found */
@ -153,8 +153,8 @@ DeletePassiveGrab(pointer value, XID id)
static Mask * static Mask *
DeleteDetailFromMask(Mask *pDetailMask, unsigned short detail) DeleteDetailFromMask(Mask *pDetailMask, unsigned short detail)
{ {
register Mask *mask; Mask *mask;
register int i; int i;
mask = (Mask *)xalloc(sizeof(Mask) * MasksPerDetailMask); mask = (Mask *)xalloc(sizeof(Mask) * MasksPerDetailMask);
if (mask) if (mask)
@ -305,7 +305,7 @@ AddPassiveGrabToList(GrabPtr pGrab)
Bool Bool
DeletePassiveGrabFromList(GrabPtr pMinuendGrab) DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
{ {
register GrabPtr grab; GrabPtr grab;
GrabPtr *deletes, *adds; GrabPtr *deletes, *adds;
Mask ***updates, **details; Mask ***updates, **details;
int i, ndels, nadds, nups; int i, ndels, nadds, nups;

6
dix/privates.c
View File

@ -225,7 +225,7 @@ AllocateWindowPrivateIndex()
} }
_X_EXPORT Bool _X_EXPORT Bool
AllocateWindowPrivate(register ScreenPtr pScreen, int index2, unsigned amount) AllocateWindowPrivate(ScreenPtr pScreen, int index2, unsigned amount)
{ {
unsigned oldamount; unsigned oldamount;
@ -275,7 +275,7 @@ AllocateGCPrivateIndex()
} }
_X_EXPORT Bool _X_EXPORT Bool
AllocateGCPrivate(register ScreenPtr pScreen, int index2, unsigned amount) AllocateGCPrivate(ScreenPtr pScreen, int index2, unsigned amount)
{ {
unsigned oldamount; unsigned oldamount;
@ -324,7 +324,7 @@ AllocatePixmapPrivateIndex()
} }
_X_EXPORT Bool _X_EXPORT Bool
AllocatePixmapPrivate(register ScreenPtr pScreen, int index2, unsigned amount) AllocatePixmapPrivate(ScreenPtr pScreen, int index2, unsigned amount)
{ {
unsigned oldamount; unsigned oldamount;

6
dix/property.c
View File

@ -76,7 +76,7 @@ static void
PrintPropertys(WindowPtr pWin) PrintPropertys(WindowPtr pWin)
{ {
PropertyPtr pProp; PropertyPtr pProp;
register int j; int j;
pProp = pWin->userProps; pProp = pWin->userProps;
while (pProp) while (pProp)
@ -97,7 +97,7 @@ ProcRotateProperties(ClientPtr client)
int i, j, delta, rc; int i, j, delta, rc;
REQUEST(xRotatePropertiesReq); REQUEST(xRotatePropertiesReq);
WindowPtr pWin; WindowPtr pWin;
register Atom * atoms; Atom * atoms;
PropertyPtr * props; /* array of pointer */ PropertyPtr * props; /* array of pointer */
PropertyPtr pProp; PropertyPtr pProp;
xEvent event; xEvent event;
@ -622,7 +622,7 @@ ProcListProperties(ClientPtr client)
} }
int int
ProcDeleteProperty(register ClientPtr client) ProcDeleteProperty(ClientPtr client)
{ {
WindowPtr pWin; WindowPtr pWin;
REQUEST(xDeletePropertyReq); REQUEST(xDeletePropertyReq);

68
dix/resource.c
View File

@ -257,7 +257,7 @@ ClientResourceRec clientTable[MAXCLIENTS];
Bool Bool
InitClientResources(ClientPtr client) InitClientResources(ClientPtr client)
{ {
register int i, j; int i, j;
if (client == serverClient) if (client == serverClient)
{ {
@ -314,7 +314,7 @@ InitClientResources(ClientPtr client)
static int static int
Hash(int client, register XID id) Hash(int client, XID id)
{ {
id &= RESOURCE_ID_MASK; id &= RESOURCE_ID_MASK;
switch (clientTable[client].hashsize) switch (clientTable[client].hashsize)
@ -337,12 +337,12 @@ Hash(int client, register XID id)
static XID static XID
AvailableID( AvailableID(
register int client, int client,
register XID id, XID id,
register XID maxid, XID maxid,
register XID goodid) XID goodid)
{ {
register ResourcePtr res; ResourcePtr res;
if ((goodid >= id) && (goodid <= maxid)) if ((goodid >= id) && (goodid <= maxid))
return goodid; return goodid;
@ -360,10 +360,10 @@ AvailableID(
_X_EXPORT void _X_EXPORT void
GetXIDRange(int client, Bool server, XID *minp, XID *maxp) GetXIDRange(int client, Bool server, XID *minp, XID *maxp)
{ {
register XID id, maxid; XID id, maxid;
register ResourcePtr *resp; ResourcePtr *resp;
register ResourcePtr res; ResourcePtr res;
register int i; int i;
XID goodid; XID goodid;
id = (Mask)client << CLIENTOFFSET; id = (Mask)client << CLIENTOFFSET;
@ -436,7 +436,7 @@ GetXIDList(ClientPtr pClient, unsigned count, XID *pids)
*/ */
_X_EXPORT XID _X_EXPORT XID
FakeClientID(register int client) FakeClientID(int client)
{ {
XID id, maxid; XID id, maxid;
@ -460,8 +460,8 @@ _X_EXPORT Bool
AddResource(XID id, RESTYPE type, pointer value) AddResource(XID id, RESTYPE type, pointer value)
{ {
int client; int client;
register ClientResourceRec *rrec; ClientResourceRec *rrec;
register ResourcePtr res, *head; ResourcePtr res, *head;
#ifdef XSERVER_DTRACE #ifdef XSERVER_DTRACE
XSERVER_RESOURCE_ALLOC(id, type, value, TypeNameString(type)); XSERVER_RESOURCE_ALLOC(id, type, value, TypeNameString(type));
@ -498,10 +498,10 @@ AddResource(XID id, RESTYPE type, pointer value)
static void static void
RebuildTable(int client) RebuildTable(int client)
{ {
register int j; int j;
register ResourcePtr res, next; ResourcePtr res, next;
ResourcePtr **tails, *resources; ResourcePtr **tails, *resources;
register ResourcePtr **tptr, *rptr; ResourcePtr **tptr, *rptr;
/* /*
* For now, preserve insertion order, since some ddx layers depend * For now, preserve insertion order, since some ddx layers depend
@ -548,9 +548,9 @@ _X_EXPORT void
FreeResource(XID id, RESTYPE skipDeleteFuncType) FreeResource(XID id, RESTYPE skipDeleteFuncType)
{ {
int cid; int cid;
register ResourcePtr res; ResourcePtr res;
register ResourcePtr *prev, *head; ResourcePtr *prev, *head;
register int *eltptr; int *eltptr;
int elements; int elements;
Bool gotOne = FALSE; Bool gotOne = FALSE;
@ -600,8 +600,8 @@ _X_EXPORT void
FreeResourceByType(XID id, RESTYPE type, Bool skipFree) FreeResourceByType(XID id, RESTYPE type, Bool skipFree)
{ {
int cid; int cid;
register ResourcePtr res; ResourcePtr res;
register ResourcePtr *prev, *head; ResourcePtr *prev, *head;
if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && clientTable[cid].buckets) if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && clientTable[cid].buckets)
{ {
head = &clientTable[cid].resources[Hash(cid, id)]; head = &clientTable[cid].resources[Hash(cid, id)];
@ -644,7 +644,7 @@ _X_EXPORT Bool
ChangeResourceValue (XID id, RESTYPE rtype, pointer value) ChangeResourceValue (XID id, RESTYPE rtype, pointer value)
{ {
int cid; int cid;
register ResourcePtr res; ResourcePtr res;
if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && clientTable[cid].buckets) if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && clientTable[cid].buckets)
{ {
@ -675,10 +675,10 @@ FindClientResourcesByType(
FindResType func, FindResType func,
pointer cdata pointer cdata
){ ){
register ResourcePtr *resources; ResourcePtr *resources;
register ResourcePtr this, next; ResourcePtr this, next;
int i, elements; int i, elements;
register int *eltptr; int *eltptr;
if (!client) if (!client)
client = serverClient; client = serverClient;
@ -706,10 +706,10 @@ FindAllClientResources(
FindAllRes func, FindAllRes func,
pointer cdata pointer cdata
){ ){
register ResourcePtr *resources; ResourcePtr *resources;
register ResourcePtr this, next; ResourcePtr this, next;
int i, elements; int i, elements;
register int *eltptr; int *eltptr;
if (!client) if (!client)
client = serverClient; client = serverClient;
@ -796,8 +796,8 @@ FreeClientNeverRetainResources(ClientPtr client)
void void
FreeClientResources(ClientPtr client) FreeClientResources(ClientPtr client)
{ {
register ResourcePtr *resources; ResourcePtr *resources;
register ResourcePtr this; ResourcePtr this;
int j; int j;
/* This routine shouldn't be called with a null client, but just in /* This routine shouldn't be called with a null client, but just in
@ -856,7 +856,7 @@ FreeAllResources()
} }
_X_EXPORT Bool _X_EXPORT Bool
LegalNewID(XID id, register ClientPtr client) LegalNewID(XID id, ClientPtr client)
{ {
#ifdef PANORAMIX #ifdef PANORAMIX
@ -887,7 +887,7 @@ _X_EXPORT pointer
SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode) SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype, Mask mode)
{ {
int cid; int cid;
register ResourcePtr res; ResourcePtr res;
pointer retval = NULL; pointer retval = NULL;
if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && if (((cid = CLIENT_ID(id)) < MAXCLIENTS) &&
@ -914,7 +914,7 @@ _X_EXPORT pointer
SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode) SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes, Mask mode)
{ {
int cid; int cid;
register ResourcePtr res = NULL; ResourcePtr res = NULL;
pointer retval = NULL; pointer retval = NULL;
if (((cid = CLIENT_ID(id)) < MAXCLIENTS) && if (((cid = CLIENT_ID(id)) < MAXCLIENTS) &&

90
dix/swaprep.c
View File

@ -73,10 +73,10 @@ static void SwapFont(xQueryFontReply *pr, Bool hasGlyphs);
* \param size size in bytes * \param size size in bytes
*/ */
_X_EXPORT void _X_EXPORT void
Swap32Write(ClientPtr pClient, int size, register CARD32 *pbuf) Swap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
{ {
register int i; int i;
register char n; char n;
size >>= 2; size >>= 2;
for(i = 0; i < size; i++) for(i = 0; i < size; i++)
@ -97,7 +97,7 @@ CopySwap32Write(ClientPtr pClient, int size, CARD32 *pbuf)
{ {
int bufsize = size; int bufsize = size;
CARD32 *pbufT; CARD32 *pbufT;
register CARD32 *from, *to, *fromLast, *toLast; CARD32 *from, *to, *fromLast, *toLast;
CARD32 tmpbuf[1]; CARD32 tmpbuf[1];
/* Allocate as big a buffer as we can... */ /* Allocate as big a buffer as we can... */
@ -145,7 +145,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
{ {
int bufsize = size; int bufsize = size;
short *pbufT; short *pbufT;
register short *from, *to, *fromLast, *toLast; short *from, *to, *fromLast, *toLast;
short tmpbuf[2]; short tmpbuf[2];
/* Allocate as big a buffer as we can... */ /* Allocate as big a buffer as we can... */
@ -189,7 +189,7 @@ CopySwap16Write(ClientPtr pClient, int size, short *pbuf)
void void
SGenericReply(ClientPtr pClient, int size, xGenericReply *pRep) SGenericReply(ClientPtr pClient, int size, xGenericReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
(void)WriteToClient(pClient, size, (char *) pRep); (void)WriteToClient(pClient, size, (char *) pRep);
@ -200,7 +200,7 @@ void
SGetWindowAttributesReply(ClientPtr pClient, int size, SGetWindowAttributesReply(ClientPtr pClient, int size,
xGetWindowAttributesReply *pRep) xGetWindowAttributesReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -218,7 +218,7 @@ SGetWindowAttributesReply(ClientPtr pClient, int size,
void void
SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply *pRep) SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->root, n); swapl(&pRep->root, n);
@ -233,7 +233,7 @@ SGetGeometryReply(ClientPtr pClient, int size, xGetGeometryReply *pRep)
void void
SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply *pRep) SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -246,7 +246,7 @@ SQueryTreeReply(ClientPtr pClient, int size, xQueryTreeReply *pRep)
void void
SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply *pRep) SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->atom, n); swapl(&pRep->atom, n);
@ -256,7 +256,7 @@ SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply *pRep)
void void
SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply *pRep) SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -268,7 +268,7 @@ SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply *pRep)
void void
SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply *pRep) SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -281,7 +281,7 @@ SGetPropertyReply(ClientPtr pClient, int size, xGetPropertyReply *pRep)
void void
SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply *pRep) SListPropertiesReply(ClientPtr pClient, int size, xListPropertiesReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -293,7 +293,7 @@ void
SGetSelectionOwnerReply(ClientPtr pClient, int size, SGetSelectionOwnerReply(ClientPtr pClient, int size,
xGetSelectionOwnerReply *pRep) xGetSelectionOwnerReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->owner, n); swapl(&pRep->owner, n);
@ -304,7 +304,7 @@ SGetSelectionOwnerReply(ClientPtr pClient, int size,
void void
SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply *pRep) SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->root, n); swapl(&pRep->root, n);
@ -320,7 +320,7 @@ SQueryPointerReply(ClientPtr pClient, int size, xQueryPointerReply *pRep)
void void
SwapTimecoord(xTimecoord* pCoord) SwapTimecoord(xTimecoord* pCoord)
{ {
register char n; char n;
swapl(&pCoord->time, n); swapl(&pCoord->time, n);
swaps(&pCoord->x, n); swaps(&pCoord->x, n);
@ -346,7 +346,7 @@ SwapTimeCoordWrite(ClientPtr pClient, int size, xTimecoord *pRep)
void void
SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply *pRep) SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -357,7 +357,7 @@ SGetMotionEventsReply(ClientPtr pClient, int size, xGetMotionEventsReply *pRep)
void void
STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply *pRep) STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->child, n); swapl(&pRep->child, n);
@ -369,7 +369,7 @@ STranslateCoordsReply(ClientPtr pClient, int size, xTranslateCoordsReply *pRep)
void void
SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply *pRep) SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->focus, n); swapl(&pRep->focus, n);
@ -380,7 +380,7 @@ SGetInputFocusReply(ClientPtr pClient, int size, xGetInputFocusReply *pRep)
void void
SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep) SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -390,7 +390,7 @@ SQueryKeymapReply(ClientPtr pClient, int size, xQueryKeymapReply *pRep)
static void static void
SwapCharInfo(xCharInfo *pInfo) SwapCharInfo(xCharInfo *pInfo)
{ {
register char n; char n;
swaps(&pInfo->leftSideBearing, n); swaps(&pInfo->leftSideBearing, n);
swaps(&pInfo->rightSideBearing, n); swaps(&pInfo->rightSideBearing, n);
@ -403,7 +403,7 @@ SwapCharInfo(xCharInfo *pInfo)
static void static void
SwapFontInfo(xQueryFontReply *pr) SwapFontInfo(xQueryFontReply *pr)
{ {
register char n; char n;
swaps(&pr->minCharOrByte2, n); swaps(&pr->minCharOrByte2, n);
swaps(&pr->maxCharOrByte2, n); swaps(&pr->maxCharOrByte2, n);
@ -423,7 +423,7 @@ SwapFont(xQueryFontReply *pr, Bool hasGlyphs)
xCharInfo * pxci; xCharInfo * pxci;
unsigned nchars, nprops; unsigned nchars, nprops;
char *pby; char *pby;
register char n; char n;
swaps(&pr->sequenceNumber, n); swaps(&pr->sequenceNumber, n);
swapl(&pr->length, n); swapl(&pr->length, n);
@ -458,7 +458,7 @@ SQueryFontReply(ClientPtr pClient, int size, xQueryFontReply *pRep)
void void
SQueryTextExtentsReply(ClientPtr pClient, int size, xQueryTextExtentsReply *pRep) SQueryTextExtentsReply(ClientPtr pClient, int size, xQueryTextExtentsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swaps(&pRep->fontAscent, n); swaps(&pRep->fontAscent, n);
@ -474,7 +474,7 @@ SQueryTextExtentsReply(ClientPtr pClient, int size, xQueryTextExtentsReply *pRep
void void
SListFontsReply(ClientPtr pClient, int size, xListFontsReply *pRep) SListFontsReply(ClientPtr pClient, int size, xListFontsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -493,7 +493,7 @@ SListFontsWithInfoReply(ClientPtr pClient, int size,
void void
SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply *pRep) SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -504,7 +504,7 @@ SGetFontPathReply(ClientPtr pClient, int size, xGetFontPathReply *pRep)
void void
SGetImageReply(ClientPtr pClient, int size, xGetImageReply *pRep) SGetImageReply(ClientPtr pClient, int size, xGetImageReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -517,7 +517,7 @@ void
SListInstalledColormapsReply(ClientPtr pClient, int size, SListInstalledColormapsReply(ClientPtr pClient, int size,
xListInstalledColormapsReply *pRep) xListInstalledColormapsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -531,7 +531,7 @@ SAllocColorReply(pClient, size, pRep)
int size; int size;
xAllocColorReply *pRep; xAllocColorReply *pRep;
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swaps(&pRep->red, n); swaps(&pRep->red, n);
@ -544,7 +544,7 @@ SAllocColorReply(pClient, size, pRep)
void void
SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply *pRep) SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->pixel, n); swapl(&pRep->pixel, n);
@ -560,7 +560,7 @@ SAllocNamedColorReply(ClientPtr pClient, int size, xAllocNamedColorReply *pRep)
void void
SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply *pRep) SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -573,7 +573,7 @@ SAllocColorCellsReply(ClientPtr pClient, int size, xAllocColorCellsReply *pRep)
void void
SAllocColorPlanesReply(ClientPtr pClient, int size, xAllocColorPlanesReply *pRep) SAllocColorPlanesReply(ClientPtr pClient, int size, xAllocColorPlanesReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -587,7 +587,7 @@ SAllocColorPlanesReply(ClientPtr pClient, int size, xAllocColorPlanesReply *pRep
void void
SwapRGB(xrgb *prgb) SwapRGB(xrgb *prgb)
{ {
register char n; char n;
swaps(&prgb->red, n); swaps(&prgb->red, n);
swaps(&prgb->green, n); swaps(&prgb->green, n);
@ -613,7 +613,7 @@ SQColorsExtend(ClientPtr pClient, int size, xrgb *prgb)
void void
SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply* pRep) SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply* pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -624,7 +624,7 @@ SQueryColorsReply(ClientPtr pClient, int size, xQueryColorsReply* pRep)
void void
SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply *pRep) SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swaps(&pRep->exactRed, n); swaps(&pRep->exactRed, n);
@ -639,7 +639,7 @@ SLookupColorReply(ClientPtr pClient, int size, xLookupColorReply *pRep)
void void
SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply *pRep) SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swaps(&pRep->width, n); swaps(&pRep->width, n);
@ -650,7 +650,7 @@ SQueryBestSizeReply(ClientPtr pClient, int size, xQueryBestSizeReply *pRep)
void void
SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply *pRep) SListExtensionsReply(ClientPtr pClient, int size, xListExtensionsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -661,7 +661,7 @@ void
SGetKeyboardMappingReply(ClientPtr pClient, int size, SGetKeyboardMappingReply(ClientPtr pClient, int size,
xGetKeyboardMappingReply *pRep) xGetKeyboardMappingReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -672,7 +672,7 @@ void
SGetPointerMappingReply(ClientPtr pClient, int size, SGetPointerMappingReply(ClientPtr pClient, int size,
xGetPointerMappingReply *pRep) xGetPointerMappingReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -683,7 +683,7 @@ void
SGetModifierMappingReply(ClientPtr pClient, int size, SGetModifierMappingReply(ClientPtr pClient, int size,
xGetModifierMappingReply *pRep) xGetModifierMappingReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -693,7 +693,7 @@ SGetModifierMappingReply(ClientPtr pClient, int size,
void void
SGetKeyboardControlReply(ClientPtr pClient, int size, xGetKeyboardControlReply *pRep) SGetKeyboardControlReply(ClientPtr pClient, int size, xGetKeyboardControlReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);
@ -706,7 +706,7 @@ SGetKeyboardControlReply(ClientPtr pClient, int size, xGetKeyboardControlReply *
void void
SGetPointerControlReply(ClientPtr pClient, int size, xGetPointerControlReply *pRep) SGetPointerControlReply(ClientPtr pClient, int size, xGetPointerControlReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swaps(&pRep->accelNumerator, n); swaps(&pRep->accelNumerator, n);
@ -718,7 +718,7 @@ SGetPointerControlReply(ClientPtr pClient, int size, xGetPointerControlReply *pR
void void
SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply *pRep) SGetScreenSaverReply(ClientPtr pClient, int size, xGetScreenSaverReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swaps(&pRep->timeout, n); swaps(&pRep->timeout, n);
@ -734,7 +734,7 @@ SLHostsExtend(ClientPtr pClient, int size, char *buf)
while (bufT < endbuf) { while (bufT < endbuf) {
xHostEntry *host = (xHostEntry *) bufT; xHostEntry *host = (xHostEntry *) bufT;
int len = host->length; int len = host->length;
register char n; char n;
swaps (&host->length, n); swaps (&host->length, n);
bufT += sizeof (xHostEntry) + (((len + 3) >> 2) << 2); bufT += sizeof (xHostEntry) + (((len + 3) >> 2) << 2);
} }
@ -744,7 +744,7 @@ SLHostsExtend(ClientPtr pClient, int size, char *buf)
void void
SListHostsReply(ClientPtr pClient, int size, xListHostsReply *pRep) SListHostsReply(ClientPtr pClient, int size, xListHostsReply *pRep)
{ {
register char n; char n;
swaps(&pRep->sequenceNumber, n); swaps(&pRep->sequenceNumber, n);
swapl(&pRep->length, n); swapl(&pRep->length, n);

276
dix/swapreq.c
View File

@ -63,9 +63,9 @@ SOFTWARE.
/* Byte swap a list of longs */ /* Byte swap a list of longs */
_X_EXPORT void _X_EXPORT void
SwapLongs (register CARD32 *list, register unsigned long count) SwapLongs (CARD32 *list, unsigned long count)
{ {
register char n; char n;
while (count >= 8) { while (count >= 8) {
swapl(list+0, n); swapl(list+0, n);
@ -89,9 +89,9 @@ SwapLongs (register CARD32 *list, register unsigned long count)
/* Byte swap a list of shorts */ /* Byte swap a list of shorts */
_X_EXPORT void _X_EXPORT void
SwapShorts (register short *list, register unsigned long count) SwapShorts (short *list, unsigned long count)
{ {
register char n; char n;
while (count >= 16) { while (count >= 16) {
swaps(list+0, n); swaps(list+0, n);
@ -124,9 +124,9 @@ SwapShorts (register short *list, register unsigned long count)
/* The following is used for all requests that have /* The following is used for all requests that have
no fields to be swapped (except "length") */ no fields to be swapped (except "length") */
int int
SProcSimpleReq(register ClientPtr client) SProcSimpleReq(ClientPtr client)
{ {
register char n; char n;
REQUEST(xReq); REQUEST(xReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -137,9 +137,9 @@ SProcSimpleReq(register ClientPtr client)
only a single 32-bit field to be swapped, coming only a single 32-bit field to be swapped, coming
right after the "length" field */ right after the "length" field */
int int
SProcResourceReq(register ClientPtr client) SProcResourceReq(ClientPtr client)
{ {
register char n; char n;
REQUEST(xResourceReq); REQUEST(xResourceReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -149,9 +149,9 @@ SProcResourceReq(register ClientPtr client)
} }
int int
SProcCreateWindow(register ClientPtr client) SProcCreateWindow(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCreateWindowReq); REQUEST(xCreateWindowReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -171,9 +171,9 @@ SProcCreateWindow(register ClientPtr client)
} }
int int
SProcChangeWindowAttributes(register ClientPtr client) SProcChangeWindowAttributes(ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangeWindowAttributesReq); REQUEST(xChangeWindowAttributesReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -185,9 +185,9 @@ SProcChangeWindowAttributes(register ClientPtr client)
} }
int int
SProcReparentWindow(register ClientPtr client) SProcReparentWindow(ClientPtr client)
{ {
register char n; char n;
REQUEST(xReparentWindowReq); REQUEST(xReparentWindowReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xReparentWindowReq); REQUEST_SIZE_MATCH(xReparentWindowReq);
@ -199,9 +199,9 @@ SProcReparentWindow(register ClientPtr client)
} }
int int
SProcConfigureWindow(register ClientPtr client) SProcConfigureWindow(ClientPtr client)
{ {
register char n; char n;
REQUEST(xConfigureWindowReq); REQUEST(xConfigureWindowReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xConfigureWindowReq); REQUEST_AT_LEAST_SIZE(xConfigureWindowReq);
@ -214,9 +214,9 @@ SProcConfigureWindow(register ClientPtr client)
int int
SProcInternAtom(register ClientPtr client) SProcInternAtom(ClientPtr client)
{ {
register char n; char n;
REQUEST(xInternAtomReq); REQUEST(xInternAtomReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xInternAtomReq); REQUEST_AT_LEAST_SIZE(xInternAtomReq);
@ -225,9 +225,9 @@ SProcInternAtom(register ClientPtr client)
} }
int int
SProcChangeProperty(register ClientPtr client) SProcChangeProperty(ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangePropertyReq); REQUEST(xChangePropertyReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xChangePropertyReq); REQUEST_AT_LEAST_SIZE(xChangePropertyReq);
@ -249,9 +249,9 @@ SProcChangeProperty(register ClientPtr client)
} }
int int
SProcDeleteProperty(register ClientPtr client) SProcDeleteProperty(ClientPtr client)
{ {
register char n; char n;
REQUEST(xDeletePropertyReq); REQUEST(xDeletePropertyReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xDeletePropertyReq); REQUEST_SIZE_MATCH(xDeletePropertyReq);
@ -262,9 +262,9 @@ SProcDeleteProperty(register ClientPtr client)
} }
int int
SProcGetProperty(register ClientPtr client) SProcGetProperty(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGetPropertyReq); REQUEST(xGetPropertyReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGetPropertyReq); REQUEST_SIZE_MATCH(xGetPropertyReq);
@ -277,9 +277,9 @@ SProcGetProperty(register ClientPtr client)
} }
int int
SProcSetSelectionOwner(register ClientPtr client) SProcSetSelectionOwner(ClientPtr client)
{ {
register char n; char n;
REQUEST(xSetSelectionOwnerReq); REQUEST(xSetSelectionOwnerReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xSetSelectionOwnerReq); REQUEST_SIZE_MATCH(xSetSelectionOwnerReq);
@ -290,9 +290,9 @@ SProcSetSelectionOwner(register ClientPtr client)
} }
int int
SProcConvertSelection(register ClientPtr client) SProcConvertSelection(ClientPtr client)
{ {
register char n; char n;
REQUEST(xConvertSelectionReq); REQUEST(xConvertSelectionReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xConvertSelectionReq); REQUEST_SIZE_MATCH(xConvertSelectionReq);
@ -305,9 +305,9 @@ SProcConvertSelection(register ClientPtr client)
} }
int int
SProcSendEvent(register ClientPtr client) SProcSendEvent(ClientPtr client)
{ {
register char n; char n;
xEvent eventT; xEvent eventT;
EventSwapPtr proc; EventSwapPtr proc;
REQUEST(xSendEventReq); REQUEST(xSendEventReq);
@ -327,9 +327,9 @@ SProcSendEvent(register ClientPtr client)
} }
int int
SProcGrabPointer(register ClientPtr client) SProcGrabPointer(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGrabPointerReq); REQUEST(xGrabPointerReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGrabPointerReq); REQUEST_SIZE_MATCH(xGrabPointerReq);
@ -342,9 +342,9 @@ SProcGrabPointer(register ClientPtr client)
} }
int int
SProcGrabButton(register ClientPtr client) SProcGrabButton(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGrabButtonReq); REQUEST(xGrabButtonReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGrabButtonReq); REQUEST_SIZE_MATCH(xGrabButtonReq);
@ -357,9 +357,9 @@ SProcGrabButton(register ClientPtr client)
} }
int int
SProcUngrabButton(register ClientPtr client) SProcUngrabButton(ClientPtr client)
{ {
register char n; char n;
REQUEST(xUngrabButtonReq); REQUEST(xUngrabButtonReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xUngrabButtonReq); REQUEST_SIZE_MATCH(xUngrabButtonReq);
@ -369,9 +369,9 @@ SProcUngrabButton(register ClientPtr client)
} }
int int
SProcChangeActivePointerGrab(register ClientPtr client) SProcChangeActivePointerGrab(ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangeActivePointerGrabReq); REQUEST(xChangeActivePointerGrabReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xChangeActivePointerGrabReq); REQUEST_SIZE_MATCH(xChangeActivePointerGrabReq);
@ -382,9 +382,9 @@ SProcChangeActivePointerGrab(register ClientPtr client)
} }
int int
SProcGrabKeyboard(register ClientPtr client) SProcGrabKeyboard(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGrabKeyboardReq); REQUEST(xGrabKeyboardReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGrabKeyboardReq); REQUEST_SIZE_MATCH(xGrabKeyboardReq);
@ -394,9 +394,9 @@ SProcGrabKeyboard(register ClientPtr client)
} }
int int
SProcGrabKey(register ClientPtr client) SProcGrabKey(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGrabKeyReq); REQUEST(xGrabKeyReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGrabKeyReq); REQUEST_SIZE_MATCH(xGrabKeyReq);
@ -406,9 +406,9 @@ SProcGrabKey(register ClientPtr client)
} }
int int
SProcUngrabKey(register ClientPtr client) SProcUngrabKey(ClientPtr client)
{ {
register char n; char n;
REQUEST(xUngrabKeyReq); REQUEST(xUngrabKeyReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xUngrabKeyReq); REQUEST_SIZE_MATCH(xUngrabKeyReq);
@ -418,9 +418,9 @@ SProcUngrabKey(register ClientPtr client)
} }
int int
SProcGetMotionEvents(register ClientPtr client) SProcGetMotionEvents(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGetMotionEventsReq); REQUEST(xGetMotionEventsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGetMotionEventsReq); REQUEST_SIZE_MATCH(xGetMotionEventsReq);
@ -431,9 +431,9 @@ SProcGetMotionEvents(register ClientPtr client)
} }
int int
SProcTranslateCoords(register ClientPtr client) SProcTranslateCoords(ClientPtr client)
{ {
register char n; char n;
REQUEST(xTranslateCoordsReq); REQUEST(xTranslateCoordsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xTranslateCoordsReq); REQUEST_SIZE_MATCH(xTranslateCoordsReq);
@ -445,9 +445,9 @@ SProcTranslateCoords(register ClientPtr client)
} }
int int
SProcWarpPointer(register ClientPtr client) SProcWarpPointer(ClientPtr client)
{ {
register char n; char n;
REQUEST(xWarpPointerReq); REQUEST(xWarpPointerReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xWarpPointerReq); REQUEST_SIZE_MATCH(xWarpPointerReq);
@ -463,9 +463,9 @@ SProcWarpPointer(register ClientPtr client)
} }
int int
SProcSetInputFocus(register ClientPtr client) SProcSetInputFocus(ClientPtr client)
{ {
register char n; char n;
REQUEST(xSetInputFocusReq); REQUEST(xSetInputFocusReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xSetInputFocusReq); REQUEST_SIZE_MATCH(xSetInputFocusReq);
@ -475,9 +475,9 @@ SProcSetInputFocus(register ClientPtr client)
} }
int int
SProcOpenFont(register ClientPtr client) SProcOpenFont(ClientPtr client)
{ {
register char n; char n;
REQUEST(xOpenFontReq); REQUEST(xOpenFontReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xOpenFontReq); REQUEST_AT_LEAST_SIZE(xOpenFontReq);
@ -487,9 +487,9 @@ SProcOpenFont(register ClientPtr client)
} }
int int
SProcListFonts(register ClientPtr client) SProcListFonts(ClientPtr client)
{ {
register char n; char n;
REQUEST(xListFontsReq); REQUEST(xListFontsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xListFontsReq); REQUEST_AT_LEAST_SIZE(xListFontsReq);
@ -499,9 +499,9 @@ SProcListFonts(register ClientPtr client)
} }
int int
SProcListFontsWithInfo(register ClientPtr client) SProcListFontsWithInfo(ClientPtr client)
{ {
register char n; char n;
REQUEST(xListFontsWithInfoReq); REQUEST(xListFontsWithInfoReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xListFontsWithInfoReq); REQUEST_AT_LEAST_SIZE(xListFontsWithInfoReq);
@ -511,9 +511,9 @@ SProcListFontsWithInfo(register ClientPtr client)
} }
int int
SProcSetFontPath(register ClientPtr client) SProcSetFontPath(ClientPtr client)
{ {
register char n; char n;
REQUEST(xSetFontPathReq); REQUEST(xSetFontPathReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xSetFontPathReq); REQUEST_AT_LEAST_SIZE(xSetFontPathReq);
@ -522,9 +522,9 @@ SProcSetFontPath(register ClientPtr client)
} }
int int
SProcCreatePixmap(register ClientPtr client) SProcCreatePixmap(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCreatePixmapReq); REQUEST(xCreatePixmapReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -537,9 +537,9 @@ SProcCreatePixmap(register ClientPtr client)
} }
int int
SProcCreateGC(register ClientPtr client) SProcCreateGC(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCreateGCReq); REQUEST(xCreateGCReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xCreateGCReq); REQUEST_AT_LEAST_SIZE(xCreateGCReq);
@ -551,9 +551,9 @@ SProcCreateGC(register ClientPtr client)
} }
int int
SProcChangeGC(register ClientPtr client) SProcChangeGC(ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangeGCReq); REQUEST(xChangeGCReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xChangeGCReq); REQUEST_AT_LEAST_SIZE(xChangeGCReq);
@ -564,9 +564,9 @@ SProcChangeGC(register ClientPtr client)
} }
int int
SProcCopyGC(register ClientPtr client) SProcCopyGC(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCopyGCReq); REQUEST(xCopyGCReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCopyGCReq); REQUEST_SIZE_MATCH(xCopyGCReq);
@ -577,9 +577,9 @@ SProcCopyGC(register ClientPtr client)
} }
int int
SProcSetDashes(register ClientPtr client) SProcSetDashes(ClientPtr client)
{ {
register char n; char n;
REQUEST(xSetDashesReq); REQUEST(xSetDashesReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xSetDashesReq); REQUEST_AT_LEAST_SIZE(xSetDashesReq);
@ -591,9 +591,9 @@ SProcSetDashes(register ClientPtr client)
} }
int int
SProcSetClipRectangles(register ClientPtr client) SProcSetClipRectangles(ClientPtr client)
{ {
register char n; char n;
REQUEST(xSetClipRectanglesReq); REQUEST(xSetClipRectanglesReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq); REQUEST_AT_LEAST_SIZE(xSetClipRectanglesReq);
@ -605,9 +605,9 @@ SProcSetClipRectangles(register ClientPtr client)
} }
int int
SProcClearToBackground(register ClientPtr client) SProcClearToBackground(ClientPtr client)
{ {
register char n; char n;
REQUEST(xClearAreaReq); REQUEST(xClearAreaReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xClearAreaReq); REQUEST_SIZE_MATCH(xClearAreaReq);
@ -620,9 +620,9 @@ SProcClearToBackground(register ClientPtr client)
} }
int int
SProcCopyArea(register ClientPtr client) SProcCopyArea(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCopyAreaReq); REQUEST(xCopyAreaReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCopyAreaReq); REQUEST_SIZE_MATCH(xCopyAreaReq);
@ -639,9 +639,9 @@ SProcCopyArea(register ClientPtr client)
} }
int int
SProcCopyPlane(register ClientPtr client) SProcCopyPlane(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCopyPlaneReq); REQUEST(xCopyPlaneReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCopyPlaneReq); REQUEST_SIZE_MATCH(xCopyPlaneReq);
@ -661,9 +661,9 @@ SProcCopyPlane(register ClientPtr client)
/* The following routine is used for all Poly drawing requests /* The following routine is used for all Poly drawing requests
(except FillPoly, which uses a different request format) */ (except FillPoly, which uses a different request format) */
int int
SProcPoly(register ClientPtr client) SProcPoly(ClientPtr client)
{ {
register char n; char n;
REQUEST(xPolyPointReq); REQUEST(xPolyPointReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -678,9 +678,9 @@ SProcPoly(register ClientPtr client)
is longer than xPolyPointReq, and we don't want to swap is longer than xPolyPointReq, and we don't want to swap
the difference as shorts! */ the difference as shorts! */
int int
SProcFillPoly(register ClientPtr client) SProcFillPoly(ClientPtr client)
{ {
register char n; char n;
REQUEST(xFillPolyReq); REQUEST(xFillPolyReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -692,9 +692,9 @@ SProcFillPoly(register ClientPtr client)
} }
int int
SProcPutImage(register ClientPtr client) SProcPutImage(ClientPtr client)
{ {
register char n; char n;
REQUEST(xPutImageReq); REQUEST(xPutImageReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xPutImageReq); REQUEST_AT_LEAST_SIZE(xPutImageReq);
@ -710,9 +710,9 @@ SProcPutImage(register ClientPtr client)
} }
int int
SProcGetImage(register ClientPtr client) SProcGetImage(ClientPtr client)
{ {
register char n; char n;
REQUEST(xGetImageReq); REQUEST(xGetImageReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xGetImageReq); REQUEST_SIZE_MATCH(xGetImageReq);
@ -728,9 +728,9 @@ SProcGetImage(register ClientPtr client)
/* ProcPolyText used for both PolyText8 and PolyText16 */ /* ProcPolyText used for both PolyText8 and PolyText16 */
int int
SProcPolyText(register ClientPtr client) SProcPolyText(ClientPtr client)
{ {
register char n; char n;
REQUEST(xPolyTextReq); REQUEST(xPolyTextReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xPolyTextReq); REQUEST_AT_LEAST_SIZE(xPolyTextReq);
@ -744,9 +744,9 @@ SProcPolyText(register ClientPtr client)
/* ProcImageText used for both ImageText8 and ImageText16 */ /* ProcImageText used for both ImageText8 and ImageText16 */
int int
SProcImageText(register ClientPtr client) SProcImageText(ClientPtr client)
{ {
register char n; char n;
REQUEST(xImageTextReq); REQUEST(xImageTextReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xImageTextReq); REQUEST_AT_LEAST_SIZE(xImageTextReq);
@ -758,9 +758,9 @@ SProcImageText(register ClientPtr client)
} }
int int
SProcCreateColormap(register ClientPtr client) SProcCreateColormap(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCreateColormapReq); REQUEST(xCreateColormapReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCreateColormapReq); REQUEST_SIZE_MATCH(xCreateColormapReq);
@ -772,9 +772,9 @@ SProcCreateColormap(register ClientPtr client)
int int
SProcCopyColormapAndFree(register ClientPtr client) SProcCopyColormapAndFree(ClientPtr client)
{ {
register char n; char n;
REQUEST(xCopyColormapAndFreeReq); REQUEST(xCopyColormapAndFreeReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq); REQUEST_SIZE_MATCH(xCopyColormapAndFreeReq);
@ -785,9 +785,9 @@ SProcCopyColormapAndFree(register ClientPtr client)
} }
int int
SProcAllocColor(register ClientPtr client) SProcAllocColor(ClientPtr client)
{ {
register char n; char n;
REQUEST(xAllocColorReq); REQUEST(xAllocColorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xAllocColorReq); REQUEST_SIZE_MATCH(xAllocColorReq);
@ -799,9 +799,9 @@ SProcAllocColor(register ClientPtr client)
} }
int int
SProcAllocNamedColor(register ClientPtr client) SProcAllocNamedColor(ClientPtr client)
{ {
register char n; char n;
REQUEST(xAllocNamedColorReq); REQUEST(xAllocNamedColorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -812,9 +812,9 @@ SProcAllocNamedColor(register ClientPtr client)
} }
int int
SProcAllocColorCells(register ClientPtr client) SProcAllocColorCells(ClientPtr client)
{ {
register char n; char n;
REQUEST(xAllocColorCellsReq); REQUEST(xAllocColorCellsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xAllocColorCellsReq); REQUEST_SIZE_MATCH(xAllocColorCellsReq);
@ -825,9 +825,9 @@ SProcAllocColorCells(register ClientPtr client)
} }
int int
SProcAllocColorPlanes(register ClientPtr client) SProcAllocColorPlanes(ClientPtr client)
{ {
register char n; char n;
REQUEST(xAllocColorPlanesReq); REQUEST(xAllocColorPlanesReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xAllocColorPlanesReq); REQUEST_SIZE_MATCH(xAllocColorPlanesReq);
@ -840,9 +840,9 @@ SProcAllocColorPlanes(register ClientPtr client)
} }
int int
SProcFreeColors(register ClientPtr client) SProcFreeColors(ClientPtr client)
{ {
register char n; char n;
REQUEST(xFreeColorsReq); REQUEST(xFreeColorsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xFreeColorsReq); REQUEST_AT_LEAST_SIZE(xFreeColorsReq);
@ -856,7 +856,7 @@ SProcFreeColors(register ClientPtr client)
_X_EXPORT void _X_EXPORT void
SwapColorItem(xColorItem *pItem) SwapColorItem(xColorItem *pItem)
{ {
register char n; char n;
swapl(&pItem->pixel, n); swapl(&pItem->pixel, n);
swaps(&pItem->red, n); swaps(&pItem->red, n);
@ -865,9 +865,9 @@ SwapColorItem(xColorItem *pItem)
} }
int int
SProcStoreColors(register ClientPtr client) SProcStoreColors(ClientPtr client)
{ {
register char n; char n;
long count; long count;
xColorItem *pItem; xColorItem *pItem;
@ -882,9 +882,9 @@ SProcStoreColors(register ClientPtr client)
} }
int int
SProcStoreNamedColor (register ClientPtr client) SProcStoreNamedColor (ClientPtr client)
{ {
register char n; char n;
REQUEST(xStoreNamedColorReq); REQUEST(xStoreNamedColorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xStoreNamedColorReq); REQUEST_AT_LEAST_SIZE(xStoreNamedColorReq);
@ -895,9 +895,9 @@ SProcStoreNamedColor (register ClientPtr client)
} }
int int
SProcQueryColors (register ClientPtr client) SProcQueryColors (ClientPtr client)
{ {
register char n; char n;
REQUEST(xQueryColorsReq); REQUEST(xQueryColorsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xQueryColorsReq); REQUEST_AT_LEAST_SIZE(xQueryColorsReq);
@ -907,9 +907,9 @@ SProcQueryColors (register ClientPtr client)
} }
int int
SProcLookupColor (register ClientPtr client) SProcLookupColor (ClientPtr client)
{ {
register char n; char n;
REQUEST(xLookupColorReq); REQUEST(xLookupColorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xLookupColorReq); REQUEST_AT_LEAST_SIZE(xLookupColorReq);
@ -919,9 +919,9 @@ SProcLookupColor (register ClientPtr client)
} }
int int
SProcCreateCursor (register ClientPtr client) SProcCreateCursor (ClientPtr client)
{ {
register char n; char n;
REQUEST(xCreateCursorReq); REQUEST(xCreateCursorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCreateCursorReq); REQUEST_SIZE_MATCH(xCreateCursorReq);
@ -940,9 +940,9 @@ SProcCreateCursor (register ClientPtr client)
} }
int int
SProcCreateGlyphCursor (register ClientPtr client) SProcCreateGlyphCursor (ClientPtr client)
{ {
register char n; char n;
REQUEST(xCreateGlyphCursorReq); REQUEST(xCreateGlyphCursorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xCreateGlyphCursorReq); REQUEST_SIZE_MATCH(xCreateGlyphCursorReq);
@ -962,9 +962,9 @@ SProcCreateGlyphCursor (register ClientPtr client)
int int
SProcRecolorCursor (register ClientPtr client) SProcRecolorCursor (ClientPtr client)
{ {
register char n; char n;
REQUEST(xRecolorCursorReq); REQUEST(xRecolorCursorReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xRecolorCursorReq); REQUEST_SIZE_MATCH(xRecolorCursorReq);
@ -979,9 +979,9 @@ SProcRecolorCursor (register ClientPtr client)
} }
int int
SProcQueryBestSize (register ClientPtr client) SProcQueryBestSize (ClientPtr client)
{ {
register char n; char n;
REQUEST(xQueryBestSizeReq); REQUEST(xQueryBestSizeReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xQueryBestSizeReq); REQUEST_SIZE_MATCH(xQueryBestSizeReq);
@ -993,9 +993,9 @@ SProcQueryBestSize (register ClientPtr client)
} }
int int
SProcQueryExtension (register ClientPtr client) SProcQueryExtension (ClientPtr client)
{ {
register char n; char n;
REQUEST(xQueryExtensionReq); REQUEST(xQueryExtensionReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xQueryExtensionReq); REQUEST_AT_LEAST_SIZE(xQueryExtensionReq);
@ -1004,9 +1004,9 @@ SProcQueryExtension (register ClientPtr client)
} }
int int
SProcChangeKeyboardMapping (register ClientPtr client) SProcChangeKeyboardMapping (ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangeKeyboardMappingReq); REQUEST(xChangeKeyboardMappingReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq); REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq);
@ -1016,9 +1016,9 @@ SProcChangeKeyboardMapping (register ClientPtr client)
int int
SProcChangeKeyboardControl (register ClientPtr client) SProcChangeKeyboardControl (ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangeKeyboardControlReq); REQUEST(xChangeKeyboardControlReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xChangeKeyboardControlReq); REQUEST_AT_LEAST_SIZE(xChangeKeyboardControlReq);
@ -1028,9 +1028,9 @@ SProcChangeKeyboardControl (register ClientPtr client)
} }
int int
SProcChangePointerControl (register ClientPtr client) SProcChangePointerControl (ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangePointerControlReq); REQUEST(xChangePointerControlReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xChangePointerControlReq); REQUEST_SIZE_MATCH(xChangePointerControlReq);
@ -1042,9 +1042,9 @@ SProcChangePointerControl (register ClientPtr client)
int int
SProcSetScreenSaver (register ClientPtr client) SProcSetScreenSaver (ClientPtr client)
{ {
register char n; char n;
REQUEST(xSetScreenSaverReq); REQUEST(xSetScreenSaverReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_SIZE_MATCH(xSetScreenSaverReq); REQUEST_SIZE_MATCH(xSetScreenSaverReq);
@ -1054,9 +1054,9 @@ SProcSetScreenSaver (register ClientPtr client)
} }
int int
SProcChangeHosts (register ClientPtr client) SProcChangeHosts (ClientPtr client)
{ {
register char n; char n;
REQUEST(xChangeHostsReq); REQUEST(xChangeHostsReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
@ -1066,9 +1066,9 @@ SProcChangeHosts (register ClientPtr client)
} }
int SProcRotateProperties (register ClientPtr client) int SProcRotateProperties (ClientPtr client)
{ {
register char n; char n;
REQUEST(xRotatePropertiesReq); REQUEST(xRotatePropertiesReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
REQUEST_AT_LEAST_SIZE(xRotatePropertiesReq); REQUEST_AT_LEAST_SIZE(xRotatePropertiesReq);
@ -1080,9 +1080,9 @@ int SProcRotateProperties (register ClientPtr client)
} }
int int
SProcNoOperation(register ClientPtr client) SProcNoOperation(ClientPtr client)
{ {
register char n; char n;
REQUEST(xReq); REQUEST(xReq);
swaps(&stuff->length, n); swaps(&stuff->length, n);
return ((* ProcVector[X_NoOperation])(client)); return ((* ProcVector[X_NoOperation])(client));
@ -1091,7 +1091,7 @@ SProcNoOperation(register ClientPtr client)
void void
SwapConnClientPrefix(xConnClientPrefix *pCCP) SwapConnClientPrefix(xConnClientPrefix *pCCP)
{ {
register char n; char n;
swaps(&pCCP->majorVersion, n); swaps(&pCCP->majorVersion, n);
swaps(&pCCP->minorVersion, n); swaps(&pCCP->minorVersion, n);

192
dix/window.c
View File

@ -220,10 +220,10 @@ PrintWindowTree(void)
#endif #endif
_X_EXPORT int _X_EXPORT int
TraverseTree(register WindowPtr pWin, VisitWindowProcPtr func, pointer data) TraverseTree(WindowPtr pWin, VisitWindowProcPtr func, pointer data)
{ {
register int result; int result;
register WindowPtr pChild; WindowPtr pChild;
if (!(pChild = pWin)) if (!(pChild = pWin))
return(WT_NOMATCH); return(WT_NOMATCH);
@ -269,7 +269,7 @@ Bool enableBackingStore = FALSE;
Bool disableSaveUnders = FALSE; Bool disableSaveUnders = FALSE;
static void static void
SetWindowToDefaults(register WindowPtr pWin) SetWindowToDefaults(WindowPtr pWin)
{ {
pWin->prevSib = NullWindow; pWin->prevSib = NullWindow;
pWin->firstChild = NullWindow; pWin->firstChild = NullWindow;
@ -313,8 +313,8 @@ MakeRootTile(WindowPtr pWin)
GCPtr pGC; GCPtr pGC;
unsigned char back[128]; unsigned char back[128];
int len = BitmapBytePad(sizeof(long)); int len = BitmapBytePad(sizeof(long));
register unsigned char *from, *to; unsigned char *from, *to;
register int i, j; int i, j;
pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4, pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4,
pScreen->rootDepth); pScreen->rootDepth);
@ -353,11 +353,11 @@ WindowPtr
AllocateWindow(ScreenPtr pScreen) AllocateWindow(ScreenPtr pScreen)
{ {
WindowPtr pWin; WindowPtr pWin;
register char *ptr; char *ptr;
register DevUnion *ppriv; DevUnion *ppriv;
register unsigned *sizes; unsigned *sizes;
register unsigned size; unsigned size;
register int i; int i;
pWin = (WindowPtr)xalloc(pScreen->totalWindowSize); pWin = (WindowPtr)xalloc(pScreen->totalWindowSize);
if (pWin) if (pWin)
@ -540,9 +540,9 @@ InitRootWindow(WindowPtr pWin)
*/ */
void void
ClippedRegionFromBox(register WindowPtr pWin, RegionPtr Rgn, ClippedRegionFromBox(WindowPtr pWin, RegionPtr Rgn,
register int x, register int y, int x, int y,
register int w, register int h) int w, int h)
{ {
ScreenPtr pScreen; ScreenPtr pScreen;
BoxRec box; BoxRec box;
@ -579,7 +579,7 @@ RegisterRealChildHeadProc (RealChildHeadProc proc)
WindowPtr WindowPtr
RealChildHead(register WindowPtr pWin) RealChildHead(WindowPtr pWin)
{ {
if (realChildHeadProc) { if (realChildHeadProc) {
return realChildHeadProc (pWin); return realChildHeadProc (pWin);
@ -599,19 +599,19 @@ RealChildHead(register WindowPtr pWin)
*****/ *****/
_X_EXPORT WindowPtr _X_EXPORT WindowPtr
CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w, CreateWindow(Window wid, WindowPtr pParent, int x, int y, unsigned w,
unsigned h, unsigned bw, unsigned class, register Mask vmask, XID *vlist, unsigned h, unsigned bw, unsigned class, Mask vmask, XID *vlist,
int depth, ClientPtr client, VisualID visual, int *error) int depth, ClientPtr client, VisualID visual, int *error)
{ {
register WindowPtr pWin; WindowPtr pWin;
WindowPtr pHead; WindowPtr pHead;
register ScreenPtr pScreen; ScreenPtr pScreen;
xEvent event; xEvent event;
int idepth, ivisual; int idepth, ivisual;
Bool fOK; Bool fOK;
DepthPtr pDepth; DepthPtr pDepth;
PixmapFormatRec *format; PixmapFormatRec *format;
register WindowOptPtr ancwopt; WindowOptPtr ancwopt;
if (class == CopyFromParent) if (class == CopyFromParent)
class = pParent->drawable.class; class = pParent->drawable.class;
@ -836,9 +836,9 @@ CreateWindow(Window wid, register WindowPtr pParent, int x, int y, unsigned w,
} }
static void static void
FreeWindowResources(register WindowPtr pWin) FreeWindowResources(WindowPtr pWin)
{ {
register ScreenPtr pScreen = pWin->drawable.pScreen; ScreenPtr pScreen = pWin->drawable.pScreen;
DeleteWindowFromAnySaveSet(pWin); DeleteWindowFromAnySaveSet(pWin);
DeleteWindowFromAnySelections(pWin); DeleteWindowFromAnySelections(pWin);
@ -869,7 +869,7 @@ FreeWindowResources(register WindowPtr pWin)
static void static void
CrushTree(WindowPtr pWin) CrushTree(WindowPtr pWin)
{ {
register WindowPtr pChild, pSib, pParent; WindowPtr pChild, pSib, pParent;
UnrealizeWindowProcPtr UnrealizeWindow; UnrealizeWindowProcPtr UnrealizeWindow;
xEvent event; xEvent event;
@ -926,8 +926,8 @@ CrushTree(WindowPtr pWin)
int int
DeleteWindow(pointer value, XID wid) DeleteWindow(pointer value, XID wid)
{ {
register WindowPtr pParent; WindowPtr pParent;
register WindowPtr pWin = (WindowPtr)value; WindowPtr pWin = (WindowPtr)value;
xEvent event; xEvent event;
UnmapWindow(pWin, FALSE); UnmapWindow(pWin, FALSE);
@ -959,7 +959,7 @@ DeleteWindow(pointer value, XID wid)
} }
void void
DestroySubwindows(register WindowPtr pWin, ClientPtr client) DestroySubwindows(WindowPtr pWin, ClientPtr client)
{ {
/* XXX /* XXX
* The protocol is quite clear that each window should be * The protocol is quite clear that each window should be
@ -986,10 +986,10 @@ DestroySubwindows(register WindowPtr pWin, ClientPtr client)
*****/ *****/
_X_EXPORT int _X_EXPORT int
ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client) ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
{ {
register Mask index2; Mask index2;
register XID *pVlist; XID *pVlist;
PixmapPtr pPixmap; PixmapPtr pPixmap;
Pixmap pixID; Pixmap pixID;
CursorPtr pCursor, pOldCursor; CursorPtr pCursor, pOldCursor;
@ -999,9 +999,9 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt
ColormapPtr pCmap; ColormapPtr pCmap;
xEvent xE; xEvent xE;
int result; int result;
register ScreenPtr pScreen; ScreenPtr pScreen;
Mask vmaskCopy = 0; Mask vmaskCopy = 0;
register Mask tmask; Mask tmask;
unsigned int val; unsigned int val;
int error; int error;
Bool checkOptional = FALSE; Bool checkOptional = FALSE;
@ -1520,7 +1520,7 @@ PatchUp:
*****/ *****/
void void
GetWindowAttributes(register WindowPtr pWin, ClientPtr client, xGetWindowAttributesReply *wa) GetWindowAttributes(WindowPtr pWin, ClientPtr client, xGetWindowAttributesReply *wa)
{ {
wa->type = X_Reply; wa->type = X_Reply;
wa->bitGravity = pWin->bitGravity; wa->bitGravity = pWin->bitGravity;
@ -1556,9 +1556,9 @@ GetWindowAttributes(register WindowPtr pWin, ClientPtr client, xGetWindowAttribu
_X_EXPORT WindowPtr _X_EXPORT WindowPtr
MoveWindowInStack(register WindowPtr pWin, register WindowPtr pNextSib) MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib)
{ {
register WindowPtr pParent = pWin->parent; WindowPtr pParent = pWin->parent;
WindowPtr pFirstChange = pWin; /* highest window where list changes */ WindowPtr pFirstChange = pWin; /* highest window where list changes */
if (pWin->nextSib != pNextSib) if (pWin->nextSib != pNextSib)
@ -1640,7 +1640,7 @@ MoveWindowInStack(register WindowPtr pWin, register WindowPtr pNextSib)
} }
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
CreateUnclippedWinSize (register WindowPtr pWin) CreateUnclippedWinSize (WindowPtr pWin)
{ {
RegionPtr pRgn; RegionPtr pRgn;
BoxRec box; BoxRec box;
@ -1668,7 +1668,7 @@ CreateUnclippedWinSize (register WindowPtr pWin)
} }
_X_EXPORT void _X_EXPORT void
SetWinSize (register WindowPtr pWin) SetWinSize (WindowPtr pWin)
{ {
#ifdef COMPOSITE #ifdef COMPOSITE
if (pWin->redirectDraw) if (pWin->redirectDraw)
@ -1707,7 +1707,7 @@ SetWinSize (register WindowPtr pWin)
} }
_X_EXPORT void _X_EXPORT void
SetBorderSize (register WindowPtr pWin) SetBorderSize (WindowPtr pWin)
{ {
int bw; int bw;
@ -1759,9 +1759,9 @@ SetBorderSize (register WindowPtr pWin)
*/ */
_X_EXPORT void _X_EXPORT void
GravityTranslate (register int x, register int y, int oldx, int oldy, GravityTranslate (int x, int y, int oldx, int oldy,
int dw, int dh, unsigned gravity, int dw, int dh, unsigned gravity,
register int *destx, register int *desty) int *destx, int *desty)
{ {
switch (gravity) { switch (gravity) {
case NorthGravity: case NorthGravity:
@ -1809,10 +1809,10 @@ GravityTranslate (register int x, register int y, int oldx, int oldy,
/* XXX need to retile border on each window with ParentRelative origin */ /* XXX need to retile border on each window with ParentRelative origin */
_X_EXPORT void _X_EXPORT void
ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh) ResizeChildrenWinSize(WindowPtr pWin, int dx, int dy, int dw, int dh)
{ {
register ScreenPtr pScreen; ScreenPtr pScreen;
register WindowPtr pSib, pChild; WindowPtr pSib, pChild;
Bool resized = (dw || dh); Bool resized = (dw || dh);
pScreen = pWin->drawable.pScreen; pScreen = pWin->drawable.pScreen;
@ -1904,10 +1904,10 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
static int static int
IsSiblingAboveMe( IsSiblingAboveMe(
register WindowPtr pMe, WindowPtr pMe,
register WindowPtr pSib) WindowPtr pSib)
{ {
register WindowPtr pWin; WindowPtr pWin;
pWin = pMe->parent->firstChild; pWin = pMe->parent->firstChild;
while (pWin) while (pWin)
@ -1923,8 +1923,8 @@ IsSiblingAboveMe(
static BoxPtr static BoxPtr
WindowExtents( WindowExtents(
register WindowPtr pWin, WindowPtr pWin,
register BoxPtr pBox) BoxPtr pBox)
{ {
pBox->x1 = pWin->drawable.x - wBorderWidth (pWin); pBox->x1 = pWin->drawable.x - wBorderWidth (pWin);
pBox->y1 = pWin->drawable.y - wBorderWidth (pWin); pBox->y1 = pWin->drawable.y - wBorderWidth (pWin);
@ -1940,7 +1940,7 @@ WindowExtents(
static RegionPtr static RegionPtr
MakeBoundingRegion ( MakeBoundingRegion (
register WindowPtr pWin, WindowPtr pWin,
BoxPtr pBox) BoxPtr pBox)
{ {
RegionPtr pRgn; RegionPtr pRgn;
@ -1966,7 +1966,7 @@ ShapeOverlap (
BoxPtr pSibBox) BoxPtr pSibBox)
{ {
RegionPtr pWinRgn, pSibRgn; RegionPtr pWinRgn, pSibRgn;
register ScreenPtr pScreen; ScreenPtr pScreen;
Bool ret; Bool ret;
if (!IS_SHAPED(pWin) && !IS_SHAPED(pSib)) if (!IS_SHAPED(pWin) && !IS_SHAPED(pSib))
@ -1986,11 +1986,11 @@ static Bool
AnyWindowOverlapsMe( AnyWindowOverlapsMe(
WindowPtr pWin, WindowPtr pWin,
WindowPtr pHead, WindowPtr pHead,
register BoxPtr box) BoxPtr box)
{ {
register WindowPtr pSib; WindowPtr pSib;
BoxRec sboxrec; BoxRec sboxrec;
register BoxPtr sbox; BoxPtr sbox;
for (pSib = pWin->prevSib; pSib != pHead; pSib = pSib->prevSib) for (pSib = pWin->prevSib; pSib != pHead; pSib = pSib->prevSib)
{ {
@ -2011,11 +2011,11 @@ AnyWindowOverlapsMe(
static Bool static Bool
IOverlapAnyWindow( IOverlapAnyWindow(
WindowPtr pWin, WindowPtr pWin,
register BoxPtr box) BoxPtr box)
{ {
register WindowPtr pSib; WindowPtr pSib;
BoxRec sboxrec; BoxRec sboxrec;
register BoxPtr sbox; BoxPtr sbox;
for (pSib = pWin->nextSib; pSib; pSib = pSib->nextSib) for (pSib = pWin->nextSib; pSib; pSib = pSib->nextSib)
{ {
@ -2063,8 +2063,8 @@ IOverlapAnyWindow(
static WindowPtr static WindowPtr
WhereDoIGoInTheStack( WhereDoIGoInTheStack(
register WindowPtr pWin, WindowPtr pWin,
register WindowPtr pSib, WindowPtr pSib,
short x, short x,
short y, short y,
unsigned short w, unsigned short w,
@ -2072,7 +2072,7 @@ WhereDoIGoInTheStack(
int smode) int smode)
{ {
BoxRec box; BoxRec box;
register ScreenPtr pScreen; ScreenPtr pScreen;
WindowPtr pHead, pFirst; WindowPtr pHead, pFirst;
if ((pWin == pWin->parent->firstChild) && if ((pWin == pWin->parent->firstChild) &&
@ -2169,8 +2169,8 @@ WhereDoIGoInTheStack(
static void static void
ReflectStackChange( ReflectStackChange(
register WindowPtr pWin, WindowPtr pWin,
register WindowPtr pSib, WindowPtr pSib,
VTKind kind) VTKind kind)
{ {
/* Note that pSib might be NULL */ /* Note that pSib might be NULL */
@ -2222,17 +2222,17 @@ ReflectStackChange(
*****/ *****/
int int
ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientPtr client) ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
{ {
#define RESTACK_WIN 0 #define RESTACK_WIN 0
#define MOVE_WIN 1 #define MOVE_WIN 1
#define RESIZE_WIN 2 #define RESIZE_WIN 2
#define REBORDER_WIN 3 #define REBORDER_WIN 3
register WindowPtr pSib = NullWindow; WindowPtr pSib = NullWindow;
register WindowPtr pParent = pWin->parent; WindowPtr pParent = pWin->parent;
Window sibwid = 0; Window sibwid = 0;
Mask index2, tmask; Mask index2, tmask;
register XID *pVlist; XID *pVlist;
short x, y, beforeX, beforeY; short x, y, beforeX, beforeY;
unsigned short w = pWin->drawable.width, unsigned short w = pWin->drawable.width,
h = pWin->drawable.height, h = pWin->drawable.height,
@ -2509,7 +2509,7 @@ ActuallyDoSomething:
int int
CirculateWindow(WindowPtr pParent, int direction, ClientPtr client) CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
{ {
register WindowPtr pWin, pHead, pFirst; WindowPtr pWin, pHead, pFirst;
xEvent event; xEvent event;
BoxRec box; BoxRec box;
@ -2579,14 +2579,14 @@ CompareWIDs(
*****/ *****/
int int
ReparentWindow(register WindowPtr pWin, register WindowPtr pParent, ReparentWindow(WindowPtr pWin, WindowPtr pParent,
int x, int y, ClientPtr client) int x, int y, ClientPtr client)
{ {
WindowPtr pPrev, pPriorParent; WindowPtr pPrev, pPriorParent;
Bool WasMapped = (Bool)(pWin->mapped); Bool WasMapped = (Bool)(pWin->mapped);
xEvent event; xEvent event;
int bw = wBorderWidth (pWin); int bw = wBorderWidth (pWin);
register ScreenPtr pScreen; ScreenPtr pScreen;
pScreen = pWin->drawable.pScreen; pScreen = pWin->drawable.pScreen;
if (TraverseTree(pWin, CompareWIDs, (pointer)&pParent->drawable.id) == WT_STOPWALKING) if (TraverseTree(pWin, CompareWIDs, (pointer)&pParent->drawable.id) == WT_STOPWALKING)
@ -2673,7 +2673,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
static void static void
RealizeTree(WindowPtr pWin) RealizeTree(WindowPtr pWin)
{ {
register WindowPtr pChild; WindowPtr pChild;
RealizeWindowProcPtr Realize; RealizeWindowProcPtr Realize;
Realize = pWin->drawable.pScreen->RealizeWindow; Realize = pWin->drawable.pScreen->RealizeWindow;
@ -2712,11 +2712,11 @@ RealizeTree(WindowPtr pWin)
*****/ *****/
_X_EXPORT int _X_EXPORT int
MapWindow(register WindowPtr pWin, ClientPtr client) MapWindow(WindowPtr pWin, ClientPtr client)
{ {
register ScreenPtr pScreen; ScreenPtr pScreen;
register WindowPtr pParent; WindowPtr pParent;
#ifdef DO_SAVE_UNDERS #ifdef DO_SAVE_UNDERS
Bool dosave = FALSE; Bool dosave = FALSE;
#endif #endif
@ -2832,16 +2832,16 @@ MapWindow(register WindowPtr pWin, ClientPtr client)
*****/ *****/
void void
MapSubwindows(register WindowPtr pParent, ClientPtr client) MapSubwindows(WindowPtr pParent, ClientPtr client)
{ {
register WindowPtr pWin; WindowPtr pWin;
WindowPtr pFirstMapped = NullWindow; WindowPtr pFirstMapped = NullWindow;
#ifdef DO_SAVE_UNDERS #ifdef DO_SAVE_UNDERS
WindowPtr pFirstSaveUndered = NullWindow; WindowPtr pFirstSaveUndered = NullWindow;
#endif #endif
register ScreenPtr pScreen; ScreenPtr pScreen;
register Mask parentRedirect; Mask parentRedirect;
register Mask parentNotify; Mask parentNotify;
xEvent event; xEvent event;
Bool anyMarked; Bool anyMarked;
#ifdef DO_SAVE_UNDERS #ifdef DO_SAVE_UNDERS
@ -2952,7 +2952,7 @@ UnrealizeTree(
WindowPtr pWin, WindowPtr pWin,
Bool fromConfigure) Bool fromConfigure)
{ {
register WindowPtr pChild; WindowPtr pChild;
UnrealizeWindowProcPtr Unrealize; UnrealizeWindowProcPtr Unrealize;
MarkUnrealizedWindowProcPtr MarkUnrealizedWindow; MarkUnrealizedWindowProcPtr MarkUnrealizedWindow;
@ -3011,9 +3011,9 @@ UnrealizeTree(
*****/ *****/
_X_EXPORT int _X_EXPORT int
UnmapWindow(register WindowPtr pWin, Bool fromConfigure) UnmapWindow(WindowPtr pWin, Bool fromConfigure)
{ {
register WindowPtr pParent; WindowPtr pParent;
xEvent event; xEvent event;
Bool wasRealized = (Bool)pWin->realized; Bool wasRealized = (Bool)pWin->realized;
Bool wasViewable = (Bool)pWin->viewable; Bool wasViewable = (Bool)pWin->viewable;
@ -3070,9 +3070,9 @@ UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
*****/ *****/
void void
UnmapSubwindows(register WindowPtr pWin) UnmapSubwindows(WindowPtr pWin)
{ {
register WindowPtr pChild, pHead; WindowPtr pChild, pHead;
xEvent event; xEvent event;
Bool wasRealized = (Bool)pWin->realized; Bool wasRealized = (Bool)pWin->realized;
Bool wasViewable = (Bool)pWin->viewable; Bool wasViewable = (Bool)pWin->viewable;
@ -3161,10 +3161,10 @@ UnmapSubwindows(register WindowPtr pWin)
void void
HandleSaveSet(register ClientPtr client) HandleSaveSet(ClientPtr client)
{ {
register WindowPtr pParent, pWin; WindowPtr pParent, pWin;
register int j; int j;
for (j=0; j<client->numSaved; j++) for (j=0; j<client->numSaved; j++)
{ {
@ -3207,7 +3207,7 @@ HandleSaveSet(register ClientPtr client)
* \param box "return" value * \param box "return" value
*/ */
Bool Bool
VisibleBoundingBoxFromPoint(register WindowPtr pWin, int x, int y, BoxPtr box) VisibleBoundingBoxFromPoint(WindowPtr pWin, int x, int y, BoxPtr box)
{ {
if (!pWin->realized) if (!pWin->realized)
return (FALSE); return (FALSE);
@ -3221,7 +3221,7 @@ VisibleBoundingBoxFromPoint(register WindowPtr pWin, int x, int y, BoxPtr box)
* \param x,y in root * \param x,y in root
*/ */
Bool Bool
PointInWindowIsVisible(register WindowPtr pWin, int x, int y) PointInWindowIsVisible(WindowPtr pWin, int x, int y)
{ {
BoxRec box; BoxRec box;
@ -3240,9 +3240,9 @@ PointInWindowIsVisible(register WindowPtr pWin, int x, int y)
_X_EXPORT RegionPtr _X_EXPORT RegionPtr
NotClippedByChildren(register WindowPtr pWin) NotClippedByChildren(WindowPtr pWin)
{ {
register ScreenPtr pScreen; ScreenPtr pScreen;
RegionPtr pReg; RegionPtr pReg;
pScreen = pWin->drawable.pScreen; pScreen = pWin->drawable.pScreen;
@ -3588,7 +3588,7 @@ TileScreenSaver(int i, int kind)
*/ */
_X_EXPORT WindowPtr _X_EXPORT WindowPtr
FindWindowWithOptional (register WindowPtr w) FindWindowWithOptional (WindowPtr w)
{ {
do do
w = w->parent; w = w->parent;
@ -3605,10 +3605,10 @@ FindWindowWithOptional (register WindowPtr w)
*/ */
_X_EXPORT void _X_EXPORT void
CheckWindowOptionalNeed (register WindowPtr w) CheckWindowOptionalNeed (WindowPtr w)
{ {
register WindowOptPtr optional; WindowOptPtr optional;
register WindowOptPtr parentOptional; WindowOptPtr parentOptional;
if (!w->parent) if (!w->parent)
return; return;
@ -3659,10 +3659,10 @@ CheckWindowOptionalNeed (register WindowPtr w)
*/ */
_X_EXPORT Bool _X_EXPORT Bool
MakeWindowOptional (register WindowPtr pWin) MakeWindowOptional (WindowPtr pWin)
{ {
register WindowOptPtr optional; WindowOptPtr optional;
register WindowOptPtr parentOptional; WindowOptPtr parentOptional;
if (pWin->optional) if (pWin->optional)
return TRUE; return TRUE;
@ -3701,7 +3701,7 @@ MakeWindowOptional (register WindowPtr pWin)
} }
void void
DisposeWindowOptional (register WindowPtr pWin) DisposeWindowOptional (WindowPtr pWin)
{ {
if (!pWin->optional) if (!pWin->optional)
return; return;