[prev in list] [next in list] [prev in thread] [next in thread]
List: freedesktop-xorg
Subject: [PATCH all of 265] ANSI-fied libX11
From: Magnus Kessler <Magnus.Kessler () gmx ! net>
Date: 2007-04-30 7:31:07
Message-ID: 200704300831.32317.Magnus.Kessler () gmx ! net
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
[Attachment #4 (multipart/mixed)]
Hi all,
sending 265 individual patches probably isn't the smartest idea, as Alan
Hourihane and others pointed out. I have created bug 10816 [0] for this
issue and attached the complete patch there. If anyone want's to have it
directly the full patch is also attached to this message.
When reviewing you will find that for most files the changes made are really
straight forward and boring. There are some, however, such as in #19
(ChkIfEv.c) in the series posted so far where the order of variable
declarations did not match the order of arguments. Please check the order
is still correct.
I made the decision early on not to do anything about the register keyword
as I'm not sure that removing it will not change the ABI on all systems. If
removing the register keyword is the Right Thing, a follow up patch set
could solve this issue.
Sorry for the noise on the list.
Best regards,
Magnus
[0] https://bugs.freedesktop.org/show_bug.cgi?id=10816
["libX11-cleanup.patch" (text/x-diff)]
diff --git a/src/AllCells.c b/src/AllCells.c
index ed7bc84..9642f73 100644
--- a/src/AllCells.c
+++ b/src/AllCells.c
@@ -32,14 +32,14 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XAllocColorCells(dpy, cmap, contig, masks, nplanes, pixels, ncolors)
-register Display *dpy;
-Colormap cmap;
-Bool contig;
-unsigned int ncolors; /* CARD16 */
-unsigned int nplanes; /* CARD16 */
-unsigned long *masks; /* LISTofCARD32 */ /* RETURN */
-unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */
+Status XAllocColorCells(
+ register Display *dpy,
+ Colormap cmap,
+ Bool contig,
+ unsigned long *masks, /* LISTofCARD32 */ /* RETURN */
+ unsigned int nplanes, /* CARD16 */
+ unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */
+ unsigned int ncolors) /* CARD16 */
{
Status status;
diff --git a/src/AllPlanes.c b/src/AllPlanes.c
index 079422b..7e714c0 100644
--- a/src/AllPlanes.c
+++ b/src/AllPlanes.c
@@ -32,15 +32,18 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XAllocColorPlanes(dpy, cmap, contig, pixels, ncolors, nreds, ngreens,
- nblues, rmask, gmask, bmask)
-register Display *dpy;
-Colormap cmap;
-Bool contig;
-unsigned long *pixels; /* LISTofCARD32 */ /* RETURN */
-int ncolors;
-int nreds, ngreens, nblues;
-unsigned long *rmask, *gmask, *bmask; /* CARD32 */ /* RETURN */
+Status XAllocColorPlanes(
+ register Display *dpy,
+ Colormap cmap,
+ Bool contig,
+ unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */
+ int ncolors,
+ int nreds,
+ int ngreens,
+ int nblues,
+ unsigned long *rmask,
+ unsigned long *gmask,
+ unsigned long *bmask) /* CARD32 */ /* RETURN */
{
xAllocColorPlanesReply rep;
Status status;
diff --git a/src/AllowEv.c b/src/AllowEv.c
index c5905b9..c995213 100644
--- a/src/AllowEv.c
+++ b/src/AllowEv.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XAllowEvents(dpy, mode, time)
- register Display *dpy;
- int mode;
- Time time;
+XAllowEvents(
+ register Display *dpy,
+ int mode,
+ Time time)
{
register xAllowEventsReq *req;
diff --git a/src/AutoRep.c b/src/AutoRep.c
index 404d520..59434f7 100644
--- a/src/AutoRep.c
+++ b/src/AutoRep.c
@@ -32,8 +32,7 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XAutoRepeatOn (dpy)
-register Display *dpy;
+XAutoRepeatOn (register Display *dpy)
{
XKeyboardControl values;
values.auto_repeat_mode = AutoRepeatModeOn;
@@ -42,8 +41,7 @@ register Display *dpy;
}
int
-XAutoRepeatOff (dpy)
-register Display *dpy;
+XAutoRepeatOff (register Display *dpy)
{
XKeyboardControl values;
values.auto_repeat_mode = AutoRepeatModeOff;
diff --git a/src/Backgnd.c b/src/Backgnd.c
index dbb9242..46c71ee 100644
--- a/src/Backgnd.c
+++ b/src/Backgnd.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetWindowBackground(dpy, w, pixel)
- register Display *dpy;
- Window w;
- unsigned long pixel;
+XSetWindowBackground(
+ register Display *dpy,
+ Window w,
+ unsigned long pixel)
{
register xChangeWindowAttributesReq *req;
diff --git a/src/BdrWidth.c b/src/BdrWidth.c
index db6df01..13bfd73 100644
--- a/src/BdrWidth.c
+++ b/src/BdrWidth.c
@@ -35,10 +35,10 @@ from The Open Group.
#include "Xlibint.h"
int
-XSetWindowBorderWidth(dpy, w, width)
-Display *dpy;
-Window w;
-unsigned int width;
+XSetWindowBorderWidth(
+ Display *dpy,
+ Window w,
+ unsigned int width)
{
unsigned long lwidth = width; /* must be CARD32 */
diff --git a/src/Bell.c b/src/Bell.c
index 8eebc6b..9b2f7ea 100644
--- a/src/Bell.c
+++ b/src/Bell.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XBell(dpy, percent)
- register Display *dpy;
- int percent;
+XBell(
+ register Display *dpy,
+ int percent)
{
register xBellReq *req;
diff --git a/src/Border.c b/src/Border.c
index 8f0bdb6..2ac8c05 100644
--- a/src/Border.c
+++ b/src/Border.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetWindowBorder(dpy, w, pixel)
- register Display *dpy;
- Window w;
- unsigned long pixel;
+XSetWindowBorder(
+ register Display *dpy,
+ Window w,
+ unsigned long pixel)
{
register xChangeWindowAttributesReq *req;
diff --git a/src/ChAccCon.c b/src/ChAccCon.c
index eef3bb0..ecc4b15 100644
--- a/src/ChAccCon.c
+++ b/src/ChAccCon.c
@@ -32,25 +32,21 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XEnableAccessControl(dpy)
- register Display *dpy;
-
+XEnableAccessControl(register Display *dpy)
{
return XSetAccessControl(dpy, EnableAccess);
}
int
-XDisableAccessControl(dpy)
- register Display *dpy;
-
+XDisableAccessControl(register Display *dpy)
{
return XSetAccessControl(dpy, DisableAccess);
}
int
-XSetAccessControl(dpy, mode)
- register Display *dpy;
- int mode;
+XSetAccessControl(
+ register Display *dpy,
+ int mode)
{
register xSetAccessControlReq *req;
diff --git a/src/ChActPGb.c b/src/ChActPGb.c
index 42ec330..f57bdbc 100644
--- a/src/ChActPGb.c
+++ b/src/ChActPGb.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XChangeActivePointerGrab(dpy, event_mask, curs, time)
-register Display *dpy;
-unsigned int event_mask; /* CARD16 */
-Cursor curs;
-Time time;
+XChangeActivePointerGrab(
+ register Display *dpy,
+ unsigned int event_mask, /* CARD16 */
+ Cursor curs,
+ Time time)
{
register xChangeActivePointerGrabReq *req;
diff --git a/src/ChClMode.c b/src/ChClMode.c
index 1b22f68..80895b6 100644
--- a/src/ChClMode.c
+++ b/src/ChClMode.c
@@ -32,10 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XSetCloseDownMode(dpy, mode)
- register Display *dpy;
- int mode;
-
+XSetCloseDownMode(
+ register Display *dpy,
+ int mode)
{
register xSetCloseDownModeReq *req;
diff --git a/src/ChCmap.c b/src/ChCmap.c
index 112c944..7fd3778 100644
--- a/src/ChCmap.c
+++ b/src/ChCmap.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetWindowColormap(dpy, w, colormap)
- register Display *dpy;
- Window w;
- Colormap colormap;
+XSetWindowColormap(
+ register Display *dpy,
+ Window w,
+ Colormap colormap)
{
register xChangeWindowAttributesReq *req;
diff --git a/src/ChGC.c b/src/ChGC.c
index bafa1d4..058c1f6 100644
--- a/src/ChGC.c
+++ b/src/ChGC.c
@@ -33,11 +33,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Cr.h"
int
-XChangeGC (dpy, gc, valuemask, values)
- register Display *dpy;
- GC gc;
- unsigned long valuemask;
- XGCValues *values;
+XChangeGC (
+ register Display *dpy,
+ GC gc,
+ unsigned long valuemask,
+ XGCValues *values)
{
LockDisplay(dpy);
diff --git a/src/ChKeyCon.c b/src/ChKeyCon.c
index 831f6f0..495f3df 100644
--- a/src/ChKeyCon.c
+++ b/src/ChKeyCon.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XChangeKeyboardControl(dpy, mask, value_list)
- register Display *dpy;
- unsigned long mask;
- XKeyboardControl *value_list;
+XChangeKeyboardControl(
+ register Display *dpy,
+ unsigned long mask,
+ XKeyboardControl *value_list)
{
unsigned long values[8];
register unsigned long *value = values;
diff --git a/src/ChPntCon.c b/src/ChPntCon.c
index 225d031..265079c 100644
--- a/src/ChPntCon.c
+++ b/src/ChPntCon.c
@@ -32,11 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XChangePointerControl(dpy, do_acc, do_thresh, acc_numerator,
- acc_denominator, threshold)
- register Display *dpy;
- Bool do_acc, do_thresh;
- int acc_numerator, acc_denominator, threshold;
+XChangePointerControl(
+ register Display *dpy,
+ Bool do_acc,
+ Bool do_thresh,
+ int acc_numerator,
+ int acc_denominator,
+ int threshold)
{
register xChangePointerControlReq *req;
diff --git a/src/ChSaveSet.c b/src/ChSaveSet.c
index 9862db7..3276cc1 100644
--- a/src/ChSaveSet.c
+++ b/src/ChSaveSet.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XChangeSaveSet(dpy, win, mode)
-register Display *dpy;
-Window win;
-int mode;
+XChangeSaveSet(
+ register Display *dpy,
+ Window win,
+ int mode)
{
register xChangeSaveSetReq *req;
@@ -49,17 +49,17 @@ int mode;
}
int
-XAddToSaveSet(dpy, win)
- register Display *dpy;
- Window win;
+XAddToSaveSet(
+ register Display *dpy,
+ Window win)
{
return XChangeSaveSet(dpy,win,SetModeInsert);
}
int
-XRemoveFromSaveSet (dpy, win)
- register Display *dpy;
- Window win;
+XRemoveFromSaveSet (
+ register Display *dpy,
+ Window win)
{
return XChangeSaveSet(dpy,win,SetModeDelete);
}
diff --git a/src/ChWAttrs.c b/src/ChWAttrs.c
index 57b81ab..6b6088e 100644
--- a/src/ChWAttrs.c
+++ b/src/ChWAttrs.c
@@ -38,11 +38,11 @@ in this Software without prior written authorization from The \
Open Group. CWDontPropagate|CWColormap|CWCursor)
int
-XChangeWindowAttributes (dpy, w, valuemask, attributes)
- register Display *dpy;
- Window w;
- unsigned long valuemask;
- XSetWindowAttributes *attributes;
+XChangeWindowAttributes (
+ register Display *dpy,
+ Window w,
+ unsigned long valuemask,
+ XSetWindowAttributes *attributes)
{
register xChangeWindowAttributesReq *req;
diff --git a/src/ChWindow.c b/src/ChWindow.c
index a403d76..2eec660 100644
--- a/src/ChWindow.c
+++ b/src/ChWindow.c
@@ -32,10 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XResizeWindow(dpy, w, width, height)
-register Display *dpy;
-Window w;
-unsigned int width, height;
+XResizeWindow(
+ register Display *dpy,
+ Window w,
+ unsigned int width,
+ unsigned int height)
{
register xConfigureWindowReq *req;
diff --git a/src/ChkIfEv.c b/src/ChkIfEv.c
index ff74bcd..45e8715 100644
--- a/src/ChkIfEv.c
+++ b/src/ChkIfEv.c
@@ -38,15 +38,15 @@ in this Software without prior written authorization from The \
Open Group.
* matches, return. If all else fails, tell the user no events found.
*/
-Bool XCheckIfEvent (dpy, event, predicate, arg)
- register Display *dpy;
+Bool XCheckIfEvent (
+ register Display *dpy,
+ register XEvent *event, /* XEvent to be filled in. */
Bool (*predicate)(
Display* /* display */,
XEvent* /* event */,
char* /* arg */
- ); /* function to call */
- register XEvent *event; /* XEvent to be filled in. */
- char *arg;
+ ), /* function to call */
+ char *arg)
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/ChkMaskEv.c b/src/ChkMaskEv.c
index 92b569f..eb7c074 100644
--- a/src/ChkMaskEv.c
+++ b/src/ChkMaskEv.c
@@ -44,10 +44,10 @@ extern long const _Xevent_to_mask[];
* matches, return. If all else fails, tell the user no events found.
*/
-Bool XCheckMaskEvent (dpy, mask, event)
- register Display *dpy;
- long mask; /* Selected event mask. */
- register XEvent *event; /* XEvent to be filled in. */
+Bool XCheckMaskEvent (
+ register Display *dpy,
+ long mask, /* Selected event mask. */
+ register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/ChkTypEv.c b/src/ChkTypEv.c
index 8fd879d..47813e3 100644
--- a/src/ChkTypEv.c
+++ b/src/ChkTypEv.c
@@ -38,10 +38,10 @@ in this Software without prior written authorization from The \
Open Group.
* matches, return. If all else fails, tell the user no events found.
*/
-Bool XCheckTypedEvent (dpy, type, event)
- register Display *dpy;
- int type; /* Selected event type. */
- register XEvent *event; /* XEvent to be filled in. */
+Bool XCheckTypedEvent (
+ register Display *dpy,
+ int type, /* Selected event type. */
+ register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/ChkTypWEv.c b/src/ChkTypWEv.c
index 83b6244..4adae0e 100644
--- a/src/ChkTypWEv.c
+++ b/src/ChkTypWEv.c
@@ -38,11 +38,11 @@ in this Software without prior written authorization from The \
Open Group.
* matches, return. If all else fails, tell the user no events found.
*/
-Bool XCheckTypedWindowEvent (dpy, w, type, event)
- register Display *dpy;
- Window w; /* Selected window. */
- int type; /* Selected event type. */
- register XEvent *event; /* XEvent to be filled in. */
+Bool XCheckTypedWindowEvent (
+ register Display *dpy,
+ Window w, /* Selected window. */
+ int type, /* Selected event type. */
+ register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/ChkWinEv.c b/src/ChkWinEv.c
index 91d9b30..3bbbfff 100644
--- a/src/ChkWinEv.c
+++ b/src/ChkWinEv.c
@@ -43,11 +43,11 @@ extern long const _Xevent_to_mask[];
* matches, return. If all else fails, tell the user no events found.
*/
-Bool XCheckWindowEvent (dpy, w, mask, event)
- register Display *dpy;
- Window w; /* Selected window. */
- long mask; /* Selected event mask. */
- register XEvent *event; /* XEvent to be filled in. */
+Bool XCheckWindowEvent (
+ register Display *dpy,
+ Window w, /* Selected window. */
+ long mask, /* Selected event mask. */
+ register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/CirWin.c b/src/CirWin.c
index 100cbbe..76d8820 100644
--- a/src/CirWin.c
+++ b/src/CirWin.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XCirculateSubwindows(dpy, w, direction)
- register Display *dpy;
- Window w;
- int direction;
+XCirculateSubwindows(
+ register Display *dpy,
+ Window w,
+ int direction)
{
register xCirculateWindowReq *req;
diff --git a/src/CirWinDn.c b/src/CirWinDn.c
index 83a5966..82cf2c0 100644
--- a/src/CirWinDn.c
+++ b/src/CirWinDn.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XCirculateSubwindowsDown(dpy,w)
- register Display *dpy;
- Window w;
+XCirculateSubwindowsDown(
+ register Display *dpy,
+ Window w)
{
register xCirculateWindowReq *req;
diff --git a/src/CirWinUp.c b/src/CirWinUp.c
index 42a2641..ed7647b 100644
--- a/src/CirWinUp.c
+++ b/src/CirWinUp.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XCirculateSubwindowsUp(dpy, w)
- register Display *dpy;
- Window w;
+XCirculateSubwindowsUp(
+ register Display *dpy,
+ Window w)
{
register xCirculateWindowReq *req;
diff --git a/src/Clear.c b/src/Clear.c
index 314d259..5e381fb 100644
--- a/src/Clear.c
+++ b/src/Clear.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XClearWindow(dpy, w)
- register Display *dpy;
- Window w;
+XClearWindow(
+ register Display *dpy,
+ Window w)
{
register xClearAreaReq *req;
diff --git a/src/ClearArea.c b/src/ClearArea.c
index 194a6a2..95b1f49 100644
--- a/src/ClearArea.c
+++ b/src/ClearArea.c
@@ -32,12 +32,14 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XClearArea (dpy, w, x, y, width, height, exposures)
- register Display *dpy;
- Window w;
- int x, y;
- unsigned int width, height;
- Bool exposures;
+XClearArea (
+ register Display *dpy,
+ Window w,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ Bool exposures)
{
register xClearAreaReq *req;
diff --git a/src/ConfWind.c b/src/ConfWind.c
index fddd283..7f153cb 100644
--- a/src/ConfWind.c
+++ b/src/ConfWind.c
@@ -32,11 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XMoveResizeWindow(dpy, w, x, y, width, height)
-register Display *dpy;
-Window w;
-int x, y;
-unsigned int width, height;
+XMoveResizeWindow(
+ register Display *dpy,
+ Window w,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height)
{
register xConfigureWindowReq *req;
diff --git a/src/ConvSel.c b/src/ConvSel.c
index 64739b2..e60148e 100644
--- a/src/ConvSel.c
+++ b/src/ConvSel.c
@@ -32,12 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XConvertSelection(dpy, selection, target, property, requestor, time)
-register Display *dpy;
-Atom selection, target;
-Atom property;
-Window requestor;
-Time time;
+XConvertSelection(
+ register Display *dpy,
+ Atom selection,
+ Atom target,
+ Atom property,
+ Window requestor,
+ Time time)
{
register xConvertSelectionReq *req;
diff --git a/src/CopyArea.c b/src/CopyArea.c
index f27bfef..a2dc6fa 100644
--- a/src/CopyArea.c
+++ b/src/CopyArea.c
@@ -32,15 +32,17 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XCopyArea(dpy, src_drawable, dst_drawable, gc,
- src_x, src_y, width, height,
- dst_x, dst_y)
- register Display *dpy;
- Drawable src_drawable, dst_drawable;
- GC gc;
- int src_x, src_y;
- unsigned int width, height;
- int dst_x, dst_y;
+XCopyArea(
+ register Display *dpy,
+ Drawable src_drawable,
+ Drawable dst_drawable,
+ GC gc,
+ int src_x,
+ int src_y,
+ unsigned int width,
+ unsigned int height,
+ int dst_x,
+ int dst_y)
{
register xCopyAreaReq *req;
diff --git a/src/CopyCmap.c b/src/CopyCmap.c
index cdfc78c..127c15b 100644
--- a/src/CopyCmap.c
+++ b/src/CopyCmap.c
@@ -42,9 +42,9 @@ extern XcmsCmapRec * _XcmsCopyCmapRecAndFree(Display *dpy,
Colormap copy_cmap);
#endif
-Colormap XCopyColormapAndFree(dpy, src_cmap)
-register Display *dpy;
-Colormap src_cmap;
+Colormap XCopyColormapAndFree(
+ register Display *dpy,
+ Colormap src_cmap)
{
Colormap mid;
register xCopyColormapAndFreeReq *req;
diff --git a/src/CopyGC.c b/src/CopyGC.c
index 7ca5f38..f94914a 100644
--- a/src/CopyGC.c
+++ b/src/CopyGC.c
@@ -32,10 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XCopyGC (dpy, srcGC, mask, destGC)
- register Display *dpy;
- unsigned long mask; /* which ones to set initially */
- GC srcGC, destGC;
+XCopyGC (
+ register Display *dpy,
+ GC srcGC,
+ unsigned long mask, /* which ones to set initially */
+ GC destGC)
{
register XGCValues *destgv = &destGC->values,
*srcgv = &srcGC->values;
diff --git a/src/CopyPlane.c b/src/CopyPlane.c
index b813888..5d1dbb9 100644
--- a/src/CopyPlane.c
+++ b/src/CopyPlane.c
@@ -32,16 +32,18 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XCopyPlane(dpy, src_drawable, dst_drawable, gc,
- src_x, src_y, width, height,
- dst_x, dst_y, bit_plane)
- register Display *dpy;
- Drawable src_drawable, dst_drawable;
- GC gc;
- int src_x, src_y;
- unsigned int width, height;
- int dst_x, dst_y;
- unsigned long bit_plane;
+XCopyPlane(
+ register Display *dpy,
+ Drawable src_drawable,
+ Drawable dst_drawable,
+ GC gc,
+ int src_x,
+ int src_y,
+ unsigned int width,
+ unsigned int height,
+ int dst_x,
+ int dst_y,
+ unsigned long bit_plane)
{
register xCopyPlaneReq *req;
diff --git a/src/CrCmap.c b/src/CrCmap.c
index c53faeb..1725fec 100644
--- a/src/CrCmap.c
+++ b/src/CrCmap.c
@@ -33,11 +33,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xcmsint.h"
-Colormap XCreateColormap(dpy, w, visual, alloc)
-register Display *dpy;
-Window w;
-Visual *visual;
-int alloc;
+Colormap XCreateColormap(
+ register Display *dpy,
+ Window w,
+ Visual *visual,
+ int alloc)
{
register xCreateColormapReq *req;
Colormap mid;
diff --git a/src/CrCursor.c b/src/CrCursor.c
index 917349f..ba1b0c2 100644
--- a/src/CrCursor.c
+++ b/src/CrCursor.c
@@ -42,11 +42,14 @@ _XTryShapeBitmapCursor (Display *dpy,
unsigned int y);
#endif
-Cursor XCreatePixmapCursor(dpy, source, mask, foreground, background, x, y)
- register Display *dpy;
- Pixmap source, mask;
- XColor *foreground, *background;
- unsigned int x, y;
+Cursor XCreatePixmapCursor(
+ register Display *dpy,
+ Pixmap source,
+ Pixmap mask,
+ XColor *foreground,
+ XColor *background,
+ unsigned int x,
+ unsigned int y)
{
register xCreateCursorReq *req;
diff --git a/src/CrGC.c b/src/CrGC.c
index 2cc09e2..65cbb11 100644
--- a/src/CrGC.c
+++ b/src/CrGC.c
@@ -63,11 +63,11 @@ static void _XGenerateGCList(
GC gc,
xReq *req);
-GC XCreateGC (dpy, d, valuemask, values)
- register Display *dpy;
- Drawable d; /* Window or Pixmap for which depth matches */
- unsigned long valuemask; /* which ones to set initially */
- XGCValues *values; /* the values themselves */
+GC XCreateGC (
+ register Display *dpy,
+ Drawable d, /* Window or Pixmap for which depth matches */
+ unsigned long valuemask, /* which ones to set initially */
+ XGCValues *values) /* the values themselves */
{
register GC gc;
register xCreateGCReq *req;
@@ -113,7 +113,7 @@ _XGenerateGCList (
register Display *dpy,
GC gc,
xReq *req)
- {
+{
unsigned long values[32];
register unsigned long *value = values;
long nvalues;
@@ -159,15 +159,15 @@ _XGenerateGCList (
nvalues <<= 2;
Data32 (dpy, (long *) values, nvalues);
- }
+}
int
-_XUpdateGCCache (gc, mask, attr)
- register unsigned long mask;
- register XGCValues *attr;
- register GC gc;
- {
+_XUpdateGCCache (
+ register GC gc,
+ register unsigned long mask,
+ register XGCValues *attr)
+{
register XGCValues *gv = &gc->values;
if (mask & GCFunction)
@@ -310,13 +310,13 @@ _XUpdateGCCache (gc, mask, attr)
gc->dashes = 0;
}
return 0;
- }
+}
/* can only call when display is already locked. */
-void _XFlushGCCache(dpy, gc)
- Display *dpy;
- GC gc;
+void _XFlushGCCache(
+ Display *dpy,
+ GC gc)
{
register xChangeGCReq *req;
register _XExtension *ext;
@@ -333,13 +333,15 @@ void _XFlushGCCache(dpy, gc)
}
}
-void XFlushGC(dpy, gc)
- Display *dpy;
- GC gc;
+void
+XFlushGC(
+ Display *dpy,
+ GC gc)
{
FlushGC(dpy, gc);
}
-GContext XGContextFromGC(gc)
- GC gc;
- { return (gc->gid); }
+GContext XGContextFromGC(GC gc)
+{
+ return (gc->gid);
+}
diff --git a/src/CrGlCur.c b/src/CrGlCur.c
index 423de75..0adb4a4 100644
--- a/src/CrGlCur.c
+++ b/src/CrGlCur.c
@@ -220,14 +220,14 @@ _XTryShapeBitmapCursor (Display *dpy,
}
#endif
-Cursor XCreateGlyphCursor(dpy, source_font, mask_font,
- source_char, mask_char,
- foreground, background)
- register Display *dpy;
- Font source_font, mask_font;
- unsigned int source_char, mask_char;
- XColor _Xconst *foreground, *background;
-
+Cursor XCreateGlyphCursor(
+ register Display *dpy,
+ Font source_font,
+ Font mask_font,
+ unsigned int source_char,
+ unsigned int mask_char,
+ XColor _Xconst *foreground,
+ XColor _Xconst *background)
{
Cursor cid;
register xCreateGlyphCursorReq *req;
diff --git a/src/CrPFBData.c b/src/CrPFBData.c
index b65e32f..e08b65c 100644
--- a/src/CrPFBData.c
+++ b/src/CrPFBData.c
@@ -49,13 +49,15 @@ in this Software without prior written authorization from The \
Open Group.
* xoffset=0
* no extra bytes per line
*/
-Pixmap XCreatePixmapFromBitmapData(display,d,data,width,height,fg,bg,depth)
- Display *display;
- Drawable d;
- char *data;
- unsigned int width, height;
- unsigned long fg, bg;
- unsigned int depth;
+Pixmap XCreatePixmapFromBitmapData(
+ Display *display,
+ Drawable d,
+ char *data,
+ unsigned int width,
+ unsigned int height,
+ unsigned long fg,
+ unsigned long bg,
+ unsigned int depth)
{
XImage ximage;
GC gc;
diff --git a/src/CrPixmap.c b/src/CrPixmap.c
index 72ef696..5656a6c 100644
--- a/src/CrPixmap.c
+++ b/src/CrPixmap.c
@@ -39,10 +39,12 @@ _XNoticeCreateBitmap (Display *dpy,
unsigned int height);
#endif
-Pixmap XCreatePixmap (dpy, d, width, height, depth)
- register Display *dpy;
- Drawable d;
- unsigned int width, height, depth;
+Pixmap XCreatePixmap (
+ register Display *dpy,
+ Drawable d,
+ unsigned int width,
+ unsigned int height,
+ unsigned int depth)
{
Pixmap pid;
register xCreatePixmapReq *req;
diff --git a/src/CrWindow.c b/src/CrWindow.c
index 9a15f2e..d0b17a2 100644
--- a/src/CrWindow.c
+++ b/src/CrWindow.c
@@ -30,14 +30,16 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Window XCreateSimpleWindow(dpy, parent, x, y, width, height,
- borderWidth, border, background)
- register Display *dpy;
- Window parent;
- int x, y;
- unsigned int width, height, borderWidth;
- unsigned long border;
- unsigned long background;
+Window XCreateSimpleWindow(
+ register Display *dpy,
+ Window parent,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ unsigned int borderWidth,
+ unsigned long border,
+ unsigned long background)
{
Window wid;
register xCreateWindowReq *req;
diff --git a/src/Cursor.c b/src/Cursor.c
index 98ac36b..76ac3be 100644
--- a/src/Cursor.c
+++ b/src/Cursor.c
@@ -33,9 +33,9 @@ in this Software without prior written authorization from The Open \
Group. static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */
static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */
-Cursor XCreateFontCursor(dpy, which)
- Display *dpy;
- unsigned int which;
+Cursor XCreateFontCursor(
+ Display *dpy,
+ unsigned int which)
{
/*
* the cursor font contains the shape glyph followed by the mask
diff --git a/src/DefCursor.c b/src/DefCursor.c
index 053afba..1715ddb 100644
--- a/src/DefCursor.c
+++ b/src/DefCursor.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDefineCursor (dpy, w, cursor)
- register Display *dpy;
- Window w;
- Cursor cursor;
+XDefineCursor (
+ register Display *dpy,
+ Window w,
+ Cursor cursor)
{
register xChangeWindowAttributesReq *req;
diff --git a/src/DelProp.c b/src/DelProp.c
index fd40b75..a108a1a 100644
--- a/src/DelProp.c
+++ b/src/DelProp.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDeleteProperty(dpy, window, property)
-register Display *dpy;
-Window window;
-Atom property;
+XDeleteProperty(
+ register Display *dpy,
+ Window window,
+ Atom property)
{
register xDeletePropertyReq *req;
diff --git a/src/Depths.c b/src/Depths.c
index 82ce2c8..dba1471 100644
--- a/src/Depths.c
+++ b/src/Depths.c
@@ -34,10 +34,10 @@ in this Software without prior written authorization from The \
Open Group. /*
* XListDepths - return info from connection setup
*/
-int *XListDepths (dpy, scrnum, countp)
- Display *dpy;
- int scrnum;
- int *countp;
+int *XListDepths (
+ Display *dpy,
+ int scrnum,
+ int *countp)
{
Screen *scr;
int count;
diff --git a/src/DestSubs.c b/src/DestSubs.c
index 3d5f48d..236ba66 100644
--- a/src/DestSubs.c
+++ b/src/DestSubs.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XDestroySubwindows(dpy, win)
-register Display *dpy;
-Window win;
+XDestroySubwindows(
+ register Display *dpy,
+ Window win)
{
register xResourceReq *req;
diff --git a/src/DestWind.c b/src/DestWind.c
index a079d44..221da26 100644
--- a/src/DestWind.c
+++ b/src/DestWind.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XDestroyWindow (dpy, w)
- register Display *dpy;
- Window w;
+XDestroyWindow (
+ register Display *dpy,
+ Window w)
{
register xResourceReq *req;
diff --git a/src/DrArc.c b/src/DrArc.c
index 3111676..1f1c86a 100644
--- a/src/DrArc.c
+++ b/src/DrArc.c
@@ -38,13 +38,16 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawArc(dpy, d, gc, x, y, width, height, angle1, angle2)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y; /* INT16 */
- unsigned int width, height; /* CARD16 */
- int angle1, angle2; /* INT16 */
+XDrawArc(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y, /* INT16 */
+ unsigned int width,
+ unsigned int height, /* CARD16 */
+ int angle1,
+ int angle2) /* INT16 */
{
register xPolyArcReq *req;
register xArc *arc;
diff --git a/src/DrArcs.c b/src/DrArcs.c
index 8e02863..bc3bda3 100644
--- a/src/DrArcs.c
+++ b/src/DrArcs.c
@@ -34,12 +34,12 @@ in this Software without prior written authorization from The \
Open Group. #define arc_scale (SIZEOF(xArc) / 4)
int
-XDrawArcs(dpy, d, gc, arcs, n_arcs)
-register Display *dpy;
-Drawable d;
-GC gc;
-XArc *arcs;
-int n_arcs;
+XDrawArcs(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XArc *arcs,
+ int n_arcs)
{
register xPolyArcReq *req;
register long len;
diff --git a/src/DrLine.c b/src/DrLine.c
index 5909506..9c5275b 100644
--- a/src/DrLine.c
+++ b/src/DrLine.c
@@ -37,11 +37,14 @@ in this Software without prior written authorization from The \
Open Group. #define zsize (SIZEOF(xPolySegmentReq) + ZLNSPERBATCH * \
SIZEOF(xSegment))
int
-XDrawLine (dpy, d, gc, x1, y1, x2, y2)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x1, y1, x2, y2;
+XDrawLine (
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x1,
+ int y1,
+ int x2,
+ int y2)
{
register xSegment *segment;
#ifdef MUSTCOPY
diff --git a/src/DrLines.c b/src/DrLines.c
index ea8bf82..bf0529f 100644
--- a/src/DrLines.c
+++ b/src/DrLines.c
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawLines (dpy, d, gc, points, npoints, mode)
- register Display *dpy;
- Drawable d;
- GC gc;
- XPoint *points;
- int npoints;
- int mode;
+XDrawLines (
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XPoint *points,
+ int npoints,
+ int mode)
{
register xPolyLineReq *req;
register long length;
diff --git a/src/DrPoint.c b/src/DrPoint.c
index 3cd6b7f..6ad0678 100644
--- a/src/DrPoint.c
+++ b/src/DrPoint.c
@@ -36,11 +36,12 @@ in this Software without prior written authorization from The \
Open Group. #define size (SIZEOF(xPolyPointReq) + PTSPERBATCH * SIZEOF(xPoint))
int
-XDrawPoint(dpy, d, gc, x, y)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y; /* INT16 */
+XDrawPoint(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y) /* INT16 */
{
xPoint *point;
#ifdef MUSTCOPY
diff --git a/src/DrPoints.c b/src/DrPoints.c
index 1637aa8..aff96ba 100644
--- a/src/DrPoints.c
+++ b/src/DrPoints.c
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawPoints(dpy, d, gc, points, n_points, mode)
- register Display *dpy;
- Drawable d;
- GC gc;
- XPoint *points;
- int n_points;
- int mode; /* CoordMode */
+XDrawPoints(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XPoint *points,
+ int n_points,
+ int mode) /* CoordMode */
{
register xPolyPointReq *req;
register long nbytes;
diff --git a/src/DrRect.c b/src/DrRect.c
index 984e291..682c002 100644
--- a/src/DrRect.c
+++ b/src/DrRect.c
@@ -37,12 +37,14 @@ in this Software without prior written authorization from The \
Open Group. #define zsize (SIZEOF(xPolyRectangleReq) + ZRCTSPERBATCH * \
SIZEOF(xRectangle))
int
-XDrawRectangle(dpy, d, gc, x, y, width, height)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y; /* INT16 */
- unsigned int width, height; /* CARD16 */
+XDrawRectangle(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y, /* INT16 */
+ unsigned int width,
+ unsigned int height) /* CARD16 */
{
xRectangle *rect;
#ifdef MUSTCOPY
diff --git a/src/DrRects.c b/src/DrRects.c
index b300f2f..ab257a5 100644
--- a/src/DrRects.c
+++ b/src/DrRects.c
@@ -32,12 +32,12 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawRectangles(dpy, d, gc, rects, n_rects)
-register Display *dpy;
-Drawable d;
-GC gc;
-XRectangle *rects;
-int n_rects;
+XDrawRectangles(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XRectangle *rects,
+ int n_rects)
{
register xPolyRectangleReq *req;
long len;
diff --git a/src/DrSegs.c b/src/DrSegs.c
index e7e61b8..78e0484 100644
--- a/src/DrSegs.c
+++ b/src/DrSegs.c
@@ -32,12 +32,12 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawSegments (dpy, d, gc, segments, nsegments)
- register Display *dpy;
- Drawable d;
- GC gc;
- XSegment *segments;
- int nsegments;
+XDrawSegments (
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XSegment *segments,
+ int nsegments)
{
register xPolySegmentReq *req;
long len;
diff --git a/src/ErrDes.c b/src/ErrDes.c
index 0905efa..eb5b4c2 100644
--- a/src/ErrDes.c
+++ b/src/ErrDes.c
@@ -94,11 +94,11 @@ static const char * const _XErrorList[] = {
int
-XGetErrorText(dpy, code, buffer, nbytes)
- register int code;
- register Display *dpy;
- char *buffer;
- int nbytes;
+XGetErrorText(
+ register Display *dpy,
+ register int code,
+ char *buffer,
+ int nbytes)
{
char buf[150];
register _XExtension *ext;
diff --git a/src/FSSaver.c b/src/FSSaver.c
index 8ffa959..e4c17f8 100644
--- a/src/FSSaver.c
+++ b/src/FSSaver.c
@@ -32,28 +32,23 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XActivateScreenSaver(dpy)
- register Display *dpy;
-
+XActivateScreenSaver(register Display *dpy)
{
XForceScreenSaver (dpy, ScreenSaverActive);
return 1;
}
int
-XResetScreenSaver(dpy)
- register Display *dpy;
-
+XResetScreenSaver(register Display *dpy)
{
XForceScreenSaver (dpy, ScreenSaverReset);
return 1;
}
int
-XForceScreenSaver(dpy, mode)
- register Display *dpy;
- int mode;
-
+XForceScreenSaver(
+ register Display *dpy,
+ int mode)
{
register xForceScreenSaverReq *req;
diff --git a/src/FSWrap.c b/src/FSWrap.c
index 10634ce..b4e17e4 100644
--- a/src/FSWrap.c
+++ b/src/FSWrap.c
@@ -208,10 +208,10 @@ XCreateFontSet (
}
int
-XFontsOfFontSet(font_set, font_struct_list, font_name_list)
- XFontSet font_set;
- XFontStruct ***font_struct_list;
- char ***font_name_list;
+XFontsOfFontSet(
+ XFontSet font_set,
+ XFontStruct ***font_struct_list,
+ char ***font_name_list)
{
*font_name_list = font_set->core.font_info.font_name_list;
*font_struct_list = font_set->core.font_info.font_struct_list;
@@ -219,42 +219,37 @@ XFontsOfFontSet(font_set, font_struct_list, font_name_list)
}
char *
-XBaseFontNameListOfFontSet(font_set)
- XFontSet font_set;
+XBaseFontNameListOfFontSet(XFontSet font_set)
{
return font_set->core.base_name_list;
}
char *
-XLocaleOfFontSet(font_set)
- XFontSet font_set;
+XLocaleOfFontSet(XFontSet font_set)
{
return font_set->core.om->core.lcd->core->name;
}
-extern Bool XContextDependentDrawing(font_set)
- XFontSet font_set;
+Bool
+XContextDependentDrawing(XFontSet font_set)
{
return font_set->core.om->core.context_dependent;
}
Bool
-XDirectionalDependentDrawing(font_set)
- XFontSet font_set;
+XDirectionalDependentDrawing(XFontSet font_set)
{
return font_set->core.om->core.directional_dependent;
}
Bool
-XContextualDrawing(font_set)
- XFontSet font_set;
+XContextualDrawing(XFontSet font_set)
{
return font_set->core.om->core.contextual_drawing;
}
XFontSetExtents *
-XExtentsOfFontSet(font_set)
- XFontSet font_set;
+XExtentsOfFontSet(XFontSet font_set)
{
if (!font_set)
return NULL;
@@ -262,9 +257,9 @@ XExtentsOfFontSet(font_set)
}
void
-XFreeFontSet(dpy, font_set)
- Display *dpy;
- XFontSet font_set;
+XFreeFontSet(
+ Display *dpy,
+ XFontSet font_set)
{
XCloseOM(font_set->core.om);
}
diff --git a/src/FetchName.c b/src/FetchName.c
index 3d41472..16b2f7a 100644
--- a/src/FetchName.c
+++ b/src/FetchName.c
@@ -34,10 +34,10 @@ in this Software without prior written authorization from The \
Open Group. #include <stdio.h>
-Status XFetchName (dpy, w, name)
- register Display *dpy;
- Window w;
- char **name;
+Status XFetchName (
+ register Display *dpy,
+ Window w,
+ char **name)
{
Atom actual_type;
int actual_format;
@@ -64,10 +64,10 @@ Status XFetchName (dpy, w, name)
return(0);
}
-Status XGetIconName (dpy, w, icon_name)
- register Display *dpy;
- Window w;
- char **icon_name;
+Status XGetIconName (
+ register Display *dpy,
+ Window w,
+ char **icon_name)
{
Atom actual_type;
int actual_format;
diff --git a/src/FillArc.c b/src/FillArc.c
index 2aa88d8..9d8060f 100644
--- a/src/FillArc.c
+++ b/src/FillArc.c
@@ -36,13 +36,16 @@ in this Software without prior written authorization from The \
Open Group. #define size (SIZEOF(xPolyFillArcReq) + FARCSPERBATCH * SIZEOF(xArc))
int
-XFillArc(dpy, d, gc, x, y, width, height, angle1, angle2)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y; /* INT16 */
- unsigned int width, height; /* CARD16 */
- int angle1, angle2; /* INT16 */
+XFillArc(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y, /* INT16 */
+ unsigned int width,
+ unsigned int height, /* CARD16 */
+ int angle1,
+ int angle2) /* INT16 */
{
xArc *arc;
#ifdef MUSTCOPY
diff --git a/src/FillArcs.c b/src/FillArcs.c
index 27f0b8f..b66083c 100644
--- a/src/FillArcs.c
+++ b/src/FillArcs.c
@@ -34,12 +34,12 @@ in this Software without prior written authorization from The \
Open Group. #define arc_scale (SIZEOF(xArc) / 4)
int
-XFillArcs(dpy, d, gc, arcs, n_arcs)
-register Display *dpy;
-Drawable d;
-GC gc;
-XArc *arcs;
-int n_arcs;
+XFillArcs(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XArc *arcs,
+ int n_arcs)
{
register xPolyFillArcReq *req;
long len;
diff --git a/src/FillPoly.c b/src/FillPoly.c
index 93884d7..b3a7f63 100644
--- a/src/FillPoly.c
+++ b/src/FillPoly.c
@@ -32,14 +32,14 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XFillPolygon(dpy, d, gc, points, n_points, shape, mode)
-register Display *dpy;
-Drawable d;
-GC gc;
-XPoint *points;
-int n_points;
-int shape;
-int mode;
+XFillPolygon(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XPoint *points,
+ int n_points,
+ int shape,
+ int mode)
{
register xFillPolyReq *req;
register long nbytes;
diff --git a/src/FillRct.c b/src/FillRct.c
index d4a362a..09bc542 100644
--- a/src/FillRct.c
+++ b/src/FillRct.c
@@ -36,12 +36,14 @@ in this Software without prior written authorization from The \
Open Group. #define size (SIZEOF(xPolyFillRectangleReq) + FRCTSPERBATCH * \
SIZEOF(xRectangle))
int
-XFillRectangle(dpy, d, gc, x, y, width, height)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y; /* INT16 */
- unsigned int width, height; /* CARD16 */
+XFillRectangle(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y, /* INT16 */
+ unsigned int width,
+ unsigned int height) /* CARD16 */
{
xRectangle *rect;
#ifdef MUSTCOPY
diff --git a/src/FillRcts.c b/src/FillRcts.c
index 0c234f0..54011f6 100644
--- a/src/FillRcts.c
+++ b/src/FillRcts.c
@@ -32,12 +32,12 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XFillRectangles(dpy, d, gc, rectangles, n_rects)
-register Display *dpy;
-Drawable d;
-GC gc;
-XRectangle *rectangles;
-int n_rects;
+XFillRectangles(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ XRectangle *rectangles,
+ int n_rects)
{
register xPolyFillRectangleReq *req;
long len;
diff --git a/src/FilterEv.c b/src/FilterEv.c
index 9fa1887..3191759 100644
--- a/src/FilterEv.c
+++ b/src/FilterEv.c
@@ -72,9 +72,9 @@ extern long const _Xevent_to_mask[];
* Look up if there is a specified filter for the event.
*/
Bool
-XFilterEvent(ev, window)
- XEvent *ev;
- Window window;
+XFilterEvent(
+ XEvent *ev,
+ Window window)
{
#if XLOCALE
XFilterEventList p;
diff --git a/src/Flush.c b/src/Flush.c
index 3df8731..82d1808 100644
--- a/src/Flush.c
+++ b/src/Flush.c
@@ -35,11 +35,10 @@ in this Software without prior written authorization from The \
Open Group. /* NOTE: NOT necessary when calling any of the Xlib routines. */
int
-XFlush (dpy)
- register Display *dpy;
- {
+XFlush (register Display *dpy)
+{
LockDisplay(dpy);
_XFlush (dpy);
UnlockDisplay(dpy);
return 1;
- }
+}
diff --git a/src/Font.c b/src/Font.c
index 9e5d0a6..5165d5e 100644
--- a/src/Font.c
+++ b/src/Font.c
@@ -126,9 +126,9 @@ XFontStruct *XLoadQueryFont(
return font_result;
}
-XFontStruct *XQueryFont (dpy, fid)
- register Display *dpy;
- Font fid;
+XFontStruct *XQueryFont (
+ register Display *dpy,
+ Font fid)
{
XFontStruct *font_result;
#ifdef USE_XF86BIGFONT
@@ -150,9 +150,9 @@ XFontStruct *XQueryFont (dpy, fid)
}
int
-XFreeFont(dpy, fs)
- register Display *dpy;
- XFontStruct *fs;
+XFreeFont(
+ register Display *dpy,
+ XFontStruct *fs)
{
register xResourceReq *req;
register _XExtension *ext;
diff --git a/src/FontInfo.c b/src/FontInfo.c
index f923758..0a741b9 100644
--- a/src/FontInfo.c
+++ b/src/FontInfo.c
@@ -226,10 +226,10 @@ XFontStruct **info) /* RETURN */
}
int
-XFreeFontInfo (names, info, actualCount)
-char **names;
-XFontStruct *info;
-int actualCount;
+XFreeFontInfo (
+ char **names,
+ XFontStruct *info,
+ int actualCount)
{
register int i;
if (names) {
diff --git a/src/FontNames.c b/src/FontNames.c
index 0db27a2..dc09785 100644
--- a/src/FontNames.c
+++ b/src/FontNames.c
@@ -101,8 +101,7 @@ int *actualCount) /* RETURN */
}
int
-XFreeFontNames(list)
-char **list;
+XFreeFontNames(char **list)
{
if (list) {
if (!*(list[0]-1)) { /* from ListFontsWithInfo */
diff --git a/src/FreeCols.c b/src/FreeCols.c
index 1ae5258..1002814 100644
--- a/src/FreeCols.c
+++ b/src/FreeCols.c
@@ -32,12 +32,12 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XFreeColors(dpy, cmap, pixels, npixels, planes)
-register Display *dpy;
-Colormap cmap;
-unsigned long *pixels; /* LISTofCARD32 */
-int npixels;
-unsigned long planes; /* CARD32 */
+XFreeColors(
+ register Display *dpy,
+ Colormap cmap,
+ unsigned long *pixels, /* LISTofCARD32 */
+ int npixels,
+ unsigned long planes) /* CARD32 */
{
register xFreeColorsReq *req;
register long nbytes;
diff --git a/src/FreeCurs.c b/src/FreeCurs.c
index 45f5d04..716af15 100644
--- a/src/FreeCurs.c
+++ b/src/FreeCurs.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XFreeCursor(dpy, cursor)
- register Display *dpy;
- Cursor cursor;
+XFreeCursor(
+ register Display *dpy,
+ Cursor cursor)
{
register xResourceReq *req;
LockDisplay(dpy);
diff --git a/src/FreeEData.c b/src/FreeEData.c
index d8278cb..f70820b 100644
--- a/src/FreeEData.c
+++ b/src/FreeEData.c
@@ -32,8 +32,7 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-_XFreeExtData (extension)
- XExtData *extension;
+_XFreeExtData (XExtData *extension)
{
XExtData *temp;
while (extension) {
diff --git a/src/FreeGC.c b/src/FreeGC.c
index ccfbba5..e76f70b 100644
--- a/src/FreeGC.c
+++ b/src/FreeGC.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XFreeGC (dpy, gc)
- register Display *dpy;
- GC gc;
+XFreeGC (
+ register Display *dpy,
+ GC gc)
{
register xResourceReq *req;
register _XExtension *ext;
diff --git a/src/FreePix.c b/src/FreePix.c
index 5fe65ba..55bcd63 100644
--- a/src/FreePix.c
+++ b/src/FreePix.c
@@ -32,10 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XFreePixmap(dpy, pixmap)
- register Display *dpy;
- Pixmap pixmap;
-
+XFreePixmap(
+ register Display *dpy,
+ Pixmap pixmap)
{
register xResourceReq *req;
LockDisplay(dpy);
diff --git a/src/GCMisc.c b/src/GCMisc.c
index 5a8233b..1dc4573 100644
--- a/src/GCMisc.c
+++ b/src/GCMisc.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetArcMode (dpy, gc, arc_mode)
-register Display *dpy;
-register GC gc;
-int arc_mode;
+XSetArcMode (
+ register Display *dpy,
+ register GC gc,
+ int arc_mode)
{
LockDisplay(dpy);
if (gc->values.arc_mode != arc_mode) {
@@ -48,10 +48,10 @@ int arc_mode;
}
int
-XSetFillRule (dpy, gc, fill_rule)
-register Display *dpy;
-register GC gc;
-int fill_rule;
+XSetFillRule (
+ register Display *dpy,
+ register GC gc,
+ int fill_rule)
{
LockDisplay(dpy);
if (gc->values.fill_rule != fill_rule) {
@@ -64,10 +64,10 @@ int fill_rule;
}
int
-XSetFillStyle (dpy, gc, fill_style)
-register Display *dpy;
-register GC gc;
-int fill_style;
+XSetFillStyle (
+ register Display *dpy,
+ register GC gc,
+ int fill_style)
{
LockDisplay(dpy);
if (gc->values.fill_style != fill_style) {
@@ -80,10 +80,10 @@ int fill_style;
}
int
-XSetGraphicsExposures (dpy, gc, graphics_exposures)
-register Display *dpy;
-register GC gc;
-Bool graphics_exposures;
+XSetGraphicsExposures (
+ register Display *dpy,
+ register GC gc,
+ Bool graphics_exposures)
{
LockDisplay(dpy);
if (gc->values.graphics_exposures != graphics_exposures) {
@@ -96,10 +96,10 @@ Bool graphics_exposures;
}
int
-XSetSubwindowMode (dpy, gc, subwindow_mode)
-register Display *dpy;
-register GC gc;
-int subwindow_mode;
+XSetSubwindowMode (
+ register Display *dpy,
+ register GC gc,
+ int subwindow_mode)
{
LockDisplay(dpy);
if (gc->values.subwindow_mode != subwindow_mode) {
diff --git a/src/GetAtomNm.c b/src/GetAtomNm.c
index 1bba975..45b4f48 100644
--- a/src/GetAtomNm.c
+++ b/src/GetAtomNm.c
@@ -59,9 +59,9 @@ char *_XGetAtomName(
return (char *)NULL;
}
-char *XGetAtomName(dpy, atom)
- register Display *dpy;
- Atom atom;
+char *XGetAtomName(
+ register Display *dpy,
+ Atom atom)
{
xGetAtomNameReply rep;
char *name;
@@ -142,11 +142,11 @@ Bool _XGetAtomNameHandler(
}
Status
-XGetAtomNames (dpy, atoms, count, names_return)
- Display *dpy;
- Atom *atoms;
- int count;
- char **names_return;
+XGetAtomNames (
+ Display *dpy,
+ Atom *atoms,
+ int count,
+ char **names_return)
{
_XAsyncHandler async;
_XGetAtomNameState async_state;
diff --git a/src/GetFPath.c b/src/GetFPath.c
index 03ad5da..3a630fe 100644
--- a/src/GetFPath.c
+++ b/src/GetFPath.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #endif
#include "Xlibint.h"
-char **XGetFontPath(dpy, npaths)
-register Display *dpy;
-int *npaths; /* RETURN */
+char **XGetFontPath(
+ register Display *dpy,
+ int *npaths) /* RETURN */
{
xGetFontPathReply rep;
register long nbytes;
@@ -84,8 +84,7 @@ int *npaths; /* RETURN */
}
int
-XFreeFontPath (list)
-char **list;
+XFreeFontPath (char **list)
{
if (list != NULL) {
Xfree (list[0]-1);
diff --git a/src/GetFProp.c b/src/GetFProp.c
index 1360ca1..986ec2a 100644
--- a/src/GetFProp.c
+++ b/src/GetFProp.c
@@ -30,11 +30,11 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Bool XGetFontProperty (fs, name, valuePtr)
- XFontStruct *fs;
- register Atom name;
- unsigned long *valuePtr;
- {
+Bool XGetFontProperty (
+ XFontStruct *fs,
+ register Atom name,
+ unsigned long *valuePtr)
+{
/* XXX this is a simple linear search for now. If the
protocol is changed to sort the property list, this should
become a binary search. */
@@ -48,7 +48,7 @@ Bool XGetFontProperty (fs, name, valuePtr)
prop++;
}
return (0);
- }
+}
diff --git a/src/GetGCVals.c b/src/GetGCVals.c
index a7fbd74..2a33b15 100644
--- a/src/GetGCVals.c
+++ b/src/GetGCVals.c
@@ -44,11 +44,11 @@ in this Software without prior written authorization from The \
Open Group. GCArcMode)
/*ARGSUSED*/
-Status XGetGCValues (dpy, gc, valuemask, values)
- Display *dpy;
- GC gc;
- unsigned long valuemask;
- XGCValues *values;
+Status XGetGCValues (
+ Display *dpy,
+ GC gc,
+ unsigned long valuemask,
+ XGCValues *values)
{
if (valuemask == ValidGCValuesBits) {
char dashes = values->dashes;
diff --git a/src/GetGeom.c b/src/GetGeom.c
index 842df33..7b44be9 100644
--- a/src/GetGeom.c
+++ b/src/GetGeom.c
@@ -31,12 +31,16 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XGetGeometry (dpy, d, root, x, y, width, height, borderWidth, depth)
- register Display *dpy;
- Drawable d;
- Window *root; /* RETURN */
- int *x, *y; /* RETURN */
- unsigned int *width, *height, *borderWidth, *depth; /* RETURN */
+Status XGetGeometry (
+ register Display *dpy,
+ Drawable d,
+ Window *root, /* RETURN */
+ int *x,
+ int *y, /* RETURN */
+ unsigned int *width,
+ unsigned int *height,
+ unsigned int *borderWidth,
+ unsigned int *depth) /* RETURN */
{
xGetGeometryReply rep;
register xResourceReq *req;
diff --git a/src/GetHColor.c b/src/GetHColor.c
index 647cc11..6a4a285 100644
--- a/src/GetHColor.c
+++ b/src/GetHColor.c
@@ -31,10 +31,10 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XAllocColor(dpy, cmap, def)
-register Display *dpy;
-Colormap cmap;
-XColor *def;
+Status XAllocColor(
+ register Display *dpy,
+ Colormap cmap,
+ XColor *def)
{
Status status;
xAllocColorReply rep;
diff --git a/src/GetHints.c b/src/GetHints.c
index 4faccb6..e5ccbcf 100644
--- a/src/GetHints.c
+++ b/src/GetHints.c
@@ -58,11 +58,11 @@ SOFTWARE.
#include <X11/Xatom.h>
#include <stdio.h>
-Status XGetSizeHints (dpy, w, hints, property)
- Display *dpy;
- Window w;
- XSizeHints *hints;
- Atom property;
+Status XGetSizeHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *hints,
+ Atom property)
{
xPropSizeHints *prop = NULL;
Atom actual_type;
@@ -105,9 +105,9 @@ Status XGetSizeHints (dpy, w, hints, property)
* on.
*/
-XWMHints *XGetWMHints (dpy, w)
- Display *dpy;
- Window w;
+XWMHints *XGetWMHints (
+ Display *dpy,
+ Window w)
{
xPropWMHints *prop = NULL;
register XWMHints *hints;
@@ -149,19 +149,19 @@ XWMHints *XGetWMHints (dpy, w)
}
Status
-XGetZoomHints (dpy, w, zhints)
- Display *dpy;
- Window w;
- XSizeHints *zhints;
+XGetZoomHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *zhints)
{
return (XGetSizeHints(dpy, w, zhints, XA_WM_ZOOM_HINTS));
}
Status
-XGetNormalHints (dpy, w, hints)
- Display *dpy;
- Window w;
- XSizeHints *hints;
+XGetNormalHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *hints)
{
return (XGetSizeHints(dpy, w, hints, XA_WM_NORMAL_HINTS));
}
@@ -172,11 +172,11 @@ XGetNormalHints (dpy, w, hints)
* ICONSIZE_ATOM type: ICONSIZE_ATOM format: 32
*/
-Status XGetIconSizes (dpy, w, size_list, count)
- Display *dpy;
- Window w; /* typically, root */
- XIconSize **size_list; /* RETURN */
- int *count; /* RETURN number of items on the list */
+Status XGetIconSizes (
+ Display *dpy,
+ Window w, /* typically, root */
+ XIconSize **size_list, /* RETURN */
+ int *count) /* RETURN number of items on the list */
{
xPropIconSize *prop = NULL;
register xPropIconSize *pp;
@@ -229,11 +229,11 @@ Status XGetIconSizes (dpy, w, size_list, count)
}
-Status XGetCommand (dpy, w, argvp, argcp)
- Display *dpy;
- Window w;
- char ***argvp;
- int *argcp;
+Status XGetCommand (
+ Display *dpy,
+ Window w,
+ char ***argvp,
+ int *argcp)
{
XTextProperty tp;
int argc;
@@ -269,10 +269,10 @@ Status XGetCommand (dpy, w, argvp, argcp)
Status
-XGetTransientForHint(dpy, w, propWindow)
- Display *dpy;
- Window w;
- Window *propWindow;
+XGetTransientForHint(
+ Display *dpy,
+ Window w,
+ Window *propWindow)
{
Atom actual_type;
int actual_format;
@@ -299,10 +299,10 @@ XGetTransientForHint(dpy, w, propWindow)
}
Status
-XGetClassHint(dpy, w, classhint)
- Display *dpy;
- Window w;
- XClassHint *classhint; /* RETURN */
+XGetClassHint(
+ Display *dpy,
+ Window w,
+ XClassHint *classhint) /* RETURN */
{
int len_name, len_class;
diff --git a/src/GetIFocus.c b/src/GetIFocus.c
index 13cab18..6e6f544 100644
--- a/src/GetIFocus.c
+++ b/src/GetIFocus.c
@@ -33,10 +33,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGetInputFocus(dpy, focus, revert_to)
- register Display *dpy;
- Window *focus;
- int *revert_to;
+XGetInputFocus(
+ register Display *dpy,
+ Window *focus,
+ int *revert_to)
{
xGetInputFocusReply rep;
register xReq *req;
diff --git a/src/GetImage.c b/src/GetImage.c
index ffe9d22..4a376c6 100644
--- a/src/GetImage.c
+++ b/src/GetImage.c
@@ -46,13 +46,15 @@ static unsigned int Ones( /* HACKMEM 169 */
return ((unsigned int) (((y + (y >> 3)) & 030707070707) % 077));
}
-XImage *XGetImage (dpy, d, x, y, width, height, plane_mask, format)
- register Display *dpy;
- Drawable d;
- int x, y;
- unsigned int width, height;
- unsigned long plane_mask;
- int format; /* either XYPixmap or ZPixmap */
+XImage *XGetImage (
+ register Display *dpy,
+ Drawable d,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ unsigned long plane_mask,
+ int format) /* either XYPixmap or ZPixmap */
{
xGetImageReply rep;
register xGetImageReq *req;
@@ -105,16 +107,18 @@ XImage *XGetImage (dpy, d, x, y, width, height, plane_mask, \
format) return (image);
}
-XImage *XGetSubImage(dpy, d, x, y, width, height, plane_mask, format,
- dest_image, dest_x, dest_y)
- register Display *dpy;
- Drawable d;
- int x, y;
- unsigned int width, height;
- unsigned long plane_mask;
- int format; /* either XYPixmap or ZPixmap */
- XImage *dest_image;
- int dest_x, dest_y;
+XImage *XGetSubImage(
+ register Display *dpy,
+ Drawable d,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ unsigned long plane_mask,
+ int format, /* either XYPixmap or ZPixmap */
+ XImage *dest_image,
+ int dest_x,
+ int dest_y)
{
XImage *temp_image;
temp_image = XGetImage(dpy, d, x, y, width, height,
diff --git a/src/GetKCnt.c b/src/GetKCnt.c
index 47f8064..4e90c03 100644
--- a/src/GetKCnt.c
+++ b/src/GetKCnt.c
@@ -33,10 +33,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGetKeyboardControl (dpy, state)
- register Display *dpy;
- register XKeyboardState *state;
- {
+XGetKeyboardControl (
+ register Display *dpy,
+ register XKeyboardState *state)
+{
xGetKeyboardControlReply rep;
register xReq *req;
LockDisplay(dpy);
@@ -54,5 +54,4 @@ XGetKeyboardControl (dpy, state)
UnlockDisplay(dpy);
SyncHandle();
return 1;
- }
-
+}
diff --git a/src/GetMoEv.c b/src/GetMoEv.c
index e332ecf..2aa6c1a 100644
--- a/src/GetMoEv.c
+++ b/src/GetMoEv.c
@@ -31,11 +31,12 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-XTimeCoord *XGetMotionEvents(dpy, w, start, stop, nEvents)
- register Display *dpy;
- Time start, stop;
- Window w;
- int *nEvents; /* RETURN */
+XTimeCoord *XGetMotionEvents(
+ register Display *dpy,
+ Time start,
+ Time stop,
+ Window w,
+ int *nEvents) /* RETURN */
{
xGetMotionEventsReply rep;
register xGetMotionEventsReq *req;
diff --git a/src/GetNrmHint.c b/src/GetNrmHint.c
index 9dcb7c4..46841a6 100644
--- a/src/GetNrmHint.c
+++ b/src/GetNrmHint.c
@@ -61,12 +61,12 @@ from The Open Group.
#include <X11/Xutil.h>
#include <stdio.h>
-Status XGetWMSizeHints (dpy, w, hints, supplied, property)
- Display *dpy;
- Window w;
- XSizeHints *hints;
- long *supplied;
- Atom property;
+Status XGetWMSizeHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *hints,
+ long *supplied,
+ Atom property)
{
xPropSizeHints *prop = NULL;
Atom actual_type;
@@ -118,11 +118,11 @@ Status XGetWMSizeHints (dpy, w, hints, supplied, property)
}
-Status XGetWMNormalHints (dpy, w, hints, supplied)
- Display *dpy;
- Window w;
- XSizeHints *hints;
- long *supplied;
+Status XGetWMNormalHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *hints,
+ long *supplied)
{
return (XGetWMSizeHints (dpy, w, hints, supplied, XA_WM_NORMAL_HINTS));
}
diff --git a/src/GetPCnt.c b/src/GetPCnt.c
index 0883aba..55a2f21 100644
--- a/src/GetPCnt.c
+++ b/src/GetPCnt.c
@@ -33,11 +33,12 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGetPointerControl(dpy, accel_numer, accel_denom, threshold)
- register Display *dpy;
+XGetPointerControl(
+ register Display *dpy,
/* the following are return only vars */
- int *accel_numer, *accel_denom;
- int *threshold;
+ int *accel_numer,
+ int *accel_denom,
+ int *threshold)
{
xGetPointerControlReply rep;
xReq *req;
diff --git a/src/GetPntMap.c b/src/GetPntMap.c
index 7a93ad7..426c9ac 100644
--- a/src/GetPntMap.c
+++ b/src/GetPntMap.c
@@ -38,10 +38,10 @@ in this Software without prior written authorization from The \
Open Group. #endif
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-int XGetPointerMapping (dpy, map, nmaps)
- register Display *dpy;
- unsigned char *map; /* RETURN */
- int nmaps;
+int XGetPointerMapping (
+ register Display *dpy,
+ unsigned char *map, /* RETURN */
+ int nmaps)
{
unsigned char mapping[256]; /* known fixed size */
diff --git a/src/GetProp.c b/src/GetProp.c
index af55257..12c641e 100644
--- a/src/GetProp.c
+++ b/src/GetProp.c
@@ -33,19 +33,19 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGetWindowProperty(dpy, w, property, offset, length, delete,
- req_type, actual_type, actual_format, nitems, bytesafter, prop)
- register Display *dpy;
- Window w;
- Atom property;
- Bool delete;
- Atom req_type;
- Atom *actual_type; /* RETURN */
- int *actual_format; /* RETURN 8, 16, or 32 */
- long offset, length;
- unsigned long *nitems; /* RETURN # of 8-, 16-, or 32-bit entities */
- unsigned long *bytesafter; /* RETURN */
- unsigned char **prop; /* RETURN */
+XGetWindowProperty(
+ register Display *dpy,
+ Window w,
+ Atom property,
+ long offset,
+ long length,
+ Bool delete,
+ Atom req_type,
+ Atom *actual_type, /* RETURN */
+ int *actual_format, /* RETURN 8, 16, or 32 */
+ unsigned long *nitems, /* RETURN # of 8-, 16-, or 32-bit entities */
+ unsigned long *bytesafter, /* RETURN */
+ unsigned char **prop) /* RETURN */
{
xGetPropertyReply reply;
register xGetPropertyReq *req;
diff --git a/src/GetRGBCMap.c b/src/GetRGBCMap.c
index 6657c53..45a94b7 100644
--- a/src/GetRGBCMap.c
+++ b/src/GetRGBCMap.c
@@ -36,12 +36,12 @@ from The Open Group.
#include "Xatomtype.h"
#include <X11/Xatom.h>
-Status XGetRGBColormaps (dpy, w, stdcmap, count, property)
- Display *dpy;
- Window w;
- XStandardColormap **stdcmap; /* RETURN */
- int *count; /* RETURN */
- Atom property; /* XA_RGB_BEST_MAP, etc. */
+Status XGetRGBColormaps (
+ Display *dpy,
+ Window w,
+ XStandardColormap **stdcmap, /* RETURN */
+ int *count, /* RETURN */
+ Atom property) /* XA_RGB_BEST_MAP, etc. */
{
register int i; /* iterator variable */
xPropStandardColormap *data = NULL; /* data read in from prop */
diff --git a/src/GetSOwner.c b/src/GetSOwner.c
index 30d5702..4a87137 100644
--- a/src/GetSOwner.c
+++ b/src/GetSOwner.c
@@ -31,9 +31,9 @@ in this Software without prior written authorization from The Open \
Group. #endif
#include "Xlibint.h"
-Window XGetSelectionOwner(dpy, selection)
-register Display *dpy;
-Atom selection;
+Window XGetSelectionOwner(
+ register Display *dpy,
+ Atom selection)
{
xGetSelectionOwnerReply rep;
register xResourceReq *req;
diff --git a/src/GetSSaver.c b/src/GetSSaver.c
index fc124eb..0806804 100644
--- a/src/GetSSaver.c
+++ b/src/GetSSaver.c
@@ -33,11 +33,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGetScreenSaver(dpy, timeout, interval, prefer_blanking, allow_exp)
- register Display *dpy;
+XGetScreenSaver(
+ register Display *dpy,
/* the following are return only vars */
- int *timeout, *interval;
- int *prefer_blanking, *allow_exp; /*boolean */
+ int *timeout,
+ int *interval,
+ int *prefer_blanking,
+ int *allow_exp) /*boolean */
{
xGetScreenSaverReply rep;
diff --git a/src/GetStCmap.c b/src/GetStCmap.c
index 5c8c37e..0c05cbb 100644
--- a/src/GetStCmap.c
+++ b/src/GetStCmap.c
@@ -62,11 +62,11 @@ SOFTWARE.
* in the XStandardColormap structure.
*/
-Status XGetStandardColormap (dpy, w, cmap, property)
- Display *dpy;
- Window w;
- XStandardColormap *cmap;
- Atom property; /* XA_RGB_BEST_MAP, etc. */
+Status XGetStandardColormap (
+ Display *dpy,
+ Window w,
+ XStandardColormap *cmap,
+ Atom property) /* XA_RGB_BEST_MAP, etc. */
{
Status stat; /* return value */
XStandardColormap *stdcmaps; /* will get malloced value */
diff --git a/src/GetTxtProp.c b/src/GetTxtProp.c
index 0d44742..90db0d4 100644
--- a/src/GetTxtProp.c
+++ b/src/GetTxtProp.c
@@ -58,11 +58,11 @@ from The Open Group.
#include <X11/Xos.h>
#include <stdio.h>
-Status XGetTextProperty (display, window, tp, property)
- Display *display;
- Window window;
- XTextProperty *tp;
- Atom property;
+Status XGetTextProperty (
+ Display *display,
+ Window window,
+ XTextProperty *tp,
+ Atom property)
{
Atom actual_type;
int actual_format = 0;
@@ -88,26 +88,26 @@ Status XGetTextProperty (display, window, tp, property)
return False;
}
-Status XGetWMName (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+Status XGetWMName (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
return (XGetTextProperty (dpy, w, tp, XA_WM_NAME));
}
-Status XGetWMIconName (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+Status XGetWMIconName (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
return (XGetTextProperty (dpy, w, tp, XA_WM_ICON_NAME));
}
-Status XGetWMClientMachine (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+Status XGetWMClientMachine (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
return (XGetTextProperty (dpy, w, tp, XA_WM_CLIENT_MACHINE));
}
diff --git a/src/GetWMCMapW.c b/src/GetWMCMapW.c
index 6d5c73c..a99fb62 100644
--- a/src/GetWMCMapW.c
+++ b/src/GetWMCMapW.c
@@ -54,11 +54,11 @@ SOFTWARE.
#include <X11/Xatom.h>
#include <stdio.h>
-Status XGetWMColormapWindows (dpy, w, colormapWindows, countReturn)
- Display *dpy;
- Window w;
- Window **colormapWindows;
- int *countReturn;
+Status XGetWMColormapWindows (
+ Display *dpy,
+ Window w,
+ Window **colormapWindows,
+ int *countReturn)
{
Atom *data = NULL;
Atom actual_type;
diff --git a/src/GetWMProto.c b/src/GetWMProto.c
index 9b244ce..f0be1bb 100644
--- a/src/GetWMProto.c
+++ b/src/GetWMProto.c
@@ -54,11 +54,11 @@ SOFTWARE.
#include <X11/Xatom.h>
#include <stdio.h>
-Status XGetWMProtocols (dpy, w, protocols, countReturn)
- Display *dpy;
- Window w;
- Atom **protocols;
- int *countReturn;
+Status XGetWMProtocols (
+ Display *dpy,
+ Window w,
+ Atom **protocols,
+ int *countReturn)
{
Atom *data = NULL;
Atom actual_type;
diff --git a/src/GrButton.c b/src/GrButton.c
index 9bb8b85..17177fd 100644
--- a/src/GrButton.c
+++ b/src/GrButton.c
@@ -32,17 +32,17 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGrabButton(dpy, button, modifiers, grab_window, owner_events, event_mask,
- pointer_mode, keyboard_mode, confine_to, curs)
-register Display *dpy;
-unsigned int modifiers; /* CARD16 */
-unsigned int button; /* CARD8 */
-Window grab_window;
-Bool owner_events;
-unsigned int event_mask; /* CARD16 */
-int pointer_mode, keyboard_mode;
-Window confine_to;
-Cursor curs;
+XGrabButton(
+ register Display *dpy,
+ unsigned int button, /* CARD8 */
+ unsigned int modifiers, /* CARD16 */
+ Window grab_window,
+ Bool owner_events,
+ unsigned int event_mask, /* CARD16 */
+ int pointer_mode,
+ int keyboard_mode,
+ Window confine_to,
+ Cursor curs)
{
register xGrabButtonReq *req;
LockDisplay(dpy);
diff --git a/src/GrKey.c b/src/GrKey.c
index ea63661..47983b5 100644
--- a/src/GrKey.c
+++ b/src/GrKey.c
@@ -32,14 +32,14 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XGrabKey(dpy, key, modifiers, grab_window, owner_events,
- pointer_mode, keyboard_mode)
- register Display *dpy;
- int key;
- unsigned int modifiers;
- Window grab_window;
- Bool owner_events;
- int pointer_mode, keyboard_mode;
+XGrabKey(
+ register Display *dpy,
+ int key,
+ unsigned int modifiers,
+ Window grab_window,
+ Bool owner_events,
+ int pointer_mode,
+ int keyboard_mode)
{
register xGrabKeyReq *req;
diff --git a/src/GrKeybd.c b/src/GrKeybd.c
index af58792..e4ea053 100644
--- a/src/GrKeybd.c
+++ b/src/GrKeybd.c
@@ -30,12 +30,13 @@ in this Software without prior written authorization from The \
Open Group. #include <config.h>
#endif
#include "Xlibint.h"
-int XGrabKeyboard (dpy, window, ownerEvents, pointerMode, keyboardMode, time)
- register Display *dpy;
- Window window;
- Bool ownerEvents;
- int pointerMode, keyboardMode;
- Time time;
+int XGrabKeyboard (
+ register Display *dpy,
+ Window window,
+ Bool ownerEvents,
+ int pointerMode,
+ int keyboardMode,
+ Time time)
{
xGrabKeyboardReply rep;
register xGrabKeyboardReq *req;
diff --git a/src/GrPointer.c b/src/GrPointer.c
index 39351f4..8aab686 100644
--- a/src/GrPointer.c
+++ b/src/GrPointer.c
@@ -31,16 +31,16 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-int XGrabPointer(dpy, grab_window, owner_events, event_mask, pointer_mode,
- keyboard_mode, confine_to, curs, time)
-register Display *dpy;
-Window grab_window;
-Bool owner_events;
-unsigned int event_mask; /* CARD16 */
-int pointer_mode, keyboard_mode;
-Window confine_to;
-Cursor curs;
-Time time;
+int XGrabPointer(
+ register Display *dpy,
+ Window grab_window,
+ Bool owner_events,
+ unsigned int event_mask, /* CARD16 */
+ int pointer_mode,
+ int keyboard_mode,
+ Window confine_to,
+ Cursor curs,
+ Time time)
{
xGrabPointerReply rep;
register xGrabPointerReq *req;
diff --git a/src/GrServer.c b/src/GrServer.c
index bdb5051..b3d7641 100644
--- a/src/GrServer.c
+++ b/src/GrServer.c
@@ -32,8 +32,7 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XGrabServer (dpy)
-register Display *dpy;
+XGrabServer (register Display *dpy)
{
register xReq *req;
LockDisplay(dpy);
diff --git a/src/Iconify.c b/src/Iconify.c
index 62e57b8..973f3d5 100644
--- a/src/Iconify.c
+++ b/src/Iconify.c
@@ -64,10 +64,10 @@ from The Open Group.
* This function instructs the window manager to change this window from
* NormalState to IconicState.
*/
-Status XIconifyWindow (dpy, w, screen)
- Display *dpy;
- Window w;
- int screen;
+Status XIconifyWindow (
+ Display *dpy,
+ Window w,
+ int screen)
{
XClientMessageEvent ev;
Window root = RootWindow (dpy, screen);
diff --git a/src/IfEvent.c b/src/IfEvent.c
index 55e7829..73a36b4 100644
--- a/src/IfEvent.c
+++ b/src/IfEvent.c
@@ -38,15 +38,15 @@ in this Software without prior written authorization from The \
Open Group.
*/
int
-XIfEvent (dpy, event, predicate, arg)
- register Display *dpy;
+XIfEvent (
+ register Display *dpy,
+ register XEvent *event,
Bool (*predicate)(
Display* /* display */,
XEvent* /* event */,
char* /* arg */
- ); /* function to call */
- register XEvent *event;
- char *arg;
+ ), /* function to call */
+ char *arg)
{
register _XQEvent *qelt, *prev;
unsigned long qe_serial = 0;
diff --git a/src/ImUtil.c b/src/ImUtil.c
index 9e667bb..d1df7ae 100644
--- a/src/ImUtil.c
+++ b/src/ImUtil.c
@@ -307,20 +307,19 @@ void _XInitImageFuncPtrs (
*
*/
-XImage *XCreateImage (dpy, visual, depth, format, offset, data, width, height,
- xpad, image_bytes_per_line)
- register Display *dpy;
- register Visual *visual;
- unsigned int depth;
- int format;
- int offset; /*How many pixels from the start of the data does the
+XImage *XCreateImage (
+ register Display *dpy,
+ register Visual *visual,
+ unsigned int depth,
+ int format,
+ int offset, /*How many pixels from the start of the data does the
picture to be transmitted start?*/
- char *data;
- unsigned int width;
- unsigned int height;
- int xpad;
- int image_bytes_per_line;
+ char *data,
+ unsigned int width,
+ unsigned int height,
+ int xpad,
+ int image_bytes_per_line)
/*How many bytes between a pixel on one line and the pixel with
the same X coordinate on the next line? 0 means
XCreateImage can calculate it.*/
@@ -387,8 +386,7 @@ XImage *XCreateImage (dpy, visual, depth, format, offset, data, \
width, height, return image;
}
-Status XInitImage (image)
- XImage *image;
+Status XInitImage (XImage *image)
{
int min_bytes_per_line;
@@ -435,9 +433,7 @@ Status XInitImage (image)
* entirely by the library.
*/
-static int _XDestroyImage (ximage)
- XImage *ximage;
-
+static int _XDestroyImage (XImage *ximage)
{
if (ximage->data != NULL) Xfree((char *)ximage->data);
if (ximage->obdata != NULL) Xfree((char *)ximage->obdata);
@@ -472,10 +468,10 @@ static unsigned long const low_bits_table[] = {
0xffffffff
};
-static unsigned long _XGetPixel (ximage, x, y)
- register XImage *ximage;
- int x;
- int y;
+static unsigned long _XGetPixel (
+ register XImage *ximage,
+ int x,
+ int y)
{
unsigned long pixel, px;
@@ -537,10 +533,10 @@ static unsigned long _XGetPixel (ximage, x, y)
static CARD32 const byteorderpixel = MSBFirst << 24;
#endif
-static unsigned long _XGetPixel32 (ximage, x, y)
- register XImage *ximage;
- int x;
- int y;
+static unsigned long _XGetPixel32 (
+ register XImage *ximage,
+ int x,
+ int y)
{
register unsigned char *addr;
unsigned long pixel;
@@ -572,10 +568,10 @@ static unsigned long _XGetPixel32 (ximage, x, y)
}
}
-static unsigned long _XGetPixel16 (ximage, x, y)
- register XImage *ximage;
- int x;
- int y;
+static unsigned long _XGetPixel16 (
+ register XImage *ximage,
+ int x,
+ int y)
{
register unsigned char *addr;
unsigned long pixel;
@@ -596,10 +592,10 @@ static unsigned long _XGetPixel16 (ximage, x, y)
}
}
-static unsigned long _XGetPixel8 (ximage, x, y)
- register XImage *ximage;
- int x;
- int y;
+static unsigned long _XGetPixel8 (
+ register XImage *ximage,
+ int x,
+ int y)
{
unsigned char pixel;
@@ -615,10 +611,10 @@ static unsigned long _XGetPixel8 (ximage, x, y)
}
}
-static unsigned long _XGetPixel1 (ximage, x, y)
- register XImage *ximage;
- int x;
- int y;
+static unsigned long _XGetPixel1 (
+ register XImage *ximage,
+ int x,
+ int y)
{
unsigned char bit;
int xoff, yoff;
@@ -655,11 +651,11 @@ static unsigned long _XGetPixel1 (ximage, x, y)
*
*/
-static int _XPutPixel (ximage, x, y, pixel)
- register XImage *ximage;
- int x;
- int y;
- unsigned long pixel;
+static int _XPutPixel (
+ register XImage *ximage,
+ int x,
+ int y,
+ unsigned long pixel)
{
unsigned long px, npixel;
@@ -728,11 +724,11 @@ static int _XPutPixel (ximage, x, y, pixel)
return 1;
}
-static int _XPutPixel32 (ximage, x, y, pixel)
- register XImage *ximage;
- int x;
- int y;
- unsigned long pixel;
+static int _XPutPixel32 (
+ register XImage *ximage,
+ int x,
+ int y,
+ unsigned long pixel)
{
unsigned char *addr;
@@ -762,11 +758,11 @@ static int _XPutPixel32 (ximage, x, y, pixel)
}
}
-static int _XPutPixel16 (ximage, x, y, pixel)
- register XImage *ximage;
- int x;
- int y;
- unsigned long pixel;
+static int _XPutPixel16 (
+ register XImage *ximage,
+ int x,
+ int y,
+ unsigned long pixel)
{
unsigned char *addr;
@@ -787,11 +783,11 @@ static int _XPutPixel16 (ximage, x, y, pixel)
}
}
-static int _XPutPixel8 (ximage, x, y, pixel)
- register XImage *ximage;
- int x;
- int y;
- unsigned long pixel;
+static int _XPutPixel8 (
+ register XImage *ximage,
+ int x,
+ int y,
+ unsigned long pixel)
{
if ((ximage->format == ZPixmap) && (ximage->bits_per_pixel == 8)) {
ximage->data[y * ximage->bytes_per_line + x] = pixel;
@@ -802,11 +798,11 @@ static int _XPutPixel8 (ximage, x, y, pixel)
}
}
-static int _XPutPixel1 (ximage, x, y, pixel)
- register XImage *ximage;
- int x;
- int y;
- unsigned long pixel;
+static int _XPutPixel1 (
+ register XImage *ximage,
+ int x,
+ int y,
+ unsigned long pixel)
{
unsigned char bit;
int xoff, yoff;
@@ -841,12 +837,12 @@ static int _XPutPixel1 (ximage, x, y, pixel)
*
*/
-static XImage *_XSubImage (ximage, x, y, width, height)
- XImage *ximage;
- register int x; /* starting x coordinate in existing image */
- register int y; /* starting y coordinate in existing image */
- unsigned int width; /* width in pixels of new subimage */
- unsigned int height;/* height in pixels of new subimage */
+static XImage *_XSubImage (
+ XImage *ximage,
+ register int x, /* starting x coordinate in existing image */
+ register int y, /* starting y coordinate in existing image */
+ unsigned int width, /* width in pixels of new subimage */
+ unsigned int height)/* height in pixels of new subimage */
{
register XImage *subimage;
@@ -973,9 +969,9 @@ int _XSetImage(
*/
static int
-_XAddPixel (ximage, value)
- register XImage *ximage;
- register long value;
+_XAddPixel (
+ register XImage *ximage,
+ register long value)
{
register int x;
register int y;
diff --git a/src/InitExt.c b/src/InitExt.c
index 67c8657..925b986 100644
--- a/src/InitExt.c
+++ b/src/InitExt.c
@@ -69,8 +69,7 @@ XExtCodes *XInitExtension (
return (&ext->codes); /* tell him which extension */
}
-XExtCodes *XAddExtension (dpy)
- Display *dpy;
+XExtCodes *XAddExtension (Display *dpy)
{
register _XExtension *ext;
@@ -99,25 +98,24 @@ static _XExtension *XLookupExtension (
return (NULL);
}
-XExtData **XEHeadOfExtensionList(object)
- XEDataObject object;
+XExtData **XEHeadOfExtensionList(XEDataObject object)
{
return *(XExtData ***)&object;
}
int
-XAddToExtensionList(structure, ext_data)
- XExtData **structure;
- XExtData *ext_data;
+XAddToExtensionList(
+ XExtData **structure,
+ XExtData *ext_data)
{
ext_data->next = *structure;
*structure = ext_data;
return 1;
}
-XExtData *XFindOnExtensionList(structure, number)
- XExtData **structure;
- int number;
+XExtData *XFindOnExtensionList(
+ XExtData **structure,
+ int number)
{
XExtData *ext;
@@ -130,10 +128,10 @@ XExtData *XFindOnExtensionList(structure, number)
/*
* Routines to hang procs on the extension structure.
*/
-CreateGCType XESetCreateGC(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- CreateGCType proc; /* routine to call when GC created */
+CreateGCType XESetCreateGC(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ CreateGCType proc) /* routine to call when GC created */
{
register _XExtension *e; /* for lookup of extension */
register CreateGCType oldproc;
@@ -145,10 +143,10 @@ CreateGCType XESetCreateGC(dpy, extension, proc)
return (CreateGCType)oldproc;
}
-CopyGCType XESetCopyGC(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- CopyGCType proc; /* routine to call when GC copied */
+CopyGCType XESetCopyGC(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ CopyGCType proc) /* routine to call when GC copied */
{
register _XExtension *e; /* for lookup of extension */
register CopyGCType oldproc;
@@ -160,10 +158,10 @@ CopyGCType XESetCopyGC(dpy, extension, proc)
return (CopyGCType)oldproc;
}
-FlushGCType XESetFlushGC(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- FlushGCType proc; /* routine to call when GC copied */
+FlushGCType XESetFlushGC(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ FlushGCType proc) /* routine to call when GC copied */
{
register _XExtension *e; /* for lookup of extension */
register FlushGCType oldproc;
@@ -175,10 +173,10 @@ FlushGCType XESetFlushGC(dpy, extension, proc)
return (FlushGCType)oldproc;
}
-FreeGCType XESetFreeGC(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- FreeGCType proc; /* routine to call when GC freed */
+FreeGCType XESetFreeGC(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ FreeGCType proc) /* routine to call when GC freed */
{
register _XExtension *e; /* for lookup of extension */
register FreeGCType oldproc;
@@ -190,10 +188,10 @@ FreeGCType XESetFreeGC(dpy, extension, proc)
return (FreeGCType)oldproc;
}
-CreateFontType XESetCreateFont(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- CreateFontType proc; /* routine to call when font created */
+CreateFontType XESetCreateFont(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ CreateFontType proc) /* routine to call when font created */
{
register _XExtension *e; /* for lookup of extension */
register CreateFontType oldproc;
@@ -205,10 +203,10 @@ CreateFontType XESetCreateFont(dpy, extension, proc)
return (CreateFontType)oldproc;
}
-FreeFontType XESetFreeFont(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- FreeFontType proc; /* routine to call when font freed */
+FreeFontType XESetFreeFont(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ FreeFontType proc) /* routine to call when font freed */
{
register _XExtension *e; /* for lookup of extension */
register FreeFontType oldproc;
@@ -220,10 +218,10 @@ FreeFontType XESetFreeFont(dpy, extension, proc)
return (FreeFontType)oldproc;
}
-CloseDisplayType XESetCloseDisplay(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- CloseDisplayType proc; /* routine to call when display closed */
+CloseDisplayType XESetCloseDisplay(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ CloseDisplayType proc) /* routine to call when display closed */
{
register _XExtension *e; /* for lookup of extension */
register CloseDisplayType oldproc;
@@ -241,10 +239,10 @@ typedef Bool (*WireToEventType) (
xEvent* /* event */
);
-WireToEventType XESetWireToEvent(dpy, event_number, proc)
- Display *dpy; /* display */
- WireToEventType proc; /* routine to call when converting event */
- int event_number; /* event routine to replace */
+WireToEventType XESetWireToEvent(
+ Display *dpy, /* display */
+ int event_number, /* event routine to replace */
+ WireToEventType proc) /* routine to call when converting event */
{
register WireToEventType oldproc;
if (proc == NULL) proc = (WireToEventType)_XUnknownWireEvent;
@@ -261,10 +259,10 @@ typedef Status (*EventToWireType) (
xEvent* /* event */
);
-EventToWireType XESetEventToWire(dpy, event_number, proc)
- Display *dpy; /* display */
- EventToWireType proc; /* routine to call when converting event */
- int event_number; /* event routine to replace */
+EventToWireType XESetEventToWire(
+ Display *dpy, /* display */
+ int event_number, /* event routine to replace */
+ EventToWireType proc) /* routine to call when converting event */
{
register EventToWireType oldproc;
if (proc == NULL) proc = (EventToWireType) _XUnknownNativeEvent;
@@ -281,10 +279,10 @@ typedef Bool (*WireToErrorType) (
xError* /* we */
);
-WireToErrorType XESetWireToError(dpy, error_number, proc)
- Display *dpy; /* display */
- WireToErrorType proc; /* routine to call when converting error */
- int error_number; /* error routine to replace */
+WireToErrorType XESetWireToError(
+ Display *dpy, /* display */
+ int error_number, /* error routine to replace */
+ WireToErrorType proc) /* routine to call when converting error */
{
register WireToErrorType oldproc = NULL;
if (proc == NULL) proc = (WireToErrorType)_XDefaultWireError;
@@ -303,10 +301,10 @@ WireToErrorType XESetWireToError(dpy, error_number, proc)
return (WireToErrorType)oldproc;
}
-ErrorType XESetError(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- ErrorType proc; /* routine to call when X error happens */
+ErrorType XESetError(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ ErrorType proc) /* routine to call when X error happens */
{
register _XExtension *e; /* for lookup of extension */
register ErrorType oldproc;
@@ -318,10 +316,10 @@ ErrorType XESetError(dpy, extension, proc)
return (ErrorType)oldproc;
}
-ErrorStringType XESetErrorString(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- ErrorStringType proc; /* routine to call when I/O error happens */
+ErrorStringType XESetErrorString(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ ErrorStringType proc) /* routine to call when I/O error happens */
{
register _XExtension *e; /* for lookup of extension */
register ErrorStringType oldproc;
@@ -333,10 +331,10 @@ ErrorStringType XESetErrorString(dpy, extension, proc)
return (ErrorStringType)oldproc;
}
-PrintErrorType XESetPrintErrorValues(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- PrintErrorType proc; /* routine to call to print */
+PrintErrorType XESetPrintErrorValues(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ PrintErrorType proc) /* routine to call to print */
{
register _XExtension *e; /* for lookup of extension */
register PrintErrorType oldproc;
@@ -348,10 +346,10 @@ PrintErrorType XESetPrintErrorValues(dpy, extension, proc)
return (PrintErrorType)oldproc;
}
-BeforeFlushType XESetBeforeFlush(dpy, extension, proc)
- Display *dpy; /* display */
- int extension; /* extension number */
- BeforeFlushType proc; /* routine to call on flush */
+BeforeFlushType XESetBeforeFlush(
+ Display *dpy, /* display */
+ int extension, /* extension number */
+ BeforeFlushType proc) /* routine to call on flush */
{
register _XExtension *e; /* for lookup of extension */
register BeforeFlushType oldproc;
diff --git a/src/InsCmap.c b/src/InsCmap.c
index 26a8644..1b59ad5 100644
--- a/src/InsCmap.c
+++ b/src/InsCmap.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XInstallColormap(dpy, cmap)
-register Display *dpy;
-Colormap cmap;
+XInstallColormap(
+ register Display *dpy,
+ Colormap cmap)
{
register xResourceReq *req;
LockDisplay(dpy);
diff --git a/src/IntAtom.c b/src/IntAtom.c
index 8161c7f..6f16081 100644
--- a/src/IntAtom.c
+++ b/src/IntAtom.c
@@ -40,8 +40,7 @@ from The Open Group.
#define REHASH(idx,rehash) ((idx + rehash) & (TABLESIZE-1))
void
-_XFreeAtomTable(dpy)
- Display *dpy;
+_XFreeAtomTable(Display *dpy)
{
register Entry *table;
register int i;
@@ -116,13 +115,13 @@ nomatch: if (idx == firstidx)
}
void
-_XUpdateAtomCache(dpy, name, atom, sig, idx, n)
- Display *dpy;
- const char *name;
- Atom atom;
- unsigned long sig;
- int idx;
- int n;
+_XUpdateAtomCache(
+ Display *dpy,
+ const char *name,
+ Atom atom,
+ unsigned long sig,
+ int idx,
+ int n)
{
Entry e, oe;
register char *s1;
@@ -241,12 +240,12 @@ Bool _XIntAtomHandler(
}
Status
-XInternAtoms (dpy, names, count, onlyIfExists, atoms_return)
- Display *dpy;
- char **names;
- int count;
- Bool onlyIfExists;
- Atom *atoms_return;
+XInternAtoms (
+ Display *dpy,
+ char **names,
+ int count,
+ Bool onlyIfExists,
+ Atom *atoms_return)
{
int i, idx, n, tidx;
unsigned long sig;
diff --git a/src/KeyBind.c b/src/KeyBind.c
index fab9eea..3d0551b 100644
--- a/src/KeyBind.c
+++ b/src/KeyBind.c
@@ -136,9 +136,9 @@ XKeycodeToKeysym(Display *dpy,
}
KeyCode
-XKeysymToKeycode(dpy, ks)
- Display *dpy;
- KeySym ks;
+XKeysymToKeycode(
+ Display *dpy,
+ KeySym ks)
{
register int i, j;
@@ -154,9 +154,9 @@ XKeysymToKeycode(dpy, ks)
}
KeySym
-XLookupKeysym(event, col)
- register XKeyEvent *event;
- int col;
+XLookupKeysym(
+ register XKeyEvent *event,
+ int col)
{
if ((! event->display->keysyms) && (! _XKeyInitialize(event->display)))
return NoSymbol;
@@ -232,8 +232,7 @@ InitModMap(
}
int
-XRefreshKeyboardMapping(event)
- register XMappingEvent *event;
+XRefreshKeyboardMapping(register XMappingEvent *event)
{
if(event->request == MappingKeyboard) {
@@ -645,10 +644,10 @@ UCSConvertCase( register unsigned code,
}
void
-XConvertCase(sym, lower, upper)
- register KeySym sym;
- KeySym *lower;
- KeySym *upper;
+XConvertCase(
+ register KeySym sym,
+ KeySym *lower,
+ KeySym *upper)
{
/* Latin 1 keysym */
if (sym < 0x100) {
@@ -820,12 +819,12 @@ _XTranslateKey( register Display *dpy,
}
int
-_XTranslateKeySym(dpy, symbol, modifiers, buffer, nbytes)
- Display *dpy;
- register KeySym symbol;
- unsigned int modifiers;
- char *buffer;
- int nbytes;
+_XTranslateKeySym(
+ Display *dpy,
+ register KeySym symbol,
+ unsigned int modifiers,
+ char *buffer,
+ int nbytes)
{
register struct _XKeytrans *p;
int length;
@@ -880,12 +879,12 @@ _XTranslateKeySym(dpy, symbol, modifiers, buffer, nbytes)
/*ARGSUSED*/
int
-XLookupString (event, buffer, nbytes, keysym, status)
- register XKeyEvent *event;
- char *buffer; /* buffer */
- int nbytes; /* space in buffer for characters */
- KeySym *keysym;
- XComposeStatus *status; /* not implemented */
+XLookupString (
+ register XKeyEvent *event,
+ char *buffer, /* buffer */
+ int nbytes, /* space in buffer for characters */
+ KeySym *keysym,
+ XComposeStatus *status) /* not implemented */
{
unsigned int modifiers;
KeySym symbol;
diff --git a/src/KeysymStr.c b/src/KeysymStr.c
index 59aa3f3..ce82761 100644
--- a/src/KeysymStr.c
+++ b/src/KeysymStr.c
@@ -71,8 +71,7 @@ SameValue(
return False;
}
-char *XKeysymToString(ks)
- KeySym ks;
+char *XKeysymToString(KeySym ks)
{
register int i, n;
int h;
diff --git a/src/KillCl.c b/src/KillCl.c
index 4c2ddcf..2c72c10 100644
--- a/src/KillCl.c
+++ b/src/KillCl.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XKillClient(dpy, resource)
- register Display *dpy;
- XID resource;
+XKillClient(
+ register Display *dpy,
+ XID resource)
{
register xResourceReq *req;
LockDisplay(dpy);
diff --git a/src/LiICmaps.c b/src/LiICmaps.c
index c36fe55..9381f49 100644
--- a/src/LiICmaps.c
+++ b/src/LiICmaps.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Colormap *XListInstalledColormaps(dpy, win, n)
-register Display *dpy;
-Window win;
-int *n; /* RETURN */
+Colormap *XListInstalledColormaps(
+ register Display *dpy,
+ Window win,
+ int *n) /* RETURN */
{
long nbytes;
Colormap *cmaps;
diff --git a/src/LiProps.c b/src/LiProps.c
index 5e3aba8..681959d 100644
--- a/src/LiProps.c
+++ b/src/LiProps.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Atom *XListProperties(dpy, window, n_props)
-register Display *dpy;
-Window window;
-int *n_props; /* RETURN */
+Atom *XListProperties(
+ register Display *dpy,
+ Window window,
+ int *n_props) /* RETURN */
{
long nbytes;
xListPropertiesReply rep;
diff --git a/src/ListExt.c b/src/ListExt.c
index 1140082..82d44d7 100644
--- a/src/ListExt.c
+++ b/src/ListExt.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #endif
#include "Xlibint.h"
-char **XListExtensions(dpy, nextensions)
-register Display *dpy;
-int *nextensions; /* RETURN */
+char **XListExtensions(
+ register Display *dpy,
+ int *nextensions) /* RETURN */
{
xListExtensionsReply rep;
char **list;
@@ -90,8 +90,7 @@ int *nextensions; /* RETURN */
}
int
-XFreeExtensionList (list)
-char **list;
+XFreeExtensionList (char **list)
{
if (list != NULL) {
Xfree (list[0]-1);
diff --git a/src/LowerWin.c b/src/LowerWin.c
index 2db1e8a..39c8dd1 100644
--- a/src/LowerWin.c
+++ b/src/LowerWin.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XLowerWindow(dpy, w)
-Display *dpy;
-Window w;
+XLowerWindow(
+ Display *dpy,
+ Window w)
{
register xConfigureWindowReq *req;
unsigned long val = Below; /* needed for macro */
diff --git a/src/Macros.c b/src/Macros.c
index 34d11fe..f720a26 100644
--- a/src/Macros.c
+++ b/src/Macros.c
@@ -39,156 +39,187 @@ in this Software without prior written authorization from The \
Open Group.
* need them.
*/
-int XConnectionNumber(dpy) Display *dpy; { return (ConnectionNumber(dpy)); }
+int XConnectionNumber(Display *dpy) { return (ConnectionNumber(dpy)); }
-Window XRootWindow (dpy, scr)
- Display *dpy; int scr;
- { return (RootWindow(dpy,scr)); }
+Window XRootWindow (Display *dpy, int scr)
+{
+ return (RootWindow(dpy,scr));
+}
-int XDefaultScreen(dpy) Display *dpy; { return (DefaultScreen(dpy)); }
+int XDefaultScreen(Display *dpy) { return (DefaultScreen(dpy)); }
-Window XDefaultRootWindow (dpy)
- Display *dpy;
- { return (RootWindow(dpy,DefaultScreen(dpy))); }
+Window XDefaultRootWindow (Display *dpy)
+{
+ return (RootWindow(dpy,DefaultScreen(dpy)));
+}
-Visual *XDefaultVisual(dpy, scr)
- Display *dpy; int scr;
- { return (DefaultVisual(dpy, scr)); }
+Visual *XDefaultVisual(Display *dpy, int scr)
+{
+ return (DefaultVisual(dpy, scr));
+}
-GC XDefaultGC(dpy, scr)
- Display *dpy; int scr;
- { return (DefaultGC(dpy,scr)); }
+GC XDefaultGC(Display *dpy, int scr)
+{
+ return (DefaultGC(dpy,scr));
+}
-unsigned long XBlackPixel(dpy, scr)
- Display *dpy; int scr;
- { return (BlackPixel(dpy, scr)); }
+unsigned long XBlackPixel(Display *dpy, int scr)
+{
+ return (BlackPixel(dpy, scr));
+}
-unsigned long XWhitePixel(dpy, scr)
- Display *dpy; int scr;
- { return (WhitePixel(dpy,scr)); }
+unsigned long XWhitePixel(Display *dpy, int scr)
+{
+ return (WhitePixel(dpy,scr));
+}
-unsigned long XAllPlanes() { return AllPlanes; }
+unsigned long XAllPlanes(void) { return AllPlanes; }
-int XQLength(dpy) Display *dpy; { return (QLength(dpy)); }
+int XQLength(Display *dpy) { return (QLength(dpy)); }
-int XDisplayWidth(dpy, scr)
- Display *dpy; int scr;
- { return (DisplayWidth(dpy,scr)); }
+int XDisplayWidth(Display *dpy, int scr)
+{
+ return (DisplayWidth(dpy,scr));
+}
-int XDisplayHeight(dpy, scr)
- Display *dpy; int scr;
- { return (DisplayHeight(dpy, scr)); }
+int XDisplayHeight(Display *dpy, int scr)
+{
+ return (DisplayHeight(dpy, scr));
+}
-int XDisplayWidthMM(dpy, scr)
- Display *dpy; int scr;
- { return (DisplayWidthMM(dpy, scr)); }
+int XDisplayWidthMM(Display *dpy, int scr)
+{
+ return (DisplayWidthMM(dpy, scr));
+}
-int XDisplayHeightMM(dpy, scr)
- Display *dpy; int scr;
- { return (DisplayHeightMM(dpy, scr)); }
+int XDisplayHeightMM(Display *dpy, int scr)
+{
+ return (DisplayHeightMM(dpy, scr));
+}
-int XDisplayPlanes(dpy, scr)
- Display *dpy; int scr;
- { return (DisplayPlanes(dpy, scr)); }
+int XDisplayPlanes(Display *dpy, int scr)
+{
+ return (DisplayPlanes(dpy, scr));
+}
-int XDisplayCells(dpy, scr)
- Display *dpy; int scr;
- { return (DisplayCells (dpy, scr)); }
+int XDisplayCells(Display *dpy, int scr)
+{
+ return (DisplayCells (dpy, scr));
+}
-int XScreenCount(dpy) Display *dpy; { return (ScreenCount(dpy)); }
+int XScreenCount(Display *dpy) { return (ScreenCount(dpy)); }
-char *XServerVendor(dpy) Display *dpy; { return (ServerVendor(dpy)); }
+char *XServerVendor(Display *dpy) { return (ServerVendor(dpy)); }
-int XProtocolVersion(dpy) Display *dpy; { return (ProtocolVersion(dpy)); }
+int XProtocolVersion(Display *dpy) { return (ProtocolVersion(dpy)); }
-int XProtocolRevision(dpy) Display *dpy; { return (ProtocolRevision(dpy));}
+int XProtocolRevision(Display *dpy) { return (ProtocolRevision(dpy));}
-int XVendorRelease(dpy) Display *dpy; { return (VendorRelease(dpy)); }
+int XVendorRelease(Display *dpy) { return (VendorRelease(dpy)); }
-char *XDisplayString(dpy) Display *dpy; { return (DisplayString(dpy)); }
+char *XDisplayString(Display *dpy) { return (DisplayString(dpy)); }
-int XDefaultDepth(dpy, scr)
- Display *dpy; int scr;
- { return(DefaultDepth(dpy, scr)); }
+int XDefaultDepth(Display *dpy, int scr)
+{
+ return(DefaultDepth(dpy, scr));
+}
-Colormap XDefaultColormap(dpy, scr)
- Display *dpy; int scr;
- { return (DefaultColormap(dpy, scr)); }
+Colormap XDefaultColormap(Display *dpy, int scr)
+{
+ return (DefaultColormap(dpy, scr));
+}
-int XBitmapUnit(dpy) Display *dpy; { return (BitmapUnit(dpy)); }
+int XBitmapUnit(Display *dpy) { return (BitmapUnit(dpy)); }
-int XBitmapBitOrder(dpy) Display *dpy; { return (BitmapBitOrder(dpy)); }
+int XBitmapBitOrder(Display *dpy) { return (BitmapBitOrder(dpy)); }
-int XBitmapPad(dpy) Display *dpy; { return (BitmapPad(dpy)); }
+int XBitmapPad(Display *dpy) { return (BitmapPad(dpy)); }
-int XImageByteOrder(dpy) Display *dpy; { return (ImageByteOrder(dpy)); }
+int XImageByteOrder(Display *dpy) { return (ImageByteOrder(dpy)); }
-unsigned long XNextRequest(dpy)
- Display *dpy;
- {
+unsigned long XNextRequest(Display *dpy)
+{
#ifdef WORD64
- WORD64ALIGN
- return dpy->request + 1;
+ WORD64ALIGN
+ return dpy->request + 1;
#else
- return (NextRequest(dpy));
+ return (NextRequest(dpy));
#endif
- }
+}
-unsigned long XLastKnownRequestProcessed(dpy)
- Display *dpy;
- { return (LastKnownRequestProcessed(dpy)); }
+unsigned long XLastKnownRequestProcessed(Display *dpy)
+{
+ return (LastKnownRequestProcessed(dpy));
+}
/* screen oriented macros (toolkit) */
-Screen *XScreenOfDisplay(dpy, scr) Display *dpy; int scr;
- { return (ScreenOfDisplay(dpy, scr)); }
+Screen *XScreenOfDisplay(Display *dpy, int scr)
+{
+ return (ScreenOfDisplay(dpy, scr));
+}
-Screen *XDefaultScreenOfDisplay(dpy) Display *dpy;
- { return (DefaultScreenOfDisplay(dpy)); }
+Screen *XDefaultScreenOfDisplay(Display *dpy)
+{
+ return (DefaultScreenOfDisplay(dpy));
+}
-Display *XDisplayOfScreen(s) Screen *s; { return (DisplayOfScreen(s)); }
+Display *XDisplayOfScreen(Screen *s) { return (DisplayOfScreen(s)); }
-Window XRootWindowOfScreen(s) Screen *s; { return (RootWindowOfScreen(s)); }
+Window XRootWindowOfScreen(Screen *s) { return (RootWindowOfScreen(s)); }
-unsigned long XBlackPixelOfScreen(s) Screen *s;
- { return (BlackPixelOfScreen(s)); }
+unsigned long XBlackPixelOfScreen(Screen *s)
+{
+ return (BlackPixelOfScreen(s));
+}
-unsigned long XWhitePixelOfScreen(s) Screen *s;
- { return (WhitePixelOfScreen(s)); }
+unsigned long XWhitePixelOfScreen(Screen *s)
+{
+ return (WhitePixelOfScreen(s));
+}
-Colormap XDefaultColormapOfScreen(s) Screen *s;
- { return (DefaultColormapOfScreen(s)); }
+Colormap XDefaultColormapOfScreen(Screen *s)
+{
+ return (DefaultColormapOfScreen(s));
+}
-int XDefaultDepthOfScreen(s) Screen *s; { return (DefaultDepthOfScreen(s)); }
+int XDefaultDepthOfScreen(Screen *s)
+{
+ return (DefaultDepthOfScreen(s));
+}
-GC XDefaultGCOfScreen(s) Screen *s; { return (DefaultGCOfScreen(s)); }
+GC XDefaultGCOfScreen(Screen *s)
+{
+ return (DefaultGCOfScreen(s));
+}
-Visual *XDefaultVisualOfScreen(s) Screen *s;
- { return (DefaultVisualOfScreen(s)); }
+Visual *XDefaultVisualOfScreen(Screen *s)
+{
+ return (DefaultVisualOfScreen(s));
+}
-int XWidthOfScreen(s) Screen *s; { return (WidthOfScreen(s)); }
+int XWidthOfScreen(Screen *s) { return (WidthOfScreen(s)); }
-int XHeightOfScreen(s) Screen *s; { return (HeightOfScreen(s)); }
+int XHeightOfScreen(Screen *s) { return (HeightOfScreen(s)); }
-int XWidthMMOfScreen(s) Screen *s; { return (WidthMMOfScreen(s)); }
+int XWidthMMOfScreen(Screen *s) { return (WidthMMOfScreen(s)); }
-int XHeightMMOfScreen(s) Screen *s; { return (HeightMMOfScreen(s)); }
+int XHeightMMOfScreen(Screen *s) { return (HeightMMOfScreen(s)); }
-int XPlanesOfScreen(s) Screen *s; { return (PlanesOfScreen(s)); }
+int XPlanesOfScreen(Screen *s) { return (PlanesOfScreen(s)); }
-int XCellsOfScreen(s) Screen *s; { return (CellsOfScreen(s)); }
+int XCellsOfScreen(Screen *s) { return (CellsOfScreen(s)); }
-int XMinCmapsOfScreen(s) Screen *s; { return (MinCmapsOfScreen(s)); }
+int XMinCmapsOfScreen(Screen *s) { return (MinCmapsOfScreen(s)); }
-int XMaxCmapsOfScreen(s) Screen *s; { return (MaxCmapsOfScreen(s)); }
+int XMaxCmapsOfScreen(Screen *s) { return (MaxCmapsOfScreen(s)); }
-Bool XDoesSaveUnders(s) Screen *s; { return (DoesSaveUnders(s)); }
+Bool XDoesSaveUnders(Screen *s) { return (DoesSaveUnders(s)); }
-int XDoesBackingStore(s) Screen *s; { return (DoesBackingStore(s)); }
+int XDoesBackingStore(Screen *s) { return (DoesBackingStore(s)); }
-long XEventMaskOfScreen(s) Screen *s; { return (EventMaskOfScreen(s)); }
+long XEventMaskOfScreen(Screen *s) { return (EventMaskOfScreen(s)); }
-int XScreenNumberOfScreen (scr)
- register Screen *scr;
+int XScreenNumberOfScreen (register Screen *scr)
{
register Display *dpy = scr->display;
register Screen *dpyscr = dpy->screens;
@@ -245,8 +276,7 @@ int XAddPixel(
int
-XNoOp (dpy)
- register Display *dpy;
+XNoOp (register Display *dpy)
{
register xReq *req;
diff --git a/src/MapRaised.c b/src/MapRaised.c
index 444c99d..d709751 100644
--- a/src/MapRaised.c
+++ b/src/MapRaised.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XMapRaised (dpy, w)
- Window w;
- register Display *dpy;
+XMapRaised (
+ register Display *dpy,
+ Window w)
{
register xConfigureWindowReq *req;
register xResourceReq *req2;
diff --git a/src/MapSubs.c b/src/MapSubs.c
index f3e11eb..751dd77 100644
--- a/src/MapSubs.c
+++ b/src/MapSubs.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XMapSubwindows(dpy, win)
- register Display *dpy;
- Window win;
+XMapSubwindows(
+ register Display *dpy,
+ Window win)
{
register xResourceReq *req;
LockDisplay(dpy);
diff --git a/src/MapWindow.c b/src/MapWindow.c
index d40bff2..ba1f519 100644
--- a/src/MapWindow.c
+++ b/src/MapWindow.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XMapWindow (dpy, w)
- Window w;
- register Display *dpy;
+XMapWindow (
+ register Display *dpy,
+ Window w)
{
register xResourceReq *req;
LockDisplay (dpy);
diff --git a/src/MaskEvent.c b/src/MaskEvent.c
index c5f41b5..fbada5e 100644
--- a/src/MaskEvent.c
+++ b/src/MaskEvent.c
@@ -44,10 +44,10 @@ extern long const _Xevent_to_mask[];
*/
int
-XMaskEvent (dpy, mask, event)
- register Display *dpy;
- long mask; /* Selected event mask. */
- register XEvent *event; /* XEvent to be filled in. */
+XMaskEvent (
+ register Display *dpy,
+ long mask, /* Selected event mask. */
+ register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/Misc.c b/src/Misc.c
index 5c3499a..a34ac6d 100644
--- a/src/Misc.c
+++ b/src/Misc.c
@@ -31,42 +31,38 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-long XMaxRequestSize(dpy)
- Display *dpy;
+long XMaxRequestSize(Display *dpy)
{
return dpy->max_request_size;
}
-char *XResourceManagerString(dpy)
- Display *dpy;
+char *XResourceManagerString(Display *dpy)
{
return dpy->xdefaults;
}
-unsigned long XDisplayMotionBufferSize(dpy)
- Display *dpy;
+unsigned long XDisplayMotionBufferSize(Display *dpy)
{
return dpy->motion_buffer;
}
int
-XDisplayKeycodes(dpy, min_keycode_return, max_keycode_return)
- Display *dpy;
- int *min_keycode_return, *max_keycode_return;
+XDisplayKeycodes(
+ Display *dpy,
+ int *min_keycode_return,
+ int *max_keycode_return)
{
*min_keycode_return = dpy->min_keycode;
*max_keycode_return = dpy->max_keycode;
return 1;
}
-VisualID XVisualIDFromVisual(visual)
- Visual *visual;
+VisualID XVisualIDFromVisual(Visual *visual)
{
return visual->visualid;
}
-long XExtendedMaxRequestSize(dpy)
- Display *dpy;
+long XExtendedMaxRequestSize(Display *dpy)
{
return dpy->bigreq_size;
}
diff --git a/src/ModMap.c b/src/ModMap.c
index f321c81..b5cb422 100644
--- a/src/ModMap.c
+++ b/src/ModMap.c
@@ -33,8 +33,7 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
XModifierKeymap *
-XGetModifierMapping(dpy)
- register Display *dpy;
+XGetModifierMapping(register Display *dpy)
{
xGetModifierMappingReply rep;
register xReq *req;
@@ -69,9 +68,9 @@ XGetModifierMapping(dpy)
* 2 Failed - one or more new modifiers unacceptable
*/
int
-XSetModifierMapping(dpy, modifier_map)
- register Display *dpy;
- register XModifierKeymap *modifier_map;
+XSetModifierMapping(
+ register Display *dpy,
+ register XModifierKeymap *modifier_map)
{
register xSetModifierMappingReq *req;
xSetModifierMappingReply rep;
@@ -94,8 +93,7 @@ XSetModifierMapping(dpy, modifier_map)
}
XModifierKeymap *
-XNewModifiermap(keyspermodifier)
- int keyspermodifier;
+XNewModifiermap(int keyspermodifier)
{
XModifierKeymap *res = (XModifierKeymap *) Xmalloc((sizeof (XModifierKeymap)));
if (res) {
@@ -113,8 +111,7 @@ XNewModifiermap(keyspermodifier)
int
-XFreeModifiermap(map)
- XModifierKeymap *map;
+XFreeModifiermap(XModifierKeymap *map)
{
if (map) {
if (map->modifiermap)
diff --git a/src/MoveWin.c b/src/MoveWin.c
index d3c4f88..bd2a5a0 100644
--- a/src/MoveWin.c
+++ b/src/MoveWin.c
@@ -32,10 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XMoveWindow (dpy, w, x, y)
- register Display *dpy;
- Window w;
- int x, y;
+XMoveWindow (
+ register Display *dpy,
+ Window w,
+ int x,
+ int y)
{
register xConfigureWindowReq *req;
diff --git a/src/NextEvent.c b/src/NextEvent.c
index 1c90806..6303234 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -38,9 +38,9 @@ in this Software without prior written authorization from The Open \
Group.
*/
int
-XNextEvent (dpy, event)
- register Display *dpy;
- register XEvent *event;
+XNextEvent (
+ register Display *dpy,
+ register XEvent *event)
{
register _XQEvent *qelt;
diff --git a/src/OCWrap.c b/src/OCWrap.c
index 63ffc42..05774c5 100644
--- a/src/OCWrap.c
+++ b/src/OCWrap.c
@@ -63,8 +63,7 @@ XCreateOC(XOM om, ...)
}
void
-XDestroyOC(oc)
- XOC oc;
+XDestroyOC(XOC oc)
{
XOC prev, oc_list;
@@ -85,8 +84,7 @@ XDestroyOC(oc)
}
XOM
-XOMOfOC(oc)
- XOC oc;
+XOMOfOC(XOC oc)
{
return oc->core.om;
}
diff --git a/src/OMWrap.c b/src/OMWrap.c
index 8f8a1fd..2373ef6 100644
--- a/src/OMWrap.c
+++ b/src/OMWrap.c
@@ -47,8 +47,7 @@ XOpenOM(Display *dpy, XrmDatabase rdb, _Xconst char *res_name,
}
Status
-XCloseOM(om)
- XOM om;
+XCloseOM(XOM om)
{
XOC oc, next;
XLCd lcd = om->core.lcd;
@@ -120,15 +119,13 @@ XGetOMValues(XOM om, ...)
}
Display *
-XDisplayOfOM(om)
- XOM om;
+XDisplayOfOM(XOM om)
{
return om->core.display;
}
char *
-XLocaleOfOM(om)
- XOM om;
+XLocaleOfOM(XOM om)
{
return om->core.lcd->core->name;
}
diff --git a/src/PeekEvent.c b/src/PeekEvent.c
index b89c6c9..c28f114 100644
--- a/src/PeekEvent.c
+++ b/src/PeekEvent.c
@@ -39,9 +39,9 @@ in this Software without prior written authorization from The Open \
Group.
*/
int
-XPeekEvent (dpy, event)
- register Display *dpy;
- register XEvent *event;
+XPeekEvent (
+ register Display *dpy,
+ register XEvent *event)
{
LockDisplay(dpy);
if (dpy->head == NULL)
diff --git a/src/PeekIfEv.c b/src/PeekIfEv.c
index beb991a..1d5b1ab 100644
--- a/src/PeekIfEv.c
+++ b/src/PeekIfEv.c
@@ -39,15 +39,15 @@ in this Software without prior written authorization from The \
Open Group.
*/
int
-XPeekIfEvent (dpy, event, predicate, arg)
- register Display *dpy;
- register XEvent *event;
+XPeekIfEvent (
+ register Display *dpy,
+ register XEvent *event,
Bool (*predicate)(
Display* /* display */,
XEvent* /* event */,
char* /* arg */
- );
- char *arg;
+ ),
+ char *arg)
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/Pending.c b/src/Pending.c
index 480ec6c..8ab7b1e 100644
--- a/src/Pending.c
+++ b/src/Pending.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group.
/* Read in pending events if needed and return the number of queued events. */
-int XEventsQueued (dpy, mode)
- register Display *dpy;
- int mode;
+int XEventsQueued (
+ register Display *dpy,
+ int mode)
{
int ret_val;
LockDisplay(dpy);
@@ -46,8 +46,7 @@ int XEventsQueued (dpy, mode)
return ret_val;
}
-int XPending (dpy)
- register Display *dpy;
+int XPending (register Display *dpy)
{
int ret_val;
LockDisplay(dpy);
diff --git a/src/PixFormats.c b/src/PixFormats.c
index dc3a238..684d0c7 100644
--- a/src/PixFormats.c
+++ b/src/PixFormats.c
@@ -35,9 +35,9 @@ in this Software without prior written authorization from The Open \
Group.
* XListPixmapFormats - return info from connection setup
*/
-XPixmapFormatValues *XListPixmapFormats (dpy, count)
- Display *dpy;
- int *count; /* RETURN */
+XPixmapFormatValues *XListPixmapFormats (
+ Display *dpy,
+ int *count) /* RETURN */
{
XPixmapFormatValues *formats = (XPixmapFormatValues *)
Xmalloc((unsigned) (dpy->nformats * sizeof (XPixmapFormatValues)));
diff --git a/src/PmapBgnd.c b/src/PmapBgnd.c
index 3333cd9..ee4581e 100644
--- a/src/PmapBgnd.c
+++ b/src/PmapBgnd.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetWindowBackgroundPixmap(dpy, w, pixmap)
- register Display *dpy;
- Window w;
- Pixmap pixmap;
+XSetWindowBackgroundPixmap(
+ register Display *dpy,
+ Window w,
+ Pixmap pixmap)
{
register xChangeWindowAttributesReq *req;
LockDisplay (dpy);
diff --git a/src/PmapBord.c b/src/PmapBord.c
index a81adc1..b0d8f1f 100644
--- a/src/PmapBord.c
+++ b/src/PmapBord.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetWindowBorderPixmap(dpy, w, pixmap)
- register Display *dpy;
- Window w;
- Pixmap pixmap;
+XSetWindowBorderPixmap(
+ register Display *dpy,
+ Window w,
+ Pixmap pixmap)
{
register xChangeWindowAttributesReq *req;
LockDisplay(dpy);
diff --git a/src/PolyReg.c b/src/PolyReg.c
index 68afeaf..d6f4c74 100644
--- a/src/PolyReg.c
+++ b/src/PolyReg.c
@@ -473,10 +473,10 @@ static int PtsToRegion(
* encoding is in the form of an array of rectangles.
*/
Region
-XPolygonRegion(Pts, Count, rule)
- int Count; /* number of pts */
- XPoint *Pts; /* the pts */
- int rule; /* winding rule */
+XPolygonRegion(
+ XPoint *Pts, /* the pts */
+ int Count, /* number of pts */
+ int rule) /* winding rule */
{
Region region;
register EdgeTableEntry *pAET; /* Active Edge Table */
diff --git a/src/PolyTxt.c b/src/PolyTxt.c
index f66b104..eb93ffd 100644
--- a/src/PolyTxt.c
+++ b/src/PolyTxt.c
@@ -32,13 +32,14 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawText(dpy, d, gc, x, y, items, nitems)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y;
- XTextItem *items;
- int nitems;
+XDrawText(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y,
+ XTextItem *items,
+ int nitems)
{
register int i;
register XTextItem *item;
diff --git a/src/PolyTxt16.c b/src/PolyTxt16.c
index ddaa62d..512f247 100644
--- a/src/PolyTxt16.c
+++ b/src/PolyTxt16.c
@@ -32,13 +32,14 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XDrawText16(dpy, d, gc, x, y, items, nitems)
- register Display *dpy;
- Drawable d;
- GC gc;
- int x, y;
- XTextItem16 *items;
- int nitems;
+XDrawText16(
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ int x,
+ int y,
+ XTextItem16 *items,
+ int nitems)
{
register int i;
register XTextItem16 *item;
diff --git a/src/PropAlloc.c b/src/PropAlloc.c
index 9005a24..aab348b 100644
--- a/src/PropAlloc.c
+++ b/src/PropAlloc.c
@@ -39,26 +39,26 @@ in this Software without prior written authorization from The \
Open Group.
* longer at some point.
*/
-XSizeHints *XAllocSizeHints ()
+XSizeHints *XAllocSizeHints (void)
{
return ((XSizeHints *) Xcalloc (1, (unsigned) sizeof (XSizeHints)));
}
-XStandardColormap *XAllocStandardColormap ()
+XStandardColormap *XAllocStandardColormap (void)
{
return ((XStandardColormap *)
Xcalloc (1, (unsigned) sizeof (XStandardColormap)));
}
-XWMHints *XAllocWMHints ()
+XWMHints *XAllocWMHints (void)
{
return ((XWMHints *) Xcalloc (1, (unsigned) sizeof (XWMHints)));
}
-XClassHint *XAllocClassHint ()
+XClassHint *XAllocClassHint (void)
{
register XClassHint *h;
@@ -69,7 +69,7 @@ XClassHint *XAllocClassHint ()
}
-XIconSize *XAllocIconSize ()
+XIconSize *XAllocIconSize (void)
{
return ((XIconSize *) Xcalloc (1, (unsigned) sizeof (XIconSize)));
}
diff --git a/src/PutImage.c b/src/PutImage.c
index b440294..b528eb9 100644
--- a/src/PutImage.c
+++ b/src/PutImage.c
@@ -941,15 +941,17 @@ PutSubImage (
int
-XPutImage (dpy, d, gc, image, req_xoffset, req_yoffset, x, y, req_width,
- req_height)
- register Display *dpy;
- Drawable d;
- GC gc;
- register XImage *image;
- int x, y;
- unsigned int req_width, req_height;
- int req_xoffset, req_yoffset;
+XPutImage (
+ register Display *dpy,
+ Drawable d,
+ GC gc,
+ register XImage *image,
+ int req_xoffset,
+ int req_yoffset,
+ int x,
+ int y,
+ unsigned int req_width,
+ unsigned int req_height)
{
long width = req_width;
diff --git a/src/QuBest.c b/src/QuBest.c
index 7fe2181..8678c28 100644
--- a/src/QuBest.c
+++ b/src/QuBest.c
@@ -31,12 +31,14 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XQueryBestSize(dpy, class, drawable, width, height, ret_width, ret_height)
- register Display *dpy;
- int class;
- Drawable drawable;
- unsigned int width, height;
- unsigned int *ret_width, *ret_height;
+Status XQueryBestSize(
+ register Display *dpy,
+ int class,
+ Drawable drawable,
+ unsigned int width,
+ unsigned int height,
+ unsigned int *ret_width,
+ unsigned int *ret_height)
{
xQueryBestSizeReply rep;
register xQueryBestSizeReq *req;
diff --git a/src/QuColor.c b/src/QuColor.c
index 9b6901e..31dd5a5 100644
--- a/src/QuColor.c
+++ b/src/QuColor.c
@@ -33,10 +33,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XQueryColor(dpy, cmap, def)
- register Display *dpy;
- Colormap cmap;
- XColor *def; /* RETURN */
+XQueryColor(
+ register Display *dpy,
+ Colormap cmap,
+ XColor *def) /* RETURN */
{
xrgb color;
xQueryColorsReply rep;
diff --git a/src/QuColors.c b/src/QuColors.c
index 74a1de8..f2203c8 100644
--- a/src/QuColors.c
+++ b/src/QuColors.c
@@ -33,11 +33,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XQueryColors(dpy, cmap, defs, ncolors)
- register Display *dpy;
- Colormap cmap;
- XColor *defs; /* RETURN */
- int ncolors;
+XQueryColors(
+ register Display *dpy,
+ Colormap cmap,
+ XColor *defs, /* RETURN */
+ int ncolors)
{
register int i;
xrgb *color;
diff --git a/src/QuCurShp.c b/src/QuCurShp.c
index b266723..47675a8 100644
--- a/src/QuCurShp.c
+++ b/src/QuCurShp.c
@@ -31,11 +31,13 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XQueryBestCursor(dpy, drawable, width, height, ret_width, ret_height)
- register Display *dpy;
- Drawable drawable;
- unsigned int width, height;
- unsigned int *ret_width, *ret_height;
+Status XQueryBestCursor(
+ register Display *dpy,
+ Drawable drawable,
+ unsigned int width,
+ unsigned int height,
+ unsigned int *ret_width,
+ unsigned int *ret_height)
{
xQueryBestSizeReply rep;
register xQueryBestSizeReq *req;
diff --git a/src/QuKeybd.c b/src/QuKeybd.c
index 62691c0..9e1c88a 100644
--- a/src/QuKeybd.c
+++ b/src/QuKeybd.c
@@ -37,10 +37,9 @@ struct kmap {
};
int
-XQueryKeymap(dpy, keys)
- register Display *dpy;
- char keys[32];
-
+XQueryKeymap(
+ register Display *dpy,
+ char keys[32])
{
xQueryKeymapReply rep;
register xReq *req;
diff --git a/src/QuPntr.c b/src/QuPntr.c
index 006553d..e74a80d 100644
--- a/src/QuPntr.c
+++ b/src/QuPntr.c
@@ -31,12 +31,16 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Bool XQueryPointer(dpy, w, root, child, root_x, root_y, win_x, win_y, mask)
- register Display *dpy;
- Window w, *root, *child;
- int *root_x, *root_y, *win_x, *win_y;
- unsigned int *mask;
-
+Bool XQueryPointer(
+ register Display *dpy,
+ Window w,
+ Window *root,
+ Window *child,
+ int *root_x,
+ int *root_y,
+ int *win_x,
+ int *win_y,
+ unsigned int *mask)
{
xQueryPointerReply rep;
xResourceReq *req;
diff --git a/src/QuStipShp.c b/src/QuStipShp.c
index 0d7c00d..96fdf98 100644
--- a/src/QuStipShp.c
+++ b/src/QuStipShp.c
@@ -31,11 +31,13 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XQueryBestStipple(dpy, drawable, width, height, ret_width, ret_height)
- register Display *dpy;
- Drawable drawable;
- unsigned int width, height;
- unsigned int *ret_width, *ret_height;
+Status XQueryBestStipple(
+ register Display *dpy,
+ Drawable drawable,
+ unsigned int width,
+ unsigned int height,
+ unsigned int *ret_width,
+ unsigned int *ret_height)
{
xQueryBestSizeReply rep;
register xQueryBestSizeReq *req;
diff --git a/src/QuTileShp.c b/src/QuTileShp.c
index 5e23ae2..5effa6c 100644
--- a/src/QuTileShp.c
+++ b/src/QuTileShp.c
@@ -31,11 +31,13 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XQueryBestTile(dpy, drawable, width, height, ret_width, ret_height)
- register Display *dpy;
- Drawable drawable;
- unsigned int width, height;
- unsigned int *ret_width, *ret_height;
+Status XQueryBestTile(
+ register Display *dpy,
+ Drawable drawable,
+ unsigned int width,
+ unsigned int height,
+ unsigned int *ret_width,
+ unsigned int *ret_height)
{
xQueryBestSizeReply rep;
register xQueryBestSizeReq *req;
diff --git a/src/QuTree.c b/src/QuTree.c
index 1a74328..3fd72f0 100644
--- a/src/QuTree.c
+++ b/src/QuTree.c
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Status XQueryTree (dpy, w, root, parent, children, nchildren)
- register Display *dpy;
- Window w;
- Window *root; /* RETURN */
- Window *parent; /* RETURN */
- Window **children; /* RETURN */
- unsigned int *nchildren; /* RETURN */
+Status XQueryTree (
+ register Display *dpy,
+ Window w,
+ Window *root, /* RETURN */
+ Window *parent, /* RETURN */
+ Window **children, /* RETURN */
+ unsigned int *nchildren) /* RETURN */
{
long nbytes;
xQueryTreeReply rep;
diff --git a/src/Quarks.c b/src/Quarks.c
index a5ffa8a..2087396 100644
--- a/src/Quarks.c
+++ b/src/Quarks.c
@@ -382,7 +382,7 @@ XrmPermStringToQuark(
return _XrmInternalStringToQuark(name, tname-(char *)name-1, sig, True);
}
-XrmQuark XrmUniqueQuark()
+XrmQuark XrmUniqueQuark(void)
{
XrmQuark q;
@@ -395,8 +395,7 @@ XrmQuark XrmUniqueQuark()
return q;
}
-XrmString XrmQuarkToString(quark)
- register XrmQuark quark;
+XrmString XrmQuarkToString(register XrmQuark quark)
{
XrmString s;
diff --git a/src/RaiseWin.c b/src/RaiseWin.c
index 15d03fa..585e9b1 100644
--- a/src/RaiseWin.c
+++ b/src/RaiseWin.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XRaiseWindow (dpy, w)
- register Display *dpy;
- Window w;
+XRaiseWindow (
+ register Display *dpy,
+ Window w)
{
register xConfigureWindowReq *req;
unsigned long val = Above; /* needed for macro below */
diff --git a/src/RecolorC.c b/src/RecolorC.c
index 0bd46d6..4f575ae 100644
--- a/src/RecolorC.c
+++ b/src/RecolorC.c
@@ -32,10 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XRecolorCursor(dpy, cursor, foreground, background)
- register Display *dpy;
- Cursor cursor;
- XColor *foreground, *background;
+XRecolorCursor(
+ register Display *dpy,
+ Cursor cursor,
+ XColor *foreground,
+ XColor *background)
{
register xRecolorCursorReq *req;
diff --git a/src/ReconfWM.c b/src/ReconfWM.c
index ecb5f6a..8c4ec16 100644
--- a/src/ReconfWM.c
+++ b/src/ReconfWM.c
@@ -37,12 +37,12 @@ from The Open Group.
#define AllMaskBits (CWX|CWY|CWWidth|CWHeight|\
CWBorderWidth|CWSibling|CWStackMode)
-Status XReconfigureWMWindow (dpy, w, screen, mask, changes)
- register Display *dpy;
- Window w;
- int screen;
- unsigned int mask;
- XWindowChanges *changes;
+Status XReconfigureWMWindow (
+ register Display *dpy,
+ Window w,
+ int screen,
+ unsigned int mask,
+ XWindowChanges *changes)
{
XConfigureRequestEvent ev;
Window root = RootWindow (dpy, screen);
diff --git a/src/ReconfWin.c b/src/ReconfWin.c
index 1aaa652..71a3a1b 100644
--- a/src/ReconfWin.c
+++ b/src/ReconfWin.c
@@ -35,12 +35,12 @@ in this Software without prior written authorization from The \
Open Group. CWBorderWidth|CWSibling|CWStackMode)
int
-XConfigureWindow(dpy, w, mask, changes)
- register Display *dpy;
- Window w;
- unsigned int mask;
- XWindowChanges *changes;
- {
+XConfigureWindow(
+ register Display *dpy,
+ Window w,
+ unsigned int mask,
+ XWindowChanges *changes)
+{
unsigned long values[7];
register unsigned long *value = values;
long nvalues;
@@ -80,4 +80,4 @@ XConfigureWindow(dpy, w, mask, changes)
UnlockDisplay(dpy);
SyncHandle();
return 1;
- }
+}
diff --git a/src/RepWindow.c b/src/RepWindow.c
index b30340e..3ffb322 100644
--- a/src/RepWindow.c
+++ b/src/RepWindow.c
@@ -32,10 +32,12 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XReparentWindow(dpy, w, p, x, y)
- register Display *dpy;
- Window w, p;
- int x, y;
+XReparentWindow(
+ register Display *dpy,
+ Window w,
+ Window p,
+ int x,
+ int y)
{
register xReparentWindowReq *req;
@@ -49,4 +51,3 @@ XReparentWindow(dpy, w, p, x, y)
SyncHandle();
return 1;
}
-
diff --git a/src/RestackWs.c b/src/RestackWs.c
index 1887e7c..4b96210 100644
--- a/src/RestackWs.c
+++ b/src/RestackWs.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XRestackWindows (dpy, windows, n)
- register Display *dpy;
- register Window *windows;
- int n;
- {
+XRestackWindows (
+ register Display *dpy,
+ register Window *windows,
+ int n)
+{
int i = 0;
#ifdef MUSTCOPY
unsigned long val = Below; /* needed for macro below */
@@ -65,8 +65,4 @@ XRestackWindows (dpy, windows, n)
UnlockDisplay(dpy);
SyncHandle();
return 1;
- }
-
-
-
-
+}
diff --git a/src/RotProp.c b/src/RotProp.c
index a8f8119..7c626f3 100644
--- a/src/RotProp.c
+++ b/src/RotProp.c
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XRotateWindowProperties(dpy, w, properties, nprops, npositions)
- register Display *dpy;
- Window w;
- Atom *properties;
- register int nprops;
- int npositions;
- {
+XRotateWindowProperties(
+ register Display *dpy,
+ Window w,
+ Atom *properties,
+ register int nprops,
+ int npositions)
+{
register long nbytes;
register xRotatePropertiesReq *req;
@@ -57,9 +57,4 @@ XRotateWindowProperties(dpy, w, properties, nprops, npositions)
UnlockDisplay(dpy);
SyncHandle();
return 1;
- }
-
-
-
-
-
+}
diff --git a/src/ScrResStr.c b/src/ScrResStr.c
index 89f7717..8948e24 100644
--- a/src/ScrResStr.c
+++ b/src/ScrResStr.c
@@ -31,8 +31,7 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
#include <X11/Xatom.h>
-char *XScreenResourceString(screen)
- Screen *screen;
+char *XScreenResourceString(Screen *screen)
{
Atom prop_name;
Atom actual_type;
diff --git a/src/SelInput.c b/src/SelInput.c
index e517a5c..e4bcad3 100644
--- a/src/SelInput.c
+++ b/src/SelInput.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSelectInput (dpy, w, mask)
- register Display *dpy;
- Window w;
- long mask;
+XSelectInput (
+ register Display *dpy,
+ Window w,
+ long mask)
{
register xChangeWindowAttributesReq *req;
diff --git a/src/SendEvent.c b/src/SendEvent.c
index a714dd1..bc35647 100644
--- a/src/SendEvent.c
+++ b/src/SendEvent.c
@@ -37,12 +37,12 @@ in this Software without prior written authorization from The \
Open Group.
* event converter here if it has never been installed.
*/
Status
-XSendEvent(dpy, w, propagate, event_mask, event)
- register Display *dpy;
- Window w;
- Bool propagate;
- long event_mask;
- XEvent *event;
+XSendEvent(
+ register Display *dpy,
+ Window w,
+ Bool propagate,
+ long event_mask,
+ XEvent *event)
{
register xSendEventReq *req;
xEvent ev;
diff --git a/src/SetBack.c b/src/SetBack.c
index 037933f..14f2b15 100644
--- a/src/SetBack.c
+++ b/src/SetBack.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetBackground (dpy, gc, background)
-register Display *dpy;
-GC gc;
-unsigned long background; /* CARD32 */
+XSetBackground (
+ register Display *dpy,
+ GC gc,
+ unsigned long background) /* CARD32 */
{
LockDisplay(dpy);
if (gc->values.background != background) {
diff --git a/src/SetCRects.c b/src/SetCRects.c
index a8dcf66..1e870f9 100644
--- a/src/SetCRects.c
+++ b/src/SetCRects.c
@@ -64,14 +64,14 @@ void _XSetClipRectangles (
}
int
-XSetClipRectangles (dpy, gc, clip_x_origin, clip_y_origin, rectangles, n,
- ordering)
- register Display *dpy;
- GC gc;
- int clip_x_origin, clip_y_origin;
- XRectangle *rectangles;
- int n;
- int ordering;
+XSetClipRectangles (
+ register Display *dpy,
+ GC gc,
+ int clip_x_origin,
+ int clip_y_origin,
+ XRectangle *rectangles,
+ int n,
+ int ordering)
{
LockDisplay(dpy);
_XSetClipRectangles (dpy, gc, clip_x_origin, clip_y_origin, rectangles, n,
diff --git a/src/SetClMask.c b/src/SetClMask.c
index f9fb051..a715d03 100644
--- a/src/SetClMask.c
+++ b/src/SetClMask.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetClipMask (dpy, gc, mask)
-register Display *dpy;
-GC gc;
-Pixmap mask;
+XSetClipMask (
+ register Display *dpy,
+ GC gc,
+ Pixmap mask)
{
LockDisplay(dpy);
/* always update, since client may have changed pixmap contents */
diff --git a/src/SetClOrig.c b/src/SetClOrig.c
index 60f0346..96d3713 100644
--- a/src/SetClOrig.c
+++ b/src/SetClOrig.c
@@ -32,10 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetClipOrigin (dpy, gc, xorig, yorig)
-register Display *dpy;
-GC gc;
-int xorig, yorig;
+XSetClipOrigin (
+ register Display *dpy,
+ GC gc,
+ int xorig,
+ int yorig)
{
XGCValues *gv = &gc->values;
diff --git a/src/SetFPath.c b/src/SetFPath.c
index 086c657..fe70ee2 100644
--- a/src/SetFPath.c
+++ b/src/SetFPath.c
@@ -34,10 +34,10 @@ in this Software without prior written authorization from The \
Open Group. #define safestrlen(s) ((s) ? strlen(s) : 0)
int
-XSetFontPath (dpy, directories, ndirs)
-register Display *dpy;
-char **directories;
-int ndirs;
+XSetFontPath (
+ register Display *dpy,
+ char **directories,
+ int ndirs)
{
register int n = 0;
register int i;
diff --git a/src/SetFont.c b/src/SetFont.c
index 089960d..4827b89 100644
--- a/src/SetFont.c
+++ b/src/SetFont.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetFont (dpy, gc, font)
-register Display *dpy;
-GC gc;
-Font font;
+XSetFont (
+ register Display *dpy,
+ GC gc,
+ Font font)
{
LockDisplay(dpy);
if (gc->values.font != font) {
diff --git a/src/SetFore.c b/src/SetFore.c
index 62ffb8f..e04b4fd 100644
--- a/src/SetFore.c
+++ b/src/SetFore.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetForeground (dpy, gc, foreground)
-register Display *dpy;
-GC gc;
-unsigned long foreground; /* CARD32 */
+XSetForeground (
+ register Display *dpy,
+ GC gc,
+ unsigned long foreground) /* CARD32 */
{
LockDisplay(dpy);
if (gc->values.foreground != foreground) {
diff --git a/src/SetFunc.c b/src/SetFunc.c
index a253266..f29c617 100644
--- a/src/SetFunc.c
+++ b/src/SetFunc.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetFunction (dpy, gc, function)
-register Display *dpy;
-GC gc;
-int function;
+XSetFunction (
+ register Display *dpy,
+ GC gc,
+ int function)
{
LockDisplay(dpy);
if (gc->values.function != function) {
diff --git a/src/SetHints.c b/src/SetHints.c
index a918e4e..130e7ca 100644
--- a/src/SetHints.c
+++ b/src/SetHints.c
@@ -60,11 +60,11 @@ SOFTWARE.
#define safestrlen(s) ((s) ? strlen(s) : 0)
int
-XSetSizeHints(dpy, w, hints, property) /* old routine */
- Display *dpy;
- Window w;
- XSizeHints *hints;
- Atom property;
+XSetSizeHints( /* old routine */
+ Display *dpy,
+ Window w,
+ XSizeHints *hints,
+ Atom property)
{
xPropSizeHints prop;
memset(&prop, 0, sizeof(prop));
@@ -106,10 +106,10 @@ XSetSizeHints(dpy, w, hints, property) /* old routine */
*/
int
-XSetWMHints (dpy, w, wmhints)
- Display *dpy;
- Window w;
- XWMHints *wmhints;
+XSetWMHints (
+ Display *dpy,
+ Window w,
+ XWMHints *wmhints)
{
xPropWMHints prop;
memset(&prop, 0, sizeof(prop));
@@ -143,10 +143,10 @@ XSetWMHints (dpy, w, wmhints)
*/
int
-XSetZoomHints (dpy, w, zhints)
- Display *dpy;
- Window w;
- XSizeHints *zhints;
+XSetZoomHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *zhints)
{
return XSetSizeHints (dpy, w, zhints, XA_WM_ZOOM_HINTS);
}
@@ -158,10 +158,10 @@ XSetZoomHints (dpy, w, zhints)
*/
int
-XSetNormalHints (dpy, w, hints) /* old routine */
- Display *dpy;
- Window w;
- XSizeHints *hints;
+XSetNormalHints ( /* old routine */
+ Display *dpy,
+ Window w,
+ XSizeHints *hints)
{
return XSetSizeHints (dpy, w, hints, XA_WM_NORMAL_HINTS);
}
@@ -175,11 +175,11 @@ XSetNormalHints (dpy, w, hints) /* old routine */
*/
int
-XSetIconSizes (dpy, w, list, count)
- Display *dpy;
- Window w; /* typically, root */
- XIconSize *list;
- int count; /* number of items on the list */
+XSetIconSizes (
+ Display *dpy,
+ Window w, /* typically, root */
+ XIconSize *list,
+ int count) /* number of items on the list */
{
register int i;
xPropIconSize *pp, *prop;
@@ -206,11 +206,11 @@ XSetIconSizes (dpy, w, list, count)
}
int
-XSetCommand (dpy, w, argv, argc)
- Display *dpy;
- Window w;
- char **argv;
- int argc;
+XSetCommand (
+ Display *dpy,
+ Window w,
+ char **argv,
+ int argc)
{
register int i;
register int nbytes;
@@ -278,20 +278,20 @@ XSetStandardProperties (
}
int
-XSetTransientForHint(dpy, w, propWindow)
- Display *dpy;
- Window w;
- Window propWindow;
+XSetTransientForHint(
+ Display *dpy,
+ Window w,
+ Window propWindow)
{
return XChangeProperty(dpy, w, XA_WM_TRANSIENT_FOR, XA_WINDOW, 32,
PropModeReplace, (unsigned char *) &propWindow, 1);
}
int
-XSetClassHint(dpy, w, classhint)
- Display *dpy;
- Window w;
- XClassHint *classhint;
+XSetClassHint(
+ Display *dpy,
+ Window w,
+ XClassHint *classhint)
{
char *class_string;
char *s;
diff --git a/src/SetIFocus.c b/src/SetIFocus.c
index 4f42908..37f796d 100644
--- a/src/SetIFocus.c
+++ b/src/SetIFocus.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetInputFocus(dpy, focus, revert_to, time)
- register Display *dpy;
- Window focus;
- int revert_to;
- Time time;
+XSetInputFocus(
+ register Display *dpy,
+ Window focus,
+ int revert_to,
+ Time time)
{
register xSetInputFocusReq *req;
diff --git a/src/SetLStyle.c b/src/SetLStyle.c
index 74233d0..93bc97a 100644
--- a/src/SetLStyle.c
+++ b/src/SetLStyle.c
@@ -32,13 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetLineAttributes(dpy, gc, linewidth, linestyle, capstyle, joinstyle)
-register Display *dpy;
-GC gc;
-unsigned int linewidth; /* CARD16 */
-int linestyle;
-int capstyle;
-int joinstyle;
+XSetLineAttributes(
+ register Display *dpy,
+ GC gc,
+ unsigned int linewidth, /* CARD16 */
+ int linestyle,
+ int capstyle,
+ int joinstyle)
{
XGCValues *gv = &gc->values;
diff --git a/src/SetNrmHint.c b/src/SetNrmHint.c
index 9e659bb..2b2f240 100644
--- a/src/SetNrmHint.c
+++ b/src/SetNrmHint.c
@@ -60,11 +60,11 @@ from The Open Group.
#include <X11/Xatom.h>
#include <X11/Xos.h>
-void XSetWMSizeHints (dpy, w, hints, prop)
- Display *dpy;
- Window w;
- XSizeHints *hints;
- Atom prop;
+void XSetWMSizeHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *hints,
+ Atom prop)
{
xPropSizeHints data;
@@ -118,10 +118,10 @@ void XSetWMSizeHints (dpy, w, hints, prop)
}
-void XSetWMNormalHints (dpy, w, hints)
- Display *dpy;
- Window w;
- XSizeHints *hints;
+void XSetWMNormalHints (
+ Display *dpy,
+ Window w,
+ XSizeHints *hints)
{
XSetWMSizeHints (dpy, w, hints, XA_WM_NORMAL_HINTS);
}
diff --git a/src/SetPMask.c b/src/SetPMask.c
index 268ef4f..b81ea9d 100644
--- a/src/SetPMask.c
+++ b/src/SetPMask.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetPlaneMask (dpy, gc, planemask)
-register Display *dpy;
-GC gc;
-unsigned long planemask; /* CARD32 */
+XSetPlaneMask (
+ register Display *dpy,
+ GC gc,
+ unsigned long planemask) /* CARD32 */
{
LockDisplay(dpy);
if (gc->values.plane_mask != planemask) {
diff --git a/src/SetPntMap.c b/src/SetPntMap.c
index 4a98ad4..0ff45bc 100644
--- a/src/SetPntMap.c
+++ b/src/SetPntMap.c
@@ -56,14 +56,13 @@ XSetPointerMapping (
}
int
-XChangeKeyboardMapping (dpy, first_keycode, keysyms_per_keycode,
- keysyms, nkeycodes)
- register Display *dpy;
- int first_keycode;
- int keysyms_per_keycode;
- KeySym *keysyms;
- int nkeycodes;
- {
+XChangeKeyboardMapping (
+ register Display *dpy,
+ int first_keycode,
+ int keysyms_per_keycode,
+ KeySym *keysyms,
+ int nkeycodes)
+{
register long nbytes;
register xChangeKeyboardMappingReq *req;
@@ -79,5 +78,5 @@ XChangeKeyboardMapping (dpy, first_keycode, keysyms_per_keycode,
UnlockDisplay(dpy);
SyncHandle();
return 0;
- }
+}
diff --git a/src/SetRGBCMap.c b/src/SetRGBCMap.c
index 4be840b..d9eda53 100644
--- a/src/SetRGBCMap.c
+++ b/src/SetRGBCMap.c
@@ -36,12 +36,12 @@ from The Open Group.
#include "Xatomtype.h"
#include <X11/Xatom.h>
-void XSetRGBColormaps (dpy, w, cmaps, count, property)
- Display *dpy;
- Window w;
- XStandardColormap *cmaps;
- int count;
- Atom property; /* XA_RGB_BEST_MAP, etc. */
+void XSetRGBColormaps (
+ Display *dpy,
+ Window w,
+ XStandardColormap *cmaps,
+ int count,
+ Atom property) /* XA_RGB_BEST_MAP, etc. */
{
register int i; /* iterator variable */
register xPropStandardColormap *map; /* tmp variable, data in prop */
diff --git a/src/SetSOwner.c b/src/SetSOwner.c
index f692cce..5dfc133 100644
--- a/src/SetSOwner.c
+++ b/src/SetSOwner.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetSelectionOwner(dpy, selection, owner, time)
-register Display *dpy;
-Atom selection;
-Window owner;
-Time time;
+XSetSelectionOwner(
+ register Display *dpy,
+ Atom selection,
+ Window owner,
+ Time time)
{
register xSetSelectionOwnerReq *req;
diff --git a/src/SetSSaver.c b/src/SetSSaver.c
index 43fd4df..3497727 100644
--- a/src/SetSSaver.c
+++ b/src/SetSSaver.c
@@ -32,9 +32,12 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XSetScreenSaver(dpy, timeout, interval, prefer_blank, allow_exp)
- register Display *dpy;
- int timeout, interval, prefer_blank, allow_exp;
+XSetScreenSaver(
+ register Display *dpy,
+ int timeout,
+ int interval,
+ int prefer_blank,
+ int allow_exp)
{
register xSetScreenSaverReq *req;
diff --git a/src/SetStCmap.c b/src/SetStCmap.c
index b5a93e3..aeae6cd 100644
--- a/src/SetStCmap.c
+++ b/src/SetStCmap.c
@@ -62,11 +62,11 @@ SOFTWARE.
* in the XStandardColormap structure.
*/
-void XSetStandardColormap(dpy, w, cmap, property)
- Display *dpy;
- Window w;
- XStandardColormap *cmap;
- Atom property; /* XA_RGB_BEST_MAP, etc. */
+void XSetStandardColormap(
+ Display *dpy,
+ Window w,
+ XStandardColormap *cmap,
+ Atom property) /* XA_RGB_BEST_MAP, etc. */
{
Screen *sp;
XStandardColormap stdcmap;
diff --git a/src/SetState.c b/src/SetState.c
index a13f11b..0f02611 100644
--- a/src/SetState.c
+++ b/src/SetState.c
@@ -32,12 +32,13 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetState(dpy, gc, foreground, background, function, planemask)
-register Display *dpy;
-GC gc;
-int function;
-unsigned long planemask;
-unsigned long foreground, background;
+XSetState(
+ register Display *dpy,
+ GC gc,
+ unsigned long foreground,
+ unsigned long background,
+ int function,
+ unsigned long planemask)
{
XGCValues *gv = &gc->values;
diff --git a/src/SetStip.c b/src/SetStip.c
index 41ebdad..dad429e 100644
--- a/src/SetStip.c
+++ b/src/SetStip.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetStipple (dpy, gc, stipple)
-register Display *dpy;
-GC gc;
-Pixmap stipple;
+XSetStipple (
+ register Display *dpy,
+ GC gc,
+ Pixmap stipple)
{
LockDisplay(dpy);
/* always update, since client may have changed pixmap contents */
diff --git a/src/SetTSOrig.c b/src/SetTSOrig.c
index c75707e..56914a1 100644
--- a/src/SetTSOrig.c
+++ b/src/SetTSOrig.c
@@ -32,10 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetTSOrigin (dpy, gc, x, y)
-register Display *dpy;
-GC gc;
-int x, y;
+XSetTSOrigin (
+ register Display *dpy,
+ GC gc,
+ int x,
+ int y)
{
XGCValues *gv = &gc->values;
diff --git a/src/SetTile.c b/src/SetTile.c
index d9ca811..574ba92 100644
--- a/src/SetTile.c
+++ b/src/SetTile.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XSetTile (dpy, gc, tile)
-register Display *dpy;
-GC gc;
-Pixmap tile;
+XSetTile (
+ register Display *dpy,
+ GC gc,
+ Pixmap tile)
{
LockDisplay(dpy);
/* always update, since client may have changed pixmap contents */
diff --git a/src/SetTxtProp.c b/src/SetTxtProp.c
index a82d9b3..65f9855 100644
--- a/src/SetTxtProp.c
+++ b/src/SetTxtProp.c
@@ -58,36 +58,36 @@ from The Open Group.
#include <X11/Xos.h>
#include <stdio.h>
-void XSetTextProperty (dpy, w, tp, property)
- Display *dpy;
- Window w;
- Atom property;
- XTextProperty *tp;
+void XSetTextProperty (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp,
+ Atom property)
{
XChangeProperty (dpy, w, property, tp->encoding, tp->format,
PropModeReplace, tp->value, tp->nitems);
}
-void XSetWMName (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+void XSetWMName (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
XSetTextProperty (dpy, w, tp, XA_WM_NAME);
}
-void XSetWMIconName (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+void XSetWMIconName (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
XSetTextProperty (dpy, w, tp, XA_WM_ICON_NAME);
}
-void XSetWMClientMachine (dpy, w, tp)
- Display *dpy;
- Window w;
- XTextProperty *tp;
+void XSetWMClientMachine (
+ Display *dpy,
+ Window w,
+ XTextProperty *tp)
{
XSetTextProperty (dpy, w, tp, XA_WM_CLIENT_MACHINE);
}
diff --git a/src/SetWMCMapW.c b/src/SetWMCMapW.c
index dd88061..efb3805 100644
--- a/src/SetWMCMapW.c
+++ b/src/SetWMCMapW.c
@@ -58,11 +58,11 @@ SOFTWARE.
* WM_COLORMAP_WINDOWS type: WINDOW format:32
*/
-Status XSetWMColormapWindows (dpy, w, windows, count)
- Display *dpy;
- Window w;
- Window *windows;
- int count;
+Status XSetWMColormapWindows (
+ Display *dpy,
+ Window w,
+ Window *windows,
+ int count)
{
Atom prop;
diff --git a/src/SetWMProto.c b/src/SetWMProto.c
index 8640e50..ed07316 100644
--- a/src/SetWMProto.c
+++ b/src/SetWMProto.c
@@ -58,11 +58,11 @@ SOFTWARE.
* WM_PROTOCOLS type: ATOM format: 32
*/
-Status XSetWMProtocols (dpy, w, protocols, count)
- Display *dpy;
- Window w;
- Atom *protocols;
- int count;
+Status XSetWMProtocols (
+ Display *dpy,
+ Window w,
+ Atom *protocols,
+ int count)
{
Atom prop;
diff --git a/src/StBytes.c b/src/StBytes.c
index b239025..b81e7a1 100644
--- a/src/StBytes.c
+++ b/src/StBytes.c
@@ -44,17 +44,17 @@ static Atom n_to_atom[8] = {
XA_CUT_BUFFER7};
int
-XRotateBuffers (dpy, rotate)
- register Display *dpy;
- int rotate;
+XRotateBuffers (
+ register Display *dpy,
+ int rotate)
{
return XRotateWindowProperties(dpy, RootWindow(dpy, 0), n_to_atom, 8, rotate);
}
-char *XFetchBuffer (dpy, nbytes, buffer)
- register Display *dpy;
- int *nbytes;
- register int buffer;
+char *XFetchBuffer (
+ register Display *dpy,
+ int *nbytes,
+ register int buffer)
{
Atom actual_type;
int actual_format;
@@ -77,9 +77,9 @@ char *XFetchBuffer (dpy, nbytes, buffer)
return(NULL);
}
-char *XFetchBytes (dpy, nbytes)
- register Display *dpy;
- int *nbytes;
+char *XFetchBytes (
+ register Display *dpy,
+ int *nbytes)
{
return (XFetchBuffer (dpy, nbytes, 0));
}
diff --git a/src/StColor.c b/src/StColor.c
index b2b197a..b35d83b 100644
--- a/src/StColor.c
+++ b/src/StColor.c
@@ -32,10 +32,10 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XStoreColor(dpy, cmap, def)
-register Display *dpy;
-Colormap cmap;
-XColor *def;
+XStoreColor(
+ register Display *dpy,
+ Colormap cmap,
+ XColor *def)
{
xColorItem *citem;
register xStoreColorsReq *req;
diff --git a/src/StColors.c b/src/StColors.c
index 16d634b..f3a6b58 100644
--- a/src/StColors.c
+++ b/src/StColors.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XStoreColors(dpy, cmap, defs, ncolors)
-register Display *dpy;
-Colormap cmap;
-XColor *defs;
-int ncolors;
+XStoreColors(
+ register Display *dpy,
+ Colormap cmap,
+ XColor *defs,
+ int ncolors)
{
register int i;
xColorItem citem;
diff --git a/src/StrToText.c b/src/StrToText.c
index ba894e1..5ff6290 100644
--- a/src/StrToText.c
+++ b/src/StrToText.c
@@ -39,10 +39,10 @@ in this Software without prior written authorization from The \
Open Group.
* count.
*/
-Status XStringListToTextProperty (argv, argc, textprop)
- char **argv;
- int argc;
- XTextProperty *textprop;
+Status XStringListToTextProperty (
+ char **argv,
+ int argc,
+ XTextProperty *textprop)
{
register int i;
register unsigned int nbytes;
diff --git a/src/Sync.c b/src/Sync.c
index 6e9f300..3f2f4ce 100644
--- a/src/Sync.c
+++ b/src/Sync.c
@@ -36,9 +36,9 @@ in this Software without prior written authorization from The Open \
Group. /* Synchronize with errors and events, optionally discarding pending events \
*/
int
-XSync (dpy, discard)
- register Display *dpy;
- Bool discard;
+XSync (
+ register Display *dpy,
+ Bool discard)
{
xGetInputFocusReply rep;
register xReq *req;
diff --git a/src/TextToStr.c b/src/TextToStr.c
index 0bea809..a32de87 100644
--- a/src/TextToStr.c
+++ b/src/TextToStr.c
@@ -40,10 +40,10 @@ in this Software without prior written authorization from The \
Open Group.
* null-separated STRING property.
*/
-Status XTextPropertyToStringList (tp, list_return, count_return)
- XTextProperty *tp;
- char ***list_return;
- int *count_return;
+Status XTextPropertyToStringList (
+ XTextProperty *tp,
+ char ***list_return,
+ int *count_return)
{
char **list; /* return value */
int nelements; /* return value */
@@ -109,8 +109,7 @@ Status XTextPropertyToStringList (tp, list_return, count_return)
}
-void XFreeStringList (list)
- char **list;
+void XFreeStringList (char **list)
{
if (list) {
if (list[0]) Xfree (list[0]);
diff --git a/src/TrCoords.c b/src/TrCoords.c
index 87ae4ae..d0e0562 100644
--- a/src/TrCoords.c
+++ b/src/TrCoords.c
@@ -31,13 +31,15 @@ in this Software without prior written authorization from The \
Open Group. #endif
#include "Xlibint.h"
-Bool XTranslateCoordinates(dpy, src_win, dest_win, src_x, src_y,
- dst_x, dst_y, child)
- register Display *dpy;
- Window src_win, dest_win;
- int src_x, src_y;
- int *dst_x, *dst_y;
- Window *child;
+Bool XTranslateCoordinates(
+ register Display *dpy,
+ Window src_win,
+ Window dest_win,
+ int src_x,
+ int src_y,
+ int *dst_x,
+ int *dst_y,
+ Window *child)
{
register xTranslateCoordsReq *req;
xTranslateCoordsReply rep;
diff --git a/src/UndefCurs.c b/src/UndefCurs.c
index 6382a83..7cfc07b 100644
--- a/src/UndefCurs.c
+++ b/src/UndefCurs.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUndefineCursor (dpy,w)
- register Display *dpy;
- Window w;
+XUndefineCursor (
+ register Display *dpy,
+ Window w)
{
register xChangeWindowAttributesReq *req;
unsigned long defcurs = None;
diff --git a/src/UngrabBut.c b/src/UngrabBut.c
index 82b1791..8d0e2a8 100644
--- a/src/UngrabBut.c
+++ b/src/UngrabBut.c
@@ -32,11 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XUngrabButton(dpy, button, modifiers, grab_window)
-register Display *dpy;
-unsigned int button; /* CARD8 */
-unsigned int modifiers; /* CARD16 */
-Window grab_window;
+XUngrabButton(
+ register Display *dpy,
+ unsigned int button, /* CARD8 */
+ unsigned int modifiers, /* CARD16 */
+ Window grab_window)
{
register xUngrabButtonReq *req;
diff --git a/src/UngrabKbd.c b/src/UngrabKbd.c
index 03d24b9..e0b2086 100644
--- a/src/UngrabKbd.c
+++ b/src/UngrabKbd.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUngrabKeyboard (dpy, time)
- register Display *dpy;
- Time time;
+XUngrabKeyboard (
+ register Display *dpy,
+ Time time)
{
register xResourceReq *req;
diff --git a/src/UngrabKey.c b/src/UngrabKey.c
index 66c691f..70dc9f6 100644
--- a/src/UngrabKey.c
+++ b/src/UngrabKey.c
@@ -32,12 +32,11 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XUngrabKey(dpy, key, modifiers, grab_window)
- register Display *dpy;
- int key;
- unsigned int modifiers;
- Window grab_window;
-
+XUngrabKey(
+ register Display *dpy,
+ int key,
+ unsigned int modifiers,
+ Window grab_window)
{
register xUngrabKeyReq *req;
diff --git a/src/UngrabPtr.c b/src/UngrabPtr.c
index 42890ff..8a3bbed 100644
--- a/src/UngrabPtr.c
+++ b/src/UngrabPtr.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUngrabPointer(dpy, time)
-register Display *dpy;
-Time time;
+XUngrabPointer(
+ register Display *dpy,
+ Time time)
{
register xResourceReq *req;
diff --git a/src/UngrabSvr.c b/src/UngrabSvr.c
index 19764f6..3c974f1 100644
--- a/src/UngrabSvr.c
+++ b/src/UngrabSvr.c
@@ -32,8 +32,8 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUngrabServer (dpy)
-register Display *dpy;
+XUngrabServer (
+ register Display *dpy)
{
register xReq *req;
diff --git a/src/UninsCmap.c b/src/UninsCmap.c
index 9a3d998..d8d16d9 100644
--- a/src/UninsCmap.c
+++ b/src/UninsCmap.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUninstallColormap(dpy, cmap)
-register Display *dpy;
-Colormap cmap;
+XUninstallColormap(
+ register Display *dpy,
+ Colormap cmap)
{
register xResourceReq *req;
diff --git a/src/UnldFont.c b/src/UnldFont.c
index f90291e..2394e2d 100644
--- a/src/UnldFont.c
+++ b/src/UnldFont.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUnloadFont(dpy, font)
- register Display *dpy;
- Font font;
+XUnloadFont(
+ register Display *dpy,
+ Font font)
{
register xResourceReq *req;
diff --git a/src/UnmapSubs.c b/src/UnmapSubs.c
index 503a6c9..8df63d4 100644
--- a/src/UnmapSubs.c
+++ b/src/UnmapSubs.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUnmapSubwindows(dpy, win)
-register Display *dpy;
-Window win;
+XUnmapSubwindows(
+ register Display *dpy,
+ Window win)
{
register xResourceReq *req;
diff --git a/src/UnmapWin.c b/src/UnmapWin.c
index 1a9cc0c..dca0035 100644
--- a/src/UnmapWin.c
+++ b/src/UnmapWin.c
@@ -32,9 +32,9 @@ in this Software without prior written authorization from The Open \
Group. #include "Xlibint.h"
int
-XUnmapWindow (dpy, w)
- register Display *dpy;
- Window w;
+XUnmapWindow (
+ register Display *dpy,
+ Window w)
{
register xResourceReq *req;
diff --git a/src/VisUtil.c b/src/VisUtil.c
index 304317a..53320ca 100644
--- a/src/VisUtil.c
+++ b/src/VisUtil.c
@@ -54,12 +54,11 @@ in this Software without prior written authorization from The \
Open Group.
* VisualAllMask
*/
-XVisualInfo *XGetVisualInfo( dpy, visual_info_mask,
- visual_info_template, nitems)
-Display *dpy;
-register long visual_info_mask;
-register XVisualInfo *visual_info_template;
-int *nitems; /* RETURN */
+XVisualInfo *XGetVisualInfo(
+ Display *dpy,
+ register long visual_info_mask,
+ register XVisualInfo *visual_info_template,
+ int *nitems) /* RETURN */
{
register Visual *vp;
@@ -190,12 +189,12 @@ int *nitems; /* RETURN */
* otherwise False is returned.
*/
-Status XMatchVisualInfo( dpy, screen, depth, class, visual_info)
- Display *dpy;
- int screen;
- int depth;
- int class;
- XVisualInfo *visual_info; /* RETURNED */
+Status XMatchVisualInfo(
+ Display *dpy,
+ int screen,
+ int depth,
+ int class,
+ XVisualInfo *visual_info) /* RETURNED */
{
Visual *vp;
diff --git a/src/WMProps.c b/src/WMProps.c
index 62c6a8d..06c76a1 100644
--- a/src/WMProps.c
+++ b/src/WMProps.c
@@ -73,17 +73,16 @@ SOFTWARE.
* WM_CLASS type: STRING/STRING format: 8
*/
-void XSetWMProperties (dpy, w, windowName, iconName, argv, argc, sizeHints,
- wmHints, classHints)
- Display *dpy;
- Window w; /* window to decorate */
- XTextProperty *windowName; /* name of application */
- XTextProperty *iconName; /* name string for icon */
- char **argv; /* command line */
- int argc; /* size of command line */
- XSizeHints *sizeHints; /* size hints for window in its normal state */
- XWMHints *wmHints; /* miscelaneous window manager hints */
- XClassHint *classHints; /* resource name and class */
+void XSetWMProperties (
+ Display *dpy,
+ Window w, /* window to decorate */
+ XTextProperty *windowName, /* name of application */
+ XTextProperty *iconName, /* name string for icon */
+ char **argv, /* command line */
+ int argc, /* size of command line */
+ XSizeHints *sizeHints, /* size hints for window in its normal state */
+ XWMHints *wmHints, /* miscelaneous window manager hints */
+ XClassHint *classHints) /* resource name and class */
{
XTextProperty textprop;
char hostName[256];
diff --git a/src/WarpPtr.c b/src/WarpPtr.c
index 545cc06..d8b1bc9 100644
--- a/src/WarpPtr.c
+++ b/src/WarpPtr.c
@@ -32,13 +32,16 @@ in this Software without prior written authorization from The \
Open Group. #include "Xlibint.h"
int
-XWarpPointer(dpy, src_win, dest_win, src_x, src_y, src_width, src_height,
- dest_x, dest_y)
- register Display *dpy;
- Window src_win, dest_win;
- int src_x, src_y;
- unsigned int src_width, src_height;
- int dest_x, dest_y;
+XWarpPointer(
+ register Display *dpy,
+ Window src_win,
+ Window dest_win,
+ int src_x,
+ int src_y,
+ unsigned int src_width,
+ unsigned int src_height,
+ int dest_x,
+ int dest_y)
{
register xWarpPointerReq *req;
diff --git a/src/WinEvent.c b/src/WinEvent.c
index 67e825c..8839f35 100644
--- a/src/WinEvent.c
+++ b/src/WinEvent.c
@@ -46,11 +46,11 @@ extern long const _Xevent_to_mask[];
*/
int
-XWindowEvent (dpy, w, mask, event)
- register Display *dpy;
- Window w; /* Selected window. */
- long mask; /* Selected event mask. */
- register XEvent *event; /* XEvent to be filled in. */
+XWindowEvent (
+ register Display *dpy,
+ Window w, /* Selected window. */
+ long mask, /* Selected event mask. */
+ register XEvent *event) /* XEvent to be filled in. */
{
register _XQEvent *prev, *qelt;
unsigned long qe_serial = 0;
diff --git a/src/Window.c b/src/Window.c
index 10d1b95..a40e748 100644
--- a/src/Window.c
+++ b/src/Window.c
@@ -99,17 +99,19 @@ void _XProcessWindowAttributes (
CWOverrideRedirect|CWSaveUnder|CWEventMask|\
CWDontPropagate|CWColormap|CWCursor)
-Window XCreateWindow(dpy, parent, x, y, width, height,
- borderWidth, depth, class, visual, valuemask, attributes)
- register Display *dpy;
- Window parent;
- int x, y;
- unsigned int width, height, borderWidth;
- int depth;
- unsigned int class;
- Visual *visual;
- unsigned long valuemask;
- XSetWindowAttributes *attributes;
+Window XCreateWindow(
+ register Display *dpy,
+ Window parent,
+ int x,
+ int y,
+ unsigned int width,
+ unsigned int height,
+ unsigned int borderWidth,
+ int depth,
+ unsigned int class,
+ Visual *visual,
+ unsigned long valuemask,
+ XSetWindowAttributes *attributes)
{
Window wid;
register xCreateWindowReq *req;
diff --git a/src/Withdraw.c b/src/Withdraw.c
index 1b771c2..2d135c4 100644
--- a/src/Withdraw.c
+++ b/src/Withdraw.c
@@ -64,10 +64,10 @@ from The Open Group.
* This function instructs the window manager to change this window from
* NormalState or IconicState to Withdrawn.
*/
-Status XWithdrawWindow (dpy, w, screen)
- Display *dpy;
- Window w;
- int screen;
+Status XWithdrawWindow (
+ Display *dpy,
+ Window w,
+ int screen)
{
XUnmapEvent ev;
Window root = RootWindow (dpy, screen);
diff --git a/src/XlibAsync.c b/src/XlibAsync.c
index a0314ba..6e963a6 100644
--- a/src/XlibAsync.c
+++ b/src/XlibAsync.c
@@ -36,12 +36,12 @@ from The Open Group.
/*ARGSUSED*/
Bool
-_XAsyncErrorHandler(dpy, rep, buf, len, data)
- register Display *dpy;
- register xReply *rep;
- char *buf;
- int len;
- XPointer data;
+_XAsyncErrorHandler(
+ register Display *dpy,
+ register xReply *rep,
+ char *buf,
+ int len,
+ XPointer data)
{
register _XAsyncErrorState *state;
@@ -64,9 +64,9 @@ _XAsyncErrorHandler(dpy, rep, buf, len, data)
return False;
}
-void _XDeqAsyncHandler(dpy, handler)
- Display *dpy;
- register _XAsyncHandler *handler;
+void _XDeqAsyncHandler(
+ Display *dpy,
+ register _XAsyncHandler *handler)
{
register _XAsyncHandler **prev;
register _XAsyncHandler *async;
@@ -80,14 +80,14 @@ void _XDeqAsyncHandler(dpy, handler)
}
char *
-_XGetAsyncReply(dpy, replbuf, rep, buf, len, extra, discard)
- register Display *dpy;
- register char *replbuf; /* data is read into this buffer */
- register xReply *rep; /* value passed to calling handler */
- char *buf; /* value passed to calling handler */
- int len; /* value passed to calling handler */
- int extra; /* extra words to read, ala _XReply */
- Bool discard; /* discard after extra?, ala _XReply */
+_XGetAsyncReply(
+ register Display *dpy,
+ register char *replbuf, /* data is read into this buffer */
+ register xReply *rep, /* value passed to calling handler */
+ char *buf, /* value passed to calling handler */
+ int len, /* value passed to calling handler */
+ int extra, /* extra words to read, ala _XReply */
+ Bool discard) /* discard after extra?, ala _XReply */
{
if (extra == 0) {
if (discard && (rep->generic.length << 2) > len)
@@ -127,15 +127,15 @@ _XGetAsyncReply(dpy, replbuf, rep, buf, len, extra, discard)
}
void
-_XGetAsyncData(dpy, data, buf, len, skip, datalen, discardtotal)
- Display *dpy;
- char *data; /* data is read into this buffer */
- char *buf; /* value passed to calling handler */
- int len; /* value passed to calling handler */
- int skip; /* number of bytes already read in previous
+_XGetAsyncData(
+ Display *dpy,
+ char *data, /* data is read into this buffer */
+ char *buf, /* value passed to calling handler */
+ int len, /* value passed to calling handler */
+ int skip, /* number of bytes already read in previous
_XGetAsyncReply or _XGetAsyncData calls */
- int datalen; /* size of data buffer in bytes */
- int discardtotal; /* min. bytes to consume (after skip) */
+ int datalen, /* size of data buffer in bytes */
+ int discardtotal) /* min. bytes to consume (after skip) */
{
buf += skip;
len -= skip;
diff --git a/src/imConv.c b/src/imConv.c
index 06042b9..408336b 100644
--- a/src/imConv.c
+++ b/src/imConv.c
@@ -158,13 +158,13 @@ static int lookup_string(
#define BUF_SIZE (20)
int
-_XimLookupMBText(ic, event, buffer, nbytes, keysym, status)
- Xic ic;
- XKeyEvent* event;
- char* buffer;
- int nbytes;
- KeySym* keysym;
- XComposeStatus* status;
+_XimLookupMBText(
+ Xic ic,
+ XKeyEvent* event,
+ char* buffer,
+ int nbytes,
+ KeySym* keysym,
+ XComposeStatus* status)
{
int count;
KeySym symbol;
@@ -229,13 +229,13 @@ _XimLookupMBText(ic, event, buffer, nbytes, keysym, status)
}
int
-_XimLookupWCText(ic, event, buffer, nbytes, keysym, status)
- Xic ic;
- XKeyEvent* event;
- wchar_t* buffer;
- int nbytes;
- KeySym* keysym;
- XComposeStatus* status;
+_XimLookupWCText(
+ Xic ic,
+ XKeyEvent* event,
+ wchar_t* buffer,
+ int nbytes,
+ KeySym* keysym,
+ XComposeStatus* status)
{
int count;
KeySym symbol;
@@ -301,13 +301,13 @@ _XimLookupWCText(ic, event, buffer, nbytes, keysym, status)
}
int
-_XimLookupUTF8Text(ic, event, buffer, nbytes, keysym, status)
- Xic ic;
- XKeyEvent* event;
- char* buffer;
- int nbytes;
- KeySym* keysym;
- XComposeStatus* status;
+_XimLookupUTF8Text(
+ Xic ic,
+ XKeyEvent* event,
+ char* buffer,
+ int nbytes,
+ KeySym* keysym,
+ XComposeStatus* status)
{
int count;
KeySym symbol;
struct _XCVList {
xcondition_t cv;
diff --git a/src/xcms/AddDIC.c b/src/xcms/AddDIC.c
index d2638b1..6f2987f 100644
--- a/src/xcms/AddDIC.c
+++ b/src/xcms/AddDIC.c
@@ -57,8 +57,7 @@
* SYNOPSIS
*/
Status
-XcmsAddColorSpace(pCS)
- XcmsColorSpace *pCS;
+XcmsAddColorSpace(XcmsColorSpace *pCS)
/*
* DESCRIPTION
* DI Color Spaces are managed on a global basis.
diff --git a/src/xcms/AddSF.c b/src/xcms/AddSF.c
index 3ab0514..395a234 100644
--- a/src/xcms/AddSF.c
+++ b/src/xcms/AddSF.c
@@ -57,8 +57,7 @@
* SYNOPSIS
*/
Status
-XcmsAddFunctionSet(pNewFS)
- XcmsFunctionSet *pNewFS;
+XcmsAddFunctionSet(XcmsFunctionSet *pNewFS)
/*
* DESCRIPTION
* Additional Screen Color Characterization Function Sets are
diff --git a/src/xcms/CCC.c b/src/xcms/CCC.c
index 7d4a9b1..3ba62cd 100644
--- a/src/xcms/CCC.c
+++ b/src/xcms/CCC.c
@@ -87,16 +87,15 @@ from The Open Group.
*/
XcmsCCC
-XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, gamutCompProc,
- gamutCompClientData, whitePtAdjProc, whitePtAdjClientData)
- Display *dpy;
- int screenNumber;
- Visual *visual;
- XcmsColor *clientWhitePt;
- XcmsCompressionProc gamutCompProc;
- XPointer gamutCompClientData;
- XcmsWhiteAdjustProc whitePtAdjProc;
- XPointer whitePtAdjClientData;
+XcmsCreateCCC(
+ Display *dpy,
+ int screenNumber,
+ Visual *visual,
+ XcmsColor *clientWhitePt,
+ XcmsCompressionProc gamutCompProc,
+ XPointer gamutCompClientData,
+ XcmsWhiteAdjustProc whitePtAdjProc,
+ XPointer whitePtAdjClientData)
/*
* DESCRIPTION
* Given a Display, Screen, Visual, etc., this routine creates
@@ -174,9 +173,9 @@ XcmsCreateCCC(dpy, screenNumber, visual, clientWhitePt, \
gamutCompProc,
* SYNOPSIS
*/
XcmsCCC
-XcmsDefaultCCC(dpy, screenNumber)
- Display *dpy;
- int screenNumber;
+XcmsDefaultCCC(
+ Display *dpy,
+ int screenNumber)
/*
* DESCRIPTION
* Given a Display and Screen, this routine creates
@@ -256,8 +255,7 @@ XcmsDefaultCCC(dpy, screenNumber)
* SYNOPSIS
*/
void
-XcmsFreeCCC(ccc)
- XcmsCCC ccc;
+XcmsFreeCCC(XcmsCCC ccc)
/*
* DESCRIPTION
* Frees memory associated with a Color Conversion Context
diff --git a/src/xcms/CvCols.c b/src/xcms/CvCols.c
index fc343cd..0fcd55e 100644
--- a/src/xcms/CvCols.c
+++ b/src/xcms/CvCols.c
@@ -714,12 +714,12 @@ Continue:
* SYNOPSIS
*/
Status
-XcmsConvertColors(ccc, pColors_in_out, nColors, targetFormat, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- XcmsColorFormat targetFormat;
- Bool *pCompressed;
+XcmsConvertColors(
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ XcmsColorFormat targetFormat,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Convert XcmsColor structures to another format
diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c
index b57e729..c242bac 100644
--- a/src/xcms/HVC.c
+++ b/src/xcms/HVC.c
@@ -330,11 +330,11 @@ XcmsTekHVC_ValidSpec(
* SYNOPSIS
*/
Status
-XcmsTekHVCToCIEuvY(ccc, pHVC_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pHVC_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsTekHVCToCIEuvY(
+ XcmsCCC ccc,
+ XcmsColor *pHVC_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Transforms an array of TekHVC color specifications, given
@@ -451,11 +451,11 @@ XcmsTekHVCToCIEuvY(ccc, pHVC_WhitePt, pColors_in_out, nColors)
* SYNOPSIS
*/
Status
-XcmsCIEuvYToTekHVC(ccc, pHVC_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pHVC_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIEuvYToTekHVC(
+ XcmsCCC ccc,
+ XcmsColor *pHVC_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Transforms an array of CIECIEuvY.color specifications, given
diff --git a/src/xcms/HVCGcC.c b/src/xcms/HVCGcC.c
index 10e0d48..35981d7 100644
--- a/src/xcms/HVCGcC.c
+++ b/src/xcms/HVCGcC.c
@@ -67,12 +67,12 @@
*/
/* ARGSUSED */
Status
-XcmsTekHVCClipC (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsTekHVCClipC (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Reduce the Chroma for a specific hue and value to
diff --git a/src/xcms/HVCGcV.c b/src/xcms/HVCGcV.c
index 4e2c636..b6761c8 100644
--- a/src/xcms/HVCGcV.c
+++ b/src/xcms/HVCGcV.c
@@ -67,12 +67,12 @@
*/
/* ARGSUSED */
Status
-XcmsTekHVCClipV (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsTekHVCClipV (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Return the closest value for a specific hue and chroma.
diff --git a/src/xcms/HVCGcVC.c b/src/xcms/HVCGcVC.c
index eef20ae..4171c72 100644
--- a/src/xcms/HVCGcVC.c
+++ b/src/xcms/HVCGcVC.c
@@ -75,12 +75,12 @@
*/
/* ARGSUSED */
Status
-XcmsTekHVCClipVC (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsTekHVCClipVC (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* This routine will find the closest value and chroma
diff --git a/src/xcms/HVCMnV.c b/src/xcms/HVCMnV.c
index 63a5108..fd33d2f 100644
--- a/src/xcms/HVCMnV.c
+++ b/src/xcms/HVCMnV.c
@@ -71,11 +71,11 @@
* SYNOPSIS
*/
Status
-XcmsTekHVCQueryMinV (ccc, hue, chroma, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue;
- XcmsFloat chroma;
- XcmsColor *pColor_return;
+XcmsTekHVCQueryMinV (
+ XcmsCCC ccc,
+ XcmsFloat hue,
+ XcmsFloat chroma,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
diff --git a/src/xcms/HVCMxC.c b/src/xcms/HVCMxC.c
index 64e7713..6e69237 100644
--- a/src/xcms/HVCMxC.c
+++ b/src/xcms/HVCMxC.c
@@ -74,11 +74,11 @@
* SYNOPSIS
*/
Status
-XcmsTekHVCQueryMaxC(ccc, hue, value, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue;
- XcmsFloat value;
- XcmsColor *pColor_return;
+XcmsTekHVCQueryMaxC(
+ XcmsCCC ccc,
+ XcmsFloat hue,
+ XcmsFloat value,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum chroma for a specific hue and value.
diff --git a/src/xcms/HVCMxV.c b/src/xcms/HVCMxV.c
index 34acdad..72d0ccb 100644
--- a/src/xcms/HVCMxV.c
+++ b/src/xcms/HVCMxV.c
@@ -74,11 +74,11 @@
* SYNOPSIS
*/
Status
-XcmsTekHVCQueryMaxV(ccc, hue, chroma, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue;
- XcmsFloat chroma;
- XcmsColor *pColor_return;
+XcmsTekHVCQueryMaxV(
+ XcmsCCC ccc,
+ XcmsFloat hue,
+ XcmsFloat chroma,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum value for a specified hue and chroma.
diff --git a/src/xcms/HVCMxVC.c b/src/xcms/HVCMxVC.c
index 74183fc..c3726f0 100644
--- a/src/xcms/HVCMxVC.c
+++ b/src/xcms/HVCMxVC.c
@@ -182,10 +182,10 @@ _XcmsTekHVCQueryMaxVCRGB(
* SYNOPSIS
*/
Status
-XcmsTekHVCQueryMaxVC (ccc, hue, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue;
- XcmsColor *pColor_return;
+XcmsTekHVCQueryMaxVC (
+ XcmsCCC ccc,
+ XcmsFloat hue,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
diff --git a/src/xcms/HVCMxVs.c b/src/xcms/HVCMxVs.c
index d90afa8..88376e5 100644
--- a/src/xcms/HVCMxVs.c
+++ b/src/xcms/HVCMxVs.c
@@ -67,11 +67,11 @@
* SYNOPSIS
*/
Status
-XcmsTekHVCQueryMaxVSamples(ccc, hue, pColor_in_out, nSamples)
- XcmsCCC ccc;
- XcmsFloat hue;
- XcmsColor *pColor_in_out;
- unsigned int nSamples;
+XcmsTekHVCQueryMaxVSamples(
+ XcmsCCC ccc,
+ XcmsFloat hue,
+ XcmsColor *pColor_in_out,
+ unsigned int nSamples)
/*
* DESCRIPTION
diff --git a/src/xcms/HVCWpAj.c b/src/xcms/HVCWpAj.c
index 558e90b..f9e2c38 100644
--- a/src/xcms/HVCWpAj.c
+++ b/src/xcms/HVCWpAj.c
@@ -67,15 +67,14 @@
* SYNOPSIS
*/
Status
-XcmsTekHVCWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
- pColors_in_out, nColors, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pWhitePtFrom;
- XcmsColor *pWhitePtTo;
- XcmsColorFormat destSpecFmt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- Bool *pCompressed;
+XcmsTekHVCWhiteShiftColors(
+ XcmsCCC ccc,
+ XcmsColor *pWhitePtFrom,
+ XcmsColor *pWhitePtTo,
+ XcmsColorFormat destSpecFmt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Convert color specifications in an array of XcmsColor structures
diff --git a/src/xcms/IdOfPr.c b/src/xcms/IdOfPr.c
index a8eda89..47e4ec3 100644
--- a/src/xcms/IdOfPr.c
+++ b/src/xcms/IdOfPr.c
@@ -49,8 +49,7 @@
* SYNOPSIS
*/
XcmsColorFormat
-XcmsFormatOfPrefix(prefix)
- char *prefix;
+XcmsFormatOfPrefix(char *prefix)
/*
* DESCRIPTION
* Returns the Color Space ID for the specified prefix
diff --git a/src/xcms/LRGB.c b/src/xcms/LRGB.c
index 1b3c5e5..dff6776 100644
--- a/src/xcms/LRGB.c
+++ b/src/xcms/LRGB.c
@@ -1469,11 +1469,11 @@ XcmsLRGB_RGBi_ParseString(
*/
/* ARGSUSED */
Status
-XcmsCIEXYZToRGBi(ccc, pXcmsColors_in_out, nColors, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert */
- unsigned int nColors; /* Number of colors */
- Bool *pCompressed; /* pointer to an array of Bool */
+XcmsCIEXYZToRGBi(
+ XcmsCCC ccc,
+ XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert */
+ unsigned int nColors, /* Number of colors */
+ Bool *pCompressed) /* pointer to an array of Bool */
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
@@ -1591,11 +1591,11 @@ XcmsCIEXYZToRGBi(ccc, pXcmsColors_in_out, nColors, \
pCompressed)
*/
/* ARGSUSED */
Status
-XcmsRGBiToCIEXYZ(ccc, pXcmsColors_in_out, nColors, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert */
- unsigned int nColors; /* Number of colors */
- Bool *pCompressed; /* pointer to a bit array */
+XcmsRGBiToCIEXYZ(
+ XcmsCCC ccc,
+ XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert */
+ unsigned int nColors, /* Number of colors */
+ Bool *pCompressed) /* pointer to a bit array */
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
@@ -1644,11 +1644,11 @@ XcmsRGBiToCIEXYZ(ccc, pXcmsColors_in_out, nColors, \
pCompressed)
*/
/* ARGSUSED */
Status
-XcmsRGBiToRGB(ccc, pXcmsColors_in_out, nColors, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pXcmsColors_in_out;/* pointer to XcmsColors to convert */
- unsigned int nColors; /* Number of colors */
- Bool *pCompressed; /* pointer to a bit array */
+XcmsRGBiToRGB(
+ XcmsCCC ccc,
+ XcmsColor *pXcmsColors_in_out,/* pointer to XcmsColors to convert */
+ unsigned int nColors, /* Number of colors */
+ Bool *pCompressed) /* pointer to a bit array */
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/Lab.c b/src/xcms/Lab.c
index 75ed21d..ae83110 100644
--- a/src/xcms/Lab.c
+++ b/src/xcms/Lab.c
@@ -232,11 +232,11 @@ XcmsCIELab_ValidSpec(
* SYNOPSIS
*/
Status
-XcmsCIELabToCIEXYZ(ccc, pLab_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pLab_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIELabToCIEXYZ(
+ XcmsCCC ccc,
+ XcmsColor *pLab_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
@@ -335,11 +335,11 @@ XcmsCIELabToCIEXYZ(ccc, pLab_WhitePt, pColors_in_out, nColors)
* SYNOPSIS
*/
Status
-XcmsCIEXYZToCIELab(ccc, pLab_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pLab_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIEXYZToCIELab(
+ XcmsCCC ccc,
+ XcmsColor *pLab_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/LabGcC.c b/src/xcms/LabGcC.c
index e210cd2..366f293 100644
--- a/src/xcms/LabGcC.c
+++ b/src/xcms/LabGcC.c
@@ -54,12 +54,12 @@
*/
/* ARGSUSED */
Status
-XcmsCIELabClipab (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsCIELabClipab (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Reduce the Chroma for a specific hue and chroma to
diff --git a/src/xcms/LabGcL.c b/src/xcms/LabGcL.c
index 445e4da..9722c21 100644
--- a/src/xcms/LabGcL.c
+++ b/src/xcms/LabGcL.c
@@ -54,12 +54,12 @@
*/
/* ARGSUSED */
Status
-XcmsCIELabClipL (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsCIELabClipL (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Return the closest L* for a specific hue and chroma.
diff --git a/src/xcms/LabGcLC.c b/src/xcms/LabGcLC.c
index f0726d9..47490cd 100644
--- a/src/xcms/LabGcLC.c
+++ b/src/xcms/LabGcLC.c
@@ -62,12 +62,12 @@
*/
/* ARGSUSED */
Status
-XcmsCIELabClipLab (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsCIELabClipLab (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* This routine will find the closest L* and chroma
diff --git a/src/xcms/LabMnL.c b/src/xcms/LabMnL.c
index 8016c4e..9b4cd3d 100644
--- a/src/xcms/LabMnL.c
+++ b/src/xcms/LabMnL.c
@@ -62,11 +62,11 @@
* SYNOPSIS
*/
Status
-XcmsCIELabQueryMinL(ccc, hue_angle, chroma, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue angle in degrees */
- XcmsFloat chroma;
- XcmsColor *pColor_return;
+XcmsCIELabQueryMinL(
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue angle in degrees */
+ XcmsFloat chroma,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LabMxC.c b/src/xcms/LabMxC.c
index c57125b..acd83f2 100644
--- a/src/xcms/LabMxC.c
+++ b/src/xcms/LabMxC.c
@@ -65,11 +65,11 @@
* SYNOPSIS
*/
Status
-XcmsCIELabQueryMaxC(ccc, hue_angle, L_star, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue angle in degrees */
- XcmsFloat L_star;
- XcmsColor *pColor_return;
+XcmsCIELabQueryMaxC(
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue angle in degrees */
+ XcmsFloat L_star,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum chroma for a specific hue_angle and L_star.
diff --git a/src/xcms/LabMxL.c b/src/xcms/LabMxL.c
index 91b3f55..fbc39ee 100644
--- a/src/xcms/LabMxL.c
+++ b/src/xcms/LabMxL.c
@@ -62,11 +62,11 @@
* SYNOPSIS
*/
Status
-XcmsCIELabQueryMaxL(ccc, hue_angle, chroma, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue in degrees */
- XcmsFloat chroma;
- XcmsColor *pColor_return;
+XcmsCIELabQueryMaxL(
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue in degrees */
+ XcmsFloat chroma,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LabMxLC.c b/src/xcms/LabMxLC.c
index d4efba3..c24dd4b 100644
--- a/src/xcms/LabMxLC.c
+++ b/src/xcms/LabMxLC.c
@@ -172,10 +172,10 @@ _XcmsCIELabQueryMaxLCRGB(
* SYNOPSIS
*/
Status
-XcmsCIELabQueryMaxLC (ccc, hue_angle, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue_angle in degrees */
- XcmsColor *pColor_return;
+XcmsCIELabQueryMaxLC (
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue_angle in degrees */
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
diff --git a/src/xcms/LabWpAj.c b/src/xcms/LabWpAj.c
index 38c57d2..3098a60 100644
--- a/src/xcms/LabWpAj.c
+++ b/src/xcms/LabWpAj.c
@@ -59,15 +59,14 @@
* SYNOPSIS
*/
Status
-XcmsCIELabWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
- pColors_in_out, nColors, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pWhitePtFrom;
- XcmsColor *pWhitePtTo;
- XcmsColorFormat destSpecFmt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- Bool *pCompressed;
+XcmsCIELabWhiteShiftColors(
+ XcmsCCC ccc,
+ XcmsColor *pWhitePtFrom,
+ XcmsColor *pWhitePtTo,
+ XcmsColorFormat destSpecFmt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Adjust color specifications in XcmsColor structures for
diff --git a/src/xcms/Luv.c b/src/xcms/Luv.c
index f6567ac..9fe80a0 100644
--- a/src/xcms/Luv.c
+++ b/src/xcms/Luv.c
@@ -233,11 +233,11 @@ XcmsCIELuv_ValidSpec(
* SYNOPSIS
*/
Status
-XcmsCIELuvToCIEuvY(ccc, pLuv_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pLuv_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIELuvToCIEuvY(
+ XcmsCCC ccc,
+ XcmsColor *pLuv_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
@@ -325,11 +325,11 @@ XcmsCIELuvToCIEuvY(ccc, pLuv_WhitePt, pColors_in_out, nColors)
* SYNOPSIS
*/
Status
-XcmsCIEuvYToCIELuv(ccc, pLuv_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pLuv_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIEuvYToCIELuv(
+ XcmsCCC ccc,
+ XcmsColor *pLuv_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/LuvGcC.c b/src/xcms/LuvGcC.c
index ecae0fe..c4fde28 100644
--- a/src/xcms/LuvGcC.c
+++ b/src/xcms/LuvGcC.c
@@ -54,12 +54,12 @@
*/
/* ARGSUSED */
Status
-XcmsCIELuvClipuv (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsCIELuvClipuv (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Reduce the Chroma for a specific hue and chroma to
diff --git a/src/xcms/LuvGcL.c b/src/xcms/LuvGcL.c
index 81a553d..c7ccc75 100644
--- a/src/xcms/LuvGcL.c
+++ b/src/xcms/LuvGcL.c
@@ -54,12 +54,12 @@
*/
/* ARGSUSED */
Status
-XcmsCIELuvClipL (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsCIELuvClipL (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Return the closest L* for a specific hue and chroma.
diff --git a/src/xcms/LuvGcLC.c b/src/xcms/LuvGcLC.c
index a3cc0f6..f2eab37 100644
--- a/src/xcms/LuvGcLC.c
+++ b/src/xcms/LuvGcLC.c
@@ -62,12 +62,12 @@
*/
/* ARGSUSED */
Status
-XcmsCIELuvClipLuv (ccc, pColors_in_out, nColors, i, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- unsigned int i;
- Bool *pCompressed;
+XcmsCIELuvClipLuv (
+ XcmsCCC ccc,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ unsigned int i,
+ Bool *pCompressed)
/*
* DESCRIPTION
* This routine will find the closest L* and chroma
diff --git a/src/xcms/LuvMnL.c b/src/xcms/LuvMnL.c
index 9938ab4..2286d7e 100644
--- a/src/xcms/LuvMnL.c
+++ b/src/xcms/LuvMnL.c
@@ -62,11 +62,11 @@
* SYNOPSIS
*/
Status
-XcmsCIELuvQueryMinL(ccc, hue_angle, chroma, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue angle in degrees */
- XcmsFloat chroma;
- XcmsColor *pColor_return;
+XcmsCIELuvQueryMinL(
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue angle in degrees */
+ XcmsFloat chroma,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LuvMxC.c b/src/xcms/LuvMxC.c
index c77319d..d228c39 100644
--- a/src/xcms/LuvMxC.c
+++ b/src/xcms/LuvMxC.c
@@ -65,11 +65,11 @@
* SYNOPSIS
*/
Status
-XcmsCIELuvQueryMaxC(ccc, hue_angle, L_star, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue angle in degrees */
- XcmsFloat L_star;
- XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxC(
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue angle in degrees */
+ XcmsFloat L_star,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum chroma for a specific hue_angle and L_star.
diff --git a/src/xcms/LuvMxL.c b/src/xcms/LuvMxL.c
index d364078..f24c414 100644
--- a/src/xcms/LuvMxL.c
+++ b/src/xcms/LuvMxL.c
@@ -62,11 +62,11 @@
* SYNOPSIS
*/
Status
-XcmsCIELuvQueryMaxL(ccc, hue_angle, chroma, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue angle in degrees */
- XcmsFloat chroma;
- XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxL(
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue angle in degrees */
+ XcmsFloat chroma,
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
* Return the maximum Lstar for a specified hue_angle and chroma.
diff --git a/src/xcms/LuvMxLC.c b/src/xcms/LuvMxLC.c
index 3f4c229..941e459 100644
--- a/src/xcms/LuvMxLC.c
+++ b/src/xcms/LuvMxLC.c
@@ -172,10 +172,10 @@ _XcmsCIELuvQueryMaxLCRGB(
* SYNOPSIS
*/
Status
-XcmsCIELuvQueryMaxLC (ccc, hue_angle, pColor_return)
- XcmsCCC ccc;
- XcmsFloat hue_angle; /* hue angle in degrees */
- XcmsColor *pColor_return;
+XcmsCIELuvQueryMaxLC (
+ XcmsCCC ccc,
+ XcmsFloat hue_angle, /* hue angle in degrees */
+ XcmsColor *pColor_return)
/*
* DESCRIPTION
diff --git a/src/xcms/LuvWpAj.c b/src/xcms/LuvWpAj.c
index c48531a..86a60b4 100644
--- a/src/xcms/LuvWpAj.c
+++ b/src/xcms/LuvWpAj.c
@@ -56,15 +56,14 @@
* SYNOPSIS
*/
Status
-XcmsCIELuvWhiteShiftColors(ccc, pWhitePtFrom, pWhitePtTo, destSpecFmt,
- pColors_in_out, nColors, pCompressed)
- XcmsCCC ccc;
- XcmsColor *pWhitePtFrom;
- XcmsColor *pWhitePtTo;
- XcmsColorFormat destSpecFmt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
- Bool *pCompressed;
+XcmsCIELuvWhiteShiftColors(
+ XcmsCCC ccc,
+ XcmsColor *pWhitePtFrom,
+ XcmsColor *pWhitePtTo,
+ XcmsColorFormat destSpecFmt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Adjusts color specifications in an array of XcmsColor
diff --git a/src/xcms/OfCCC.c b/src/xcms/OfCCC.c
index 1f96316..1c9e16b 100644
--- a/src/xcms/OfCCC.c
+++ b/src/xcms/OfCCC.c
@@ -56,8 +56,8 @@
*/
Display *
-XcmsDisplayOfCCC(ccc)
- XcmsCCC ccc;
+XcmsDisplayOfCCC(
+ XcmsCCC ccc)
/*
* DESCRIPTION
* Queries the Display of the specified CCC.
@@ -79,8 +79,8 @@ XcmsDisplayOfCCC(ccc)
*/
Visual *
-XcmsVisualOfCCC(ccc)
- XcmsCCC ccc;
+XcmsVisualOfCCC(
+ XcmsCCC ccc)
/*
* DESCRIPTION
* Queries the Visual of the specified CCC.
@@ -102,8 +102,8 @@ XcmsVisualOfCCC(ccc)
*/
int
-XcmsScreenNumberOfCCC(ccc)
- XcmsCCC ccc;
+XcmsScreenNumberOfCCC(
+ XcmsCCC ccc)
/*
* DESCRIPTION
* Queries the screen number of the specified CCC.
@@ -125,8 +125,8 @@ XcmsScreenNumberOfCCC(ccc)
*/
XcmsColor *
-XcmsScreenWhitePointOfCCC(ccc)
- XcmsCCC ccc;
+XcmsScreenWhitePointOfCCC(
+ XcmsCCC ccc)
/*
* DESCRIPTION
* Queries the screen white point of the specified CCC.
@@ -148,8 +148,8 @@ XcmsScreenWhitePointOfCCC(ccc)
*/
XcmsColor *
-XcmsClientWhitePointOfCCC(ccc)
- XcmsCCC ccc;
+XcmsClientWhitePointOfCCC(
+ XcmsCCC ccc)
/*
* DESCRIPTION
* Queries the client white point of the specified CCC.
diff --git a/src/xcms/PrOfId.c b/src/xcms/PrOfId.c
index d8fe6e9..01d2c26 100644
--- a/src/xcms/PrOfId.c
+++ b/src/xcms/PrOfId.c
@@ -49,8 +49,8 @@
* SYNOPSIS
*/
char *
-XcmsPrefixOfFormat(id)
- XcmsColorFormat id;
+XcmsPrefixOfFormat(
+ XcmsColorFormat id)
/*
* DESCRIPTION
* Returns the color space prefix for the specified color
diff --git a/src/xcms/QBlack.c b/src/xcms/QBlack.c
index ec04494..cdeae03 100644
--- a/src/xcms/QBlack.c
+++ b/src/xcms/QBlack.c
@@ -56,10 +56,10 @@
*/
Status
-XcmsQueryBlack(ccc, target_format, pColor_ret)
- XcmsCCC ccc;
- XcmsColorFormat target_format;
- XcmsColor *pColor_ret;
+XcmsQueryBlack(
+ XcmsCCC ccc,
+ XcmsColorFormat target_format,
+ XcmsColor *pColor_ret)
/*
* DESCRIPTION
* Returns the color specification in the target format for
diff --git a/src/xcms/QBlue.c b/src/xcms/QBlue.c
index 6026851..eae77dd 100644
--- a/src/xcms/QBlue.c
+++ b/src/xcms/QBlue.c
@@ -56,10 +56,10 @@
*/
Status
-XcmsQueryBlue(ccc, target_format, pColor_ret)
- XcmsCCC ccc;
- XcmsColorFormat target_format;
- XcmsColor *pColor_ret;
+XcmsQueryBlue(
+ XcmsCCC ccc,
+ XcmsColorFormat target_format,
+ XcmsColor *pColor_ret)
/*
* DESCRIPTION
* Returns the color specification in the target format for
diff --git a/src/xcms/QGreen.c b/src/xcms/QGreen.c
index 59bbbd5..deb24cc 100644
--- a/src/xcms/QGreen.c
+++ b/src/xcms/QGreen.c
@@ -56,10 +56,10 @@
*/
Status
-XcmsQueryGreen(ccc, target_format, pColor_ret)
- XcmsCCC ccc;
- XcmsColorFormat target_format;
- XcmsColor *pColor_ret;
+XcmsQueryGreen(
+ XcmsCCC ccc,
+ XcmsColorFormat target_format,
+ XcmsColor *pColor_ret)
/*
* DESCRIPTION
* Returns the color specification in the target format for
diff --git a/src/xcms/QRed.c b/src/xcms/QRed.c
index bcd276c..51b6be4 100644
--- a/src/xcms/QRed.c
+++ b/src/xcms/QRed.c
@@ -56,10 +56,10 @@
*/
Status
-XcmsQueryRed(ccc, target_format, pColor_ret)
- XcmsCCC ccc;
- XcmsColorFormat target_format;
- XcmsColor *pColor_ret;
+XcmsQueryRed(
+ XcmsCCC ccc,
+ XcmsColorFormat target_format,
+ XcmsColor *pColor_ret)
/*
* DESCRIPTION
* Returns the color specification in the target format for
diff --git a/src/xcms/QWhite.c b/src/xcms/QWhite.c
index 7e58db6..d23443d 100644
--- a/src/xcms/QWhite.c
+++ b/src/xcms/QWhite.c
@@ -56,10 +56,10 @@
*/
Status
-XcmsQueryWhite(ccc, target_format, pColor_ret)
- XcmsCCC ccc;
- XcmsColorFormat target_format;
- XcmsColor *pColor_ret;
+XcmsQueryWhite(
+ XcmsCCC ccc,
+ XcmsColorFormat target_format,
+ XcmsColor *pColor_ret)
/*
* DESCRIPTION
* Returns the color specification in the target format for
diff --git a/src/xcms/QuCol.c b/src/xcms/QuCol.c
index 0864bc8..7944faa 100644
--- a/src/xcms/QuCol.c
+++ b/src/xcms/QuCol.c
@@ -55,11 +55,11 @@
* SYNOPSIS
*/
Status
-XcmsQueryColor(dpy, colormap, pXcmsColor_in_out, result_format)
- Display *dpy;
- Colormap colormap;
- XcmsColor *pXcmsColor_in_out;
- XcmsColorFormat result_format;
+XcmsQueryColor(
+ Display *dpy,
+ Colormap colormap,
+ XcmsColor *pXcmsColor_in_out,
+ XcmsColorFormat result_format)
/*
* DESCRIPTION
* This routine uses XQueryColor to obtain the X RGB values
diff --git a/src/xcms/QuCols.c b/src/xcms/QuCols.c
index d6c4890..7a0816d 100644
--- a/src/xcms/QuCols.c
+++ b/src/xcms/QuCols.c
@@ -54,12 +54,12 @@
* SYNOPSIS
*/
Status
-XcmsQueryColors(dpy, colormap, pXcmsColors_in_out, nColors, result_format)
- Display *dpy;
- Colormap colormap;
- XcmsColor *pXcmsColors_in_out;
- unsigned int nColors;
- XcmsColorFormat result_format;
+XcmsQueryColors(
+ Display *dpy,
+ Colormap colormap,
+ XcmsColor *pXcmsColors_in_out,
+ unsigned int nColors,
+ XcmsColorFormat result_format)
/*
* DESCRIPTION
* This routine uses XQueryColors to obtain the X RGB values
diff --git a/src/xcms/SetCCC.c b/src/xcms/SetCCC.c
index 8ab0464..a7094b1 100644
--- a/src/xcms/SetCCC.c
+++ b/src/xcms/SetCCC.c
@@ -57,9 +57,9 @@
*/
Status
-XcmsSetWhitePoint(ccc, pColor)
- XcmsCCC ccc;
- XcmsColor *pColor;
+XcmsSetWhitePoint(
+ XcmsCCC ccc,
+ XcmsColor *pColor)
/*
* DESCRIPTION
* Sets the Client White Point in the specified CCC.
diff --git a/src/xcms/StCol.c b/src/xcms/StCol.c
index 80c3f7d..fef449e 100644
--- a/src/xcms/StCol.c
+++ b/src/xcms/StCol.c
@@ -55,10 +55,10 @@
* SYNOPSIS
*/
Status
-XcmsStoreColor(dpy, colormap, pColor_in)
- Display *dpy;
- Colormap colormap;
- XcmsColor *pColor_in;
+XcmsStoreColor(
+ Display *dpy,
+ Colormap colormap,
+ XcmsColor *pColor_in)
/*
* DESCRIPTION
* Given a device-dependent or device-independent color
diff --git a/src/xcms/StCols.c b/src/xcms/StCols.c
index cff6cc3..163d621 100644
--- a/src/xcms/StCols.c
+++ b/src/xcms/StCols.c
@@ -55,13 +55,12 @@
* SYNOPSIS
*/
Status
-XcmsStoreColors(dpy, colormap, pColors_in,
- nColors, pCompressed)
- Display *dpy;
- Colormap colormap;
- XcmsColor *pColors_in;
- unsigned int nColors;
- Bool *pCompressed;
+XcmsStoreColors(
+ Display *dpy,
+ Colormap colormap,
+ XcmsColor *pColors_in,
+ unsigned int nColors,
+ Bool *pCompressed)
/*
* DESCRIPTION
* Given device-dependent or device-independent color
diff --git a/src/xcms/cmsAllCol.c b/src/xcms/cmsAllCol.c
index 3aca573..145d117 100644
--- a/src/xcms/cmsAllCol.c
+++ b/src/xcms/cmsAllCol.c
@@ -49,11 +49,11 @@
* SYNOPSIS
*/
Status
-XcmsAllocColor(dpy, colormap, pXcmsColor_in_out, result_format)
- Display *dpy;
- Colormap colormap;
- XcmsColor *pXcmsColor_in_out;
- XcmsColorFormat result_format;
+XcmsAllocColor(
+ Display *dpy,
+ Colormap colormap,
+ XcmsColor *pXcmsColor_in_out,
+ XcmsColorFormat result_format)
/*
* DESCRIPTION
* Given a device-dependent or device-independent color
diff --git a/src/xcms/cmsCmap.c b/src/xcms/cmsCmap.c
index 5c6d1a1..e213682 100644
--- a/src/xcms/cmsCmap.c
+++ b/src/xcms/cmsCmap.c
@@ -236,11 +236,11 @@ CmapRecForColormap(
* SYNOPSIS
*/
XcmsCmapRec *
-_XcmsAddCmapRec(dpy, cmap, windowID, visual)
- Display *dpy;
- Colormap cmap;
- Window windowID;
- Visual *visual;
+_XcmsAddCmapRec(
+ Display *dpy,
+ Colormap cmap,
+ Window windowID,
+ Visual *visual)
/*
* DESCRIPTION
* Create an XcmsCmapRec for the specified cmap, windowID,
@@ -412,9 +412,9 @@ _XcmsFreeClientCmaps(
* SYNOPSIS
*/
XcmsCCC
-XcmsCCCOfColormap(dpy, cmap)
- Display *dpy;
- Colormap cmap;
+XcmsCCCOfColormap(
+ Display *dpy,
+ Colormap cmap)
/*
* DESCRIPTION
* Finds the XcmsCCC associated with the specified colormap.
@@ -480,10 +480,10 @@ XcmsCCCOfColormap(dpy, cmap)
return(NULL);
}
-XcmsCCC XcmsSetCCCOfColormap(dpy, cmap, ccc)
- Display *dpy;
- Colormap cmap;
- XcmsCCC ccc;
+XcmsCCC XcmsSetCCCOfColormap(
+ Display *dpy,
+ Colormap cmap,
+ XcmsCCC ccc)
{
XcmsCCC prev_ccc = NULL;
XcmsCmapRec *pRec;
diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c
index c48b85a..1491be7 100644
--- a/src/xcms/cmsColNm.c
+++ b/src/xcms/cmsColNm.c
@@ -132,7 +132,7 @@ _XcmsColorSpaceOfString(
char *pchar;
if ((pchar = strchr(color_string, ':')) == NULL) {
- return(XcmsFailure);
+ return(NULL);
}
n = (int)(pchar - color_string);
diff --git a/src/xcms/cmsMath.c b/src/xcms/cmsMath.c
index c97c7a9..1586f7c 100644
--- a/src/xcms/cmsMath.c
+++ b/src/xcms/cmsMath.c
@@ -42,6 +42,12 @@ in this Software without prior written authorization from The Open \
Group. #define DBL_EPSILON 1e-6
#endif
+/* make sure sparse can always handle this */
+#ifdef __CHECKER__
+#undef DBL_EPSILON
+#define DBL_EPSILON 1e-6
+#endif
+
#ifdef _X_ROOT_STATS
int cbrt_loopcount;
int sqrt_loopcount;
@@ -53,8 +59,7 @@ int sqrt_loopcount;
/* for cube roots, x^3 - a = 0, x_new = x - 1/3 (x - a/x^2) */
double
-_XcmsCubeRoot(a)
- double a;
+_XcmsCubeRoot(double a)
{
register double abs_a, cur_guess, delta;
@@ -98,8 +103,7 @@ _XcmsCubeRoot(a)
/* for square roots, x^2 - a = 0, x_new = x - 1/2 (x - a/x) */
double
-_XcmsSquareRoot(a)
- double a;
+_XcmsSquareRoot(double a)
{
register double cur_guess, delta;
diff --git a/src/xcms/cmsTrig.c b/src/xcms/cmsTrig.c
index 1859fa9..4e17e7d 100644
--- a/src/xcms/cmsTrig.c
+++ b/src/xcms/cmsTrig.c
@@ -509,8 +509,7 @@ static double _XcmsPolynomial(
*/
double
-_XcmsSine (x)
-double x;
+_XcmsSine (double x)
{
double y;
double yt2;
@@ -550,8 +549,7 @@ double x;
* SYNOPSIS
*/
double
-_XcmsArcTangent(x)
- double x;
+_XcmsArcTangent(double x)
/*
* DESCRIPTION
* Computes the arctangent.
diff --git a/src/xcms/uvY.c b/src/xcms/uvY.c
index 46e9c19..da9fd0f 100644
--- a/src/xcms/uvY.c
+++ b/src/xcms/uvY.c
@@ -227,11 +227,11 @@ _XcmsCIEuvY_ValidSpec(
* SYNOPSIS
*/
Status
-XcmsCIEuvYToCIEXYZ(ccc, puvY_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *puvY_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIEuvYToCIEXYZ(
+ XcmsCCC ccc,
+ XcmsColor *puvY_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
@@ -342,11 +342,11 @@ XcmsCIEuvYToCIEXYZ(ccc, puvY_WhitePt, pColors_in_out, nColors)
* SYNOPSIS
*/
Status
-XcmsCIEXYZToCIEuvY(ccc, puvY_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *puvY_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIEXYZToCIEuvY(
+ XcmsCCC ccc,
+ XcmsColor *puvY_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
diff --git a/src/xcms/xyY.c b/src/xcms/xyY.c
index b15e901..2e56a08 100644
--- a/src/xcms/xyY.c
+++ b/src/xcms/xyY.c
@@ -235,11 +235,11 @@ XcmsCIExyY_ValidSpec(
* SYNOPSIS
*/
Status
-XcmsCIExyYToCIEXYZ(ccc, pxyY_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pxyY_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIExyYToCIEXYZ(
+ XcmsCCC ccc,
+ XcmsColor *pxyY_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
@@ -342,11 +342,11 @@ XcmsCIExyYToCIEXYZ(ccc, pxyY_WhitePt, pColors_in_out, nColors)
*/
/* ARGSUSED */
Status
-XcmsCIEXYZToCIExyY(ccc, pxyY_WhitePt, pColors_in_out, nColors)
- XcmsCCC ccc;
- XcmsColor *pxyY_WhitePt;
- XcmsColor *pColors_in_out;
- unsigned int nColors;
+XcmsCIEXYZToCIExyY(
+ XcmsCCC ccc,
+ XcmsColor *pxyY_WhitePt,
+ XcmsColor *pColors_in_out,
+ unsigned int nColors)
/*
* DESCRIPTION
* Converts color specifications in an array of XcmsColor
diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c
index e190d00..71f21a5 100644
--- a/src/xkb/XKBBind.c
+++ b/src/xkb/XKBBind.c
@@ -634,7 +634,7 @@ XkbTranslateKeySym( register Display * dpy,
}
if (change) {
if (n==1)
- *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,0);
+ *sym_rtrn=(*xkb->cvt.MBToKS)(xkb->cvt.MBToKSPriv,buffer,n,NULL);
else *sym_rtrn= NoSymbol;
}
}
diff --git a/src/xkb/XKBCvt.c b/src/xkb/XKBCvt.c
index 9ac438e..056f39f 100644
--- a/src/xkb/XKBCvt.c
+++ b/src/xkb/XKBCvt.c
@@ -220,7 +220,7 @@ _XkbGetConverters(const char *encoding_name, XkbConverters \
*cvt_rtrn) static char *_XkbKnownLanguages = \
"c=ascii:da,de,en,es,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:eo=iso8859-3:sp \
=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:he=iso8859-8:tr=iso8859-9:lt,lv=iso8859-13:et \
,fi=iso8859-15:ru=koi8-r:uk=koi8-u:th,th_TH,th_TH.iso8859-11=iso8859-11:th_TH.TIS620=tis620:hy=armscii-8:vi=tcvn-5712:ka=georgian-academy:be,bg=microsoft-cp1251";
char *
-_XkbGetCharset()
+_XkbGetCharset(void)
{
/*
* PAGE USAGE TUNING: explicitly initialize to move these to data
@@ -321,7 +321,7 @@ _XkbGetCharset()
}
#else
char *
-_XkbGetCharset()
+_XkbGetCharset(void)
{
char *tmp;
XLCd lcd;
diff --git a/src/xkb/XKBExtDev.c b/src/xkb/XKBExtDev.c
index 34558e4..0e44166 100644
--- a/src/xkb/XKBExtDev.c
+++ b/src/xkb/XKBExtDev.c
@@ -40,7 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/***====================================================================***/
-extern void
+void
XkbNoteDeviceChanges( XkbDeviceChangesPtr old,
XkbExtensionDeviceNotifyEvent * new,
unsigned int wanted)
diff --git a/src/xlibi18n/XDefaultIMIF.c b/src/xlibi18n/XDefaultIMIF.c
index 41bd43c..fd6a847 100644
--- a/src/xlibi18n/XDefaultIMIF.c
+++ b/src/xlibi18n/XDefaultIMIF.c
@@ -242,17 +242,17 @@ _CloseIM(XIM xim)
}
static char *
-_SetIMValues(xim, arg)
-XIM xim;
-XIMArg *arg;
+_SetIMValues(
+ XIM xim,
+ XIMArg *arg)
{
return(arg->name); /* evil */
}
static char *
-_GetIMValues(xim, values)
-XIM xim;
-XIMArg *values;
+_GetIMValues(
+ XIM xim,
+ XIMArg *values)
{
XIMArg *p;
XIMStyles *styles;
@@ -359,8 +359,7 @@ _DestroyIC(XIC ic)
}
static void
-_SetFocus(ic)
-XIC ic;
+_SetFocus(XIC ic)
{
}
["signature.asc" (application/pgp-signature)]
_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic