1 files changed, 189 insertions, 194 deletions

diff --git a/win/stubs.c b/win/stubs.c
index 5fbc8d1..1138ccb 100644
--- a/win/stubs.c
+++ b/win/stubs.c
@@ -4,7 +4,9 @@
  * Undocumented Xlib internal function
  */
 
-int _XInitImageFuncPtrs(XImage *image)
+int
+_XInitImageFuncPtrs(
+    XImage *image)
 {
     return 0;
 }
@@ -14,20 +16,20 @@ int _XInitImageFuncPtrs(XImage *image)
  */
 
 void
-XSetWMClientMachine(display, w, text_prop)
-    Display* display;
-    Window w;
-    XTextProperty* text_prop;
+XSetWMClientMachine(
+    Display *display,
+    Window w,
+    XTextProperty *text_prop)
 {
 }
 
 Status
-XStringListToTextProperty(list, count, text_prop_return)
-    char** list;
-    int count;
-    XTextProperty* text_prop_return;
+XStringListToTextProperty(
+    char **list,
+    int count,
+    XTextProperty *text_prop_return)
 {
-    return (Status) NULL;
+    return (Status) 0;
 }
 
 /*
@@ -35,354 +37,347 @@ XStringListToTextProperty(list, count, text_prop_return)
  */
 
 void
-XChangeProperty(display, w, property, type, format, mode, data, nelements)
-    Display* display;
-    Window w;
-    Atom property;
-    Atom type;
-    int format;
-    int mode;
-    _Xconst unsigned char* data;
-    int nelements;
+XChangeProperty(
+    Display *display,
+    Window w,
+    Atom property,
+    Atom type,
+    int format,
+    int mode,
+    _Xconst unsigned char *data,
+    int nelements)
 {
 }
 
 Cursor
-XCreateGlyphCursor(display, source_font, mask_font, source_char, mask_char,
-	foreground_color, background_color)
-    Display* display;
-    Font source_font;
-    Font mask_font;
-    unsigned int source_char;
-    unsigned int mask_char;
-    XColor* foreground_color;
-    XColor* background_color;
+XCreateGlyphCursor(
+    Display *display,
+    Font source_font,
+    Font mask_font,
+    unsigned int source_char,
+    unsigned int mask_char,
+    XColor *foreground_color,
+    XColor *background_color)
 {
     return 1;
 }
 
 XIC
-XCreateIC()
+XCreateIC(void)
 {
     return NULL;
 }
 
 Cursor
-XCreatePixmapCursor(display, source, mask, foreground_color,
-	background_color, x, y)
-    Display* display;
-    Pixmap source;
-    Pixmap mask;
-    XColor* foreground_color;
-    XColor* background_color;
-    unsigned int x;
-    unsigned int y;
+XCreatePixmapCursor(
+    Display *display,
+    Pixmap source,
+    Pixmap mask,
+    XColor *foreground_color,
+    XColor *background_color,
+    unsigned int x,
+    unsigned int y)
 {
     return (Cursor) NULL;
 }
 
 void
-XDeleteProperty(display, w, property)
-    Display* display;
-    Window w;
-    Atom property;
+XDeleteProperty(
+    Display *display,
+    Window w,
+    Atom property)
 {
 }
 
 void
-XDestroyIC(ic)
-    XIC ic;
+XDestroyIC(
+    XIC ic)
 {
 }
 
 Bool
-XFilterEvent(event, window)
-    XEvent* event;
-    Window window;
+XFilterEvent(
+    XEvent *event,
+    Window window)
 {
     return 0;
 }
 
-extern void XForceScreenSaver(display, mode)
-    Display* display;
-    int mode;
+void
+XForceScreenSaver(
+    Display *display,
+    int mode)
 {
 }
 
 void
-XFreeCursor(display, cursor)
-    Display* display;
-    Cursor cursor;
+XFreeCursor(
+    Display *display,
+    Cursor cursor)
 {
 }
 
 GContext
-XGContextFromGC(gc)
-    GC gc;
+XGContextFromGC(
+    GC gc)
 {
     return (GContext) NULL;
 }
 
 char *
-XGetAtomName(display, atom)
-    Display* display;
-    Atom atom;
+XGetAtomName(
+    Display *display,
+    Atom atom)
 {
     return NULL;
 }
 
 int
-XGetWindowAttributes(display, w, window_attributes_return)
-    Display* display;
-    Window w;
-    XWindowAttributes* window_attributes_return;
+XGetWindowAttributes(
+    Display *display,
+    Window w,
+    XWindowAttributes *window_attributes_return)
 {
     return 0;
 }
 
 Status
-XGetWMColormapWindows(display, w, windows_return, count_return)
-    Display* display;
-    Window w;
-    Window** windows_return;
-    int* count_return;
+XGetWMColormapWindows(
+    Display *display,
+    Window w,
+    Window **windows_return,
+    int *count_return)
 {
-    return (Status) NULL;
+    return (Status) 0;
 }
 
 int
-XIconifyWindow(display, w, screen_number)
-    Display* display;
-    Window w;
-    int screen_number;
+XIconifyWindow(
+    Display *display,
+    Window w,
+    int screen_number)
 {
     return 0;
 }
 
 XHostAddress *
-XListHosts(display, nhosts_return, state_return)
-    Display* display;
-    int* nhosts_return;
-    Bool* state_return;
+XListHosts(
+    Display *display,
+    int *nhosts_return,
+    Bool *state_return)
 {
     return NULL;
 }
 
 int
-XLookupColor(display, colormap, color_name, exact_def_return,
-	screen_def_return)
-    Display* display;
-    Colormap colormap;
-    _Xconst char* color_name;
-    XColor* exact_def_return;
-    XColor* screen_def_return;
+XLookupColor(
+    Display *display,
+    Colormap colormap,
+    _Xconst char *color_name,
+    XColor *exact_def_return,
+    XColor *screen_def_return)
 {
     return 0;
 }
 
 void
-XNextEvent(display, event_return)
-    Display* display;
-    XEvent* event_return;
+XNextEvent(
+    Display *display,
+    XEvent *event_return)
 {
 }
 
 void
-XPutBackEvent(display, event)
-    Display* display;
-    XEvent* event;
+XPutBackEvent(
+    Display *display,
+    XEvent *event)
 {
 }
 
 void
-XQueryColors(display, colormap, defs_in_out, ncolors)
-    Display* display;
-    Colormap colormap;
-    XColor* defs_in_out;
-    int ncolors;
+XQueryColors(
+    Display *display,
+    Colormap colormap,
+    XColor *defs_in_out,
+    int ncolors)
 {
 }
 
 int
-XQueryTree(display, w, root_return, parent_return, children_return,
-	nchildren_return)
-    Display* display;
-    Window w;
-    Window* root_return;
-    Window* parent_return;
-    Window** children_return;
-    unsigned int* nchildren_return;
+XQueryTree(
+    Display *display,
+    Window w,
+    Window *root_return,
+    Window *parent_return,
+    Window **children_return,
+    unsigned int *nchildren_return)
 {
     return 0;
 }
 
 void
-XRefreshKeyboardMapping(event_map)
-    XMappingEvent* event_map;
+XRefreshKeyboardMapping(
+    XMappingEvent *event_map)
 {
 }
 
 Window
-XRootWindow(display, screen_number)
-    Display* display;
-    int screen_number;
+XRootWindow(
+    Display *display,
+    int screen_number)
 {
     return (Window) NULL;
 }
 
 void
-XSelectInput(display, w, event_mask)
-    Display* display;
-    Window w;
-    long event_mask;
+XSelectInput(
+    Display *display,
+    Window w,
+    long event_mask)
 {
 }
 
 int
-XSendEvent(display, w, propagate, event_mask, event_send)
-    Display* display;
-    Window w;
-    Bool propagate;
-    long event_mask;
-    XEvent* event_send;
+XSendEvent(
+    Display *display,
+    Window w,
+    Bool propagate,
+    long event_mask,
+    XEvent *event_send)
 {
     return 0;
 }
 
 void
-XSetCommand(display, w, argv, argc)
-    Display* display;
-    Window w;
-    CONST char** argv;
-    int argc;
+XSetCommand(
+    Display *display,
+    Window w,
+    CONST char **argv,
+    int argc)
 {
 }
 
 XErrorHandler
-XSetErrorHandler (handler)
-    XErrorHandler handler;
+XSetErrorHandler(
+    XErrorHandler handler)
 {
     return NULL;
 }
 
 void
-XSetIconName(display, w, icon_name)
-    Display* display;
-    Window w;
-    _Xconst char* icon_name;
+XSetIconName(
+    Display *display,
+    Window w,
+    _Xconst char *icon_name)
 {
 }
 
 void
-XSetWindowBackground(display, w, background_pixel)
-    Display* display;
-    Window w;
-    unsigned long background_pixel;
+XSetWindowBackground(
+    Display *display,
+    Window w,
+    unsigned long background_pixel)
 {
 }
 
 void
-XSetWindowBackgroundPixmap(display, w, background_pixmap)
-    Display* display;
-    Window w;
-    Pixmap background_pixmap;
+XSetWindowBackgroundPixmap(
+    Display *display,
+    Window w,
+    Pixmap background_pixmap)
 {
 }
 
 void
-XSetWindowBorder(display, w, border_pixel)
-    Display* display;
-    Window w;
-    unsigned long border_pixel;
+XSetWindowBorder(
+    Display *display,
+    Window w,
+    unsigned long border_pixel)
 {
 }
 
 void
-XSetWindowBorderPixmap(display, w, border_pixmap)
-    Display* display;
-    Window w;
-    Pixmap border_pixmap;
+XSetWindowBorderPixmap(
+    Display *display,
+    Window w,
+    Pixmap border_pixmap)
 {
 }
 
 void
-XSetWindowBorderWidth(display, w, width)
-    Display* display;
-    Window w;
-    unsigned int width;
+XSetWindowBorderWidth(
+    Display *display,
+    Window w,
+    unsigned int width)
 {
 }
 
 void
-XSetWindowColormap(display, w, colormap)
-    Display* display;
-    Window w;
-    Colormap colormap;
+XSetWindowColormap(
+    Display *display,
+    Window w,
+    Colormap colormap)
 {
 }
 
 Bool
-XTranslateCoordinates(display, src_w, dest_w, src_x, src_y, dest_x_return,
-	dest_y_return, child_return)
-    Display* display;
-    Window src_w;
-    Window dest_w;
-    int src_x;
-    int src_y;
-    int* dest_x_return;
-    int* dest_y_return;
-    Window* child_return;
+XTranslateCoordinates(
+    Display *display,
+    Window src_w,
+    Window dest_w,
+    int src_x,
+    int src_y,
+    int *dest_x_return,
+    int *dest_y_return,
+    Window *child_return)
 {
     return 0;
 }
 
 void
-XWindowEvent(display, w, event_mask, event_return)
-    Display* display;
-    Window w;
-    long event_mask;
-    XEvent* event_return;
+XWindowEvent(
+    Display *display,
+    Window w,
+    long event_mask,
+    XEvent *event_return)
 {
 }
 
 int
-XWithdrawWindow(display, w, screen_number)
-    Display* display;
-    Window w;
-    int screen_number;
+XWithdrawWindow(
+    Display *display,
+    Window w,
+    int screen_number)
 {
     return 0;
 }
 
 int
-XmbLookupString(ic, event, buffer_return, bytes_buffer, keysym_return,
-	status_return)
-    XIC ic;
-    XKeyPressedEvent* event;
-    char* buffer_return;
-    int bytes_buffer;
-    KeySym* keysym_return;
-    Status* status_return;
+XmbLookupString(
+    XIC ic,
+    XKeyPressedEvent *event,
+    char *buffer_return,
+    int bytes_buffer,
+    KeySym *keysym_return,
+    Status *status_return)
 {
     return 0;
 }
 
 int
-XGetWindowProperty(display, w, property, long_offset, long_length, delete,
-	req_type, actual_type_return, actual_format_return, nitems_return,
-	bytes_after_return, prop_return)
-    Display* display;
-    Window w;
-    Atom property;
-    long long_offset;
-    long long_length;
-    Bool delete;
-    Atom req_type;
-    Atom* actual_type_return;
-    int* actual_format_return;
-    unsigned long* nitems_return;
-    unsigned long* bytes_after_return;
-    unsigned char** prop_return;
+XGetWindowProperty(
+    Display *display,
+    Window w,
+    Atom property,
+    long long_offset,
+    long long_length,
+    Bool delete,
+    Atom req_type,
+    Atom *actual_type_return,
+    int *actual_format_return,
+    unsigned long *nitems_return,
+    unsigned long *bytes_after_return,
+    unsigned char **prop_return)
 {
     *actual_type_return = None;
     *actual_format_return = 0;