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.

diff -r -u -N xwit-3.4/dsimple.c d/xwit-3.4/dsimple.c
--- xwit-3.4/dsimple.c	1995-10-19 00:59:17.000000000 +0100
+++ d/xwit-3.4/dsimple.c	2005-10-21 20:11:26.000000000 +0200
@@ -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,22 @@
  *               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;
 
+static void _bitmap_error(int, char *);
 
 /*
  * 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 +78,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 +96,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 +154,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);
@@ -259,7 +273,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 +299,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 +315,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 +390,9 @@
  */
 void blip()
 {
-  outl("blip!");
+    fflush(stdout);
+    fprintf(stderr, "blip!\n");
+    fflush(stderr);
 }
 
 
@@ -472,13 +483,14 @@
  *       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;
+void
+outl(char *msg, ...)
 {
+	va_list args;
 	fflush(stdout);
-	fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+	va_start(args, msg);
+	vfprintf(stderr, msg, args);
+	va_end(args);
 	fprintf(stderr, "\n");
 	fflush(stderr);
 }
@@ -488,15 +500,15 @@
  * 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);
 }
diff -r -u -N xwit-3.4/dsimple.h d/xwit-3.4/dsimple.h
--- xwit-3.4/dsimple.h	1995-08-25 02:26:37.000000000 +0200
+++ d/xwit-3.4/dsimple.h	2005-10-21 20:12:30.000000000 +0200
@@ -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);
diff -r -u -N xwit-3.4/Makefile d/xwit-3.4/Makefile
--- xwit-3.4/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ d/xwit-3.4/Makefile	2005-10-22 00:21:19.000000000 +0200
@@ -0,0 +1,20 @@
+CFLAGS ?= -Wall -O2 -g
+LDFLAGS ?= -L/usr/X11R6/lib
+LIBRARIES = -lX11
+
+xwit: xwit.o ClientWin.o dsimple.o
+	gcc $(CFLAGS) $(LDFLAGS) $(LIBRARIES) -o $@ $^
+
+%.o: %.c
+	gcc $(CFLAGS) -c -o $@ $<
+
+# Headers needed
+dsimple.o: dsimple.h
+xwit.o: dsimple.h
+
+clean:
+	-rm xwit *.o
+
+install: xwit
+	install xwit $(DESTDIR)/usr/bin/
+
diff -r -u -N xwit-3.4/xwit.man d/xwit-3.4/xwit.man
--- xwit-3.4/xwit.man	2005-10-21 19:38:35.000000000 +0200
+++ d/xwit-3.4/xwit.man	2005-10-22 12:10:49.000000000 +0200
@@ -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.