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

ANSIfy Xi/. Mostly automated via protoize(1).

This commit is contained in:
Adam Jackson 2006-02-20 21:50:49 +00:00
parent cc42e153c2
commit 5480c537ce
39 changed files with 362 additions and 690 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ChangeLog
View File

@ -1,3 +1,45 @@
2006-02-21 Adam Jackson <ajax@freedesktop.org>
* Xi/allowev.c:
* Xi/chgdctl.c:
* Xi/chgfctl.c:
* Xi/chgkbd.c:
* Xi/chgkmap.c:
* Xi/chgprop.c:
* Xi/chgptr.c:
* Xi/closedev.c:
* Xi/devbell.c:
* Xi/exevents.c:
* Xi/extinit.c:
* Xi/getbmap.c:
* Xi/getdctl.c:
* Xi/getfctl.c:
* Xi/getfocus.c:
* Xi/getkmap.c:
* Xi/getmmap.c:
* Xi/getprop.c:
* Xi/getselev.c:
* Xi/getvers.c:
* Xi/grabdev.c:
* Xi/grabdevb.c:
* Xi/grabdevk.c:
* Xi/gtmotion.c:
* Xi/listdev.c:
* Xi/opendev.c:
* Xi/queryst.c:
* Xi/selectev.c:
* Xi/sendexev.c:
* Xi/setbmap.c:
* Xi/setdval.c:
* Xi/setfocus.c:
* Xi/setmmap.c:
* Xi/setmode.c:
* Xi/stubs.c:
* Xi/ungrdev.c:
* Xi/ungrdevb.c:
* Xi/ungrdevk.c:
ANSIfy Xi/. Mostly automated via protoize(1).
2006-02-16 Eric Anholt <anholt@FreeBSD.org> 2006-02-16 Eric Anholt <anholt@FreeBSD.org>
* Xext/Makefile.am: * Xext/Makefile.am:

10
Xi/allowev.c
View File

@ -79,9 +79,8 @@ SOFTWARE.
*/ */
int int
SProcXAllowDeviceEvents(client) SProcXAllowDeviceEvents(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xAllowDeviceEventsReq); REQUEST(xAllowDeviceEventsReq);
@ -98,9 +97,8 @@ SProcXAllowDeviceEvents(client)
*/ */
int int
ProcXAllowDeviceEvents(client) ProcXAllowDeviceEvents(register ClientPtr client)
register ClientPtr client; {
{
TimeStamp time; TimeStamp time;
DeviceIntPtr thisdev; DeviceIntPtr thisdev;

17
Xi/chgdctl.c
View File

@ -80,9 +80,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeDeviceControl(client) SProcXChangeDeviceControl(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xChangeDeviceControlReq); REQUEST(xChangeDeviceControlReq);
@ -99,9 +98,8 @@ SProcXChangeDeviceControl(client)
*/ */
int int
ProcXChangeDeviceControl(client) ProcXChangeDeviceControl(ClientPtr client)
ClientPtr client; {
{
unsigned len; unsigned len;
int i, status; int i, status;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -205,11 +203,8 @@ ProcXChangeDeviceControl(client)
*/ */
void void
SRepXChangeDeviceControl (client, size, rep) SRepXChangeDeviceControl (ClientPtr client, int size, xChangeDeviceControlReply *rep)
ClientPtr client; {
int size;
xChangeDeviceControlReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

64
Xi/chgfctl.c
View File

@ -81,9 +81,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeFeedbackControl(client) SProcXChangeFeedbackControl(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xChangeFeedbackControlReq); REQUEST(xChangeFeedbackControlReq);
@ -100,9 +99,8 @@ SProcXChangeFeedbackControl(client)
*/ */
int int
ProcXChangeFeedbackControl(client) ProcXChangeFeedbackControl(ClientPtr client)
ClientPtr client; {
{
unsigned len; unsigned len;
DeviceIntPtr dev; DeviceIntPtr dev;
KbdFeedbackPtr k; KbdFeedbackPtr k;
@ -233,13 +231,8 @@ ProcXChangeFeedbackControl(client)
*/ */
int int
ChangeKbdFeedback (client, dev, mask, k, f) ChangeKbdFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, KbdFeedbackPtr k, xKbdFeedbackCtl *f)
ClientPtr client; {
DeviceIntPtr dev;
unsigned long mask;
KbdFeedbackPtr k;
xKbdFeedbackCtl *f;
{
register char n; register char n;
KeybdCtrl kctrl; KeybdCtrl kctrl;
int t; int t;
@ -389,13 +382,8 @@ ChangeKbdFeedback (client, dev, mask, k, f)
*/ */
int int
ChangePtrFeedback (client, dev, mask, p, f) ChangePtrFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, PtrFeedbackPtr p, xPtrFeedbackCtl *f)
ClientPtr client; {
DeviceIntPtr dev;
unsigned long mask;
PtrFeedbackPtr p;
xPtrFeedbackCtl *f;
{
register char n; register char n;
PtrCtrl pctrl; /* might get BadValue part way through */ PtrCtrl pctrl; /* might get BadValue part way through */
@ -471,13 +459,8 @@ ChangePtrFeedback (client, dev, mask, p, f)
*/ */
int int
ChangeIntegerFeedback (client, dev, mask, i, f) ChangeIntegerFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, IntegerFeedbackPtr i, xIntegerFeedbackCtl *f)
ClientPtr client; {
DeviceIntPtr dev;
unsigned long mask;
IntegerFeedbackPtr i;
xIntegerFeedbackCtl *f;
{
register char n; register char n;
if (client->swapped) if (client->swapped)
@ -498,13 +481,8 @@ ChangeIntegerFeedback (client, dev, mask, i, f)
*/ */
int int
ChangeStringFeedback (client, dev, mask, s, f) ChangeStringFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, StringFeedbackPtr s, xStringFeedbackCtl *f)
ClientPtr client; {
DeviceIntPtr dev;
unsigned long mask;
StringFeedbackPtr s;
xStringFeedbackCtl *f;
{
register char n; register char n;
register long *p; register long *p;
int i, j; int i, j;
@ -556,13 +534,8 @@ ChangeStringFeedback (client, dev, mask, s, f)
*/ */
int int
ChangeBellFeedback (client, dev, mask, b, f) ChangeBellFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, BellFeedbackPtr b, xBellFeedbackCtl *f)
ClientPtr client; {
DeviceIntPtr dev;
unsigned long mask;
BellFeedbackPtr b;
xBellFeedbackCtl *f;
{
register char n; register char n;
int t; int t;
BellCtrl bctrl; /* might get BadValue part way through */ BellCtrl bctrl; /* might get BadValue part way through */
@ -631,13 +604,8 @@ ChangeBellFeedback (client, dev, mask, b, f)
*/ */
int int
ChangeLedFeedback (client, dev, mask, l, f) ChangeLedFeedback (ClientPtr client, DeviceIntPtr dev, long unsigned int mask, LedFeedbackPtr l, xLedFeedbackCtl *f)
ClientPtr client; {
DeviceIntPtr dev;
unsigned long mask;
LedFeedbackPtr l;
xLedFeedbackCtl *f;
{
register char n; register char n;
LedCtrl lctrl; /* might get BadValue part way through */ LedCtrl lctrl; /* might get BadValue part way through */

17
Xi/chgkbd.c
View File

@ -82,9 +82,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeKeyboardDevice(client) SProcXChangeKeyboardDevice(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xChangeKeyboardDeviceReq); REQUEST(xChangeKeyboardDeviceReq);
@ -101,9 +100,8 @@ SProcXChangeKeyboardDevice(client)
*/ */
int int
ProcXChangeKeyboardDevice (client) ProcXChangeKeyboardDevice (register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
DeviceIntPtr xkbd = inputInfo.keyboard; DeviceIntPtr xkbd = inputInfo.keyboard;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -203,11 +201,8 @@ ProcXChangeKeyboardDevice (client)
*/ */
void void
SRepXChangeKeyboardDevice (client, size, rep) SRepXChangeKeyboardDevice (ClientPtr client, int size, xChangeKeyboardDeviceReply *rep)
ClientPtr client; {
int size;
xChangeKeyboardDeviceReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

10
Xi/chgkmap.c
View File

@ -79,9 +79,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeDeviceKeyMapping(client) SProcXChangeDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i, count; register int i, count;
@ -106,9 +105,8 @@ SProcXChangeDeviceKeyMapping(client)
*/ */
int int
ProcXChangeDeviceKeyMapping(client) ProcXChangeDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
unsigned len; unsigned len;
DeviceIntPtr dev; DeviceIntPtr dev;

10
Xi/chgprop.c
View File

@ -81,9 +81,8 @@ SOFTWARE.
*/ */
int int
SProcXChangeDeviceDontPropagateList(client) SProcXChangeDeviceDontPropagateList(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i; register int i;
@ -109,9 +108,8 @@ SProcXChangeDeviceDontPropagateList(client)
*/ */
int int
ProcXChangeDeviceDontPropagateList (client) ProcXChangeDeviceDontPropagateList (register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
WindowPtr pWin; WindowPtr pWin;
struct tmask tmp[EMASKSIZE]; struct tmask tmp[EMASKSIZE];

39
Xi/chgptr.c
View File

@ -85,9 +85,8 @@ SOFTWARE.
*/ */
int int
SProcXChangePointerDevice(client) SProcXChangePointerDevice(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xChangePointerDeviceReq); REQUEST(xChangePointerDeviceReq);
@ -103,9 +102,8 @@ SProcXChangePointerDevice(client)
*/ */
int int
ProcXChangePointerDevice (client) ProcXChangePointerDevice (register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr xptr = inputInfo.pointer; DeviceIntPtr xptr = inputInfo.pointer;
DeviceIntPtr dev; DeviceIntPtr dev;
ValuatorClassPtr v; ValuatorClassPtr v;
@ -182,9 +180,8 @@ ProcXChangePointerDevice (client)
} }
void void
DeleteFocusClassDeviceStruct(dev) DeleteFocusClassDeviceStruct(DeviceIntPtr dev)
DeviceIntPtr dev; {
{
xfree(dev->focus->trace); xfree(dev->focus->trace);
xfree(dev->focus); xfree(dev->focus);
dev->focus = NULL; dev->focus = NULL;
@ -197,12 +194,8 @@ DeleteFocusClassDeviceStruct(dev)
*/ */
void void
SendEventToAllWindows (dev, mask, ev, count) SendEventToAllWindows (DeviceIntPtr dev, Mask mask, xEvent *ev, int count)
DeviceIntPtr dev; {
Mask mask;
xEvent *ev;
int count;
{
int i; int i;
WindowPtr pWin, p1; WindowPtr pWin, p1;
@ -223,13 +216,8 @@ SendEventToAllWindows (dev, mask, ev, count)
*/ */
void void
FindInterestedChildren (dev, p1, mask, ev, count) FindInterestedChildren (DeviceIntPtr dev, WindowPtr p1, Mask mask, xEvent *ev, int count)
DeviceIntPtr dev; {
WindowPtr p1;
Mask mask;
xEvent *ev;
int count;
{
WindowPtr p2; WindowPtr p2;
while (p1) while (p1)
@ -249,11 +237,8 @@ FindInterestedChildren (dev, p1, mask, ev, count)
*/ */
void void
SRepXChangePointerDevice (client, size, rep) SRepXChangePointerDevice (ClientPtr client, int size, xChangePointerDeviceReply *rep)
ClientPtr client; {
int size;
xChangePointerDeviceReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

24
Xi/closedev.c
View File

@ -80,9 +80,8 @@ SOFTWARE.
*/ */
int int
SProcXCloseDevice(client) SProcXCloseDevice(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xCloseDeviceReq); REQUEST(xCloseDeviceReq);
@ -98,9 +97,8 @@ SProcXCloseDevice(client)
*/ */
int int
ProcXCloseDevice(client) ProcXCloseDevice(register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
WindowPtr pWin, p1; WindowPtr pWin, p1;
DeviceIntPtr d; DeviceIntPtr d;
@ -142,11 +140,8 @@ ProcXCloseDevice(client)
*/ */
void void
DeleteEventsFromChildren(dev, p1, client) DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client)
DeviceIntPtr dev; {
WindowPtr p1;
ClientPtr client;
{
WindowPtr p2; WindowPtr p2;
while (p1) while (p1)
@ -166,11 +161,8 @@ DeleteEventsFromChildren(dev, p1, client)
*/ */
void void
DeleteDeviceEvents (dev, pWin, client) DeleteDeviceEvents (DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
DeviceIntPtr dev; {
WindowPtr pWin;
ClientPtr client;
{
InputClientsPtr others; InputClientsPtr others;
OtherInputMasks *pOthers; OtherInputMasks *pOthers;
GrabPtr grab, next; GrabPtr grab, next;

10
Xi/devbell.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXDeviceBell(client) SProcXDeviceBell(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xDeviceBellReq); REQUEST(xDeviceBellReq);
@ -95,9 +94,8 @@ SProcXDeviceBell(client)
*/ */
int int
ProcXDeviceBell (client) ProcXDeviceBell (register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
KbdFeedbackPtr k; KbdFeedbackPtr k;
BellFeedbackPtr b; BellFeedbackPtr b;

163
Xi/exevents.c
View File

@ -100,8 +100,7 @@ static Bool MakeInputMasks (
*/ */
void void
RegisterOtherDevice (device) RegisterOtherDevice (DeviceIntPtr device)
DeviceIntPtr device;
{ {
device->public.processInputProc = ProcessOtherEvent; device->public.processInputProc = ProcessOtherEvent;
device->public.realInputProc = ProcessOtherEvent; device->public.realInputProc = ProcessOtherEvent;
@ -111,10 +110,7 @@ RegisterOtherDevice (device)
/*ARGSUSED*/ /*ARGSUSED*/
void void
ProcessOtherEvent (xE, other, count) ProcessOtherEvent (xEventPtr xE, register DeviceIntPtr other, int count)
xEventPtr xE;
register DeviceIntPtr other;
int count;
{ {
register BYTE *kptr; register BYTE *kptr;
register int i; register int i;
@ -298,7 +294,7 @@ ProcessOtherEvent (xE, other, count)
} }
_X_EXPORT int _X_EXPORT int
InitProximityClassDeviceStruct( DeviceIntPtr dev) InitProximityClassDeviceStruct(DeviceIntPtr dev)
{ {
register ProximityClassPtr proxc; register ProximityClassPtr proxc;
@ -310,13 +306,8 @@ InitProximityClassDeviceStruct( DeviceIntPtr dev)
} }
_X_EXPORT void _X_EXPORT void
InitValuatorAxisStruct( DeviceIntPtr dev, InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval,
int axnum, int resolution, int min_res, int max_res)
int minval,
int maxval,
int resolution,
int min_res,
int max_res )
{ {
register AxisInfoPtr ax = dev->valuator->axes + axnum; register AxisInfoPtr ax = dev->valuator->axes + axnum;
@ -328,13 +319,8 @@ InitValuatorAxisStruct( DeviceIntPtr dev,
} }
static void static void
FixDeviceStateNotify ( FixDeviceStateNotify (DeviceIntPtr dev, deviceStateNotify *ev, KeyClassPtr k,
DeviceIntPtr dev, ButtonClassPtr b, ValuatorClassPtr v, int first)
deviceStateNotify *ev,
KeyClassPtr k,
ButtonClassPtr b,
ValuatorClassPtr v,
int first)
{ {
ev->type = DeviceStateNotify; ev->type = DeviceStateNotify;
ev->deviceid = dev->id; ev->deviceid = dev->id;
@ -373,10 +359,7 @@ FixDeviceStateNotify (
} }
static void static void
FixDeviceValuator ( FixDeviceValuator(DeviceIntPtr dev, deviceValuator *ev, ValuatorClassPtr v,
DeviceIntPtr dev,
deviceValuator *ev,
ValuatorClassPtr v,
int first) int first)
{ {
int nval = v->numAxes - first; int nval = v->numAxes - first;
@ -398,10 +381,8 @@ FixDeviceValuator (
} }
void void
DeviceFocusEvent(dev, type, mode, detail, pWin) DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
DeviceIntPtr dev; register WindowPtr pWin)
int type, mode, detail;
register WindowPtr pWin;
{ {
deviceFocus event; deviceFocus event;
@ -520,19 +501,10 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
} }
int int
GrabButton( GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
ClientPtr client, BYTE other_devices_mode, CARD16 modifiers,
DeviceIntPtr dev, DeviceIntPtr modifier_device, CARD8 button, Window grabWindow,
BYTE this_device_mode, BOOL ownerEvents, Cursor rcursor, Window rconfineTo, Mask eventMask)
BYTE other_devices_mode,
CARD16 modifiers,
DeviceIntPtr modifier_device,
CARD8 button,
Window grabWindow,
BOOL ownerEvents,
Cursor rcursor,
Window rconfineTo,
Mask eventMask)
{ {
WindowPtr pWin, confineTo; WindowPtr pWin, confineTo;
CursorPtr cursor; CursorPtr cursor;
@ -594,17 +566,9 @@ GrabButton(
} }
int int
GrabKey( GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
ClientPtr client, BYTE other_devices_mode, CARD16 modifiers, DeviceIntPtr modifier_device,
DeviceIntPtr dev, CARD8 key, Window grabWindow, BOOL ownerEvents, Mask mask)
BYTE this_device_mode,
BYTE other_devices_mode,
CARD16 modifiers,
DeviceIntPtr modifier_device,
CARD8 key,
Window grabWindow,
BOOL ownerEvents,
Mask mask)
{ {
WindowPtr pWin; WindowPtr pWin;
GrabPtr grab; GrabPtr grab;
@ -656,13 +620,8 @@ GrabKey(
} }
int int
SelectForWindow(dev, pWin, client, mask, exclusivemasks, validmasks) SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client, Mask mask,
DeviceIntPtr dev; Mask exclusivemasks, Mask validmasks)
WindowPtr pWin;
ClientPtr client;
Mask mask;
Mask exclusivemasks;
Mask validmasks;
{ {
int mskidx = dev->id; int mskidx = dev->id;
int i, ret; int i, ret;
@ -731,11 +690,7 @@ maskSet:
} }
int int
AddExtensionClient (pWin, client, mask, mskidx) AddExtensionClient (WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
WindowPtr pWin;
ClientPtr client;
Mask mask;
int mskidx;
{ {
InputClientsPtr others; InputClientsPtr others;
@ -757,8 +712,7 @@ AddExtensionClient (pWin, client, mask, mskidx)
} }
static Bool static Bool
MakeInputMasks (pWin) MakeInputMasks (WindowPtr pWin)
WindowPtr pWin;
{ {
struct _OtherInputMasks *imasks; struct _OtherInputMasks *imasks;
@ -772,8 +726,7 @@ MakeInputMasks (pWin)
} }
void void
RecalculateDeviceDeliverableEvents(pWin) RecalculateDeviceDeliverableEvents(WindowPtr pWin)
WindowPtr pWin;
{ {
register InputClientsPtr others; register InputClientsPtr others;
struct _OtherInputMasks *inputMasks; /* default: NULL */ struct _OtherInputMasks *inputMasks; /* default: NULL */
@ -814,9 +767,7 @@ RecalculateDeviceDeliverableEvents(pWin)
} }
int int
InputClientGone(pWin, id) InputClientGone(register WindowPtr pWin, XID id)
register WindowPtr pWin;
XID id;
{ {
register InputClientsPtr other, prev; register InputClientsPtr other, prev;
if (!wOtherInputMasks(pWin)) if (!wOtherInputMasks(pWin))
@ -861,18 +812,11 @@ InputClientGone(pWin, id)
prev = other; prev = other;
} }
FatalError("client not on device event list"); FatalError("client not on device event list");
/*NOTREACHED*/
} }
int int
SendEvent (client, d, dest, propagate, ev, mask, count) SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
ClientPtr client; xEvent *ev, Mask mask, int count)
DeviceIntPtr d;
Window dest;
Bool propagate;
xEvent *ev;
Mask mask;
int count;
{ {
WindowPtr pWin; WindowPtr pWin;
WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */ WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */
@ -938,11 +882,7 @@ SendEvent (client, d, dest, propagate, ev, mask, count)
} }
int int
SetButtonMapping (client, dev, nElts, map) SetButtonMapping (ClientPtr client, DeviceIntPtr dev, int nElts, BYTE *map)
ClientPtr client;
DeviceIntPtr dev;
int nElts;
BYTE *map;
{ {
register int i; register int i;
ButtonClassPtr b = dev->button; ButtonClassPtr b = dev->button;
@ -967,14 +907,8 @@ SetButtonMapping (client, dev, nElts, map)
} }
int int
SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k) SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen,
ClientPtr client; int numKeyPerModifier, KeyCode *inputMap, KeyClassPtr *k)
DeviceIntPtr dev;
int len;
int rlen;
int numKeyPerModifier;
KeyCode *inputMap;
KeyClassPtr *k;
{ {
KeyCode *map = NULL; KeyCode *map = NULL;
int inputMapLen; int inputMapLen;
@ -1116,9 +1050,7 @@ ChangeKeyMapping(
} }
void void
DeleteWindowFromAnyExtEvents(pWin, freeResources) DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
WindowPtr pWin;
Bool freeResources;
{ {
int i; int i;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1147,9 +1079,7 @@ DeleteWindowFromAnyExtEvents(pWin, freeResources)
} }
void void
DeleteDeviceFromAnyExtEvents(pWin, dev) DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
WindowPtr pWin;
DeviceIntPtr dev;
{ {
WindowPtr parent; WindowPtr parent;
@ -1216,9 +1146,7 @@ DeleteDeviceFromAnyExtEvents(pWin, dev)
} }
int int
MaybeSendDeviceMotionNotifyHint (pEvents, mask) MaybeSendDeviceMotionNotifyHint (deviceKeyButtonPointer *pEvents, Mask mask)
deviceKeyButtonPointer *pEvents;
Mask mask;
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1242,13 +1170,9 @@ MaybeSendDeviceMotionNotifyHint (pEvents, mask)
} }
void void
CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask) CheckDeviceGrabAndHintWindow (WindowPtr pWin, int type,
WindowPtr pWin; deviceKeyButtonPointer *xE, GrabPtr grab,
int type; ClientPtr client, Mask deliveryMask)
deviceKeyButtonPointer *xE;
GrabPtr grab;
ClientPtr client;
Mask deliveryMask;
{ {
DeviceIntPtr dev; DeviceIntPtr dev;
@ -1274,10 +1198,7 @@ CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask)
} }
Mask Mask
DeviceEventMaskForClient(dev, pWin, client) DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
DeviceIntPtr dev;
WindowPtr pWin;
ClientPtr client;
{ {
register InputClientsPtr other; register InputClientsPtr other;
@ -1293,9 +1214,7 @@ DeviceEventMaskForClient(dev, pWin, client)
} }
void void
MaybeStopDeviceHint(dev, client) MaybeStopDeviceHint(register DeviceIntPtr dev, ClientPtr client)
register DeviceIntPtr dev;
ClientPtr client;
{ {
WindowPtr pWin; WindowPtr pWin;
GrabPtr grab = dev->grab; GrabPtr grab = dev->grab;
@ -1313,11 +1232,7 @@ MaybeStopDeviceHint(dev, client)
} }
int int
DeviceEventSuppressForWindow(pWin, client, mask, maskndx) DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask, int maskndx)
WindowPtr pWin;
ClientPtr client;
Mask mask;
int maskndx;
{ {
struct _OtherInputMasks *inputMasks = wOtherInputMasks (pWin); struct _OtherInputMasks *inputMasks = wOtherInputMasks (pWin);
@ -1346,9 +1261,7 @@ DeviceEventSuppressForWindow(pWin, client, mask, maskndx)
} }
static Bool static Bool
ShouldFreeInputMasks (pWin, ignoreSelectedEvents) ShouldFreeInputMasks (WindowPtr pWin, Bool ignoreSelectedEvents)
WindowPtr pWin;
Bool ignoreSelectedEvents;
{ {
int i; int i;
Mask allInputEventMasks = 0; Mask allInputEventMasks = 0;

95
Xi/extinit.c
View File

@ -219,7 +219,7 @@ static XExtensionVersion thisversion =
*/ */
void void
XInputExtensionInit() XInputExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
@ -263,8 +263,7 @@ XInputExtensionInit()
*/ */
int int
ProcIDispatch (client) ProcIDispatch (register ClientPtr client)
register ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
if (stuff->data == X_GetExtensionVersion) if (stuff->data == X_GetExtensionVersion)
@ -354,8 +353,7 @@ ProcIDispatch (client)
*/ */
int int
SProcIDispatch(client) SProcIDispatch(register ClientPtr client)
register ClientPtr client;
{ {
REQUEST(xReq); REQUEST(xReq);
if (stuff->data == X_GetExtensionVersion) if (stuff->data == X_GetExtensionVersion)
@ -448,10 +446,10 @@ SProcIDispatch(client)
SRepX##code (client, len, (x##code##Reply *) rep) SRepX##code (client, len, (x##code##Reply *) rep)
void void
SReplyIDispatch (client, len, rep) SReplyIDispatch (ClientPtr client, int len, xGrabDeviceReply *rep)
ClientPtr client;
int len;
xGrabDeviceReply *rep; /* All we look at is the type field */ /* All we look at is the type field */
{ /* This is common to all replies */ { /* This is common to all replies */
if (rep->RepType == X_GetExtensionVersion) if (rep->RepType == X_GetExtensionVersion)
SRepXGetExtensionVersion (client, len, (xGetExtensionVersionReply *)rep); SRepXGetExtensionVersion (client, len, (xGetExtensionVersionReply *)rep);
@ -510,9 +508,7 @@ SReplyIDispatch (client, len, rep)
#define DO_SWAP(func,type) func ((type *)from, (type *)to) #define DO_SWAP(func,type) func ((type *)from, (type *)to)
void void
SEventIDispatch (from, to) SEventIDispatch (xEvent *from, xEvent *to)
xEvent *from;
xEvent *to;
{ {
int type = from->u.u.type & 0177; int type = from->u.u.type & 0177;
@ -580,10 +576,8 @@ SEventIDispatch (from, to)
*/ */
void void
SEventDeviceValuator (from, to) SEventDeviceValuator (deviceValuator *from, deviceValuator *to)
deviceValuator *from; {
deviceValuator *to;
{
register char n; register char n;
register int i; register int i;
INT32 *ip B32; INT32 *ip B32;
@ -599,9 +593,7 @@ SEventDeviceValuator (from, to)
} }
void void
SEventFocus (from, to) SEventFocus (deviceFocus *from, deviceFocus *to)
deviceFocus *from;
deviceFocus *to;
{ {
register char n; register char n;
@ -612,9 +604,7 @@ SEventFocus (from, to)
} }
void void
SDeviceStateNotifyEvent (from, to) SDeviceStateNotifyEvent (deviceStateNotify *from, deviceStateNotify *to)
deviceStateNotify *from;
deviceStateNotify *to;
{ {
register int i; register int i;
register char n; register char n;
@ -631,9 +621,7 @@ SDeviceStateNotifyEvent (from, to)
} }
void void
SDeviceKeyStateNotifyEvent (from, to) SDeviceKeyStateNotifyEvent (deviceKeyStateNotify *from, deviceKeyStateNotify *to)
deviceKeyStateNotify *from;
deviceKeyStateNotify *to;
{ {
register char n; register char n;
@ -642,9 +630,7 @@ SDeviceKeyStateNotifyEvent (from, to)
} }
void void
SDeviceButtonStateNotifyEvent (from, to) SDeviceButtonStateNotifyEvent (deviceButtonStateNotify *from, deviceButtonStateNotify *to)
deviceButtonStateNotify *from;
deviceButtonStateNotify *to;
{ {
register char n; register char n;
@ -653,9 +639,7 @@ SDeviceButtonStateNotifyEvent (from, to)
} }
void void
SChangeDeviceNotifyEvent (from, to) SChangeDeviceNotifyEvent (changeDeviceNotify *from, changeDeviceNotify *to)
changeDeviceNotify *from;
changeDeviceNotify *to;
{ {
register char n; register char n;
@ -665,9 +649,7 @@ SChangeDeviceNotifyEvent (from, to)
} }
void void
SDeviceMappingNotifyEvent (from, to) SDeviceMappingNotifyEvent (deviceMappingNotify *from, deviceMappingNotify *to)
deviceMappingNotify *from;
deviceMappingNotify *to;
{ {
register char n; register char n;
@ -683,8 +665,7 @@ SDeviceMappingNotifyEvent (from, to)
*/ */
void void
FixExtensionEvents (extEntry) FixExtensionEvents (ExtensionEntry *extEntry)
ExtensionEntry *extEntry;
{ {
Mask mask; Mask mask;
@ -786,7 +767,7 @@ FixExtensionEvents (extEntry)
*/ */
void void
RestoreExtensionEvents () RestoreExtensionEvents (void)
{ {
int i; int i;
@ -834,9 +815,8 @@ RestoreExtensionEvents ()
*/ */
void void
IResetProc(unused) IResetProc(ExtensionEntry *unused)
ExtensionEntry *unused; {
{
ReplySwapVector[IReqCode] = ReplyNotSwappd; ReplySwapVector[IReqCode] = ReplyNotSwappd;
EventSwapVector[DeviceValuator] = NotImplemented; EventSwapVector[DeviceValuator] = NotImplemented;
@ -864,10 +844,7 @@ IResetProc(unused)
*/ */
_X_EXPORT void _X_EXPORT void
AssignTypeAndName (dev, type, name) AssignTypeAndName (DeviceIntPtr dev, Atom type, char *name)
DeviceIntPtr dev;
Atom type;
char *name;
{ {
dev->type = type; dev->type = type;
dev->name = (char *) xalloc(strlen(name)+1); dev->name = (char *) xalloc(strlen(name)+1);
@ -881,8 +858,8 @@ AssignTypeAndName (dev, type, name)
*/ */
void void
MakeDeviceTypeAtoms () MakeDeviceTypeAtoms (void)
{ {
int i; int i;
for (i=0; i<NUMTYPES; i++) for (i=0; i<NUMTYPES; i++)
@ -924,9 +901,8 @@ LookupDeviceIntRec (
*/ */
void void
SetExclusiveAccess (mask) SetExclusiveAccess (Mask mask)
Mask mask; {
{
int i; int i;
for (i=0; i<MAX_DEVICES; i++) for (i=0; i<MAX_DEVICES; i++)
@ -941,9 +917,8 @@ SetExclusiveAccess (mask)
*/ */
void void
AllowPropagateSuppress (mask) AllowPropagateSuppress (Mask mask)
Mask mask; {
{
int i; int i;
for (i=0; i<MAX_DEVICES; i++) for (i=0; i<MAX_DEVICES; i++)
@ -957,8 +932,8 @@ AllowPropagateSuppress (mask)
*/ */
Mask Mask
GetNextExtEventMask () GetNextExtEventMask (void)
{ {
int i; int i;
Mask mask = lastExtEventMask; Mask mask = lastExtEventMask;
@ -980,10 +955,8 @@ GetNextExtEventMask ()
*/ */
void void
SetMaskForExtEvent(mask, event) SetMaskForExtEvent(Mask mask, int event)
Mask mask; {
int event;
{
EventInfo[ExtEventIndex].mask = mask; EventInfo[ExtEventIndex].mask = mask;
EventInfo[ExtEventIndex++].type = event; EventInfo[ExtEventIndex++].type = event;
@ -1007,10 +980,8 @@ SetMaskForExtEvent(mask, event)
*/ */
void void
SetEventInfo(mask, constant) SetEventInfo(Mask mask, int constant)
Mask mask; {
int constant;
{
EventInfo[ExtEventIndex].mask = mask; EventInfo[ExtEventIndex].mask = mask;
EventInfo[ExtEventIndex++].type = constant; EventInfo[ExtEventIndex++].type = constant;
} }

17
Xi/getbmap.c
View File

@ -77,9 +77,8 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceButtonMapping(client) SProcXGetDeviceButtonMapping(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceButtonMappingReq); REQUEST(xGetDeviceButtonMappingReq);
@ -94,9 +93,8 @@ SProcXGetDeviceButtonMapping(client)
*/ */
int int
ProcXGetDeviceButtonMapping (client) ProcXGetDeviceButtonMapping (register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
xGetDeviceButtonMappingReply rep; xGetDeviceButtonMappingReply rep;
ButtonClassPtr b; ButtonClassPtr b;
@ -141,11 +139,8 @@ ProcXGetDeviceButtonMapping (client)
*/ */
void void
SRepXGetDeviceButtonMapping (client, size, rep) SRepXGetDeviceButtonMapping (ClientPtr client, int size, xGetDeviceButtonMappingReply *rep)
ClientPtr client; {
int size;
xGetDeviceButtonMappingReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

25
Xi/getdctl.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceControl(client) SProcXGetDeviceControl(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceControlReq); REQUEST(xGetDeviceControlReq);
@ -97,9 +96,8 @@ SProcXGetDeviceControl(client)
*/ */
int int
ProcXGetDeviceControl(client) ProcXGetDeviceControl(ClientPtr client)
ClientPtr client; {
{
int total_length = 0; int total_length = 0;
char *buf, *savbuf; char *buf, *savbuf;
register DeviceIntPtr dev; register DeviceIntPtr dev;
@ -172,12 +170,8 @@ ProcXGetDeviceControl(client)
*/ */
void void
CopySwapDeviceResolution (client, v, buf, length) CopySwapDeviceResolution (ClientPtr client, ValuatorClassPtr v, char *buf, int length)
ClientPtr client; {
ValuatorClassPtr v;
char *buf;
int length;
{
register char n; register char n;
AxisInfoPtr a; AxisInfoPtr a;
xDeviceResolutionState *r; xDeviceResolutionState *r;
@ -216,11 +210,8 @@ CopySwapDeviceResolution (client, v, buf, length)
*/ */
void void
SRepXGetDeviceControl (client, size, rep) SRepXGetDeviceControl (ClientPtr client, int size, xGetDeviceControlReply *rep)
ClientPtr client; {
int size;
xGetDeviceControlReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

59
Xi/getfctl.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXGetFeedbackControl(client) SProcXGetFeedbackControl(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetFeedbackControlReq); REQUEST(xGetFeedbackControlReq);
@ -95,9 +94,8 @@ SProcXGetFeedbackControl(client)
*/ */
int int
ProcXGetFeedbackControl(client) ProcXGetFeedbackControl(ClientPtr client)
ClientPtr client; {
{
int total_length = 0; int total_length = 0;
char *buf, *savbuf; char *buf, *savbuf;
register DeviceIntPtr dev; register DeviceIntPtr dev;
@ -201,11 +199,8 @@ ProcXGetFeedbackControl(client)
*/ */
void void
CopySwapKbdFeedback (client, k, buf) CopySwapKbdFeedback (ClientPtr client, KbdFeedbackPtr k, char **buf)
ClientPtr client; {
KbdFeedbackPtr k;
char **buf;
{
int i; int i;
register char n; register char n;
xKbdFeedbackState *k2; xKbdFeedbackState *k2;
@ -240,11 +235,8 @@ CopySwapKbdFeedback (client, k, buf)
*/ */
void void
CopySwapPtrFeedback (client, p, buf) CopySwapPtrFeedback (ClientPtr client, PtrFeedbackPtr p, char **buf)
ClientPtr client; {
PtrFeedbackPtr p;
char **buf;
{
register char n; register char n;
xPtrFeedbackState *p2; xPtrFeedbackState *p2;
@ -272,11 +264,8 @@ CopySwapPtrFeedback (client, p, buf)
*/ */
void void
CopySwapIntegerFeedback (client, i, buf) CopySwapIntegerFeedback (ClientPtr client, IntegerFeedbackPtr i, char **buf)
ClientPtr client; {
IntegerFeedbackPtr i;
char **buf;
{
register char n; register char n;
xIntegerFeedbackState *i2; xIntegerFeedbackState *i2;
@ -304,11 +293,8 @@ CopySwapIntegerFeedback (client, i, buf)
*/ */
void void
CopySwapStringFeedback (client, s, buf) CopySwapStringFeedback (ClientPtr client, StringFeedbackPtr s, char **buf)
ClientPtr client; {
StringFeedbackPtr s;
char **buf;
{
int i; int i;
register char n; register char n;
xStringFeedbackState *s2; xStringFeedbackState *s2;
@ -346,11 +332,8 @@ CopySwapStringFeedback (client, s, buf)
*/ */
void void
CopySwapLedFeedback (client, l, buf) CopySwapLedFeedback (ClientPtr client, LedFeedbackPtr l, char **buf)
ClientPtr client; {
LedFeedbackPtr l;
char **buf;
{
register char n; register char n;
xLedFeedbackState *l2; xLedFeedbackState *l2;
@ -376,11 +359,8 @@ CopySwapLedFeedback (client, l, buf)
*/ */
void void
CopySwapBellFeedback (client, b, buf) CopySwapBellFeedback (ClientPtr client, BellFeedbackPtr b, char **buf)
ClientPtr client; {
BellFeedbackPtr b;
char **buf;
{
register char n; register char n;
xBellFeedbackState *b2; xBellFeedbackState *b2;
@ -408,11 +388,8 @@ CopySwapBellFeedback (client, b, buf)
*/ */
void void
SRepXGetFeedbackControl (client, size, rep) SRepXGetFeedbackControl (ClientPtr client, int size, xGetFeedbackControlReply *rep)
ClientPtr client; {
int size;
xGetFeedbackControlReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/getfocus.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceFocus(client) SProcXGetDeviceFocus(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceFocusReq); REQUEST(xGetDeviceFocusReq);
@ -95,9 +94,8 @@ SProcXGetDeviceFocus(client)
*/ */
int int
ProcXGetDeviceFocus(client) ProcXGetDeviceFocus(ClientPtr client)
ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
FocusClassPtr focus; FocusClassPtr focus;
xGetDeviceFocusReply rep; xGetDeviceFocusReply rep;
@ -142,11 +140,8 @@ ProcXGetDeviceFocus(client)
*/ */
void void
SRepXGetDeviceFocus (client, size, rep) SRepXGetDeviceFocus (ClientPtr client, int size, xGetDeviceFocusReply *rep)
ClientPtr client; {
int size;
xGetDeviceFocusReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/getkmap.c
View File

@ -79,9 +79,8 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceKeyMapping(client) SProcXGetDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceKeyMappingReq); REQUEST(xGetDeviceKeyMappingReq);
@ -96,9 +95,8 @@ SProcXGetDeviceKeyMapping(client)
*/ */
int int
ProcXGetDeviceKeyMapping(client) ProcXGetDeviceKeyMapping(register ClientPtr client)
register ClientPtr client; {
{
xGetDeviceKeyMappingReply rep; xGetDeviceKeyMappingReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
KeySymsPtr k; KeySymsPtr k;
@ -164,11 +162,8 @@ ProcXGetDeviceKeyMapping(client)
*/ */
void void
SRepXGetDeviceKeyMapping (client, size, rep) SRepXGetDeviceKeyMapping (ClientPtr client, int size, xGetDeviceKeyMappingReply *rep)
ClientPtr client; {
int size;
xGetDeviceKeyMappingReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/getmmap.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceModifierMapping(client) SProcXGetDeviceModifierMapping(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceModifierMappingReq); REQUEST(xGetDeviceModifierMappingReq);
@ -95,9 +94,8 @@ SProcXGetDeviceModifierMapping(client)
*/ */
int int
ProcXGetDeviceModifierMapping(client) ProcXGetDeviceModifierMapping(ClientPtr client)
ClientPtr client; {
{
CARD8 maxkeys; CARD8 maxkeys;
DeviceIntPtr dev; DeviceIntPtr dev;
xGetDeviceModifierMappingReply rep; xGetDeviceModifierMappingReply rep;
@ -145,11 +143,8 @@ ProcXGetDeviceModifierMapping(client)
*/ */
void void
SRepXGetDeviceModifierMapping (client, size, rep) SRepXGetDeviceModifierMapping (ClientPtr client, int size, xGetDeviceModifierMappingReply *rep)
ClientPtr client; {
int size;
xGetDeviceModifierMappingReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

26
Xi/getprop.c
View File

@ -82,9 +82,8 @@ extern int ExtEventIndex;
*/ */
int int
SProcXGetDeviceDontPropagateList(client) SProcXGetDeviceDontPropagateList(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceDontPropagateListReq); REQUEST(xGetDeviceDontPropagateListReq);
@ -101,9 +100,8 @@ SProcXGetDeviceDontPropagateList(client)
*/ */
int int
ProcXGetDeviceDontPropagateList (client) ProcXGetDeviceDontPropagateList (register ClientPtr client)
register ClientPtr client; {
{
CARD16 count = 0; CARD16 count = 0;
int i; int i;
XEventClass *buf = NULL, *tbuf; XEventClass *buf = NULL, *tbuf;
@ -167,13 +165,8 @@ ProcXGetDeviceDontPropagateList (client)
*/ */
XEventClass XEventClass
*ClassFromMask (buf, mask, maskndx, count, mode) *ClassFromMask (XEventClass *buf, Mask mask, int maskndx, CARD16 *count, int mode)
XEventClass *buf; {
Mask mask;
int maskndx;
CARD16 *count;
int mode;
{
int i,j; int i,j;
int id = maskndx; int id = maskndx;
Mask tmask = 0x80000000; Mask tmask = 0x80000000;
@ -201,11 +194,8 @@ XEventClass
*/ */
void void
SRepXGetDeviceDontPropagateList (client, size, rep) SRepXGetDeviceDontPropagateList (ClientPtr client, int size, xGetDeviceDontPropagateListReply *rep)
ClientPtr client; {
int size;
xGetDeviceDontPropagateListReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/getselev.c
View File

@ -80,9 +80,8 @@ SOFTWARE.
*/ */
int int
SProcXGetSelectedExtensionEvents(client) SProcXGetSelectedExtensionEvents(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetSelectedExtensionEventsReq); REQUEST(xGetSelectedExtensionEventsReq);
@ -100,9 +99,8 @@ SProcXGetSelectedExtensionEvents(client)
*/ */
int int
ProcXGetSelectedExtensionEvents(client) ProcXGetSelectedExtensionEvents(register ClientPtr client)
register ClientPtr client; {
{
int i; int i;
int total_length = 0; int total_length = 0;
xGetSelectedExtensionEventsReply rep; xGetSelectedExtensionEventsReply rep;
@ -181,11 +179,8 @@ ProcXGetSelectedExtensionEvents(client)
*/ */
void void
SRepXGetSelectedExtensionEvents (client, size, rep) SRepXGetSelectedExtensionEvents (ClientPtr client, int size, xGetSelectedExtensionEventsReply *rep)
ClientPtr client; {
int size;
xGetSelectedExtensionEventsReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/getvers.c
View File

@ -79,9 +79,8 @@ XExtensionVersion AllExtensionVersions[128];
*/ */
int int
SProcXGetExtensionVersion(client) SProcXGetExtensionVersion(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetExtensionVersionReq); REQUEST(xGetExtensionVersionReq);
@ -98,9 +97,8 @@ SProcXGetExtensionVersion(client)
*/ */
int int
ProcXGetExtensionVersion (client) ProcXGetExtensionVersion (register ClientPtr client)
register ClientPtr client; {
{
xGetExtensionVersionReply rep; xGetExtensionVersionReply rep;
REQUEST(xGetExtensionVersionReq); REQUEST(xGetExtensionVersionReq);
@ -142,11 +140,8 @@ ProcXGetExtensionVersion (client)
*/ */
void void
SRepXGetExtensionVersion (client, size, rep) SRepXGetExtensionVersion (ClientPtr client, int size, xGetExtensionVersionReply *rep)
ClientPtr client; {
int size;
xGetExtensionVersionReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

27
Xi/grabdev.c
View File

@ -83,9 +83,8 @@ extern int ExtEventIndex;
*/ */
int int
SProcXGrabDevice(client) SProcXGrabDevice(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i; register int i;
@ -113,9 +112,8 @@ SProcXGrabDevice(client)
*/ */
int int
ProcXGrabDevice(client) ProcXGrabDevice(ClientPtr client)
ClientPtr client; {
{
int error; int error;
xGrabDeviceReply rep; xGrabDeviceReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -167,14 +165,8 @@ ProcXGrabDevice(client)
*/ */
int int
CreateMaskFromList (client, list, count, mask, dev, req) CreateMaskFromList (ClientPtr client, XEventClass *list, int count, struct tmask *mask, DeviceIntPtr dev, int req)
ClientPtr client; {
XEventClass *list;
int count;
struct tmask mask[];
DeviceIntPtr dev;
int req;
{
int i,j; int i,j;
int device; int device;
DeviceIntPtr tdev; DeviceIntPtr tdev;
@ -219,11 +211,8 @@ CreateMaskFromList (client, list, count, mask, dev, req)
*/ */
void void
SRepXGrabDevice (client, size, rep) SRepXGrabDevice (ClientPtr client, int size, xGrabDeviceReply *rep)
ClientPtr client; {
int size;
xGrabDeviceReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

10
Xi/grabdevb.c
View File

@ -80,9 +80,8 @@ SOFTWARE.
*/ */
int int
SProcXGrabDeviceButton(client) SProcXGrabDeviceButton(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i; register int i;
@ -110,9 +109,8 @@ SProcXGrabDeviceButton(client)
*/ */
int int
ProcXGrabDeviceButton(client) ProcXGrabDeviceButton(ClientPtr client)
ClientPtr client; {
{
int ret; int ret;
DeviceIntPtr dev; DeviceIntPtr dev;
DeviceIntPtr mdev; DeviceIntPtr mdev;

10
Xi/grabdevk.c
View File

@ -80,9 +80,8 @@ SOFTWARE.
*/ */
int int
SProcXGrabDeviceKey(client) SProcXGrabDeviceKey(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i; register int i;
@ -109,9 +108,8 @@ SProcXGrabDeviceKey(client)
*/ */
int int
ProcXGrabDeviceKey(client) ProcXGrabDeviceKey(ClientPtr client)
ClientPtr client; {
{
int ret; int ret;
DeviceIntPtr dev; DeviceIntPtr dev;
DeviceIntPtr mdev; DeviceIntPtr mdev;

15
Xi/gtmotion.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXGetDeviceMotionEvents(client) SProcXGetDeviceMotionEvents(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xGetDeviceMotionEventsReq); REQUEST(xGetDeviceMotionEventsReq);
@ -98,8 +97,7 @@ register ClientPtr client;
*/ */
int int
ProcXGetDeviceMotionEvents(client) ProcXGetDeviceMotionEvents(ClientPtr client)
ClientPtr client;
{ {
INT32 *coords = NULL, *bufptr; INT32 *coords = NULL, *bufptr;
xGetDeviceMotionEventsReply rep; xGetDeviceMotionEventsReply rep;
@ -199,11 +197,8 @@ ProcXGetDeviceMotionEvents(client)
*/ */
void void
SRepXGetDeviceMotionEvents (client, size, rep) SRepXGetDeviceMotionEvents (ClientPtr client, int size, xGetDeviceMotionEventsReply *rep)
ClientPtr client; {
int size;
xGetDeviceMotionEventsReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

67
Xi/listdev.c
View File

@ -80,9 +80,8 @@ SOFTWARE.
*/ */
int int
SProcXListInputDevices(client) SProcXListInputDevices(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xListInputDevicesReq); REQUEST(xListInputDevicesReq);
@ -97,9 +96,8 @@ SProcXListInputDevices(client)
*/ */
int int
ProcXListInputDevices (client) ProcXListInputDevices (register ClientPtr client)
register ClientPtr client; {
{
xListInputDevicesReply rep; xListInputDevicesReply rep;
int numdevs; int numdevs;
int namesize = 1; /* need 1 extra byte for strcpy */ int namesize = 1; /* need 1 extra byte for strcpy */
@ -155,11 +153,8 @@ ProcXListInputDevices (client)
*/ */
void void
SizeDeviceInfo (d, namesize, size) SizeDeviceInfo (DeviceIntPtr d, int *namesize, int *size)
DeviceIntPtr d; {
int *namesize;
int *size;
{
int chunks; int chunks;
*namesize += 1; *namesize += 1;
@ -184,14 +179,8 @@ SizeDeviceInfo (d, namesize, size)
*/ */
void void
ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf) ListDeviceInfo (ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev, char **devbuf, char **classbuf, char **namebuf)
ClientPtr client; {
DeviceIntPtr d;
xDeviceInfoPtr dev;
char **devbuf;
char **classbuf;
char **namebuf;
{
CopyDeviceName (namebuf, d->name); CopyDeviceName (namebuf, d->name);
CopySwapDevice (client, d, 0, devbuf); CopySwapDevice (client, d, 0, devbuf);
if (d->key != NULL) if (d->key != NULL)
@ -221,10 +210,8 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
*/ */
void void
CopyDeviceName (namebuf, name) CopyDeviceName (char **namebuf, char *name)
char **namebuf; {
char *name;
{
char *nameptr = (char *) *namebuf; char *nameptr = (char *) *namebuf;
if (name) if (name)
@ -247,12 +234,8 @@ CopyDeviceName (namebuf, name)
*/ */
void void
CopySwapDevice (client, d, num_classes, buf) CopySwapDevice (register ClientPtr client, DeviceIntPtr d, int num_classes, char **buf)
register ClientPtr client; {
DeviceIntPtr d;
int num_classes;
char **buf;
{
register char n; register char n;
xDeviceInfoPtr dev; xDeviceInfoPtr dev;
@ -281,11 +264,8 @@ CopySwapDevice (client, d, num_classes, buf)
*/ */
void void
CopySwapKeyClass (client, k, buf) CopySwapKeyClass (register ClientPtr client, KeyClassPtr k, char **buf)
register ClientPtr client; {
KeyClassPtr k;
char **buf;
{
register char n; register char n;
xKeyInfoPtr k2; xKeyInfoPtr k2;
@ -309,11 +289,8 @@ CopySwapKeyClass (client, k, buf)
*/ */
void void
CopySwapButtonClass (client, b, buf) CopySwapButtonClass (register ClientPtr client, ButtonClassPtr b, char **buf)
register ClientPtr client; {
ButtonClassPtr b;
char **buf;
{
register char n; register char n;
xButtonInfoPtr b2; xButtonInfoPtr b2;
@ -341,10 +318,7 @@ CopySwapButtonClass (client, b, buf)
*/ */
int int
CopySwapValuatorClass (client, v, buf) CopySwapValuatorClass (register ClientPtr client, ValuatorClassPtr v, char **buf)
register ClientPtr client;
ValuatorClassPtr v;
char **buf;
{ {
int i, j, axes, t_axes; int i, j, axes, t_axes;
register char n; register char n;
@ -394,11 +368,8 @@ CopySwapValuatorClass (client, v, buf)
*/ */
void void
SRepXListInputDevices (client, size, rep) SRepXListInputDevices (ClientPtr client, int size, xListInputDevicesReply *rep)
ClientPtr client; {
int size;
xListInputDevicesReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/opendev.c
View File

@ -82,9 +82,8 @@ extern CARD8 event_base [];
*/ */
int int
SProcXOpenDevice(client) SProcXOpenDevice(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xOpenDeviceReq); REQUEST(xOpenDeviceReq);
@ -99,9 +98,8 @@ SProcXOpenDevice(client)
*/ */
int int
ProcXOpenDevice(client) ProcXOpenDevice(register ClientPtr client)
register ClientPtr client; {
{
xInputClassInfo evbase [numInputClasses]; xInputClassInfo evbase [numInputClasses];
Bool enableit = FALSE; Bool enableit = FALSE;
int j=0; int j=0;
@ -192,11 +190,8 @@ ProcXOpenDevice(client)
*/ */
void void
SRepXOpenDevice (client, size, rep) SRepXOpenDevice (ClientPtr client, int size, xOpenDeviceReply *rep)
ClientPtr client; {
int size;
xOpenDeviceReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/queryst.c
View File

@ -60,9 +60,8 @@ from The Open Group.
*/ */
int int
SProcXQueryDeviceState(client) SProcXQueryDeviceState(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xQueryDeviceStateReq); REQUEST(xQueryDeviceStateReq);
@ -77,9 +76,8 @@ SProcXQueryDeviceState(client)
*/ */
int int
ProcXQueryDeviceState(client) ProcXQueryDeviceState(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
int i; int i;
int num_classes = 0; int num_classes = 0;
@ -202,11 +200,8 @@ ProcXQueryDeviceState(client)
*/ */
void void
SRepXQueryDeviceState (client, size, rep) SRepXQueryDeviceState (ClientPtr client, int size, xQueryDeviceStateReply *rep)
ClientPtr client; {
int size;
xQueryDeviceStateReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

10
Xi/selectev.c
View File

@ -84,9 +84,8 @@ extern Mask ExtValidMasks[];
*/ */
int int
SProcXSelectExtensionEvent (client) SProcXSelectExtensionEvent (register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i; register int i;
@ -112,9 +111,8 @@ register ClientPtr client;
*/ */
int int
ProcXSelectExtensionEvent (client) ProcXSelectExtensionEvent (register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
int i; int i;
WindowPtr pWin; WindowPtr pWin;

10
Xi/sendexev.c
View File

@ -83,9 +83,8 @@ extern int lastEvent; /* Defined in extension.c */
*/ */
int int
SProcXSendExtensionEvent(client) SProcXSendExtensionEvent(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
register long *p; register long *p;
register int i; register int i;
@ -125,9 +124,8 @@ SProcXSendExtensionEvent(client)
*/ */
int int
ProcXSendExtensionEvent (client) ProcXSendExtensionEvent (register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
DeviceIntPtr dev; DeviceIntPtr dev;
xEvent *first; xEvent *first;

17
Xi/setbmap.c
View File

@ -81,9 +81,8 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceButtonMapping(client) SProcXSetDeviceButtonMapping(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xSetDeviceButtonMappingReq); REQUEST(xSetDeviceButtonMappingReq);
@ -98,9 +97,8 @@ SProcXSetDeviceButtonMapping(client)
*/ */
int int
ProcXSetDeviceButtonMapping (client) ProcXSetDeviceButtonMapping (register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
xSetDeviceButtonMappingReply rep; xSetDeviceButtonMappingReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -157,11 +155,8 @@ ProcXSetDeviceButtonMapping (client)
*/ */
void void
SRepXSetDeviceButtonMapping (client, size, rep) SRepXSetDeviceButtonMapping (ClientPtr client, int size, xSetDeviceButtonMappingReply *rep)
ClientPtr client; {
int size;
xSetDeviceButtonMappingReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/setdval.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceValuators(client) SProcXSetDeviceValuators(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xSetDeviceValuatorsReq); REQUEST(xSetDeviceValuatorsReq);
@ -95,9 +94,8 @@ SProcXSetDeviceValuators(client)
*/ */
int int
ProcXSetDeviceValuators(client) ProcXSetDeviceValuators(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
xSetDeviceValuatorsReply rep; xSetDeviceValuatorsReply rep;
@ -161,11 +159,8 @@ ProcXSetDeviceValuators(client)
*/ */
void void
SRepXSetDeviceValuators (client, size, rep) SRepXSetDeviceValuators (ClientPtr client, int size, xSetDeviceValuatorsReply *rep)
ClientPtr client; {
int size;
xSetDeviceValuatorsReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

10
Xi/setfocus.c
View File

@ -81,9 +81,8 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceFocus(client) SProcXSetDeviceFocus(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xSetDeviceFocusReq); REQUEST(xSetDeviceFocusReq);
@ -101,9 +100,8 @@ SProcXSetDeviceFocus(client)
*/ */
int int
ProcXSetDeviceFocus(client) ProcXSetDeviceFocus(register ClientPtr client)
register ClientPtr client; {
{
int ret; int ret;
register DeviceIntPtr dev; register DeviceIntPtr dev;

17
Xi/setmmap.c
View File

@ -79,9 +79,8 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceModifierMapping(client) SProcXSetDeviceModifierMapping(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xSetDeviceModifierMappingReq); REQUEST(xSetDeviceModifierMappingReq);
@ -96,9 +95,8 @@ SProcXSetDeviceModifierMapping(client)
*/ */
int int
ProcXSetDeviceModifierMapping(client) ProcXSetDeviceModifierMapping(ClientPtr client)
ClientPtr client; {
{
int ret; int ret;
xSetDeviceModifierMappingReply rep; xSetDeviceModifierMappingReply rep;
DeviceIntPtr dev; DeviceIntPtr dev;
@ -150,11 +148,8 @@ ProcXSetDeviceModifierMapping(client)
*/ */
void void
SRepXSetDeviceModifierMapping (client, size, rep) SRepXSetDeviceModifierMapping (ClientPtr client, int size, xSetDeviceModifierMappingReply *rep)
ClientPtr client; {
int size;
xSetDeviceModifierMappingReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

17
Xi/setmode.c
View File

@ -78,9 +78,8 @@ SOFTWARE.
*/ */
int int
SProcXSetDeviceMode(client) SProcXSetDeviceMode(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xSetDeviceModeReq); REQUEST(xSetDeviceModeReq);
@ -95,9 +94,8 @@ SProcXSetDeviceMode(client)
*/ */
int int
ProcXSetDeviceMode(client) ProcXSetDeviceMode(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
xSetDeviceModeReply rep; xSetDeviceModeReply rep;
@ -145,11 +143,8 @@ ProcXSetDeviceMode(client)
*/ */
void void
SRepXSetDeviceMode (client, size, rep) SRepXSetDeviceMode (ClientPtr client, int size, xSetDeviceModeReply *rep)
ClientPtr client; {
int size;
xSetDeviceModeReply *rep;
{
register char n; register char n;
swaps(&rep->sequenceNumber, n); swaps(&rep->sequenceNumber, n);

46
Xi/stubs.c
View File

@ -94,10 +94,8 @@ SOFTWARE.
*/ */
int int
ChangeKeyboardDevice (old_dev, new_dev) ChangeKeyboardDevice (DeviceIntPtr old_dev, DeviceIntPtr new_dev)
DeviceIntPtr old_dev; {
DeviceIntPtr new_dev;
{
/*********************************************************************** /***********************************************************************
DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c * DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c *
**********************************************************************/ **********************************************************************/
@ -169,10 +167,8 @@ ChangePointerDevice (
*/ */
void void
CloseInputDevice (d, client) CloseInputDevice (DeviceIntPtr d, ClientPtr client)
DeviceIntPtr d; {
ClientPtr client;
{
} }
/*********************************************************************** /***********************************************************************
@ -202,8 +198,8 @@ CloseInputDevice (d, client)
*/ */
void void
AddOtherInputDevices () AddOtherInputDevices (void)
{ {
/********************************************************************** /**********************************************************************
for each uninitialized device, do something like: for each uninitialized device, do something like:
@ -242,11 +238,8 @@ AddOtherInputDevices ()
*/ */
void void
OpenInputDevice (dev, client, status) OpenInputDevice (DeviceIntPtr dev, ClientPtr client, int *status)
DeviceIntPtr dev; {
ClientPtr client;
int *status;
{
} }
/**************************************************************************** /****************************************************************************
@ -262,11 +255,8 @@ OpenInputDevice (dev, client, status)
*/ */
int int
SetDeviceMode (client, dev, mode) SetDeviceMode (register ClientPtr client, DeviceIntPtr dev, int mode)
register ClientPtr client; {
DeviceIntPtr dev;
int mode;
{
return BadMatch; return BadMatch;
} }
@ -283,13 +273,8 @@ SetDeviceMode (client, dev, mode)
*/ */
int int
SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators) SetDeviceValuators (register ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators)
register ClientPtr client; {
DeviceIntPtr dev;
int *valuators;
int first_valuator;
int num_valuators;
{
return BadMatch; return BadMatch;
} }
@ -302,11 +287,8 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
*/ */
int int
ChangeDeviceControl (client, dev, control) ChangeDeviceControl (register ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
register ClientPtr client; {
DeviceIntPtr dev;
xDeviceCtl *control;
{
switch (control->control) switch (control->control)
{ {
case DEVICE_RESOLUTION: case DEVICE_RESOLUTION:

10
Xi/ungrdev.c
View File

@ -77,9 +77,8 @@ SOFTWARE.
*/ */
int int
SProcXUngrabDevice(client) SProcXUngrabDevice(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xUngrabDeviceReq); REQUEST(xUngrabDeviceReq);
@ -96,9 +95,8 @@ register ClientPtr client;
*/ */
int int
ProcXUngrabDevice(client) ProcXUngrabDevice(register ClientPtr client)
register ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
GrabPtr grab; GrabPtr grab;
TimeStamp time; TimeStamp time;

10
Xi/ungrdevb.c
View File

@ -83,9 +83,8 @@ SOFTWARE.
*/ */
int int
SProcXUngrabDeviceButton(client) SProcXUngrabDeviceButton(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xUngrabDeviceButtonReq); REQUEST(xUngrabDeviceButtonReq);
@ -103,9 +102,8 @@ SProcXUngrabDeviceButton(client)
*/ */
int int
ProcXUngrabDeviceButton(client) ProcXUngrabDeviceButton(ClientPtr client)
ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
DeviceIntPtr mdev; DeviceIntPtr mdev;
WindowPtr pWin; WindowPtr pWin;

10
Xi/ungrdevk.c
View File

@ -83,9 +83,8 @@ SOFTWARE.
*/ */
int int
SProcXUngrabDeviceKey(client) SProcXUngrabDeviceKey(register ClientPtr client)
register ClientPtr client; {
{
register char n; register char n;
REQUEST(xUngrabDeviceKeyReq); REQUEST(xUngrabDeviceKeyReq);
@ -103,9 +102,8 @@ SProcXUngrabDeviceKey(client)
*/ */
int int
ProcXUngrabDeviceKey(client) ProcXUngrabDeviceKey(ClientPtr client)
ClientPtr client; {
{
DeviceIntPtr dev; DeviceIntPtr dev;
DeviceIntPtr mdev; DeviceIntPtr mdev;
WindowPtr pWin; WindowPtr pWin;