[X2Go-Commits] [nx-libs] 13/38: Xi: ansify function prototypes
git-admin at x2go.org
git-admin at x2go.org
Mon Feb 26 06:44:59 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit 7aca428ffe10b2cffca8fe01962aef421a5a5645
Author: Ulrich Sibiller <uli42 at gmx.de>
Date: Thu Feb 15 15:14:14 2018 +0100
Xi: ansify function prototypes
---
nx-X11/programs/Xserver/Xi/allowev.c | 6 +-
nx-X11/programs/Xserver/Xi/allowev.h | 8 +-
nx-X11/programs/Xserver/Xi/chgdctl.c | 13 +--
nx-X11/programs/Xserver/Xi/chgdctl.h | 12 +--
nx-X11/programs/Xserver/Xi/chgfctl.c | 60 ++++-------
nx-X11/programs/Xserver/Xi/chgfctl.h | 32 ++----
nx-X11/programs/Xserver/Xi/chgkbd.c | 12 +--
nx-X11/programs/Xserver/Xi/chgkbd.h | 13 +--
nx-X11/programs/Xserver/Xi/chgkmap.c | 6 +-
nx-X11/programs/Xserver/Xi/chgkmap.h | 8 +-
nx-X11/programs/Xserver/Xi/chgprop.c | 6 +-
nx-X11/programs/Xserver/Xi/chgprop.h | 8 +-
nx-X11/programs/Xserver/Xi/chgptr.c | 29 ++----
nx-X11/programs/Xserver/Xi/chgptr.h | 23 ++---
nx-X11/programs/Xserver/Xi/closedev.c | 16 +--
nx-X11/programs/Xserver/Xi/closedev.h | 16 +--
nx-X11/programs/Xserver/Xi/devbell.c | 6 +-
nx-X11/programs/Xserver/Xi/devbell.h | 8 +-
nx-X11/programs/Xserver/Xi/exevents.c | 188 +++++++++-------------------------
nx-X11/programs/Xserver/Xi/extinit.c | 80 +++++----------
nx-X11/programs/Xserver/Xi/getbmap.c | 12 +--
nx-X11/programs/Xserver/Xi/getbmap.h | 12 +--
nx-X11/programs/Xserver/Xi/getdctl.c | 19 +---
nx-X11/programs/Xserver/Xi/getdctl.h | 16 +--
nx-X11/programs/Xserver/Xi/getfctl.c | 42 ++------
nx-X11/programs/Xserver/Xi/getfctl.h | 36 ++-----
nx-X11/programs/Xserver/Xi/getfocus.c | 11 +-
nx-X11/programs/Xserver/Xi/getfocus.h | 12 +--
nx-X11/programs/Xserver/Xi/getkmap.c | 13 +--
nx-X11/programs/Xserver/Xi/getkmap.h | 12 +--
nx-X11/programs/Xserver/Xi/getmmap.c | 12 +--
nx-X11/programs/Xserver/Xi/getmmap.h | 12 +--
nx-X11/programs/Xserver/Xi/getprop.c | 20 ++--
nx-X11/programs/Xserver/Xi/getprop.h | 16 +--
nx-X11/programs/Xserver/Xi/getselev.c | 12 +--
nx-X11/programs/Xserver/Xi/getselev.h | 12 +--
nx-X11/programs/Xserver/Xi/getvers.c | 12 +--
nx-X11/programs/Xserver/Xi/getvers.h | 12 +--
nx-X11/programs/Xserver/Xi/grabdev.c | 20 +---
nx-X11/programs/Xserver/Xi/grabdev.h | 16 +--
nx-X11/programs/Xserver/Xi/grabdevb.c | 6 +-
nx-X11/programs/Xserver/Xi/grabdevb.h | 8 +-
nx-X11/programs/Xserver/Xi/grabdevk.c | 6 +-
nx-X11/programs/Xserver/Xi/grabdevk.h | 8 +-
nx-X11/programs/Xserver/Xi/gtmotion.c | 12 +--
nx-X11/programs/Xserver/Xi/gtmotion.h | 12 +--
nx-X11/programs/Xserver/Xi/listdev.c | 51 +++------
nx-X11/programs/Xserver/Xi/listdev.h | 40 ++------
nx-X11/programs/Xserver/Xi/opendev.c | 11 +-
nx-X11/programs/Xserver/Xi/opendev.h | 12 +--
nx-X11/programs/Xserver/Xi/queryst.c | 11 +-
nx-X11/programs/Xserver/Xi/queryst.h | 12 +--
nx-X11/programs/Xserver/Xi/selectev.c | 6 +-
nx-X11/programs/Xserver/Xi/selectev.h | 8 +-
nx-X11/programs/Xserver/Xi/sendexev.c | 6 +-
nx-X11/programs/Xserver/Xi/sendexev.h | 8 +-
nx-X11/programs/Xserver/Xi/setbmap.c | 12 +--
nx-X11/programs/Xserver/Xi/setbmap.h | 12 +--
nx-X11/programs/Xserver/Xi/setdval.c | 12 +--
nx-X11/programs/Xserver/Xi/setdval.h | 12 +--
nx-X11/programs/Xserver/Xi/setfocus.c | 6 +-
nx-X11/programs/Xserver/Xi/setfocus.h | 8 +-
nx-X11/programs/Xserver/Xi/setmmap.c | 13 +--
nx-X11/programs/Xserver/Xi/setmmap.h | 12 +--
nx-X11/programs/Xserver/Xi/setmode.c | 11 +-
nx-X11/programs/Xserver/Xi/setmode.h | 12 +--
nx-X11/programs/Xserver/Xi/stubs.c | 44 +++-----
nx-X11/programs/Xserver/Xi/ungrdev.c | 6 +-
nx-X11/programs/Xserver/Xi/ungrdev.h | 8 +-
nx-X11/programs/Xserver/Xi/ungrdevb.c | 6 +-
nx-X11/programs/Xserver/Xi/ungrdevb.h | 8 +-
nx-X11/programs/Xserver/Xi/ungrdevk.c | 6 +-
nx-X11/programs/Xserver/Xi/ungrdevk.h | 8 +-
73 files changed, 350 insertions(+), 942 deletions(-)
diff --git a/nx-X11/programs/Xserver/Xi/allowev.c b/nx-X11/programs/Xserver/Xi/allowev.c
index 77e9994..85e3ed9 100644
--- a/nx-X11/programs/Xserver/Xi/allowev.c
+++ b/nx-X11/programs/Xserver/Xi/allowev.c
@@ -75,8 +75,7 @@ SOFTWARE.
*/
int
-SProcXAllowDeviceEvents(client)
- register ClientPtr client;
+SProcXAllowDeviceEvents(register ClientPtr client)
{
REQUEST(xAllowDeviceEventsReq);
swaps(&stuff->length);
@@ -92,8 +91,7 @@ SProcXAllowDeviceEvents(client)
*/
int
-ProcXAllowDeviceEvents(client)
- register ClientPtr client;
+ProcXAllowDeviceEvents(register ClientPtr client)
{
TimeStamp time;
DeviceIntPtr thisdev;
diff --git a/nx-X11/programs/Xserver/Xi/allowev.h b/nx-X11/programs/Xserver/Xi/allowev.h
index 3b5aa52..199744f 100644
--- a/nx-X11/programs/Xserver/Xi/allowev.h
+++ b/nx-X11/programs/Xserver/Xi/allowev.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef ALLOWEV_H
#define ALLOWEV_H 1
-int
-SProcXAllowDeviceEvents(
- ClientPtr /* client */
+int SProcXAllowDeviceEvents(ClientPtr /* client */
);
-int
-ProcXAllowDeviceEvents(
- ClientPtr /* client */
+int ProcXAllowDeviceEvents(ClientPtr /* client */
);
#endif /* ALLOWEV_H */
diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.c b/nx-X11/programs/Xserver/Xi/chgdctl.c
index c60570a..9f45ddc 100644
--- a/nx-X11/programs/Xserver/Xi/chgdctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgdctl.c
@@ -76,8 +76,7 @@ SOFTWARE.
*/
int
-SProcXChangeDeviceControl(client)
- register ClientPtr client;
+SProcXChangeDeviceControl(register ClientPtr client)
{
REQUEST(xChangeDeviceControlReq);
swaps(&stuff->length);
@@ -93,8 +92,7 @@ SProcXChangeDeviceControl(client)
*/
int
-ProcXChangeDeviceControl(client)
- ClientPtr client;
+ProcXChangeDeviceControl(ClientPtr client)
{
unsigned len;
int i, status;
@@ -199,13 +197,10 @@ ProcXChangeDeviceControl(client)
*/
void
-SRepXChangeDeviceControl (client, size, rep)
- ClientPtr client;
- int size;
- xChangeDeviceControlReply *rep;
+SRepXChangeDeviceControl(ClientPtr client, int size,
+ xChangeDeviceControlReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
-
diff --git a/nx-X11/programs/Xserver/Xi/chgdctl.h b/nx-X11/programs/Xserver/Xi/chgdctl.h
index e036063..9cda225 100644
--- a/nx-X11/programs/Xserver/Xi/chgdctl.h
+++ b/nx-X11/programs/Xserver/Xi/chgdctl.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGDCTL_H
#define CHGDCTL_H 1
-int
-SProcXChangeDeviceControl(
- ClientPtr /* client */
+int SProcXChangeDeviceControl(ClientPtr /* client */
);
-int
-ProcXChangeDeviceControl(
- ClientPtr /* client */
+int ProcXChangeDeviceControl(ClientPtr /* client */
);
-void
-SRepXChangeDeviceControl (
- ClientPtr /* client */,
+void SRepXChangeDeviceControl(ClientPtr /* client */ ,
int /* size */ ,
xChangeDeviceControlReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.c b/nx-X11/programs/Xserver/Xi/chgfctl.c
index c1a7fbf..da4111b 100644
--- a/nx-X11/programs/Xserver/Xi/chgfctl.c
+++ b/nx-X11/programs/Xserver/Xi/chgfctl.c
@@ -77,8 +77,7 @@ SOFTWARE.
*/
int
-SProcXChangeFeedbackControl(client)
- register ClientPtr client;
+SProcXChangeFeedbackControl(register ClientPtr client)
{
REQUEST(xChangeFeedbackControlReq);
swaps(&stuff->length);
@@ -94,8 +93,7 @@ SProcXChangeFeedbackControl(client)
*/
int
-ProcXChangeFeedbackControl(client)
- ClientPtr client;
+ProcXChangeFeedbackControl(ClientPtr client)
{
unsigned len;
DeviceIntPtr dev;
@@ -228,12 +226,8 @@ ProcXChangeFeedbackControl(client)
*/
int
-ChangeKbdFeedback (client, dev, mask, k, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- KbdFeedbackPtr k;
- xKbdFeedbackCtl *f;
+ChangeKbdFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ KbdFeedbackPtr k, xKbdFeedbackCtl * f)
{
KeybdCtrl kctrl;
int t;
@@ -383,12 +377,8 @@ ChangeKbdFeedback (client, dev, mask, k, f)
*/
int
-ChangePtrFeedback (client, dev, mask, p, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- PtrFeedbackPtr p;
- xPtrFeedbackCtl *f;
+ChangePtrFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ PtrFeedbackPtr p, xPtrFeedbackCtl * f)
{
PtrCtrl pctrl; /* might get BadValue part way through */
@@ -464,15 +454,11 @@ ChangePtrFeedback (client, dev, mask, p, f)
*/
int
-ChangeIntegerFeedback (client, dev, mask, i, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- IntegerFeedbackPtr i;
- xIntegerFeedbackCtl *f;
- {
- if (client->swapped)
+ChangeIntegerFeedback(ClientPtr client, DeviceIntPtr dev,
+ long unsigned int mask, IntegerFeedbackPtr i,
+ xIntegerFeedbackCtl * f)
{
+ if (client->swapped) {
swaps(&f->length);
swapl(&f->int_to_display);
}
@@ -489,12 +475,9 @@ ChangeIntegerFeedback (client, dev, mask, i, f)
*/
int
-ChangeStringFeedback (client, dev, mask, s, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- StringFeedbackPtr s;
- xStringFeedbackCtl *f;
+ChangeStringFeedback(ClientPtr client, DeviceIntPtr dev,
+ long unsigned int mask, StringFeedbackPtr s,
+ xStringFeedbackCtl * f)
{
int i, j;
KeySym *syms, *sup_syms;
@@ -540,12 +523,9 @@ ChangeStringFeedback (client, dev, mask, s, f)
*/
int
-ChangeBellFeedback (client, dev, mask, b, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- BellFeedbackPtr b;
- xBellFeedbackCtl *f;
+ChangeBellFeedback(ClientPtr client, DeviceIntPtr dev,
+ long unsigned int mask, BellFeedbackPtr b,
+ xBellFeedbackCtl * f)
{
int t;
BellCtrl bctrl; /* might get BadValue part way through */
@@ -614,12 +594,8 @@ ChangeBellFeedback (client, dev, mask, b, f)
*/
int
-ChangeLedFeedback (client, dev, mask, l, f)
- ClientPtr client;
- DeviceIntPtr dev;
- unsigned long mask;
- LedFeedbackPtr l;
- xLedFeedbackCtl *f;
+ChangeLedFeedback(ClientPtr client, DeviceIntPtr dev, long unsigned int mask,
+ LedFeedbackPtr l, xLedFeedbackCtl * f)
{
LedCtrl lctrl; /* might get BadValue part way through */
diff --git a/nx-X11/programs/Xserver/Xi/chgfctl.h b/nx-X11/programs/Xserver/Xi/chgfctl.h
index e3f6d82..81e1153 100644
--- a/nx-X11/programs/Xserver/Xi/chgfctl.h
+++ b/nx-X11/programs/Xserver/Xi/chgfctl.h
@@ -30,64 +30,48 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGFCTL_H
#define CHGFCTL_H 1
-int
-SProcXChangeFeedbackControl(
- ClientPtr /* client */
+int SProcXChangeFeedbackControl(ClientPtr /* client */
);
-int
-ProcXChangeFeedbackControl(
- ClientPtr /* client */
+int ProcXChangeFeedbackControl(ClientPtr /* client */
);
-int
-ChangeKbdFeedback (
- ClientPtr /* client */,
+int ChangeKbdFeedback(ClientPtr /* client */ ,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
KbdFeedbackPtr /* k */ ,
xKbdFeedbackCtl * /* f */
);
-int
-ChangePtrFeedback (
- ClientPtr /* client */,
+int ChangePtrFeedback(ClientPtr /* client */ ,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
PtrFeedbackPtr /* p */ ,
xPtrFeedbackCtl * /* f */
);
-int
-ChangeIntegerFeedback (
- ClientPtr /* client */,
+int ChangeIntegerFeedback(ClientPtr /* client */ ,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
IntegerFeedbackPtr /* i */ ,
xIntegerFeedbackCtl * /* f */
);
-int
-ChangeStringFeedback (
- ClientPtr /* client */,
+int ChangeStringFeedback(ClientPtr /* client */ ,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
StringFeedbackPtr /* s */ ,
xStringFeedbackCtl * /* f */
);
-int
-ChangeBellFeedback (
- ClientPtr /* client */,
+int ChangeBellFeedback(ClientPtr /* client */ ,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
BellFeedbackPtr /* b */ ,
xBellFeedbackCtl * /* f */
);
-int
-ChangeLedFeedback (
- ClientPtr /* client */,
+int ChangeLedFeedback(ClientPtr /* client */ ,
DeviceIntPtr /* dev */ ,
unsigned long /* mask */ ,
LedFeedbackPtr /* l */ ,
diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.c b/nx-X11/programs/Xserver/Xi/chgkbd.c
index c97293f..a74fe69 100644
--- a/nx-X11/programs/Xserver/Xi/chgkbd.c
+++ b/nx-X11/programs/Xserver/Xi/chgkbd.c
@@ -78,8 +78,7 @@ SOFTWARE.
*/
int
-SProcXChangeKeyboardDevice(client)
- register ClientPtr client;
+SProcXChangeKeyboardDevice(register ClientPtr client)
{
REQUEST(xChangeKeyboardDeviceReq);
swaps(&stuff->length);
@@ -95,8 +94,7 @@ SProcXChangeKeyboardDevice(client)
*/
int
-ProcXChangeKeyboardDevice (client)
- register ClientPtr client;
+ProcXChangeKeyboardDevice(register ClientPtr client)
{
int i;
DeviceIntPtr xkbd = inputInfo.keyboard;
@@ -197,10 +195,8 @@ ProcXChangeKeyboardDevice (client)
*/
void
-SRepXChangeKeyboardDevice (client, size, rep)
- ClientPtr client;
- int size;
- xChangeKeyboardDeviceReply *rep;
+SRepXChangeKeyboardDevice(ClientPtr client, int size,
+ xChangeKeyboardDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/chgkbd.h b/nx-X11/programs/Xserver/Xi/chgkbd.h
index a225de3..7a883b7 100644
--- a/nx-X11/programs/Xserver/Xi/chgkbd.h
+++ b/nx-X11/programs/Xserver/Xi/chgkbd.h
@@ -30,22 +30,15 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGKBD_H
#define CHGKBD_H 1
-int
-SProcXChangeKeyboardDevice(
- ClientPtr /* client */
+int SProcXChangeKeyboardDevice(ClientPtr /* client */
);
-int
-ProcXChangeKeyboardDevice (
- ClientPtr /* client */
+int ProcXChangeKeyboardDevice(ClientPtr /* client */
);
-void
-SRepXChangeKeyboardDevice (
- ClientPtr /* client */,
+void SRepXChangeKeyboardDevice(ClientPtr /* client */ ,
int /* size */ ,
xChangeKeyboardDeviceReply * /* rep */
);
-
#endif /* CHGKBD_H */
diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.c b/nx-X11/programs/Xserver/Xi/chgkmap.c
index 2b2f53e..82054e8 100644
--- a/nx-X11/programs/Xserver/Xi/chgkmap.c
+++ b/nx-X11/programs/Xserver/Xi/chgkmap.c
@@ -75,8 +75,7 @@ SOFTWARE.
*/
int
-SProcXChangeDeviceKeyMapping(client)
- register ClientPtr client;
+SProcXChangeDeviceKeyMapping(register ClientPtr client)
{
unsigned int count;
@@ -96,8 +95,7 @@ SProcXChangeDeviceKeyMapping(client)
*/
int
-ProcXChangeDeviceKeyMapping(client)
- register ClientPtr client;
+ProcXChangeDeviceKeyMapping(register ClientPtr client)
{
int ret;
unsigned len;
diff --git a/nx-X11/programs/Xserver/Xi/chgkmap.h b/nx-X11/programs/Xserver/Xi/chgkmap.h
index daf2635..6ed6420 100644
--- a/nx-X11/programs/Xserver/Xi/chgkmap.h
+++ b/nx-X11/programs/Xserver/Xi/chgkmap.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGKMAP_H
#define CHGKMAP_H 1
-int
-SProcXChangeDeviceKeyMapping(
- ClientPtr /* client */
+int SProcXChangeDeviceKeyMapping(ClientPtr /* client */
);
-int
-ProcXChangeDeviceKeyMapping(
- ClientPtr /* client */
+int ProcXChangeDeviceKeyMapping(ClientPtr /* client */
);
#endif /* CHGKMAP_H */
diff --git a/nx-X11/programs/Xserver/Xi/chgprop.c b/nx-X11/programs/Xserver/Xi/chgprop.c
index 662e5bd..4c55f55 100644
--- a/nx-X11/programs/Xserver/Xi/chgprop.c
+++ b/nx-X11/programs/Xserver/Xi/chgprop.c
@@ -77,8 +77,7 @@ SOFTWARE.
*/
int
-SProcXChangeDeviceDontPropagateList(client)
- register ClientPtr client;
+SProcXChangeDeviceDontPropagateList(register ClientPtr client)
{
REQUEST(xChangeDeviceDontPropagateListReq);
swaps(&stuff->length);
@@ -98,8 +97,7 @@ SProcXChangeDeviceDontPropagateList(client)
*/
int
-ProcXChangeDeviceDontPropagateList (client)
- register ClientPtr client;
+ProcXChangeDeviceDontPropagateList(register ClientPtr client)
{
int i;
WindowPtr pWin;
diff --git a/nx-X11/programs/Xserver/Xi/chgprop.h b/nx-X11/programs/Xserver/Xi/chgprop.h
index de9e200..3671618 100644
--- a/nx-X11/programs/Xserver/Xi/chgprop.h
+++ b/nx-X11/programs/Xserver/Xi/chgprop.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGPROP_H
#define CHGPROP_H 1
-int
-SProcXChangeDeviceDontPropagateList (
- ClientPtr /* client */
+int SProcXChangeDeviceDontPropagateList(ClientPtr /* client */
);
-int
-ProcXChangeDeviceDontPropagateList (
- ClientPtr /* client */
+int ProcXChangeDeviceDontPropagateList(ClientPtr /* client */
);
#endif /* CHGPROP_H */
diff --git a/nx-X11/programs/Xserver/Xi/chgptr.c b/nx-X11/programs/Xserver/Xi/chgptr.c
index fd01c7e..978a6b3 100644
--- a/nx-X11/programs/Xserver/Xi/chgptr.c
+++ b/nx-X11/programs/Xserver/Xi/chgptr.c
@@ -81,8 +81,7 @@ SOFTWARE.
*/
int
-SProcXChangePointerDevice(client)
- register ClientPtr client;
+SProcXChangePointerDevice(register ClientPtr client)
{
REQUEST(xChangePointerDeviceReq);
swaps(&stuff->length);
@@ -97,8 +96,7 @@ SProcXChangePointerDevice(client)
*/
int
-ProcXChangePointerDevice (client)
- register ClientPtr client;
+ProcXChangePointerDevice(register ClientPtr client)
{
DeviceIntPtr xptr = inputInfo.pointer;
DeviceIntPtr dev;
@@ -176,8 +174,7 @@ ProcXChangePointerDevice (client)
}
void
-DeleteFocusClassDeviceStruct(dev)
- DeviceIntPtr dev;
+DeleteFocusClassDeviceStruct(DeviceIntPtr dev)
{
free(dev->focus->trace);
free(dev->focus);
@@ -191,11 +188,7 @@ DeleteFocusClassDeviceStruct(dev)
*/
void
-SendEventToAllWindows (dev, mask, ev, count)
- DeviceIntPtr dev;
- Mask mask;
- xEvent *ev;
- int count;
+SendEventToAllWindows(DeviceIntPtr dev, Mask mask, xEvent * ev, int count)
{
int i;
WindowPtr pWin, p1;
@@ -217,12 +210,8 @@ SendEventToAllWindows (dev, mask, ev, count)
*/
void
-FindInterestedChildren (dev, p1, mask, ev, count)
- DeviceIntPtr dev;
- WindowPtr p1;
- Mask mask;
- xEvent *ev;
- int count;
+FindInterestedChildren(DeviceIntPtr dev, WindowPtr p1, Mask mask,
+ xEvent * ev, int count)
{
WindowPtr p2;
@@ -243,10 +232,8 @@ FindInterestedChildren (dev, p1, mask, ev, count)
*/
void
-SRepXChangePointerDevice (client, size, rep)
- ClientPtr client;
- int size;
- xChangePointerDeviceReply *rep;
+SRepXChangePointerDevice(ClientPtr client, int size,
+ xChangePointerDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/chgptr.h b/nx-X11/programs/Xserver/Xi/chgptr.h
index c94cc4a..aeda822 100644
--- a/nx-X11/programs/Xserver/Xi/chgptr.h
+++ b/nx-X11/programs/Xserver/Xi/chgptr.h
@@ -30,31 +30,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CHGPTR_H
#define CHGPTR_H 1
-int
-SProcXChangePointerDevice(
- ClientPtr /* client */
+int SProcXChangePointerDevice(ClientPtr /* client */
);
-int
-ProcXChangePointerDevice (
- ClientPtr /* client */
+int ProcXChangePointerDevice(ClientPtr /* client */
);
-void
-DeleteFocusClassDeviceStruct(
- DeviceIntPtr /* dev */
+void DeleteFocusClassDeviceStruct(DeviceIntPtr /* dev */
);
-void
-SendEventToAllWindows (
- DeviceIntPtr /* dev */,
+void SendEventToAllWindows(DeviceIntPtr /* dev */ ,
Mask /* mask */ ,
xEvent * /* ev */ ,
int /* count */
);
-void
-FindInterestedChildren ( /* FIXME: could be static? */
+void FindInterestedChildren( /* FIXME: could be static? */
DeviceIntPtr /* dev */ ,
WindowPtr /* p1 */ ,
Mask /* mask */ ,
@@ -62,9 +53,7 @@ FindInterestedChildren ( /* FIXME: could be static? */
int /* count */
);
-void
-SRepXChangePointerDevice (
- ClientPtr /* client */,
+void SRepXChangePointerDevice(ClientPtr /* client */ ,
int /* size */ ,
xChangePointerDeviceReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/closedev.c b/nx-X11/programs/Xserver/Xi/closedev.c
index 29a4130..48a743a 100644
--- a/nx-X11/programs/Xserver/Xi/closedev.c
+++ b/nx-X11/programs/Xserver/Xi/closedev.c
@@ -76,8 +76,7 @@ SOFTWARE.
*/
int
-SProcXCloseDevice(client)
- register ClientPtr client;
+SProcXCloseDevice(register ClientPtr client)
{
REQUEST(xCloseDeviceReq);
swaps(&stuff->length);
@@ -92,8 +91,7 @@ SProcXCloseDevice(client)
*/
int
-ProcXCloseDevice(client)
- register ClientPtr client;
+ProcXCloseDevice(register ClientPtr client)
{
int i;
WindowPtr pWin, p1;
@@ -136,10 +134,7 @@ ProcXCloseDevice(client)
*/
void
-DeleteEventsFromChildren(dev, p1, client)
- DeviceIntPtr dev;
- WindowPtr p1;
- ClientPtr client;
+DeleteEventsFromChildren(DeviceIntPtr dev, WindowPtr p1, ClientPtr client)
{
WindowPtr p2;
@@ -160,10 +155,7 @@ DeleteEventsFromChildren(dev, p1, client)
*/
void
-DeleteDeviceEvents (dev, pWin, client)
- DeviceIntPtr dev;
- WindowPtr pWin;
- ClientPtr client;
+DeleteDeviceEvents(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
{
InputClientsPtr others;
OtherInputMasks *pOthers;
diff --git a/nx-X11/programs/Xserver/Xi/closedev.h b/nx-X11/programs/Xserver/Xi/closedev.h
index a476d99..6853d50 100644
--- a/nx-X11/programs/Xserver/Xi/closedev.h
+++ b/nx-X11/programs/Xserver/Xi/closedev.h
@@ -30,26 +30,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef CLOSEDEV_H
#define CLOSEDEV_H 1
-int
-SProcXCloseDevice(
- ClientPtr /* client */
+int SProcXCloseDevice(ClientPtr /* client */
);
-int
-ProcXCloseDevice(
- ClientPtr /* client */
+int ProcXCloseDevice(ClientPtr /* client */
);
-void
-DeleteEventsFromChildren(
- DeviceIntPtr /* dev */,
+void DeleteEventsFromChildren(DeviceIntPtr /* dev */ ,
WindowPtr /* p1 */ ,
ClientPtr /* client */
);
-void
-DeleteDeviceEvents (
- DeviceIntPtr /* dev */,
+void DeleteDeviceEvents(DeviceIntPtr /* dev */ ,
WindowPtr /* pWin */ ,
ClientPtr /* client */
);
diff --git a/nx-X11/programs/Xserver/Xi/devbell.c b/nx-X11/programs/Xserver/Xi/devbell.c
index 3b6a224..8738436 100644
--- a/nx-X11/programs/Xserver/Xi/devbell.c
+++ b/nx-X11/programs/Xserver/Xi/devbell.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXDeviceBell(client)
- register ClientPtr client;
+SProcXDeviceBell(register ClientPtr client)
{
REQUEST(xDeviceBellReq);
swaps(&stuff->length);
@@ -89,8 +88,7 @@ SProcXDeviceBell(client)
*/
int
-ProcXDeviceBell (client)
- register ClientPtr client;
+ProcXDeviceBell(register ClientPtr client)
{
DeviceIntPtr dev;
KbdFeedbackPtr k;
diff --git a/nx-X11/programs/Xserver/Xi/devbell.h b/nx-X11/programs/Xserver/Xi/devbell.h
index 9bcf1f9..02a77a6 100644
--- a/nx-X11/programs/Xserver/Xi/devbell.h
+++ b/nx-X11/programs/Xserver/Xi/devbell.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef DEVBELL_H
#define DEVBELL_H 1
-int
-SProcXDeviceBell (
- ClientPtr /* client */
+int SProcXDeviceBell(ClientPtr /* client */
);
-int
-ProcXDeviceBell (
- ClientPtr /* client */
+int ProcXDeviceBell(ClientPtr /* client */
);
#endif /* DEVBELL_H */
diff --git a/nx-X11/programs/Xserver/Xi/exevents.c b/nx-X11/programs/Xserver/Xi/exevents.c
index ce05858..07d6eac 100644
--- a/nx-X11/programs/Xserver/Xi/exevents.c
+++ b/nx-X11/programs/Xserver/Xi/exevents.c
@@ -82,12 +82,10 @@ SOFTWARE.
#define Motion_Filter(class) (DevicePointerMotionMask | \
(class)->state | (class)->motionMask)
-static Bool ShouldFreeInputMasks(
- WindowPtr /* pWin */,
+static Bool ShouldFreeInputMasks(WindowPtr /* pWin */ ,
Bool /* ignoreSelectedEvents */
);
-static Bool MakeInputMasks (
- WindowPtr /* pWin */
+static Bool MakeInputMasks(WindowPtr /* pWin */
);
/**************************************************************************
@@ -97,8 +95,7 @@ static Bool MakeInputMasks (
*/
void
-RegisterOtherDevice (device)
- DeviceIntPtr device;
+RegisterOtherDevice(DeviceIntPtr device)
{
device->public.processInputProc = ProcessOtherEvent;
device->public.realInputProc = ProcessOtherEvent;
@@ -106,12 +103,8 @@ RegisterOtherDevice (device)
(device)->DeactivateGrab = DeactivateKeyboardGrab;
}
-/*ARGSUSED*/
-void
-ProcessOtherEvent (xE, other, count)
- xEventPtr xE;
- register DeviceIntPtr other;
- int count;
+ /*ARGSUSED*/ void
+ProcessOtherEvent(xEventPtr xE, register DeviceIntPtr other, int count)
{
register BYTE *kptr;
register int i;
@@ -307,13 +300,8 @@ InitProximityClassDeviceStruct(DeviceIntPtr dev)
}
void
-InitValuatorAxisStruct( DeviceIntPtr dev,
- int axnum,
- int minval,
- int maxval,
- int resolution,
- int min_res,
- int max_res )
+InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval,
+ int resolution, int min_res, int max_res)
{
register AxisInfoPtr ax = dev->valuator->axes + axnum;
@@ -325,13 +313,8 @@ InitValuatorAxisStruct( DeviceIntPtr dev,
}
static void
-FixDeviceStateNotify (
- DeviceIntPtr dev,
- deviceStateNotify *ev,
- KeyClassPtr k,
- ButtonClassPtr b,
- ValuatorClassPtr v,
- int first)
+FixDeviceStateNotify(DeviceIntPtr dev, deviceStateNotify * ev, KeyClassPtr k,
+ ButtonClassPtr b, ValuatorClassPtr v, int first)
{
ev->type = DeviceStateNotify;
ev->deviceid = dev->id;
@@ -370,10 +353,7 @@ FixDeviceStateNotify (
}
static void
-FixDeviceValuator (
- DeviceIntPtr dev,
- deviceValuator *ev,
- ValuatorClassPtr v,
+FixDeviceValuator(DeviceIntPtr dev, deviceValuator * ev, ValuatorClassPtr v,
int first)
{
int nval = v->numAxes - first;
@@ -395,10 +375,8 @@ FixDeviceValuator (
}
void
-DeviceFocusEvent(dev, type, mode, detail, pWin)
- DeviceIntPtr dev;
- int type, mode, detail;
- register WindowPtr pWin;
+DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
+ register WindowPtr pWin)
{
deviceFocus event;
@@ -517,19 +495,10 @@ DeviceFocusEvent(dev, type, mode, detail, pWin)
}
int
-GrabButton(
- ClientPtr client,
- DeviceIntPtr dev,
- BYTE this_device_mode,
- BYTE other_devices_mode,
- CARD16 modifiers,
- DeviceIntPtr modifier_device,
- CARD8 button,
- Window grabWindow,
- BOOL ownerEvents,
- Cursor rcursor,
- Window rconfineTo,
- Mask eventMask)
+GrabButton(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
+ BYTE other_devices_mode, CARD16 modifiers,
+ DeviceIntPtr modifier_device, CARD8 button, Window grabWindow,
+ BOOL ownerEvents, Cursor rcursor, Window rconfineTo, Mask eventMask)
{
WindowPtr pWin, confineTo;
CursorPtr cursor;
@@ -591,17 +560,10 @@ GrabButton(
}
int
-GrabKey(
- ClientPtr client,
- DeviceIntPtr dev,
- BYTE this_device_mode,
- BYTE other_devices_mode,
- CARD16 modifiers,
- DeviceIntPtr modifier_device,
- CARD8 key,
- Window grabWindow,
- BOOL ownerEvents,
- Mask mask)
+GrabKey(ClientPtr client, DeviceIntPtr dev, BYTE this_device_mode,
+ BYTE other_devices_mode, CARD16 modifiers,
+ DeviceIntPtr modifier_device, CARD8 key, Window grabWindow,
+ BOOL ownerEvents, Mask mask)
{
WindowPtr pWin;
GrabPtr grab;
@@ -653,13 +615,8 @@ GrabKey(
}
int
-SelectForWindow(dev, pWin, client, mask, exclusivemasks, validmasks)
- DeviceIntPtr dev;
- WindowPtr pWin;
- ClientPtr client;
- Mask mask;
- Mask exclusivemasks;
- Mask validmasks;
+SelectForWindow(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client,
+ Mask mask, Mask exclusivemasks, Mask validmasks)
{
int mskidx = dev->id;
int i, ret;
@@ -720,19 +677,14 @@ SelectForWindow(dev, pWin, client, mask, exclusivemasks, validmasks)
if (dev->valuator)
if ((dev->valuator->motionHintWindow == pWin) &&
(mask & DevicePointerMotionHintMask) &&
- !(check & DevicePointerMotionHintMask) &&
- !dev->grab)
+ !(check & DevicePointerMotionHintMask) && !dev->grab)
dev->valuator->motionHintWindow = NullWindow;
RecalculateDeviceDeliverableEvents(pWin);
return Success;
}
int
-AddExtensionClient (pWin, client, mask, mskidx)
- WindowPtr pWin;
- ClientPtr client;
- Mask mask;
- int mskidx;
+AddExtensionClient(WindowPtr pWin, ClientPtr client, Mask mask, int mskidx)
{
InputClientsPtr others;
@@ -754,8 +706,7 @@ AddExtensionClient (pWin, client, mask, mskidx)
}
static Bool
-MakeInputMasks (pWin)
- WindowPtr pWin;
+MakeInputMasks(WindowPtr pWin)
{
struct _OtherInputMasks *imasks;
@@ -769,8 +720,7 @@ MakeInputMasks (pWin)
}
void
-RecalculateDeviceDeliverableEvents(pWin)
- WindowPtr pWin;
+RecalculateDeviceDeliverableEvents(WindowPtr pWin)
{
register InputClientsPtr others;
struct _OtherInputMasks *inputMasks; /* default: NULL */
@@ -811,9 +761,7 @@ RecalculateDeviceDeliverableEvents(pWin)
}
int
-InputClientGone(pWin, id)
- register WindowPtr pWin;
- XID id;
+InputClientGone(register WindowPtr pWin, XID id)
{
register InputClientsPtr other, prev;
if (!wOtherInputMasks(pWin))
@@ -862,14 +810,8 @@ InputClientGone(pWin, id)
}
int
-SendEvent (client, d, dest, propagate, ev, mask, count)
- ClientPtr client;
- DeviceIntPtr d;
- Window dest;
- Bool propagate;
- xEvent *ev;
- Mask mask;
- int count;
+SendEvent(ClientPtr client, DeviceIntPtr d, Window dest, Bool propagate,
+ xEvent * ev, Mask mask, int count)
{
WindowPtr pWin;
WindowPtr effectiveFocus = NullWindow; /* only set if dest==InputFocus */
@@ -935,11 +877,7 @@ SendEvent (client, d, dest, propagate, ev, mask, count)
}
int
-SetButtonMapping (client, dev, nElts, map)
- ClientPtr client;
- DeviceIntPtr dev;
- int nElts;
- BYTE *map;
+SetButtonMapping(ClientPtr client, DeviceIntPtr dev, int nElts, BYTE * map)
{
register int i;
ButtonClassPtr b = dev->button;
@@ -964,14 +902,8 @@ SetButtonMapping (client, dev, nElts, map)
}
int
-SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k)
- ClientPtr client;
- DeviceIntPtr dev;
- int len;
- int rlen;
- int numKeyPerModifier;
- KeyCode *inputMap;
- KeyClassPtr *k;
+SetModifierMapping(ClientPtr client, DeviceIntPtr dev, int len, int rlen,
+ int numKeyPerModifier, KeyCode * inputMap, KeyClassPtr * k)
{
KeyCode *map = NULL;
int inputMapLen;
@@ -1048,11 +980,8 @@ SetModifierMapping(client, dev, len, rlen, numKeyPerModifier, inputMap, k)
}
void
-SendDeviceMappingNotify(
- CARD8 request,
- KeyCode firstKeyCode,
- CARD8 count,
- DeviceIntPtr dev)
+SendDeviceMappingNotify(CARD8 request,
+ KeyCode firstKeyCode, CARD8 count, DeviceIntPtr dev)
{
xEvent event;
deviceMappingNotify *ev = (deviceMappingNotify *) & event;
@@ -1071,15 +1000,12 @@ SendDeviceMappingNotify(
}
int
-ChangeKeyMapping(
- ClientPtr client,
+ChangeKeyMapping(ClientPtr client,
DeviceIntPtr dev,
unsigned len,
int type,
KeyCode firstKeyCode,
- CARD8 keyCodes,
- CARD8 keySymsPerKeyCode,
- KeySym *map)
+ CARD8 keyCodes, CARD8 keySymsPerKeyCode, KeySym * map)
{
KeySymsRec keysyms;
KeyClassPtr k = dev->key;
@@ -1113,9 +1039,7 @@ ChangeKeyMapping(
}
void
-DeleteWindowFromAnyExtEvents(pWin, freeResources)
- WindowPtr pWin;
- Bool freeResources;
+DeleteWindowFromAnyExtEvents(WindowPtr pWin, Bool freeResources)
{
int i;
DeviceIntPtr dev;
@@ -1144,9 +1068,7 @@ DeleteWindowFromAnyExtEvents(pWin, freeResources)
}
void
-DeleteDeviceFromAnyExtEvents(pWin, dev)
- WindowPtr pWin;
- DeviceIntPtr dev;
+DeleteDeviceFromAnyExtEvents(WindowPtr pWin, DeviceIntPtr dev)
{
WindowPtr parent;
@@ -1213,9 +1135,7 @@ DeleteDeviceFromAnyExtEvents(pWin, dev)
}
int
-MaybeSendDeviceMotionNotifyHint (pEvents, mask)
- deviceKeyButtonPointer *pEvents;
- Mask mask;
+MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * pEvents, Mask mask)
{
DeviceIntPtr dev;
@@ -1239,13 +1159,9 @@ MaybeSendDeviceMotionNotifyHint (pEvents, mask)
}
void
-CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask)
- WindowPtr pWin;
- int type;
- deviceKeyButtonPointer *xE;
- GrabPtr grab;
- ClientPtr client;
- Mask deliveryMask;
+CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
+ deviceKeyButtonPointer * xE, GrabPtr grab,
+ ClientPtr client, Mask deliveryMask)
{
DeviceIntPtr dev;
@@ -1271,10 +1187,7 @@ CheckDeviceGrabAndHintWindow (pWin, type, xE, grab, client, deliveryMask)
}
Mask
-DeviceEventMaskForClient(dev, pWin, client)
- DeviceIntPtr dev;
- WindowPtr pWin;
- ClientPtr client;
+DeviceEventMaskForClient(DeviceIntPtr dev, WindowPtr pWin, ClientPtr client)
{
register InputClientsPtr other;
@@ -1290,9 +1203,7 @@ DeviceEventMaskForClient(dev, pWin, client)
}
void
-MaybeStopDeviceHint(dev, client)
- register DeviceIntPtr dev;
- ClientPtr client;
+MaybeStopDeviceHint(register DeviceIntPtr dev, ClientPtr client)
{
WindowPtr pWin;
GrabPtr grab = dev->grab;
@@ -1310,11 +1221,8 @@ MaybeStopDeviceHint(dev, client)
}
int
-DeviceEventSuppressForWindow(pWin, client, mask, maskndx)
- WindowPtr pWin;
- ClientPtr client;
- Mask mask;
- int maskndx;
+DeviceEventSuppressForWindow(WindowPtr pWin, ClientPtr client, Mask mask,
+ int maskndx)
{
struct _OtherInputMasks *inputMasks = wOtherInputMasks(pWin);
@@ -1343,9 +1251,7 @@ DeviceEventSuppressForWindow(pWin, client, mask, maskndx)
}
static Bool
-ShouldFreeInputMasks (pWin, ignoreSelectedEvents)
- WindowPtr pWin;
- Bool ignoreSelectedEvents;
+ShouldFreeInputMasks(WindowPtr pWin, Bool ignoreSelectedEvents)
{
int i;
Mask allInputEventMasks = 0;
diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c
index 229fde2..f9415af 100644
--- a/nx-X11/programs/Xserver/Xi/extinit.c
+++ b/nx-X11/programs/Xserver/Xi/extinit.c
@@ -261,8 +261,7 @@ XInputExtensionInit()
*/
int
-ProcIDispatch (client)
- register ClientPtr client;
+ProcIDispatch(register ClientPtr client)
{
REQUEST(xReq);
if (stuff->data == X_GetExtensionVersion)
@@ -352,8 +351,7 @@ ProcIDispatch (client)
*/
int
-SProcIDispatch(client)
- register ClientPtr client;
+SProcIDispatch(register ClientPtr client)
{
REQUEST(xReq);
if (stuff->data == X_GetExtensionVersion)
@@ -446,10 +444,8 @@ SProcIDispatch(client)
SRepX##code (client, len, (x##code##Reply *) rep)
void
-SReplyIDispatch (client, len, rep)
- ClientPtr client;
- int len;
- xGrabDeviceReply *rep; /* All we look at is the type field */
+SReplyIDispatch(ClientPtr client, int len, xGrabDeviceReply * rep)
+ /* All we look at is the type field */
{ /* This is common to all replies */
if (rep->RepType == X_GetExtensionVersion)
SRepXGetExtensionVersion (client, len, (xGetExtensionVersionReply *)rep);
@@ -508,9 +504,7 @@ SReplyIDispatch (client, len, rep)
#define DO_SWAP(func,type) func ((type *)from, (type *)to)
void
-SEventIDispatch (from, to)
- xEvent *from;
- xEvent *to;
+SEventIDispatch(xEvent * from, xEvent * to)
{
int type = from->u.u.type & 0177;
@@ -578,9 +572,7 @@ SEventIDispatch (from, to)
*/
void
-SEventDeviceValuator (from, to)
- deviceValuator *from;
- deviceValuator *to;
+SEventDeviceValuator(deviceValuator * from, deviceValuator * to)
{
register int i;
INT32 *ip B32;
@@ -596,9 +588,7 @@ SEventDeviceValuator (from, to)
}
void
-SEventFocus (from, to)
- deviceFocus *from;
- deviceFocus *to;
+SEventFocus(deviceFocus * from, deviceFocus * to)
{
*to = *from;
swaps(&to->sequenceNumber);
@@ -607,9 +597,7 @@ SEventFocus (from, to)
}
void
-SDeviceStateNotifyEvent (from, to)
- deviceStateNotify *from;
- deviceStateNotify *to;
+SDeviceStateNotifyEvent(deviceStateNotify * from, deviceStateNotify * to)
{
register int i;
INT32 *ip B32;
@@ -625,27 +613,23 @@ SDeviceStateNotifyEvent (from, to)
}
void
-SDeviceKeyStateNotifyEvent (from, to)
- deviceKeyStateNotify *from;
- deviceKeyStateNotify *to;
+SDeviceKeyStateNotifyEvent(deviceKeyStateNotify * from,
+ deviceKeyStateNotify * to)
{
*to = *from;
swaps(&to->sequenceNumber);
}
void
-SDeviceButtonStateNotifyEvent (from, to)
- deviceButtonStateNotify *from;
- deviceButtonStateNotify *to;
+SDeviceButtonStateNotifyEvent(deviceButtonStateNotify * from,
+ deviceButtonStateNotify * to)
{
*to = *from;
swaps(&to->sequenceNumber);
}
void
-SChangeDeviceNotifyEvent (from, to)
- changeDeviceNotify *from;
- changeDeviceNotify *to;
+SChangeDeviceNotifyEvent(changeDeviceNotify * from, changeDeviceNotify * to)
{
*to = *from;
swaps(&to->sequenceNumber);
@@ -653,9 +637,7 @@ SChangeDeviceNotifyEvent (from, to)
}
void
-SDeviceMappingNotifyEvent (from, to)
- deviceMappingNotify *from;
- deviceMappingNotify *to;
+SDeviceMappingNotifyEvent(deviceMappingNotify * from, deviceMappingNotify * to)
{
*to = *from;
swaps(&to->sequenceNumber);
@@ -669,8 +651,7 @@ SDeviceMappingNotifyEvent (from, to)
*/
void
-FixExtensionEvents (extEntry)
- ExtensionEntry *extEntry;
+FixExtensionEvents(ExtensionEntry * extEntry)
{
Mask mask;
@@ -772,7 +753,7 @@ FixExtensionEvents (extEntry)
*/
void
-RestoreExtensionEvents ()
+RestoreExtensionEvents()
{
int i;
@@ -820,8 +801,7 @@ RestoreExtensionEvents ()
*/
void
-IResetProc(unused)
- ExtensionEntry *unused;
+IResetProc(ExtensionEntry * unused)
{
ReplySwapVector[IReqCode] = ReplyNotSwappd;
@@ -850,10 +830,7 @@ IResetProc(unused)
*/
void
-AssignTypeAndName (dev, type, name)
- DeviceIntPtr dev;
- Atom type;
- char *name;
+AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name)
{
dev->type = type;
dev->name = (char *)malloc(strlen(name) + 1);
@@ -867,7 +844,7 @@ AssignTypeAndName (dev, type, name)
*/
void
-MakeDeviceTypeAtoms ()
+MakeDeviceTypeAtoms()
{
int i;
@@ -884,8 +861,7 @@ MakeDeviceTypeAtoms ()
*/
DeviceIntPtr
-LookupDeviceIntRec (
- CARD8 id)
+LookupDeviceIntRec(CARD8 id)
{
DeviceIntPtr dev;
@@ -910,8 +886,7 @@ LookupDeviceIntRec (
*/
void
-SetExclusiveAccess (mask)
- Mask mask;
+SetExclusiveAccess(Mask mask)
{
int i;
@@ -927,8 +902,7 @@ SetExclusiveAccess (mask)
*/
void
-AllowPropagateSuppress (mask)
- Mask mask;
+AllowPropagateSuppress(Mask mask)
{
int i;
@@ -943,7 +917,7 @@ AllowPropagateSuppress (mask)
*/
Mask
-GetNextExtEventMask ()
+GetNextExtEventMask()
{
int i;
Mask mask = lastExtEventMask;
@@ -966,9 +940,7 @@ GetNextExtEventMask ()
*/
void
-SetMaskForExtEvent(mask, event)
- Mask mask;
- int event;
+SetMaskForExtEvent(Mask mask, int event)
{
EventInfo[ExtEventIndex].mask = mask;
@@ -993,9 +965,7 @@ SetMaskForExtEvent(mask, event)
*/
void
-SetEventInfo(mask, constant)
- Mask mask;
- int constant;
+SetEventInfo(Mask mask, int constant)
{
EventInfo[ExtEventIndex].mask = mask;
EventInfo[ExtEventIndex++].type = constant;
diff --git a/nx-X11/programs/Xserver/Xi/getbmap.c b/nx-X11/programs/Xserver/Xi/getbmap.c
index e0f8778..0708e5f 100644
--- a/nx-X11/programs/Xserver/Xi/getbmap.c
+++ b/nx-X11/programs/Xserver/Xi/getbmap.c
@@ -73,8 +73,7 @@ SOFTWARE.
*/
int
-SProcXGetDeviceButtonMapping(client)
- register ClientPtr client;
+SProcXGetDeviceButtonMapping(register ClientPtr client)
{
REQUEST(xGetDeviceButtonMappingReq);
swaps(&stuff->length);
@@ -88,8 +87,7 @@ SProcXGetDeviceButtonMapping(client)
*/
int
-ProcXGetDeviceButtonMapping (client)
- register ClientPtr client;
+ProcXGetDeviceButtonMapping(register ClientPtr client)
{
DeviceIntPtr dev;
xGetDeviceButtonMappingReply rep;
@@ -135,10 +133,8 @@ ProcXGetDeviceButtonMapping (client)
*/
void
-SRepXGetDeviceButtonMapping (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceButtonMappingReply *rep;
+SRepXGetDeviceButtonMapping(ClientPtr client, int size,
+ xGetDeviceButtonMappingReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getbmap.h b/nx-X11/programs/Xserver/Xi/getbmap.h
index c6ac5af..d95b3c6 100644
--- a/nx-X11/programs/Xserver/Xi/getbmap.h
+++ b/nx-X11/programs/Xserver/Xi/getbmap.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETBMAP_H
#define GETBMAP_H 1
-int
-SProcXGetDeviceButtonMapping(
- ClientPtr /* client */
+int SProcXGetDeviceButtonMapping(ClientPtr /* client */
);
-int
-ProcXGetDeviceButtonMapping (
- ClientPtr /* client */
+int ProcXGetDeviceButtonMapping(ClientPtr /* client */
);
-void
-SRepXGetDeviceButtonMapping (
- ClientPtr /* client */,
+void SRepXGetDeviceButtonMapping(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceButtonMappingReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getdctl.c b/nx-X11/programs/Xserver/Xi/getdctl.c
index 268366c..f23fc21 100644
--- a/nx-X11/programs/Xserver/Xi/getdctl.c
+++ b/nx-X11/programs/Xserver/Xi/getdctl.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXGetDeviceControl(client)
- register ClientPtr client;
+SProcXGetDeviceControl(register ClientPtr client)
{
REQUEST(xGetDeviceControlReq);
swaps(&stuff->length);
@@ -91,8 +90,7 @@ SProcXGetDeviceControl(client)
*/
int
-ProcXGetDeviceControl(client)
- ClientPtr client;
+ProcXGetDeviceControl(ClientPtr client)
{
int total_length = 0;
char *buf, *savbuf;
@@ -166,11 +164,8 @@ ProcXGetDeviceControl(client)
*/
void
-CopySwapDeviceResolution (client, v, buf, length)
- ClientPtr client;
- ValuatorClassPtr v;
- char *buf;
- int length;
+CopySwapDeviceResolution(ClientPtr client, ValuatorClassPtr v, char *buf,
+ int length)
{
AxisInfoPtr a;
xDeviceResolutionState *r;
@@ -209,13 +204,9 @@ CopySwapDeviceResolution (client, v, buf, length)
*/
void
-SRepXGetDeviceControl (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceControlReply *rep;
+SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
-
diff --git a/nx-X11/programs/Xserver/Xi/getdctl.h b/nx-X11/programs/Xserver/Xi/getdctl.h
index eba0c03..c7cfb19 100644
--- a/nx-X11/programs/Xserver/Xi/getdctl.h
+++ b/nx-X11/programs/Xserver/Xi/getdctl.h
@@ -30,27 +30,19 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETDCTL_H
#define GETDCTL_H 1
-int
-SProcXGetDeviceControl (
- ClientPtr /* client */
+int SProcXGetDeviceControl(ClientPtr /* client */
);
-int
-ProcXGetDeviceControl (
- ClientPtr /* client */
+int ProcXGetDeviceControl(ClientPtr /* client */
);
-void
-CopySwapDeviceResolution (
- ClientPtr /* client */,
+void CopySwapDeviceResolution(ClientPtr /* client */ ,
ValuatorClassPtr /* v */ ,
char * /* buf */ ,
int /* length */
);
-void
-SRepXGetDeviceControl (
- ClientPtr /* client */,
+void SRepXGetDeviceControl(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceControlReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getfctl.c b/nx-X11/programs/Xserver/Xi/getfctl.c
index d450ec8..a7d46e2 100644
--- a/nx-X11/programs/Xserver/Xi/getfctl.c
+++ b/nx-X11/programs/Xserver/Xi/getfctl.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXGetFeedbackControl(client)
- register ClientPtr client;
+SProcXGetFeedbackControl(register ClientPtr client)
{
REQUEST(xGetFeedbackControlReq);
swaps(&stuff->length);
@@ -89,8 +88,7 @@ SProcXGetFeedbackControl(client)
*/
int
-ProcXGetFeedbackControl(client)
- ClientPtr client;
+ProcXGetFeedbackControl(ClientPtr client)
{
int total_length = 0;
char *buf, *savbuf;
@@ -195,10 +193,7 @@ ProcXGetFeedbackControl(client)
*/
void
-CopySwapKbdFeedback (client, k, buf)
- ClientPtr client;
- KbdFeedbackPtr k;
- char **buf;
+CopySwapKbdFeedback(ClientPtr client, KbdFeedbackPtr k, char **buf)
{
int i;
xKbdFeedbackState *k2;
@@ -233,10 +228,7 @@ CopySwapKbdFeedback (client, k, buf)
*/
void
-CopySwapPtrFeedback (client, p, buf)
- ClientPtr client;
- PtrFeedbackPtr p;
- char **buf;
+CopySwapPtrFeedback(ClientPtr client, PtrFeedbackPtr p, char **buf)
{
xPtrFeedbackState *p2;
@@ -264,10 +256,7 @@ CopySwapPtrFeedback (client, p, buf)
*/
void
-CopySwapIntegerFeedback (client, i, buf)
- ClientPtr client;
- IntegerFeedbackPtr i;
- char **buf;
+CopySwapIntegerFeedback(ClientPtr client, IntegerFeedbackPtr i, char **buf)
{
xIntegerFeedbackState *i2;
@@ -295,10 +284,7 @@ CopySwapIntegerFeedback (client, i, buf)
*/
void
-CopySwapStringFeedback (client, s, buf)
- ClientPtr client;
- StringFeedbackPtr s;
- char **buf;
+CopySwapStringFeedback(ClientPtr client, StringFeedbackPtr s, char **buf)
{
int i;
xStringFeedbackState *s2;
@@ -336,10 +322,7 @@ CopySwapStringFeedback (client, s, buf)
*/
void
-CopySwapLedFeedback (client, l, buf)
- ClientPtr client;
- LedFeedbackPtr l;
- char **buf;
+CopySwapLedFeedback(ClientPtr client, LedFeedbackPtr l, char **buf)
{
xLedFeedbackState *l2;
@@ -365,10 +348,7 @@ CopySwapLedFeedback (client, l, buf)
*/
void
-CopySwapBellFeedback (client, b, buf)
- ClientPtr client;
- BellFeedbackPtr b;
- char **buf;
+CopySwapBellFeedback(ClientPtr client, BellFeedbackPtr b, char **buf)
{
xBellFeedbackState *b2;
@@ -396,10 +376,8 @@ CopySwapBellFeedback (client, b, buf)
*/
void
-SRepXGetFeedbackControl (client, size, rep)
- ClientPtr client;
- int size;
- xGetFeedbackControlReply *rep;
+SRepXGetFeedbackControl(ClientPtr client, int size,
+ xGetFeedbackControlReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getfctl.h b/nx-X11/programs/Xserver/Xi/getfctl.h
index dff71e5..7d2d17a 100644
--- a/nx-X11/programs/Xserver/Xi/getfctl.h
+++ b/nx-X11/programs/Xserver/Xi/getfctl.h
@@ -30,61 +30,43 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETFCTL_H
#define GETFCTL_H 1
-int
-SProcXGetFeedbackControl(
- ClientPtr /* client */
+int SProcXGetFeedbackControl(ClientPtr /* client */
);
-int
-ProcXGetFeedbackControl(
- ClientPtr /* client */
+int ProcXGetFeedbackControl(ClientPtr /* client */
);
-void
-CopySwapKbdFeedback (
- ClientPtr /* client */,
+void CopySwapKbdFeedback(ClientPtr /* client */ ,
KbdFeedbackPtr /* k */ ,
char ** /* buf */
);
-void
-CopySwapPtrFeedback (
- ClientPtr /* client */,
+void CopySwapPtrFeedback(ClientPtr /* client */ ,
PtrFeedbackPtr /* p */ ,
char ** /* buf */
);
-void
-CopySwapIntegerFeedback (
- ClientPtr /* client */,
+void CopySwapIntegerFeedback(ClientPtr /* client */ ,
IntegerFeedbackPtr /* i */ ,
char ** /* buf */
);
-void
-CopySwapStringFeedback (
- ClientPtr /* client */,
+void CopySwapStringFeedback(ClientPtr /* client */ ,
StringFeedbackPtr /* s */ ,
char ** /* buf */
);
-void
-CopySwapLedFeedback (
- ClientPtr /* client */,
+void CopySwapLedFeedback(ClientPtr /* client */ ,
LedFeedbackPtr /* l */ ,
char ** /* buf */
);
-void
-CopySwapBellFeedback (
- ClientPtr /* client */,
+void CopySwapBellFeedback(ClientPtr /* client */ ,
BellFeedbackPtr /* b */ ,
char ** /* buf */
);
-void
-SRepXGetFeedbackControl (
- ClientPtr /* client */,
+void SRepXGetFeedbackControl(ClientPtr /* client */ ,
int /* size */ ,
xGetFeedbackControlReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getfocus.c b/nx-X11/programs/Xserver/Xi/getfocus.c
index 769ef63..6642d5b 100644
--- a/nx-X11/programs/Xserver/Xi/getfocus.c
+++ b/nx-X11/programs/Xserver/Xi/getfocus.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXGetDeviceFocus(client)
- register ClientPtr client;
+SProcXGetDeviceFocus(register ClientPtr client)
{
REQUEST(xGetDeviceFocusReq);
swaps(&stuff->length);
@@ -89,8 +88,7 @@ SProcXGetDeviceFocus(client)
*/
int
-ProcXGetDeviceFocus(client)
- ClientPtr client;
+ProcXGetDeviceFocus(ClientPtr client)
{
DeviceIntPtr dev;
FocusClassPtr focus;
@@ -136,10 +134,7 @@ ProcXGetDeviceFocus(client)
*/
void
-SRepXGetDeviceFocus (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceFocusReply *rep;
+SRepXGetDeviceFocus(ClientPtr client, int size, xGetDeviceFocusReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getfocus.h b/nx-X11/programs/Xserver/Xi/getfocus.h
index 6fb5038..c3f2d67 100644
--- a/nx-X11/programs/Xserver/Xi/getfocus.h
+++ b/nx-X11/programs/Xserver/Xi/getfocus.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETFOCUS_H
#define GETFOCUS_H 1
-int
-SProcXGetDeviceFocus(
- ClientPtr /* client */
+int SProcXGetDeviceFocus(ClientPtr /* client */
);
-int
-ProcXGetDeviceFocus(
- ClientPtr /* client */
+int ProcXGetDeviceFocus(ClientPtr /* client */
);
-void
-SRepXGetDeviceFocus (
- ClientPtr /* client */,
+void SRepXGetDeviceFocus(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceFocusReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getkmap.c b/nx-X11/programs/Xserver/Xi/getkmap.c
index c410df3..2ce9892 100644
--- a/nx-X11/programs/Xserver/Xi/getkmap.c
+++ b/nx-X11/programs/Xserver/Xi/getkmap.c
@@ -75,8 +75,7 @@ SOFTWARE.
*/
int
-SProcXGetDeviceKeyMapping(client)
- register ClientPtr client;
+SProcXGetDeviceKeyMapping(register ClientPtr client)
{
REQUEST(xGetDeviceKeyMappingReq);
swaps(&stuff->length);
@@ -90,8 +89,7 @@ SProcXGetDeviceKeyMapping(client)
*/
int
-ProcXGetDeviceKeyMapping(client)
- register ClientPtr client;
+ProcXGetDeviceKeyMapping(register ClientPtr client)
{
xGetDeviceKeyMappingReply rep;
DeviceIntPtr dev;
@@ -158,13 +156,10 @@ ProcXGetDeviceKeyMapping(client)
*/
void
-SRepXGetDeviceKeyMapping (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceKeyMappingReply *rep;
+SRepXGetDeviceKeyMapping(ClientPtr client, int size,
+ xGetDeviceKeyMappingReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
-
diff --git a/nx-X11/programs/Xserver/Xi/getkmap.h b/nx-X11/programs/Xserver/Xi/getkmap.h
index 4c5f868..58c8f12 100644
--- a/nx-X11/programs/Xserver/Xi/getkmap.h
+++ b/nx-X11/programs/Xserver/Xi/getkmap.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETKMAP_H
#define GETKMAP_H 1
-int
-SProcXGetDeviceKeyMapping(
- ClientPtr /* client */
+int SProcXGetDeviceKeyMapping(ClientPtr /* client */
);
-int
-ProcXGetDeviceKeyMapping(
- ClientPtr /* client */
+int ProcXGetDeviceKeyMapping(ClientPtr /* client */
);
-void
-SRepXGetDeviceKeyMapping (
- ClientPtr /* client */,
+void SRepXGetDeviceKeyMapping(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceKeyMappingReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getmmap.c b/nx-X11/programs/Xserver/Xi/getmmap.c
index 79ca2c9..f127835 100644
--- a/nx-X11/programs/Xserver/Xi/getmmap.c
+++ b/nx-X11/programs/Xserver/Xi/getmmap.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXGetDeviceModifierMapping(client)
- register ClientPtr client;
+SProcXGetDeviceModifierMapping(register ClientPtr client)
{
REQUEST(xGetDeviceModifierMappingReq);
swaps(&stuff->length);
@@ -89,8 +88,7 @@ SProcXGetDeviceModifierMapping(client)
*/
int
-ProcXGetDeviceModifierMapping(client)
- ClientPtr client;
+ProcXGetDeviceModifierMapping(ClientPtr client)
{
CARD8 maxkeys;
DeviceIntPtr dev;
@@ -139,10 +137,8 @@ ProcXGetDeviceModifierMapping(client)
*/
void
-SRepXGetDeviceModifierMapping (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceModifierMappingReply *rep;
+SRepXGetDeviceModifierMapping(ClientPtr client, int size,
+ xGetDeviceModifierMappingReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getmmap.h b/nx-X11/programs/Xserver/Xi/getmmap.h
index 2ee3daf..9a93bb8 100644
--- a/nx-X11/programs/Xserver/Xi/getmmap.h
+++ b/nx-X11/programs/Xserver/Xi/getmmap.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETMMAP_H
#define GETMMAP_H 1
-int
-SProcXGetDeviceModifierMapping(
- ClientPtr /* client */
+int SProcXGetDeviceModifierMapping(ClientPtr /* client */
);
-int
-ProcXGetDeviceModifierMapping(
- ClientPtr /* client */
+int ProcXGetDeviceModifierMapping(ClientPtr /* client */
);
-void
-SRepXGetDeviceModifierMapping (
- ClientPtr /* client */,
+void SRepXGetDeviceModifierMapping(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceModifierMappingReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getprop.c b/nx-X11/programs/Xserver/Xi/getprop.c
index e8bd198..c8b1489 100644
--- a/nx-X11/programs/Xserver/Xi/getprop.c
+++ b/nx-X11/programs/Xserver/Xi/getprop.c
@@ -78,8 +78,7 @@ extern int ExtEventIndex;
*/
int
-SProcXGetDeviceDontPropagateList(client)
- register ClientPtr client;
+SProcXGetDeviceDontPropagateList(register ClientPtr client)
{
REQUEST(xGetDeviceDontPropagateListReq);
swaps(&stuff->length);
@@ -95,8 +94,7 @@ SProcXGetDeviceDontPropagateList(client)
*/
int
-ProcXGetDeviceDontPropagateList (client)
- register ClientPtr client;
+ProcXGetDeviceDontPropagateList(register ClientPtr client)
{
CARD16 count = 0;
int i;
@@ -161,12 +159,8 @@ ProcXGetDeviceDontPropagateList (client)
*/
XEventClass
-*ClassFromMask (buf, mask, maskndx, count, mode)
- XEventClass *buf;
- Mask mask;
- int maskndx;
- CARD16 *count;
- int mode;
+ * ClassFromMask(XEventClass * buf, Mask mask, int maskndx, CARD16 * count,
+ int mode)
{
int i, j;
int id = maskndx;
@@ -195,10 +189,8 @@ XEventClass
*/
void
-SRepXGetDeviceDontPropagateList (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceDontPropagateListReply *rep;
+SRepXGetDeviceDontPropagateList(ClientPtr client, int size,
+ xGetDeviceDontPropagateListReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getprop.h b/nx-X11/programs/Xserver/Xi/getprop.h
index b6539ed..1a7b128 100644
--- a/nx-X11/programs/Xserver/Xi/getprop.h
+++ b/nx-X11/programs/Xserver/Xi/getprop.h
@@ -30,28 +30,20 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETPROP_H
#define GETPROP_H 1
-int
-SProcXGetDeviceDontPropagateList(
- ClientPtr /* client */
+int SProcXGetDeviceDontPropagateList(ClientPtr /* client */
);
-int
-ProcXGetDeviceDontPropagateList (
- ClientPtr /* client */
+int ProcXGetDeviceDontPropagateList(ClientPtr /* client */
);
-XEventClass *
-ClassFromMask (
- XEventClass * /* buf */,
+XEventClass *ClassFromMask(XEventClass * /* buf */ ,
Mask /* mask */ ,
int /* maskndx */ ,
CARD16 * /* count */ ,
int /* mode */
);
-void
-SRepXGetDeviceDontPropagateList (
- ClientPtr /* client */,
+void SRepXGetDeviceDontPropagateList(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceDontPropagateListReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getselev.c b/nx-X11/programs/Xserver/Xi/getselev.c
index b39f40e..10e040d 100644
--- a/nx-X11/programs/Xserver/Xi/getselev.c
+++ b/nx-X11/programs/Xserver/Xi/getselev.c
@@ -76,8 +76,7 @@ SOFTWARE.
*/
int
-SProcXGetSelectedExtensionEvents(client)
- register ClientPtr client;
+SProcXGetSelectedExtensionEvents(register ClientPtr client)
{
REQUEST(xGetSelectedExtensionEventsReq);
swaps(&stuff->length);
@@ -94,8 +93,7 @@ SProcXGetSelectedExtensionEvents(client)
*/
int
-ProcXGetSelectedExtensionEvents(client)
- register ClientPtr client;
+ProcXGetSelectedExtensionEvents(register ClientPtr client)
{
int i;
int total_length = 0;
@@ -175,10 +173,8 @@ ProcXGetSelectedExtensionEvents(client)
*/
void
-SRepXGetSelectedExtensionEvents (client, size, rep)
- ClientPtr client;
- int size;
- xGetSelectedExtensionEventsReply *rep;
+SRepXGetSelectedExtensionEvents(ClientPtr client, int size,
+ xGetSelectedExtensionEventsReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getselev.h b/nx-X11/programs/Xserver/Xi/getselev.h
index 7b14b3c..5e7a659 100644
--- a/nx-X11/programs/Xserver/Xi/getselev.h
+++ b/nx-X11/programs/Xserver/Xi/getselev.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETSELEV_H
#define GETSELEV_H 1
-int
-SProcXGetSelectedExtensionEvents(
- ClientPtr /* client */
+int SProcXGetSelectedExtensionEvents(ClientPtr /* client */
);
-int
-ProcXGetSelectedExtensionEvents(
- ClientPtr /* client */
+int ProcXGetSelectedExtensionEvents(ClientPtr /* client */
);
-void
-SRepXGetSelectedExtensionEvents (
- ClientPtr /* client */,
+void SRepXGetSelectedExtensionEvents(ClientPtr /* client */ ,
int /* size */ ,
xGetSelectedExtensionEventsReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/getvers.c b/nx-X11/programs/Xserver/Xi/getvers.c
index e2f1413..51afa41 100644
--- a/nx-X11/programs/Xserver/Xi/getvers.c
+++ b/nx-X11/programs/Xserver/Xi/getvers.c
@@ -75,8 +75,7 @@ XExtensionVersion AllExtensionVersions[128];
*/
int
-SProcXGetExtensionVersion(client)
- register ClientPtr client;
+SProcXGetExtensionVersion(register ClientPtr client)
{
REQUEST(xGetExtensionVersionReq);
swaps(&stuff->length);
@@ -92,8 +91,7 @@ SProcXGetExtensionVersion(client)
*/
int
-ProcXGetExtensionVersion (client)
- register ClientPtr client;
+ProcXGetExtensionVersion(register ClientPtr client)
{
xGetExtensionVersionReply rep;
@@ -137,10 +135,8 @@ ProcXGetExtensionVersion (client)
*/
void
-SRepXGetExtensionVersion (client, size, rep)
- ClientPtr client;
- int size;
- xGetExtensionVersionReply *rep;
+SRepXGetExtensionVersion(ClientPtr client, int size,
+ xGetExtensionVersionReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/getvers.h b/nx-X11/programs/Xserver/Xi/getvers.h
index 6a3abaf..c67e77a 100644
--- a/nx-X11/programs/Xserver/Xi/getvers.h
+++ b/nx-X11/programs/Xserver/Xi/getvers.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GETVERS_H
#define GETVERS_H 1
-int
-SProcXGetExtensionVersion(
- ClientPtr /* client */
+int SProcXGetExtensionVersion(ClientPtr /* client */
);
-int
-ProcXGetExtensionVersion (
- ClientPtr /* client */
+int ProcXGetExtensionVersion(ClientPtr /* client */
);
-void
-SRepXGetExtensionVersion (
- ClientPtr /* client */,
+void SRepXGetExtensionVersion(ClientPtr /* client */ ,
int /* size */ ,
xGetExtensionVersionReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/grabdev.c b/nx-X11/programs/Xserver/Xi/grabdev.c
index 8cdb1e8..1ecc05f 100644
--- a/nx-X11/programs/Xserver/Xi/grabdev.c
+++ b/nx-X11/programs/Xserver/Xi/grabdev.c
@@ -79,8 +79,7 @@ extern int ExtEventIndex;
*/
int
-SProcXGrabDevice(client)
- register ClientPtr client;
+SProcXGrabDevice(register ClientPtr client)
{
REQUEST(xGrabDeviceReq);
swaps(&stuff->length);
@@ -104,8 +103,7 @@ SProcXGrabDevice(client)
*/
int
-ProcXGrabDevice(client)
- ClientPtr client;
+ProcXGrabDevice(ClientPtr client)
{
int error;
xGrabDeviceReply rep;
@@ -158,13 +156,8 @@ ProcXGrabDevice(client)
*/
int
-CreateMaskFromList (client, list, count, mask, dev, req)
- ClientPtr client;
- XEventClass *list;
- int count;
- struct tmask mask[];
- DeviceIntPtr dev;
- int req;
+CreateMaskFromList(ClientPtr client, XEventClass * list, int count,
+ struct tmask *mask, DeviceIntPtr dev, int req)
{
int i, j;
int device;
@@ -210,10 +203,7 @@ CreateMaskFromList (client, list, count, mask, dev, req)
*/
void
-SRepXGrabDevice (client, size, rep)
- ClientPtr client;
- int size;
- xGrabDeviceReply *rep;
+SRepXGrabDevice(ClientPtr client, int size, xGrabDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/grabdev.h b/nx-X11/programs/Xserver/Xi/grabdev.h
index 149cdf0..881982f 100644
--- a/nx-X11/programs/Xserver/Xi/grabdev.h
+++ b/nx-X11/programs/Xserver/Xi/grabdev.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GRABDEV_H
#define GRABDEV_H 1
-int
-SProcXGrabDevice(
- ClientPtr /* client */
+int SProcXGrabDevice(ClientPtr /* client */
);
-int
-ProcXGrabDevice(
- ClientPtr /* client */
+int ProcXGrabDevice(ClientPtr /* client */
);
-int
-CreateMaskFromList (
- ClientPtr /* client */,
+int CreateMaskFromList(ClientPtr /* client */ ,
XEventClass * /* list */ ,
int /* count */ ,
struct tmask /* mask */ [],
@@ -50,9 +44,7 @@ CreateMaskFromList (
int /* req */
);
-void
-SRepXGrabDevice (
- ClientPtr /* client */,
+void SRepXGrabDevice(ClientPtr /* client */ ,
int /* size */ ,
xGrabDeviceReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.c b/nx-X11/programs/Xserver/Xi/grabdevb.c
index f513517..8db8976 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevb.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevb.c
@@ -76,8 +76,7 @@ SOFTWARE.
*/
int
-SProcXGrabDeviceButton(client)
- register ClientPtr client;
+SProcXGrabDeviceButton(register ClientPtr client)
{
REQUEST(xGrabDeviceButtonReq);
swaps(&stuff->length);
@@ -99,8 +98,7 @@ SProcXGrabDeviceButton(client)
*/
int
-ProcXGrabDeviceButton(client)
- ClientPtr client;
+ProcXGrabDeviceButton(ClientPtr client)
{
int ret;
DeviceIntPtr dev;
diff --git a/nx-X11/programs/Xserver/Xi/grabdevb.h b/nx-X11/programs/Xserver/Xi/grabdevb.h
index 7337b7a..84a27b3 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevb.h
+++ b/nx-X11/programs/Xserver/Xi/grabdevb.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GRABDEVB_H
#define GRABDEVB_H 1
-int
-SProcXGrabDeviceButton(
- ClientPtr /* client */
+int SProcXGrabDeviceButton(ClientPtr /* client */
);
-int
-ProcXGrabDeviceButton(
- ClientPtr /* client */
+int ProcXGrabDeviceButton(ClientPtr /* client */
);
#endif /* GRABDEVB_H */
diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.c b/nx-X11/programs/Xserver/Xi/grabdevk.c
index 376a634..26469c4 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevk.c
+++ b/nx-X11/programs/Xserver/Xi/grabdevk.c
@@ -76,8 +76,7 @@ SOFTWARE.
*/
int
-SProcXGrabDeviceKey(client)
- register ClientPtr client;
+SProcXGrabDeviceKey(register ClientPtr client)
{
REQUEST(xGrabDeviceKeyReq);
swaps(&stuff->length);
@@ -97,8 +96,7 @@ SProcXGrabDeviceKey(client)
*/
int
-ProcXGrabDeviceKey(client)
- ClientPtr client;
+ProcXGrabDeviceKey(ClientPtr client)
{
int ret;
DeviceIntPtr dev;
diff --git a/nx-X11/programs/Xserver/Xi/grabdevk.h b/nx-X11/programs/Xserver/Xi/grabdevk.h
index 9cd4843..e349136 100644
--- a/nx-X11/programs/Xserver/Xi/grabdevk.h
+++ b/nx-X11/programs/Xserver/Xi/grabdevk.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GRABDEVK_H
#define GRABDEVK_H 1
-int
-SProcXGrabDeviceKey(
- ClientPtr /* client */
+int SProcXGrabDeviceKey(ClientPtr /* client */
);
-int
-ProcXGrabDeviceKey(
- ClientPtr /* client */
+int ProcXGrabDeviceKey(ClientPtr /* client */
);
#endif /* GRABDEVK_H */
diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.c b/nx-X11/programs/Xserver/Xi/gtmotion.c
index e9447e2..870d87f 100644
--- a/nx-X11/programs/Xserver/Xi/gtmotion.c
+++ b/nx-X11/programs/Xserver/Xi/gtmotion.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXGetDeviceMotionEvents(client)
-register ClientPtr client;
+SProcXGetDeviceMotionEvents(register ClientPtr client)
{
REQUEST(xGetDeviceMotionEventsReq);
swaps(&stuff->length);
@@ -92,8 +91,7 @@ register ClientPtr client;
*/
int
-ProcXGetDeviceMotionEvents(client)
- ClientPtr client;
+ProcXGetDeviceMotionEvents(ClientPtr client)
{
INT32 *coords = NULL, *bufptr;
xGetDeviceMotionEventsReply rep;
@@ -191,10 +189,8 @@ ProcXGetDeviceMotionEvents(client)
*/
void
-SRepXGetDeviceMotionEvents (client, size, rep)
- ClientPtr client;
- int size;
- xGetDeviceMotionEventsReply *rep;
+SRepXGetDeviceMotionEvents(ClientPtr client, int size,
+ xGetDeviceMotionEventsReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/gtmotion.h b/nx-X11/programs/Xserver/Xi/gtmotion.h
index b42a076..cdd8825 100644
--- a/nx-X11/programs/Xserver/Xi/gtmotion.h
+++ b/nx-X11/programs/Xserver/Xi/gtmotion.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef GTMOTION_H
#define GTMOTION_H 1
-int
-SProcXGetDeviceMotionEvents(
- ClientPtr /* client */
+int SProcXGetDeviceMotionEvents(ClientPtr /* client */
);
-int
-ProcXGetDeviceMotionEvents(
- ClientPtr /* client */
+int ProcXGetDeviceMotionEvents(ClientPtr /* client */
);
-void
-SRepXGetDeviceMotionEvents (
- ClientPtr /* client */,
+void SRepXGetDeviceMotionEvents(ClientPtr /* client */ ,
int /* size */ ,
xGetDeviceMotionEventsReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/listdev.c b/nx-X11/programs/Xserver/Xi/listdev.c
index 76bfa35..c667f16 100644
--- a/nx-X11/programs/Xserver/Xi/listdev.c
+++ b/nx-X11/programs/Xserver/Xi/listdev.c
@@ -76,8 +76,7 @@ SOFTWARE.
*/
int
-SProcXListInputDevices(client)
- register ClientPtr client;
+SProcXListInputDevices(register ClientPtr client)
{
REQUEST(xListInputDevicesReq);
swaps(&stuff->length);
@@ -91,8 +90,7 @@ SProcXListInputDevices(client)
*/
int
-ProcXListInputDevices (client)
- register ClientPtr client;
+ProcXListInputDevices(register ClientPtr client)
{
xListInputDevicesReply rep;
int numdevs;
@@ -150,10 +148,7 @@ ProcXListInputDevices (client)
*/
void
-SizeDeviceInfo (d, namesize, size)
- DeviceIntPtr d;
- int *namesize;
- int *size;
+SizeDeviceInfo(DeviceIntPtr d, int *namesize, int *size)
{
int chunks;
@@ -179,13 +174,8 @@ SizeDeviceInfo (d, namesize, size)
*/
void
-ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
- ClientPtr client;
- DeviceIntPtr d;
- xDeviceInfoPtr dev;
- char **devbuf;
- char **classbuf;
- char **namebuf;
+ListDeviceInfo(ClientPtr client, DeviceIntPtr d, xDeviceInfoPtr dev,
+ char **devbuf, char **classbuf, char **namebuf)
{
CopyDeviceName(namebuf, d->name);
CopySwapDevice(client, d, 0, devbuf);
@@ -216,9 +206,7 @@ ListDeviceInfo (client, d, dev, devbuf, classbuf, namebuf)
*/
void
-CopyDeviceName (namebuf, name)
- char **namebuf;
- char *name;
+CopyDeviceName(char **namebuf, char *name)
{
char *nameptr = (char *)*namebuf;
@@ -242,11 +230,8 @@ CopyDeviceName (namebuf, name)
*/
void
-CopySwapDevice (client, d, num_classes, buf)
- register ClientPtr client;
- DeviceIntPtr d;
- int num_classes;
- char **buf;
+CopySwapDevice(register ClientPtr client, DeviceIntPtr d, int num_classes,
+ char **buf)
{
xDeviceInfoPtr dev;
@@ -275,10 +260,7 @@ CopySwapDevice (client, d, num_classes, buf)
*/
void
-CopySwapKeyClass (client, k, buf)
- register ClientPtr client;
- KeyClassPtr k;
- char **buf;
+CopySwapKeyClass(register ClientPtr client, KeyClassPtr k, char **buf)
{
xKeyInfoPtr k2;
@@ -302,10 +284,7 @@ CopySwapKeyClass (client, k, buf)
*/
void
-CopySwapButtonClass (client, b, buf)
- register ClientPtr client;
- ButtonClassPtr b;
- char **buf;
+CopySwapButtonClass(register ClientPtr client, ButtonClassPtr b, char **buf)
{
xButtonInfoPtr b2;
@@ -333,10 +312,7 @@ CopySwapButtonClass (client, b, buf)
*/
int
-CopySwapValuatorClass (client, v, buf)
- register ClientPtr client;
- ValuatorClassPtr v;
- char **buf;
+CopySwapValuatorClass(register ClientPtr client, ValuatorClassPtr v, char **buf)
{
int i, j, axes, t_axes;
xValuatorInfoPtr v2;
@@ -385,10 +361,7 @@ CopySwapValuatorClass (client, v, buf)
*/
void
-SRepXListInputDevices (client, size, rep)
- ClientPtr client;
- int size;
- xListInputDevicesReply *rep;
+SRepXListInputDevices(ClientPtr client, int size, xListInputDevicesReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/listdev.h b/nx-X11/programs/Xserver/Xi/listdev.h
index 75e5ff4..bdd67ce 100644
--- a/nx-X11/programs/Xserver/Xi/listdev.h
+++ b/nx-X11/programs/Xserver/Xi/listdev.h
@@ -30,26 +30,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef LISTDEV_H
#define LISTDEV_H 1
-int
-SProcXListInputDevices(
- ClientPtr /* client */
+int SProcXListInputDevices(ClientPtr /* client */
);
-int
-ProcXListInputDevices (
- ClientPtr /* client */
+int ProcXListInputDevices(ClientPtr /* client */
);
-void
-SizeDeviceInfo (
- DeviceIntPtr /* d */,
+void SizeDeviceInfo(DeviceIntPtr /* d */ ,
int * /* namesize */ ,
int * /* size */
);
-void
-ListDeviceInfo (
- ClientPtr /* client */,
+void ListDeviceInfo(ClientPtr /* client */ ,
DeviceIntPtr /* d */ ,
xDeviceInfoPtr /* dev */ ,
char ** /* devbuf */ ,
@@ -57,44 +49,32 @@ ListDeviceInfo (
char ** /* namebuf */
);
-void
-CopyDeviceName (
- char ** /* namebuf */,
+void CopyDeviceName(char ** /* namebuf */ ,
char * /* name */
);
-void
-CopySwapDevice (
- ClientPtr /* client */,
+void CopySwapDevice(ClientPtr /* client */ ,
DeviceIntPtr /* d */ ,
int /* num_classes */ ,
char ** /* buf */
);
-void
-CopySwapKeyClass (
- ClientPtr /* client */,
+void CopySwapKeyClass(ClientPtr /* client */ ,
KeyClassPtr /* k */ ,
char ** /* buf */
);
-void
-CopySwapButtonClass (
- ClientPtr /* client */,
+void CopySwapButtonClass(ClientPtr /* client */ ,
ButtonClassPtr /* b */ ,
char ** /* buf */
);
-int
-CopySwapValuatorClass (
- ClientPtr /* client */,
+int CopySwapValuatorClass(ClientPtr /* client */ ,
ValuatorClassPtr /* v */ ,
char ** /* buf */
);
-void
-SRepXListInputDevices (
- ClientPtr /* client */,
+void SRepXListInputDevices(ClientPtr /* client */ ,
int /* size */ ,
xListInputDevicesReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/opendev.c b/nx-X11/programs/Xserver/Xi/opendev.c
index 7e237b2..52bd036 100644
--- a/nx-X11/programs/Xserver/Xi/opendev.c
+++ b/nx-X11/programs/Xserver/Xi/opendev.c
@@ -78,8 +78,7 @@ extern CARD8 event_base[];
*/
int
-SProcXOpenDevice(client)
- register ClientPtr client;
+SProcXOpenDevice(register ClientPtr client)
{
REQUEST(xOpenDeviceReq);
swaps(&stuff->length);
@@ -93,8 +92,7 @@ SProcXOpenDevice(client)
*/
int
-ProcXOpenDevice(client)
- register ClientPtr client;
+ProcXOpenDevice(register ClientPtr client)
{
xInputClassInfo evbase[numInputClasses];
Bool enableit = FALSE;
@@ -187,10 +185,7 @@ ProcXOpenDevice(client)
*/
void
-SRepXOpenDevice (client, size, rep)
- ClientPtr client;
- int size;
- xOpenDeviceReply *rep;
+SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/opendev.h b/nx-X11/programs/Xserver/Xi/opendev.h
index 8e04eb0..9665fe9 100644
--- a/nx-X11/programs/Xserver/Xi/opendev.h
+++ b/nx-X11/programs/Xserver/Xi/opendev.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef OPENDEV_H
#define OPENDEV_H 1
-int
-SProcXOpenDevice(
- ClientPtr /* client */
+int SProcXOpenDevice(ClientPtr /* client */
);
-int
-ProcXOpenDevice(
- ClientPtr /* client */
+int ProcXOpenDevice(ClientPtr /* client */
);
-void
-SRepXOpenDevice (
- ClientPtr /* client */,
+void SRepXOpenDevice(ClientPtr /* client */ ,
int /* size */ ,
xOpenDeviceReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/queryst.c b/nx-X11/programs/Xserver/Xi/queryst.c
index ebf4dcb..ba9b63f 100644
--- a/nx-X11/programs/Xserver/Xi/queryst.c
+++ b/nx-X11/programs/Xserver/Xi/queryst.c
@@ -56,8 +56,7 @@ from The Open Group.
*/
int
-SProcXQueryDeviceState(client)
- register ClientPtr client;
+SProcXQueryDeviceState(register ClientPtr client)
{
REQUEST(xQueryDeviceStateReq);
swaps(&stuff->length);
@@ -71,8 +70,7 @@ SProcXQueryDeviceState(client)
*/
int
-ProcXQueryDeviceState(client)
- register ClientPtr client;
+ProcXQueryDeviceState(register ClientPtr client)
{
int i;
int num_classes = 0;
@@ -195,10 +193,7 @@ ProcXQueryDeviceState(client)
*/
void
-SRepXQueryDeviceState (client, size, rep)
- ClientPtr client;
- int size;
- xQueryDeviceStateReply *rep;
+SRepXQueryDeviceState(ClientPtr client, int size, xQueryDeviceStateReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/queryst.h b/nx-X11/programs/Xserver/Xi/queryst.h
index 93061a2..9232ff6 100644
--- a/nx-X11/programs/Xserver/Xi/queryst.h
+++ b/nx-X11/programs/Xserver/Xi/queryst.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef QUERYST_H
#define QUERYST_H 1
-int
-SProcXQueryDeviceState(
- ClientPtr /* client */
+int SProcXQueryDeviceState(ClientPtr /* client */
);
-int
-ProcXQueryDeviceState(
- ClientPtr /* client */
+int ProcXQueryDeviceState(ClientPtr /* client */
);
-void
-SRepXQueryDeviceState (
- ClientPtr /* client */,
+void SRepXQueryDeviceState(ClientPtr /* client */ ,
int /* size */ ,
xQueryDeviceStateReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/selectev.c b/nx-X11/programs/Xserver/Xi/selectev.c
index 7104537..8b8fff0 100644
--- a/nx-X11/programs/Xserver/Xi/selectev.c
+++ b/nx-X11/programs/Xserver/Xi/selectev.c
@@ -79,8 +79,7 @@ extern Mask ExtValidMasks[];
*/
int
-SProcXSelectExtensionEvent (client)
-register ClientPtr client;
+SProcXSelectExtensionEvent(register ClientPtr client)
{
REQUEST(xSelectExtensionEventReq);
swaps(&stuff->length);
@@ -101,8 +100,7 @@ register ClientPtr client;
*/
int
-ProcXSelectExtensionEvent (client)
- register ClientPtr client;
+ProcXSelectExtensionEvent(register ClientPtr client)
{
int ret;
int i;
diff --git a/nx-X11/programs/Xserver/Xi/selectev.h b/nx-X11/programs/Xserver/Xi/selectev.h
index e0d52d5..60fb447 100644
--- a/nx-X11/programs/Xserver/Xi/selectev.h
+++ b/nx-X11/programs/Xserver/Xi/selectev.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SELECTEV_H
#define SELECTEV_H 1
-int
-SProcXSelectExtensionEvent (
- ClientPtr /* client */
+int SProcXSelectExtensionEvent(ClientPtr /* client */
);
-int
-ProcXSelectExtensionEvent (
- ClientPtr /* client */
+int ProcXSelectExtensionEvent(ClientPtr /* client */
);
#endif /* SELECTEV_H */
diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c
index 9dd00ce..aeb3be6 100644
--- a/nx-X11/programs/Xserver/Xi/sendexev.c
+++ b/nx-X11/programs/Xserver/Xi/sendexev.c
@@ -79,8 +79,7 @@ extern int lastEvent; /* Defined in extension.c */
*/
int
-SProcXSendExtensionEvent(client)
- register ClientPtr client;
+SProcXSendExtensionEvent(register ClientPtr client)
{
CARD32 *p;
register int i;
@@ -121,8 +120,7 @@ SProcXSendExtensionEvent(client)
*/
int
-ProcXSendExtensionEvent (client)
- register ClientPtr client;
+ProcXSendExtensionEvent(register ClientPtr client)
{
int ret;
DeviceIntPtr dev;
diff --git a/nx-X11/programs/Xserver/Xi/sendexev.h b/nx-X11/programs/Xserver/Xi/sendexev.h
index 46aa09d..e156f1b 100644
--- a/nx-X11/programs/Xserver/Xi/sendexev.h
+++ b/nx-X11/programs/Xserver/Xi/sendexev.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SENDEXEV_H
#define SENDEXEV_H 1
-int
-SProcXSendExtensionEvent(
- ClientPtr /* client */
+int SProcXSendExtensionEvent(ClientPtr /* client */
);
-int
-ProcXSendExtensionEvent(
- ClientPtr /* client */
+int ProcXSendExtensionEvent(ClientPtr /* client */
);
#endif /* SENDEXEV_H */
diff --git a/nx-X11/programs/Xserver/Xi/setbmap.c b/nx-X11/programs/Xserver/Xi/setbmap.c
index eb3fc17..7bdbe95 100644
--- a/nx-X11/programs/Xserver/Xi/setbmap.c
+++ b/nx-X11/programs/Xserver/Xi/setbmap.c
@@ -77,8 +77,7 @@ SOFTWARE.
*/
int
-SProcXSetDeviceButtonMapping(client)
- register ClientPtr client;
+SProcXSetDeviceButtonMapping(register ClientPtr client)
{
REQUEST(xSetDeviceButtonMappingReq);
swaps(&stuff->length);
@@ -92,8 +91,7 @@ SProcXSetDeviceButtonMapping(client)
*/
int
-ProcXSetDeviceButtonMapping (client)
- register ClientPtr client;
+ProcXSetDeviceButtonMapping(register ClientPtr client)
{
int ret;
xSetDeviceButtonMappingReply rep;
@@ -151,10 +149,8 @@ ProcXSetDeviceButtonMapping (client)
*/
void
-SRepXSetDeviceButtonMapping (client, size, rep)
- ClientPtr client;
- int size;
- xSetDeviceButtonMappingReply *rep;
+SRepXSetDeviceButtonMapping(ClientPtr client, int size,
+ xSetDeviceButtonMappingReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/setbmap.h b/nx-X11/programs/Xserver/Xi/setbmap.h
index 1ab6035..20ad8e0 100644
--- a/nx-X11/programs/Xserver/Xi/setbmap.h
+++ b/nx-X11/programs/Xserver/Xi/setbmap.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETBMAP_H
#define SETBMAP_H 1
-int
-SProcXSetDeviceButtonMapping(
- ClientPtr /* client */
+int SProcXSetDeviceButtonMapping(ClientPtr /* client */
);
-int
-ProcXSetDeviceButtonMapping(
- ClientPtr /* client */
+int ProcXSetDeviceButtonMapping(ClientPtr /* client */
);
-void
-SRepXSetDeviceButtonMapping(
- ClientPtr /* client */,
+void SRepXSetDeviceButtonMapping(ClientPtr /* client */ ,
int /* size */ ,
xSetDeviceButtonMappingReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/setdval.c b/nx-X11/programs/Xserver/Xi/setdval.c
index 2fb3991..d9620a9 100644
--- a/nx-X11/programs/Xserver/Xi/setdval.c
+++ b/nx-X11/programs/Xserver/Xi/setdval.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXSetDeviceValuators(client)
- register ClientPtr client;
+SProcXSetDeviceValuators(register ClientPtr client)
{
REQUEST(xSetDeviceValuatorsReq);
swaps(&stuff->length);
@@ -89,8 +88,7 @@ SProcXSetDeviceValuators(client)
*/
int
-ProcXSetDeviceValuators(client)
- register ClientPtr client;
+ProcXSetDeviceValuators(register ClientPtr client)
{
DeviceIntPtr dev;
xSetDeviceValuatorsReply rep;
@@ -155,10 +153,8 @@ ProcXSetDeviceValuators(client)
*/
void
-SRepXSetDeviceValuators (client, size, rep)
- ClientPtr client;
- int size;
- xSetDeviceValuatorsReply *rep;
+SRepXSetDeviceValuators(ClientPtr client, int size,
+ xSetDeviceValuatorsReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/setdval.h b/nx-X11/programs/Xserver/Xi/setdval.h
index 3eee2c5..40b4317 100644
--- a/nx-X11/programs/Xserver/Xi/setdval.h
+++ b/nx-X11/programs/Xserver/Xi/setdval.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETDVAL_H
#define SETDVAL_H 1
-int
-SProcXSetDeviceValuators(
- ClientPtr /* client */
+int SProcXSetDeviceValuators(ClientPtr /* client */
);
-int
-ProcXSetDeviceValuators(
- ClientPtr /* client */
+int ProcXSetDeviceValuators(ClientPtr /* client */
);
-void
-SRepXSetDeviceValuators(
- ClientPtr /* client */,
+void SRepXSetDeviceValuators(ClientPtr /* client */ ,
int /* size */ ,
xSetDeviceValuatorsReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/setfocus.c b/nx-X11/programs/Xserver/Xi/setfocus.c
index e2dcdd8..6f01852 100644
--- a/nx-X11/programs/Xserver/Xi/setfocus.c
+++ b/nx-X11/programs/Xserver/Xi/setfocus.c
@@ -77,8 +77,7 @@ SOFTWARE.
*/
int
-SProcXSetDeviceFocus(client)
- register ClientPtr client;
+SProcXSetDeviceFocus(register ClientPtr client)
{
REQUEST(xSetDeviceFocusReq);
swaps(&stuff->length);
@@ -95,8 +94,7 @@ SProcXSetDeviceFocus(client)
*/
int
-ProcXSetDeviceFocus(client)
- register ClientPtr client;
+ProcXSetDeviceFocus(register ClientPtr client)
{
int ret;
register DeviceIntPtr dev;
diff --git a/nx-X11/programs/Xserver/Xi/setfocus.h b/nx-X11/programs/Xserver/Xi/setfocus.h
index b777ec4..3a49f84 100644
--- a/nx-X11/programs/Xserver/Xi/setfocus.h
+++ b/nx-X11/programs/Xserver/Xi/setfocus.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETFOCUS_H
#define SETFOCUS_H 1
-int
-SProcXSetDeviceFocus(
- ClientPtr /* client */
+int SProcXSetDeviceFocus(ClientPtr /* client */
);
-int
-ProcXSetDeviceFocus(
- ClientPtr /* client */
+int ProcXSetDeviceFocus(ClientPtr /* client */
);
#endif /* SETFOCUS_H */
diff --git a/nx-X11/programs/Xserver/Xi/setmmap.c b/nx-X11/programs/Xserver/Xi/setmmap.c
index 6a93c8c..3b51c2e 100644
--- a/nx-X11/programs/Xserver/Xi/setmmap.c
+++ b/nx-X11/programs/Xserver/Xi/setmmap.c
@@ -75,8 +75,7 @@ SOFTWARE.
*/
int
-SProcXSetDeviceModifierMapping(client)
- register ClientPtr client;
+SProcXSetDeviceModifierMapping(register ClientPtr client)
{
REQUEST(xSetDeviceModifierMappingReq);
swaps(&stuff->length);
@@ -90,8 +89,7 @@ SProcXSetDeviceModifierMapping(client)
*/
int
-ProcXSetDeviceModifierMapping(client)
- ClientPtr client;
+ProcXSetDeviceModifierMapping(ClientPtr client)
{
int ret;
xSetDeviceModifierMappingReply rep;
@@ -144,13 +142,10 @@ ProcXSetDeviceModifierMapping(client)
*/
void
-SRepXSetDeviceModifierMapping (client, size, rep)
- ClientPtr client;
- int size;
- xSetDeviceModifierMappingReply *rep;
+SRepXSetDeviceModifierMapping(ClientPtr client, int size,
+ xSetDeviceModifierMappingReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
WriteToClient(client, size, rep);
}
-
diff --git a/nx-X11/programs/Xserver/Xi/setmmap.h b/nx-X11/programs/Xserver/Xi/setmmap.h
index bfcc325..9b345da 100644
--- a/nx-X11/programs/Xserver/Xi/setmmap.h
+++ b/nx-X11/programs/Xserver/Xi/setmmap.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETMMAP_H
#define SETMMAP_H 1
-int
-SProcXSetDeviceModifierMapping(
- ClientPtr /* client */
+int SProcXSetDeviceModifierMapping(ClientPtr /* client */
);
-int
-ProcXSetDeviceModifierMapping(
- ClientPtr /* client */
+int ProcXSetDeviceModifierMapping(ClientPtr /* client */
);
-void
-SRepXSetDeviceModifierMapping(
- ClientPtr /* client */,
+void SRepXSetDeviceModifierMapping(ClientPtr /* client */ ,
int /* size */ ,
xSetDeviceModifierMappingReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/setmode.c b/nx-X11/programs/Xserver/Xi/setmode.c
index cccd990..d63d4aa 100644
--- a/nx-X11/programs/Xserver/Xi/setmode.c
+++ b/nx-X11/programs/Xserver/Xi/setmode.c
@@ -74,8 +74,7 @@ SOFTWARE.
*/
int
-SProcXSetDeviceMode(client)
- register ClientPtr client;
+SProcXSetDeviceMode(register ClientPtr client)
{
REQUEST(xSetDeviceModeReq);
swaps(&stuff->length);
@@ -89,8 +88,7 @@ SProcXSetDeviceMode(client)
*/
int
-ProcXSetDeviceMode(client)
- register ClientPtr client;
+ProcXSetDeviceMode(register ClientPtr client)
{
DeviceIntPtr dev;
xSetDeviceModeReply rep;
@@ -139,10 +137,7 @@ ProcXSetDeviceMode(client)
*/
void
-SRepXSetDeviceMode (client, size, rep)
- ClientPtr client;
- int size;
- xSetDeviceModeReply *rep;
+SRepXSetDeviceMode(ClientPtr client, int size, xSetDeviceModeReply * rep)
{
swaps(&rep->sequenceNumber);
swapl(&rep->length);
diff --git a/nx-X11/programs/Xserver/Xi/setmode.h b/nx-X11/programs/Xserver/Xi/setmode.h
index 1949608..021bfa0 100644
--- a/nx-X11/programs/Xserver/Xi/setmode.h
+++ b/nx-X11/programs/Xserver/Xi/setmode.h
@@ -30,19 +30,13 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef SETMODE_H
#define SETMODE_H 1
-int
-SProcXSetDeviceMode(
- ClientPtr /* client */
+int SProcXSetDeviceMode(ClientPtr /* client */
);
-int
-ProcXSetDeviceMode(
- ClientPtr /* client */
+int ProcXSetDeviceMode(ClientPtr /* client */
);
-void
-SRepXSetDeviceMode(
- ClientPtr /* client */,
+void SRepXSetDeviceMode(ClientPtr /* client */ ,
int /* size */ ,
xSetDeviceModeReply * /* rep */
);
diff --git a/nx-X11/programs/Xserver/Xi/stubs.c b/nx-X11/programs/Xserver/Xi/stubs.c
index 8a9ec92..a45ffa5 100644
--- a/nx-X11/programs/Xserver/Xi/stubs.c
+++ b/nx-X11/programs/Xserver/Xi/stubs.c
@@ -91,9 +91,7 @@ SOFTWARE.
*/
int
-ChangeKeyboardDevice (old_dev, new_dev)
- DeviceIntPtr old_dev;
- DeviceIntPtr new_dev;
+ChangeKeyboardDevice(DeviceIntPtr old_dev, DeviceIntPtr new_dev)
{
/***********************************************************************
DeleteFocusClassDeviceStruct(old_dev); * defined in xchgptr.c *
@@ -133,11 +131,8 @@ ChangeKeyboardDevice (old_dev, new_dev)
*/
int
-ChangePointerDevice (
- DeviceIntPtr old_dev,
- DeviceIntPtr new_dev,
- unsigned char x,
- unsigned char y)
+ChangePointerDevice(DeviceIntPtr old_dev,
+ DeviceIntPtr new_dev, unsigned char x, unsigned char y)
{
/***********************************************************************
InitFocusClassDeviceStruct(old_dev); * allow focusing old ptr*
@@ -166,9 +161,7 @@ ChangePointerDevice (
*/
void
-CloseInputDevice (d, client)
- DeviceIntPtr d;
- ClientPtr client;
+CloseInputDevice(DeviceIntPtr d, ClientPtr client)
{
}
@@ -199,7 +192,7 @@ CloseInputDevice (d, client)
*/
void
-AddOtherInputDevices ()
+AddOtherInputDevices()
{
/**********************************************************************
for each uninitialized device, do something like:
@@ -239,10 +232,7 @@ AddOtherInputDevices ()
*/
void
-OpenInputDevice (dev, client, status)
- DeviceIntPtr dev;
- ClientPtr client;
- int *status;
+OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status)
{
}
@@ -259,10 +249,7 @@ OpenInputDevice (dev, client, status)
*/
int
-SetDeviceMode (client, dev, mode)
- register ClientPtr client;
- DeviceIntPtr dev;
- int mode;
+SetDeviceMode(register ClientPtr client, DeviceIntPtr dev, int mode)
{
return BadMatch;
}
@@ -280,12 +267,8 @@ SetDeviceMode (client, dev, mode)
*/
int
-SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
- register ClientPtr client;
- DeviceIntPtr dev;
- int *valuators;
- int first_valuator;
- int num_valuators;
+SetDeviceValuators(register ClientPtr client, DeviceIntPtr dev,
+ int *valuators, int first_valuator, int num_valuators)
{
return BadMatch;
}
@@ -299,13 +282,10 @@ SetDeviceValuators (client, dev, valuators, first_valuator, num_valuators)
*/
int
-ChangeDeviceControl (client, dev, control)
- register ClientPtr client;
- DeviceIntPtr dev;
- xDeviceCtl *control;
- {
- switch (control->control)
+ChangeDeviceControl(register ClientPtr client, DeviceIntPtr dev,
+ xDeviceCtl * control)
{
+ switch (control->control) {
case DEVICE_RESOLUTION:
return (BadMatch);
default:
diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.c b/nx-X11/programs/Xserver/Xi/ungrdev.c
index 4192979..976adc9 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdev.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdev.c
@@ -73,8 +73,7 @@ SOFTWARE.
*/
int
-SProcXUngrabDevice(client)
-register ClientPtr client;
+SProcXUngrabDevice(register ClientPtr client)
{
REQUEST(xUngrabDeviceReq);
swaps(&stuff->length);
@@ -90,8 +89,7 @@ register ClientPtr client;
*/
int
-ProcXUngrabDevice(client)
-register ClientPtr client;
+ProcXUngrabDevice(register ClientPtr client)
{
DeviceIntPtr dev;
GrabPtr grab;
diff --git a/nx-X11/programs/Xserver/Xi/ungrdev.h b/nx-X11/programs/Xserver/Xi/ungrdev.h
index df8358e..8e3c210 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdev.h
+++ b/nx-X11/programs/Xserver/Xi/ungrdev.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef UNGRDEV_H
#define UNGRDEV_H 1
-int
-SProcXUngrabDevice(
- ClientPtr /* client */
+int SProcXUngrabDevice(ClientPtr /* client */
);
-int
-ProcXUngrabDevice(
- ClientPtr /* client */
+int ProcXUngrabDevice(ClientPtr /* client */
);
#endif /* UNGRDEV_H */
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.c b/nx-X11/programs/Xserver/Xi/ungrdevb.c
index b9feced..366b433 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevb.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdevb.c
@@ -79,8 +79,7 @@ SOFTWARE.
*/
int
-SProcXUngrabDeviceButton(client)
- register ClientPtr client;
+SProcXUngrabDeviceButton(register ClientPtr client)
{
REQUEST(xUngrabDeviceButtonReq);
swaps(&stuff->length);
@@ -97,8 +96,7 @@ SProcXUngrabDeviceButton(client)
*/
int
-ProcXUngrabDeviceButton(client)
- ClientPtr client;
+ProcXUngrabDeviceButton(ClientPtr client)
{
DeviceIntPtr dev;
DeviceIntPtr mdev;
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevb.h b/nx-X11/programs/Xserver/Xi/ungrdevb.h
index b2558bb..400d61d 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevb.h
+++ b/nx-X11/programs/Xserver/Xi/ungrdevb.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef UNGRDEVB_H
#define UNGRDEVB_H 1
-int
-SProcXUngrabDeviceButton(
- ClientPtr /* client */
+int SProcXUngrabDeviceButton(ClientPtr /* client */
);
-int
-ProcXUngrabDeviceButton(
- ClientPtr /* client */
+int ProcXUngrabDeviceButton(ClientPtr /* client */
);
#endif /* UNGRDEVB_H */
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.c b/nx-X11/programs/Xserver/Xi/ungrdevk.c
index 76714b6..89dcdcd 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevk.c
+++ b/nx-X11/programs/Xserver/Xi/ungrdevk.c
@@ -79,8 +79,7 @@ SOFTWARE.
*/
int
-SProcXUngrabDeviceKey(client)
- register ClientPtr client;
+SProcXUngrabDeviceKey(register ClientPtr client)
{
REQUEST(xUngrabDeviceKeyReq);
swaps(&stuff->length);
@@ -97,8 +96,7 @@ SProcXUngrabDeviceKey(client)
*/
int
-ProcXUngrabDeviceKey(client)
- ClientPtr client;
+ProcXUngrabDeviceKey(ClientPtr client)
{
DeviceIntPtr dev;
DeviceIntPtr mdev;
diff --git a/nx-X11/programs/Xserver/Xi/ungrdevk.h b/nx-X11/programs/Xserver/Xi/ungrdevk.h
index b235bbf..9dec17a 100644
--- a/nx-X11/programs/Xserver/Xi/ungrdevk.h
+++ b/nx-X11/programs/Xserver/Xi/ungrdevk.h
@@ -30,14 +30,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef UNGRDEVK_H
#define UNGRDEVK_H 1
-int
-SProcXUngrabDeviceKey(
- ClientPtr /* client */
+int SProcXUngrabDeviceKey(ClientPtr /* client */
);
-int
-ProcXUngrabDeviceKey(
- ClientPtr /* client */
+int ProcXUngrabDeviceKey(ClientPtr /* client */
);
#endif /* UNGRDEVK_H */
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list