This patch replaces dpatch.c with a newer version of
that file from the xorg cvs. 
Additionally it makes dsimple.h contain proper prototypes
and adds a Makefile and changes the manpage.
Additionally it makes xwit compile cleanly with
-Wstrict-prototypes -Wmissing-prototypes and -W

                                        brl

Index: xwit-3.4/dsimple.c
===================================================================
--- xwit-3.4.orig/dsimple.c	1995-10-19 00:59:17.000000000 +0100
+++ xwit-3.4/dsimple.c	2007-12-08 13:10:27.000000000 +0100
@@ -1,25 +1,47 @@
-/* $XConsortium: dsimple.c,v 1.12 91/05/11 21:01:36 gildea Exp $ */
-/* $Id: dsimple.c,v 3.2 95/10/18 16:58:55 dd Exp $ */
+/* $Xorg: dsimple.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
+/*
+
+Copyright 1993, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+/* $XFree86: xc/programs/xlsfonts/dsimple.c,v 3.6 2001/12/14 20:02:09 dawes Exp $ */
+
 #include <X11/Xos.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/cursorfont.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
 /*
  * Other_stuff.h: Definitions of routines in other_stuff.
  *
  * Written by Mark Lillibridge.   Last updated 7/1/87
- *
- * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-void out();
-void blip();
-Window Window_With_Name();
-void Fatal_Error();
+#include "dsimple.h"
 
 /*
  * Just_display: A group of routines designed to make the writting of simple
@@ -29,24 +51,20 @@
  *               and screen already defined on entry.
  *
  * Written by Mark Lillibridge.   Last updated 7/1/87
- *
- * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
 
 /* This stuff is defined in the calling program by just_display.h */
-extern char *program_name;
-extern Display *dpy;
-extern int screen;
-
+char *program_name = "unknown_program";
+Display *dpy;
+int screen;
 
 /*
  * Malloc: like malloc but handles out of memory using Fatal_Error.
  */
-char *Malloc(size)
-     unsigned size;
+char *Malloc(size_t size)
 {
-	char *data, *malloc();
+	char *data;
 
 	if (!(data = malloc(size)))
 	  Fatal_Error("Out of memory!");
@@ -58,11 +76,9 @@
 /*
  * Realloc: like Malloc except for realloc, handles NULL using Malloc.
  */
-char *Realloc(ptr, size)
-        char *ptr;
-        int size;
+char *Realloc(void *ptr,size_t size)
 {
-	char *new_ptr, *realloc();
+	void *new_ptr;
 
 	if (!ptr)
 	  return(Malloc(size));
@@ -78,9 +94,7 @@
  * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
  * If found, remove it from command line.  Don't go past a lone -.
  */
-char *Get_Display_Name(pargc, argv)
-    int *pargc;  /* MODIFIED */
-    char **argv; /* MODIFIED */
+char *Get_Display_Name(int *pargc, char **argv)
 {
     int argc = *pargc;
     char **pargv = argv+1;
@@ -138,9 +152,7 @@
  *                           for this display is then stored in screen.
  *                           Does not require dpy or screen defined.
  */
-void Setup_Display_And_Screen(argc, argv)
-int *argc;      /* MODIFIED */
-char **argv;    /* MODIFIED */
+void Setup_Display_And_Screen(int *argc, char **argv)
 {
 	dpy = Open_Display (Get_Display_Name(argc, argv));
 	screen = DefaultScreen(dpy);
@@ -170,59 +182,6 @@
 	XBell(dpy, 50);
 }
 
-
-/*
- * ReadBitmapFile: same as XReadBitmapFile except it returns the bitmap
- *                 directly and handles errors using Fatal_Error.
- */
-static void _bitmap_error(status, filename)
-     int status;
-     char *filename;
-{
-  if (status == BitmapOpenFailed)
-    Fatal_Error("Can't open file %s!", filename);
-  else if (status == BitmapFileInvalid)
-    Fatal_Error("file %s: Bad bitmap format.", filename);
-  else
-    Fatal_Error("Out of memory!");
-}
-
-Pixmap ReadBitmapFile(d, filename, width, height, x_hot, y_hot)
-     Drawable d;
-     char *filename;
-     int *width, *height, *x_hot, *y_hot;
-{
-  Pixmap bitmap;
-  int status;
-
-  status = XReadBitmapFile(dpy, RootWindow(dpy, screen), filename,
-			   (unsigned int *)width, (unsigned int *)height,
-			   &bitmap, x_hot, y_hot);
-  if (status != BitmapSuccess)
-    _bitmap_error(status, filename);
-
-  return(bitmap);
-}
-
-
-/*
- * WriteBitmapFile: same as XWriteBitmapFile except it handles errors
- *                  using Fatal_Error.
- */
-void WriteBitmapFile(filename, bitmap, width, height, x_hot, y_hot)
-     char *filename;
-     Pixmap bitmap;
-     int width, height, x_hot, y_hot;
-{
-  int status;
-
-  status= XWriteBitmapFile(dpy, filename, bitmap, width, height, x_hot,
-			   y_hot);
-  if (status != BitmapSuccess)
-    _bitmap_error(status, filename);
-}
-
-
 /*
  * Select_Window_Args: a rountine to provide a common interface for
  *                     applications that need to allow the user to select one
@@ -259,7 +218,7 @@
 #define OPTION argv[0]
 #define NXTOPTP ++argv, --argc>0
 #define NXTOPT if (++argv, --argc==0) usage()
-#define COPYOPT nargv++[0]=OPTION; nargc++
+#define COPYOPT nargv++[0]=OPTION, nargc++
 
 	while (NXTOPTP) {
 		if (!strcmp(OPTION, "-")) {
@@ -285,7 +244,7 @@
 			w=0;
 			sscanf(OPTION, "0x%lx", &w);
 			if (!w)
-			  sscanf(OPTION, "%ld", &w);
+			  sscanf(OPTION, "%lu", &w);
 			if (!w)
 			  Fatal_Error("Invalid window id format: %s.", OPTION);
 			continue;
@@ -301,13 +260,8 @@
  * Other_stuff: A group of routines which do common X11 tasks.
  *
  * Written by Mark Lillibridge.   Last updated 7/1/87
- *
- * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
-extern Display *dpy;
-extern int screen;
-
 /*
  * Resolve_Color: This routine takes a color name and returns the pixel #
  *                that when used in the window w will be of color name.
@@ -381,7 +335,9 @@
  */
 void blip()
 {
-  outl("blip!");
+    fflush(stdout);
+    fprintf(stderr, "blip!\n");
+    fflush(stderr);
 }
 
 
@@ -447,7 +403,7 @@
 {
 	Window *children, dummy;
 	unsigned int nchildren;
-	int i;
+	unsigned int i;
 	Window w=0;
 	char *window_name;
 
@@ -467,36 +423,18 @@
 }
 
 /*
- * outl: a debugging routine.  Flushes stdout then prints a message on stderr
- *       and flushes stderr.  Used to print messages when past certain points
- *       in code so we can tell where we are.  Outl may be invoked like
- *       printf with up to 7 arguments.
- */
-/* VARARGS1 */
-outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
-     char *msg;
-     char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
-{
-	fflush(stdout);
-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
-	fprintf(stderr, "\n");
-	fflush(stderr);
-}
-
-
-/*
  * Standard fatal error routine - call like printf but maximum of 7 arguments.
  * Does not require dpy or screen defined.
  */
-/* VARARGS1 */
-void Fatal_Error(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
-char *msg;
-char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+void Fatal_Error(char *msg, ...)
 {
+	va_list args;
 	fflush(stdout);
 	fflush(stderr);
 	fprintf(stderr, "%s: error: ", program_name);
-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	va_start(args, msg);
+	vfprintf(stderr, msg, args);
+	va_end(args);
 	fprintf(stderr, "\n");
 	exit(2);
 }
Index: xwit-3.4/dsimple.h
===================================================================
--- xwit-3.4.orig/dsimple.h	1995-08-25 02:26:37.000000000 +0200
+++ xwit-3.4/dsimple.h	2007-12-08 12:54:08.000000000 +0100
@@ -12,26 +12,26 @@
 
     /* Global variables used by routines in just_display.c */
 
-char *program_name = "unknown_program";       /* Name of this program */
-Display *dpy;                                 /* The current display */
-int screen;                                   /* The current screen */
+extern char *program_name;       /* Name of this program */
+extern Display *dpy;                                 /* The current display */
+extern int screen;                                   /* The current screen */
 
 #define INIT_NAME program_name=argv[0]        /* use this in main to setup
                                                  program_name */
 
     /* Declaritions for functions in just_display.c */
 
-void Fatal_Error();
-char *Malloc();
-char *Realloc();
-char *Get_Display_Name();
-Display *Open_Display();
-void Setup_Display_And_Screen();
-XFontStruct *Open_Font();
-void Beep();
-Pixmap ReadBitmapFile();
-void WriteBitmapFile();
-Window Select_Window_Args();
+void Fatal_Error(char *msg, ...);
+char *Malloc(size_t);
+char *Realloc(void*,size_t);
+char *Get_Display_Name(int*,char **);
+Display *Open_Display(char *);
+void Setup_Display_And_Screen(int *, char **);
+XFontStruct *Open_Font(char *);
+void Beep(void);
+Pixmap ReadBitmapFile(Drawable,char *,int*,int*,int*,int*);
+void WriteBitmapFile(char *,Pixmap,int,int,int,int);
+Window Select_Window_Args(int *,char **);
 
 #define X_USAGE "[host:display]"              /* X arguments handled by
 						 Get_Display_Name */
@@ -45,9 +45,10 @@
  * Send bugs, etc. to chariot@athena.mit.edu.
  */
 
-unsigned long Resolve_Color();
-Pixmap Bitmap_To_Pixmap();
-Window Select_Window();
-void out();
-void blip();
-Window Window_With_Name();
+unsigned long Resolve_Color(Window,char *);
+Pixmap Bitmap_To_Pixmap(Display *,Drawable,GC,Pixmap,int,int);
+Window Select_Window(Display *);
+void out(void);
+void blip(void);
+Window Window_With_Name(Display *,Window,char *);
+void usage(void);
Index: xwit-3.4/Makefile
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ xwit-3.4/Makefile	2007-12-08 12:57:31.000000000 +0100
@@ -0,0 +1,23 @@
+CFLAGS ?= -Wall -O2 -g -Wstrict-prototypes -Wmissing-prototypes
+LDFLAGS ?= -Wl,-z,defs
+LIBRARIES = -lX11
+
+all: xwit
+
+xwit: xwit.o ClientWin.o dsimple.o
+	gcc $(CFLAGS) $(LDFLAGS) $(LIBRARIES) -o $@ $^
+
+%.o: %.c
+	gcc $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
+
+# Headers needed
+dsimple.o: dsimple.h
+xwit.o: dsimple.h ClientWin.h
+ClientWin.o: ClientWin.h
+
+clean:
+	-rm xwit *.o
+
+install: xwit
+	install xwit $(DESTDIR)/usr/bin/
+
Index: xwit-3.4/xwit.man
===================================================================
--- xwit-3.4.orig/xwit.man	2007-12-08 12:53:57.000000000 +0100
+++ xwit-3.4/xwit.man	2007-12-08 13:08:53.000000000 +0100
@@ -1,5 +1,4 @@
-.\" $Id: xwit.man,v 3.4 97/10/20 18:32:54 dd Exp $
-.TH XWIT 1X
+.TH XWIT 1 "22 Oct 2005"
 .SH NAME
 xwit \- window interface tool: pop or iconify this xterm window or named windows
 .SH SYNOPSIS
@@ -70,7 +69,7 @@
 strings, or a particular window id given, or the window id found
 in the environment variable
 .B WINDOWID
-(which is set by xterm for the program it runs).
+(which is set by xterm for the program it runs), or the window under the mouse cursor.
 .SH OPTIONS
 .TP
 -display
@@ -229,5 +228,6 @@
 .br
 David DiGiacomo, david@slack.com
 .SH ACKNOWLEDGEMENTS
-Thanks to Andre Delafontaine, Norman R. McBride, Keith Thompson, and
-Glen R. Walker for bug reports and suggestions.
+Thanks to Andre Delafontaine, Norman R. McBride, Keith Thompson,
+Glen R. Walker, Michael Mauch, Dima Barsky and Decklin Foster
+for bug reports, suggestions and/or patches.
Index: xwit-3.4/ClientWin.c
===================================================================
--- xwit-3.4.orig/ClientWin.c	2007-12-08 12:54:21.000000000 +0100
+++ xwit-3.4/ClientWin.c	2007-12-08 12:55:03.000000000 +0100
@@ -17,14 +17,13 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include "ClientWin.h"
 
-static Window TryChildren();
+static Window TryChildren(Display *,Window,Atom);
 
 /* Find a window with WM_STATE, else return win itself, as per ICCCM */
 
-Window XmuClientWindow (dpy, win)
-    Display *dpy;
-    Window win;
+Window XmuClientWindow (Display *dpy,Window win)
 {
     Atom WM_STATE;
     Atom type = None;
@@ -47,10 +46,7 @@
 }
 
 static
-Window TryChildren (dpy, win, WM_STATE)
-    Display *dpy;
-    Window win;
-    Atom WM_STATE;
+Window TryChildren (Display *dpy, Window win, Atom WM_STATE)
 {
     Window root, parent;
     Window *children;
Index: xwit-3.4/ClientWin.h
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ xwit-3.4/ClientWin.h	2007-12-08 12:55:03.000000000 +0100
@@ -0,0 +1,2 @@
+
+Window XmuClientWindow (Display *dpy,Window win);
Index: xwit-3.4/xwit.c
===================================================================
--- xwit-3.4.orig/xwit.c	2007-12-08 12:54:21.000000000 +0100
+++ xwit-3.4/xwit.c	2007-12-08 13:07:04.000000000 +0100
@@ -34,8 +34,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include "dsimple.h"
-
-Window XmuClientWindow();
+#include "ClientWin.h"
 
 /* note: called by dsimple.c code, must be global */
 void
@@ -129,14 +128,13 @@
 static int Gwinfound;
 
 /* forward declarations */
-static void doit();
+static void doit(Window);
 
 /*
  * sleep for given millisecs for those without usleep
  */
 static void
-mssleep(ms)
-int ms;
+mssleep(int ms)
 {
     struct timeval tv;
     tv.tv_sec = ms/1000;
@@ -148,8 +146,7 @@
  * find all windows below this and if name matches call doit on it
  */
 static void
-downtree(top)
-Window top;
+downtree(Window top)
 {
     Window *child, dummy;
     unsigned int children, i;
@@ -172,7 +169,7 @@
  * [un]set autorepeat for individual keys
  */
 static void
-setrepeat()
+setrepeat(void)
 {
     unsigned long value_mask;
     XKeyboardControl values;
@@ -194,9 +191,7 @@
  * (based on xwininfo.c)
  */
 static void
-getpos(window, xp, yp)
-	Window window;
-	int *xp, *yp;
+getpos(Window window, int *xp, int *yp)
 {
 	XWindowAttributes attributes;
 	int rx, ry;
@@ -217,9 +212,7 @@
  * get window size
  */
 static void
-getsize(window, wp, hp)
-	Window window;
-	int *wp, *hp;
+getsize(Window window, int *wp, int *hp)
 {
 	XWindowAttributes attributes;
 
@@ -234,10 +227,7 @@
  * set window position
  */
 static void
-domove(window, x, y, right, bottom)
-	Window window;
-	int x, y;
-	int right, bottom;
+domove(Window window, int x, int y, int right, int bottom)
 {
 	XWindowChanges values;
 	unsigned int value_mask;
@@ -307,9 +297,7 @@
  * set window size
  */
 static void
-doresize(window, w, h)
-    Window window;
-    int w, h;
+doresize(Window window, int w, int h)
 {
     XWindowChanges values;
     unsigned int value_mask;
@@ -351,9 +339,7 @@
  * set row/column size
  */
 static void
-rcresize(what, window)
-    enum functions what;
-    Window window;
+rcresize(enum functions what, Window window)
 {
     XSizeHints *hints;
     long supplied;
@@ -383,10 +369,7 @@
 }
 
 static void
-loadbitmap(window, file, pmp)
-	Window window;
-	char *file;
-	Pixmap *pmp;
+loadbitmap(Window window, const char *file, Pixmap *pmp)
 {
 	unsigned int w, h;
 	int xhot, yhot;
@@ -397,8 +380,7 @@
 }
 
 static void
-setbitmap(window)
-	Window window;
+setbitmap(Window window)
 {
 	static XWMHints *hints;
 	static Pixmap bitmap_pm;
@@ -437,8 +419,7 @@
 }
 
 static void
-setwinattr(window)
-	Window window;
+setwinattr(Window window)
 {
 	XSetWindowAttributes swa;
 	unsigned long valuemask;
@@ -462,8 +443,7 @@
  * iconify the given window, or map and raise it, or whatever
  */
 static void
-doit(window)
-	Window window;
+doit(Window window)
 {
 	XWindowChanges values;
 	unsigned int value_mask;
@@ -622,9 +602,7 @@
 
 /* based on xwininfo.c */
 static Window
-xwit_select_window(dpy, current)
-	Display *dpy;
-	int current;
+xwit_select_window(Display *dpy, int current)
 {
 	Window window = None;
 	Window wroot;
@@ -653,8 +631,7 @@
 }
 
 static Window
-getxid(s)
-	char *s;
+getxid(const char *s)
 {
 	XID id;
 
@@ -668,15 +645,12 @@
 }
 
 static int
-matchopt(key, nargs, argc, argv)
-	char *key;
-	int nargs;
-	int *argc;
-	char **argv;
+matchopt(const char *key, int nargs, int *argc, char **argv)
 {
 	int enough = 0;
 	int match = 1;
-	char *ap, *kp;
+	char *ap;
+	const char *kp;
 
 	ap = *argv;
 	if (*ap == '-')
@@ -741,10 +715,8 @@
 	return match;
 }
 
-void
-FetchBuffer( dpy, nbuf )
-	Display *dpy;
-	int nbuf;
+static void
+FetchBuffer(Display *dpy, int nbuf)
 {
         char *buf;
         int size;
@@ -757,10 +729,8 @@
                 fwrite( buf, 1, size, stdout );
 }
 
-void
-StoreBuffer( dpy, nbuf )
-	Display *dpy;
-	int nbuf;
+static void
+StoreBuffer(Display *dpy, int nbuf)
 {
         char *buf = NULL;
         int bufsize, nread, total=0;
@@ -778,9 +748,7 @@
 }
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char *argv[])
 {
 	Window window = 0;
 	int *pargc = &argc;
@@ -1011,7 +979,6 @@
 	case WID_env:
 		{
 			char *s;
-			extern char *getenv();
 
 			s = getenv("WINDOWID");
 			if (s != 0)