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