[Xlibs] ansification of XUtil.h
Warren Turkal
wt@midsouth.rr.com
Mon, 19 Jan 2004 06:30:31 -0600
=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Here is a patch that ansifies XUtil.h. I consider this low risk because I d=
id=20
not create any of the prototypes, they were already there. Also, libX11=20
appears to compile fine with -DNeedFunctionPrototypes. I would like to get=
=20
some input on this change though. This patch appears to also have some=20
whitespace policing.
=2D --- tmp/kde-wt/cervisiaDCisga.tmp 2004-01-19 06:20:44.000000000 -0600
+++ home/wt/src/xfree-auto/cvsauto/X11/include/X11/Xutil.h 2004-01-18=20
20:14:39.000000000 -0600
@@ -29,7 +29,7 @@
=20
All Rights Reserved
=20
=2D -Permission to use, copy, modify, and distribute this software and its=
=20
+Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,=20
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in=20
@@ -150,7 +150,7 @@
=20
=20
/*
=2D - * new structure for manipulating TEXT properties; used with WM_NAME,=
=20
+ * new structure for manipulating TEXT properties; used with WM_NAME,
* WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND.
*/
typedef struct {
@@ -254,16 +254,16 @@
|| ((KeySym)(keysym) =3D=3D XK_Mode_switch) \
|| ((KeySym)(keysym) =3D=3D XK_Num_Lock))
/*
=2D - * opaque reference to Region data type=20
+ * opaque reference to Region data type
*/
=2D -typedef struct _XRegion *Region;=20
+typedef struct _XRegion *Region;
=20
/* Return values from XRectInRegion() */
=2D -=20
+
#define RectangleOut 0
#define RectangleIn 1
#define RectanglePart 2
=2D -=20
+
=20
/*
* Information used by the visual utility routines to find desired visual
@@ -349,341 +349,246 @@
=20
/* The following declarations are alphabetized. */
=20
=2D -extern XClassHint *XAllocClassHint (
=2D -#if NeedFunctionPrototypes
=2D - void
=2D -#endif
=2D -);
+extern XClassHint *XAllocClassHint (void);
=20
=2D -extern XIconSize *XAllocIconSize (
=2D -#if NeedFunctionPrototypes
=2D - void
=2D -#endif
=2D -);
+extern XIconSize *XAllocIconSize (void);
=20
=2D -extern XSizeHints *XAllocSizeHints (
=2D -#if NeedFunctionPrototypes
=2D - void
=2D -#endif
=2D -);
+extern XSizeHints *XAllocSizeHints (void);
=20
=2D -extern XStandardColormap *XAllocStandardColormap (
=2D -#if NeedFunctionPrototypes
=2D - void
=2D -#endif
=2D -);
+extern XStandardColormap *XAllocStandardColormap (void);
=20
=2D -extern XWMHints *XAllocWMHints (
=2D -#if NeedFunctionPrototypes
=2D - void
=2D -#endif
=2D -);
+extern XWMHints *XAllocWMHints (void);
=20
extern int XClipBox(
=2D -#if NeedFunctionPrototypes
Region /* r */,
XRectangle* /* rect_return */
=2D -#endif
);
=20
=2D -extern Region XCreateRegion(
=2D -#if NeedFunctionPrototypes
=2D - void
=2D -#endif
=2D -);
+extern Region XCreateRegion(void);
=20
extern const char *XDefaultString (void);
=20
extern int XDeleteContext(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
XID /* rid */,
XContext /* context */
=2D -#endif
);
=20
extern int XDestroyRegion(
=2D -#if NeedFunctionPrototypes
Region /* r */
=2D -#endif
);
=20
extern int XEmptyRegion(
=2D -#if NeedFunctionPrototypes
Region /* r */
=2D -#endif
);
=20
extern int XEqualRegion(
=2D -#if NeedFunctionPrototypes
Region /* r1 */,
Region /* r2 */
=2D -#endif
);
=20
extern int XFindContext(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
XID /* rid */,
XContext /* context */,
XPointer* /* data_return */
=2D -#endif
);
=20
extern Status XGetClassHint(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XClassHint* /* class_hints_return */
=2D -#endif
);
=20
extern Status XGetIconSizes(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XIconSize** /* size_list_return */,
int* /* count_return */
=2D -#endif
);
=20
extern Status XGetNormalHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */
=2D -#endif
);
=20
extern Status XGetRGBColormaps(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XStandardColormap** /* stdcmap_return */,
int* /* count_return */,
Atom /* property */
=2D -#endif
);
=20
extern Status XGetSizeHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */,
Atom /* property */
=2D -#endif
);
=20
extern Status XGetStandardColormap(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XStandardColormap* /* colormap_return */,
=2D - Atom /* property */ =20
=2D -#endif
+ Atom /* property */
);
=20
extern Status XGetTextProperty(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* window */,
XTextProperty* /* text_prop_return */,
Atom /* property */
=2D -#endif
);
=20
extern XVisualInfo *XGetVisualInfo(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
long /* vinfo_mask */,
XVisualInfo* /* vinfo_template */,
int* /* nitems_return */
=2D -#endif
);
=20
extern Status XGetWMClientMachine(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop_return */
=2D -#endif
);
=20
extern XWMHints *XGetWMHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
=2D - Window /* w */ =20
=2D -#endif
+ Window /* w */
);
=20
extern Status XGetWMIconName(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop_return */
=2D -#endif
);
=20
extern Status XGetWMName(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop_return */
=2D -#endif
);
=20
extern Status XGetWMNormalHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */,
=2D - long* /* supplied_return */=20
=2D -#endif
+ long* /* supplied_return */
);
=20
extern Status XGetWMSizeHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints_return */,
long* /* supplied_return */,
Atom /* property */
=2D -#endif
);
=20
extern Status XGetZoomHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* zhints_return */
=2D -#endif
);
=20
extern int XIntersectRegion(
=2D -#if NeedFunctionPrototypes
Region /* sra */,
Region /* srb */,
Region /* dr_return */
=2D -#endif
);
=20
extern void XConvertCase(
=2D -#if NeedFunctionPrototypes
KeySym /* sym */,
KeySym* /* lower */,
KeySym* /* upper */
=2D -#endif
);
=20
extern int XLookupString(
=2D -#if NeedFunctionPrototypes
XKeyEvent* /* event_struct */,
char* /* buffer_return */,
int /* bytes_buffer */,
KeySym* /* keysym_return */,
XComposeStatus* /* status_in_out */
=2D -#endif
);
=20
extern Status XMatchVisualInfo(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
int /* screen */,
int /* depth */,
int /* class */,
XVisualInfo* /* vinfo_return */
=2D -#endif
);
=20
extern int XOffsetRegion(
=2D -#if NeedFunctionPrototypes
Region /* r */,
int /* dx */,
int /* dy */
=2D -#endif
);
=20
extern Bool XPointInRegion(
=2D -#if NeedFunctionPrototypes
Region /* r */,
int /* x */,
int /* y */
=2D -#endif
);
=20
extern Region XPolygonRegion(
=2D -#if NeedFunctionPrototypes
XPoint* /* points */,
int /* n */,
int /* fill_rule */
=2D -#endif
);
=20
extern int XRectInRegion(
=2D -#if NeedFunctionPrototypes
Region /* r */,
int /* x */,
int /* y */,
unsigned int /* width */,
unsigned int /* height */
=2D -#endif
);
=20
extern int XSaveContext(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
XID /* rid */,
XContext /* context */,
_Xconst char* /* data */
=2D -#endif
);
=20
extern int XSetClassHint(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XClassHint* /* class_hints */
=2D -#endif
);
=20
extern int XSetIconSizes(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XIconSize* /* size_list */,
=2D - int /* count */ =20
=2D -#endif
+ int /* count */
);
=20
extern int XSetNormalHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints */
=2D -#endif
);
=20
extern void XSetRGBColormaps(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XStandardColormap* /* stdcmaps */,
int /* count */,
Atom /* property */
=2D -#endif
);
=20
extern int XSetSizeHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints */,
Atom /* property */
=2D -#endif
);
=20
extern int XSetStandardProperties(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
_Xconst char* /* window_name */,
@@ -692,60 +597,46 @@
char** /* argv */,
int /* argc */,
XSizeHints* /* hints */
=2D -#endif
);
=20
extern void XSetTextProperty(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop */,
Atom /* property */
=2D -#endif
);
=20
extern void XSetWMClientMachine(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop */
=2D -#endif
);
=20
extern int XSetWMHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XWMHints* /* wm_hints */
=2D -#endif
);
=20
extern void XSetWMIconName(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop */
=2D -#endif
);
=20
extern void XSetWMName(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* text_prop */
=2D -#endif
);
=20
extern void XSetWMNormalHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints */
=2D -#endif
);
=20
extern void XSetWMProperties(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XTextProperty* /* window_name */,
@@ -755,11 +646,9 @@
XSizeHints* /* normal_hints */,
XWMHints* /* wm_hints */,
XClassHint* /* class_hints */
=2D -#endif
);
=20
extern void XmbSetWMProperties(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
_Xconst char* /* window_name */,
@@ -769,11 +658,9 @@
XSizeHints* /* normal_hints */,
XWMHints* /* wm_hints */,
XClassHint* /* class_hints */
=2D -#endif
);
=20
extern void Xutf8SetWMProperties(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
_Xconst char* /* window_name */,
@@ -783,65 +670,50 @@
XSizeHints* /* normal_hints */,
XWMHints* /* wm_hints */,
XClassHint* /* class_hints */
=2D -#endif
);
=20
extern void XSetWMSizeHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* hints */,
Atom /* property */
=2D -#endif
);
=20
extern int XSetRegion(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
GC /* gc */,
Region /* r */
=2D -#endif
);
=20
extern void XSetStandardColormap(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XStandardColormap* /* colormap */,
Atom /* property */
=2D -#endif
);
=20
extern int XSetZoomHints(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
Window /* w */,
XSizeHints* /* zhints */
=2D -#endif
);
=20
extern int XShrinkRegion(
=2D -#if NeedFunctionPrototypes
Region /* r */,
int /* dx */,
int /* dy */
=2D -#endif
);
=20
extern Status XStringListToTextProperty(
=2D -#if NeedFunctionPrototypes
char** /* list */,
int /* count */,
XTextProperty* /* text_prop_return */
=2D -#endif
);
=20
extern int XSubtractRegion(
=2D -#if NeedFunctionPrototypes
Region /* sra */,
Region /* srb */,
Region /* dr_return */
=2D -#endif
);
=20
extern int XmbTextListToTextProperty(
@@ -873,11 +745,9 @@
);
=20
extern Status XTextPropertyToStringList(
=2D -#if NeedFunctionPrototypes
XTextProperty* /* text_prop */,
char*** /* list_return */,
int* /* count_return */
=2D -#endif
);
=20
extern int XmbTextPropertyToTextList(
@@ -910,15 +780,12 @@
);
=20
extern int XUnionRegion(
=2D -#if NeedFunctionPrototypes
Region /* sra */,
Region /* srb */,
Region /* dr_return */
=2D -#endif
);
=20
extern int XWMGeometry(
=2D -#if NeedFunctionPrototypes
Display* /* display */,
int /* screen_number */,
_Xconst char* /* user_geometry */,
@@ -930,15 +797,12 @@
int* /* width_return */,
int* /* height_return */,
int* /* gravity_return */
=2D -#endif
);
=20
extern int XXorRegion(
=2D -#if NeedFunctionPrototypes
Region /* sra */,
Region /* srb */,
Region /* dr_return */
=2D -#endif
);
=20
_XFUNCPROTOEND
=2D --=20
Warren Turkal
President, GOLUM, Inc.
http://www.golum.org
=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFAC83rYMCwkUrND5wRArOVAJ4pqBmhweF1iNQAPyWXuz6hAuo+OACgmRgF
tCcILuWCPKBn8L6d8KD89rc=3D
=3Dp5nb
=2D----END PGP SIGNATURE-----