Fix return types.

26 files changed, 681 insertions, 40 deletions

diff --git a/wm/olvwm/distinfo b/wm/olvwm/distinfo
index 014c58bd0ec..b2bb65e1fec 100644
--- a/wm/olvwm/distinfo
+++ b/wm/olvwm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/08/08 20:40:48 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/03/28 21:40:10 joerg Exp $
 
 SHA1 (olvwm4.src4.tar.gz) = d8900f1aeccfc75924e922d9e86008462de12e62
 RMD160 (olvwm4.src4.tar.gz) = 6523adb9a2f08829dbe6099e88ac031b1dd232a4
@@ -6,14 +6,32 @@ Size (olvwm4.src4.tar.gz) = 386560 bytes
 SHA1 (patch-aa) = e0a4eaab392555e9e5adb3b7376a21e70f8fadb1
 SHA1 (patch-ab) = c9e045f8dbc966feac732adb2ab53c531bdfa8cf
 SHA1 (patch-ac) = 157710147ecef7ff4ce3b167c7c6cdaa2449cf33
-SHA1 (patch-ad) = d33f6afd90cfd21e038dfea456eb2d9e34ac8fc6
-SHA1 (patch-ae) = 537fa9aed7555eede44b3b13cf2ef2ee5378dd3a
-SHA1 (patch-af) = 2a6d5ba368b91ac829b03f9c3b2d92073a0aaf26
-SHA1 (patch-ag) = 9651a2a6acd3bc7acf04517f4eaf32b795c519f4
-SHA1 (patch-ah) = c3ed0d792a9cdaba4ae69fcd4482e0d612bc1cc7
-SHA1 (patch-ai) = 186f9283f7eb31bf2c3ac296b505bdb487398107
+SHA1 (patch-ad) = 28b4f4cac1c94e787e68bbdb8ce859545f898528
+SHA1 (patch-ae) = feb9b4effe6066021ac16e20b982a52211d1c7ba
+SHA1 (patch-af) = 14d28f23cbf6cb37aeff124124bef3aa79d3e1a8
+SHA1 (patch-ag) = 07a2294c9a42c047aff203844f1535766bc13a6f
+SHA1 (patch-ah) = d3b1ed50b35d9c27bf6825474a36f9f94037f094
+SHA1 (patch-ai) = cb6dc2f0ccfcfe82aebc35baa4c8ad8359419d37
 SHA1 (patch-aj) = ca38388a38ae00f3085dccf7933517cb07a070bf
-SHA1 (patch-ak) = 2b5caceb2022dd769cf3ad1eefbb25a924ade012
+SHA1 (patch-ak) = c6898b31d134b72fb2c07dae0451d714fdad88de
 SHA1 (patch-al) = 76e0eccf43e6a103ffdafad2692b5817ec138d14
 SHA1 (patch-am) = 801152c57c9e5b50a48f9091464d8cff3b4db0f5
 SHA1 (patch-an) = 5e6e28b8f07184ec13420b3c2e24d9e7cc81957e
+SHA1 (patch-events.c) = bea715d047938cfc1d7abddb016be8e238a272c8
+SHA1 (patch-olwm.h) = 54a75c473fa4978170e5f606cb03fc9359bd97c9
+SHA1 (patch-selection.c) = c18c1d39b3b81a976b120d5bd609132b4521d854
+SHA1 (patch-selection.h) = d38718ecc7e606f72ef90249a7485b908d22fa48
+SHA1 (patch-slots.c) = 107a5795ea4edb8dbf18571c1ef004474df4427d
+SHA1 (patch-slots.h) = 8c12e3c02142bd4899fc49bf1f857676e7db24ff
+SHA1 (patch-st.h) = 8425fc18906edfba6c79b51db774d84e34702e9a
+SHA1 (patch-win.h) = c76ad39d1f2a53ce1652a155dad11d7d780b14b3
+SHA1 (patch-winbusy.c) = e6fc21ee47a37c3630d9ed697f4e5c8f814e3f26
+SHA1 (patch-winbutton.c) = aa9fcc005ee13c3b0605bd2a2aeb83913a5f6a31
+SHA1 (patch-wingframe.c) = 38d12809953a567105b865b6c2f5916fd718287e
+SHA1 (patch-winipane.c) = eea35770b3c15903b75e6d006765c1fc298c36ec
+SHA1 (patch-winnofoc.c) = bc8dfb61c726e2aca04959aa3de74b64ed88c443
+SHA1 (patch-winpane.c) = db8dd3ff760e333976acd6fa362325ddcfbe792e
+SHA1 (patch-winpinmenu.c) = fdae4ac8081fffa45adf2967fcb6849af5fc3923
+SHA1 (patch-winpush.c) = 13188fcc22d80185e6757137076449bff8a2790d
+SHA1 (patch-winresize.c) = a96aea080330eeec4f84f37394ebb485670aa707
+SHA1 (patch-winroot.c) = e9d71732e0c11fc295bbc64cd0c228b8a6018b1d
diff --git a/wm/olvwm/patches/patch-ad b/wm/olvwm/patches/patch-ad
index b173e79115d..72ebf5e670f 100644
--- a/wm/olvwm/patches/patch-ad
+++ b/wm/olvwm/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2013/03/28 21:40:10 joerg Exp $
 
---- olvwmrc.y.orig	Wed Apr 28 23:27:20 1999
-+++ olvwmrc.y	Sat Jan  8 00:46:36 2000
-@@ -37,7 +37,7 @@
+--- olvwmrc.y.orig	2000-03-02 21:39:55.000000000 +0000
++++ olvwmrc.y
+@@ -37,7 +37,7 @@ extern CheckForKeyProg();
  char	*LookupToken();
  char	*FindOlvwmRC();
  void	resetKeys();
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  
  typedef struct progscreen {
      char        *target;
-@@ -527,7 +527,6 @@
+@@ -527,7 +527,6 @@ String :    WORD
  	    }
  %%
  /* Programs */
@@ -19,3 +19,46 @@ $NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  #include "parse.c"
  
  extern List	*ActiveClientList;
+@@ -773,10 +772,7 @@ static void clientSaveFocus();
+ static void clientRestoreFocus();
+ 
+ static int
+-applyAction(p, cli)
+-    ProgKeyNode	*p;
+-    Client	*cli;
+-
++applyAction(ProgKeyNode *p, Client *cli)
+ {
+ Client	*c;
+ char	*s, *t;
+@@ -1160,7 +1156,7 @@ struct stat statbuf;
+ 	    for (c = ListEnum(&l); c != NULL; c = ListEnum(&l)) {
+ 		if (findClient(c, ie->identifier)) {
+ 		    ListApply(ie->doIf, applyAction, c);
+-		    return;
++		    return False;
+ 		}
+ 	    }
+ 	    ListApply(ie->doElse, applyAction, cli);
+@@ -1251,10 +1247,7 @@ struct stat	tmp;
+ static struct stat olvwmBuf;
+ static struct stat olvwmOldBuf;
+ 
+-InitOlvwmRC(ldpy, path)
+-    Display	*ldpy;
+-    char	*path;
+-
++void InitOlvwmRC(Display *ldpy, char *path)
+ {
+ 
+     if (path == NULL)
+@@ -1276,8 +1269,7 @@ InitOlvwmRC(ldpy, path)
+ /*
+  * Check to see if olvwmrc has been changed since we last read it
+  */
+-CheckOlvwmRC(dpy)
+-    Display *dpy;
++void CheckOlvwmRC(Display *dpy)
+ {
+ char *p = FindOlvwmRC(&olvwmBuf);
+ extern XrmDatabase OlwmDB;
diff --git a/wm/olvwm/patches/patch-ae b/wm/olvwm/patches/patch-ae
index 196098620c8..d9487ffa99d 100644
--- a/wm/olvwm/patches/patch-ae
+++ b/wm/olvwm/patches/patch-ae
@@ -1,8 +1,16 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2013/03/28 21:40:10 joerg Exp $
 
---- olwm.c.orig	Sat Jan  8 00:25:00 2000
-+++ olwm.c	Sat Jan  8 00:25:06 2000
-@@ -675,12 +675,11 @@
+--- olwm.c.orig	2000-03-02 21:43:52.000000000 +0000
++++ olwm.c
+@@ -67,6 +67,7 @@ GlobalResourceVariables GRV;		/* variabl
+ XrmDatabase	OlwmDB;			/* the main resource database */
+ Display		*DefDpy;		/* the display connection */
+ 
++void InitOlvwmRC(Display *ldpy, char *path);
+ 
+ #ifdef DEBUG
+ 
+@@ -675,12 +676,11 @@ ReapChildren()
  {
  #ifdef SYSV
          pid_t pid;
diff --git a/wm/olvwm/patches/patch-af b/wm/olvwm/patches/patch-af
index 32acabe91f8..cb2af9ac5f1 100644
--- a/wm/olvwm/patches/patch-af
+++ b/wm/olvwm/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-af,v 1.2 2013/03/28 21:40:10 joerg Exp $
 
---- screen.c.orig	Sat Jan  8 00:34:00 2000
-+++ screen.c	Sat Jan  8 00:34:05 2000
-@@ -157,6 +157,15 @@
+--- screen.c.orig	2000-03-02 21:43:02.000000000 +0000
++++ screen.c
+@@ -157,6 +157,16 @@ static XrmQuark virtualPixmapColorIQ;
   *	Local Functions
   *-------------------------------------------------------------------------*/
  
@@ -13,8 +13,42 @@ $NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
 +static updateScreenBorderColor();
 +static updateScreenInputFocusColor();
 +static updateScreenGlyphFont();
++static void UpdateScreenVirtualPixmapColor(Display *dpy, ScreenInfo *scrInfo);
 +
 +
  /*
   * makeScreenQuarks -- set up quarks for screen resources
   */
+@@ -2422,9 +2432,7 @@ UpdateScreenVirtualFont(dpy,scrInfo)
+ /*
+  */
+ /* ARGSUSED */
+-UpdateScreenVirtualGeometry(dpy,scrInfo)
+-	Display		*dpy;
+-	ScreenInfo	*scrInfo;
++void UpdateScreenVirtualGeometry(Display *dpy, ScreenInfo *scrInfo)
+ {
+ char	*geom;
+ 	
+@@ -2439,9 +2447,7 @@ char	*geom;
+ 	VirtualSetGeometry(scrInfo->vdm->client->framewin, geom);
+ }
+ 
+-UpdateScreenVirtualMap(dpy,scrInfo)
+-	Display		*dpy;
+-	ScreenInfo	*scrInfo;
++void UpdateScreenVirtualMap(Display *dpy, ScreenInfo *scrInfo)
+ {
+ char		*name;
+ XSizeHints	*sizeHints;
+@@ -2475,9 +2481,7 @@ long		sizeSet;
+ 	}
+ }
+ 
+-UpdateScreenVirtualPixmapColor(dpy,scrInfo)
+-	Display		*dpy;
+-	ScreenInfo	*scrInfo;
++static void UpdateScreenVirtualPixmapColor(Display *dpy, ScreenInfo *scrInfo)
+ {
+ 	if (!scrInfo->vdm->resources->background)
+ 	    return;
diff --git a/wm/olvwm/patches/patch-ag b/wm/olvwm/patches/patch-ag
index df7689fd5df..3e46dc20c8b 100644
--- a/wm/olvwm/patches/patch-ag
+++ b/wm/olvwm/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2013/03/28 21:40:10 joerg Exp $
 
---- st.c.orig	Sat Jan  8 00:34:44 2000
-+++ st.c	Sat Jan  8 00:35:22 2000
+--- st.c.orig	2000-03-02 21:40:47.000000000 +0000
++++ st.c
 @@ -44,6 +44,8 @@
  	(table->hash == ST_NUMHASH) ? ((int) (key) % table->num_bins) :\
  	(*table->hash)((key), table->num_bins))*/
@@ -11,3 +11,15 @@ $NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  st_table *st_init_table_with_params(compare, hash, size, density, grow_factor,
  				    reorder_flag)
  int (*compare)();
+@@ -320,10 +322,7 @@ char **value;
+     return 0;
+ }
+ 
+-st_foreach(table, func, arg)
+-st_table *table;
+-enum st_retval (*func)();
+-char *arg;
++void st_foreach(st_table *table, enum st_retval (*func)(), char *arg)
+ {
+     st_table_entry *ptr, *last, *tmp;
+     enum st_retval retval;
diff --git a/wm/olvwm/patches/patch-ah b/wm/olvwm/patches/patch-ah
index 91922810314..56634e68b21 100644
--- a/wm/olvwm/patches/patch-ah
+++ b/wm/olvwm/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2006/01/19 23:15:59 joerg Exp $
+$NetBSD: patch-ah,v 1.3 2013/03/28 21:40:10 joerg Exp $
 
 --- virtual.c.orig	2000-03-02 21:41:11.000000000 +0000
 +++ virtual.c
@@ -10,7 +10,16 @@ $NetBSD: patch-ah,v 1.2 2006/01/19 23:15:59 joerg Exp $
  #include <stdio.h>
  #include <string.h>
  #include <dirent.h>
-@@ -69,6 +70,9 @@ extern Button	*MakeUpLeftButton(),*MakeL
+@@ -48,6 +49,8 @@ regexp *expbuf;
+ #ident "@(#)virtual.c	1.6 olvwm version 01/07/94"
+ #endif
+ 
++void PaintVirtualWindow(WinGenericFrame *win);
++
+ /* Class Function Vector; a virtual pane is the VDM window in which all
+  * the little virtual windows appear (and to which said windows are
+  * parented)
+@@ -69,6 +72,9 @@ extern Button	*MakeUpLeftButton(),*MakeL
  
  extern char	*ExpandPath();
  
@@ -20,7 +29,47 @@ $NetBSD: patch-ah,v 1.2 2006/01/19 23:15:59 joerg Exp $
  /*
   * Semantic action associated with each of the buttons above.  These must
   * be in the same order as the button array; it would be better if the Button
-@@ -1982,8 +1986,13 @@ struct _menu	*menu;
+@@ -639,11 +645,8 @@ SemanticAction	action;
+  *
+  * Event functions for the VDM
+  */
+-static
+-vdmExpose(dpy, event, winInfo)
+-    Display	*dpy;
+-    XEvent	*event;
+-    WinGeneric	*winInfo;
++static void
++vdmExpose(Display *dpy, XEvent *event, WinGeneric *winInfo)
+ {
+ XEvent	dummy;
+ 
+@@ -1309,9 +1312,8 @@ int	length;
+ /*
+  * Refresh the window's virtual representation
+  */
+-int
+-PaintVirtualWindow(win)
+-    WinGenericFrame	*win;
++void
++PaintVirtualWindow(WinGenericFrame *win)
+ {
+ Client	*cli = win->core.client;
+ int	length;
+@@ -1969,21 +1971,19 @@ cmpButton(b1, b2)
+  *
+  */
+ /* ARGSUSED */
+-GenDirMenuFunc(dpy, menuInfo, bindex, cache, winInfo, depth)
+-    Display	*dpy;
+-    MenuInfo	*menuInfo;
+-    int		bindex;
+-    MenuCache	*cache;
+-    WinGeneric	*winInfo;
+-    int		depth;
+-
++void GenDirMenuFunc(Display *dpy, MenuInfo *menuInfo, int bindex, MenuCache *cache, WinGeneric *winInfo, int depth)
+ {
+ struct _menu	*menu;
  DIR	*dir;
  struct dirent	*ent;
  Button	*b;
@@ -34,7 +83,7 @@ $NetBSD: patch-ah,v 1.2 2006/01/19 23:15:59 joerg Exp $
  extern int AppMenuFunc();
  MenuCache	*menuCache;
  int		slot;
-@@ -2108,7 +2117,9 @@ int val;
+@@ -2108,7 +2108,9 @@ int val;
      }
  }
  
diff --git a/wm/olvwm/patches/patch-ai b/wm/olvwm/patches/patch-ai
index 7c616f0aed3..fb3c7c4bf68 100644
--- a/wm/olvwm/patches/patch-ai
+++ b/wm/olvwm/patches/patch-ai
@@ -1,8 +1,16 @@
-$NetBSD: patch-ai,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2013/03/28 21:40:11 joerg Exp $
 
---- winframe.c.orig	Sat Jan  8 00:38:12 2000
-+++ winframe.c	Sat Jan  8 00:38:49 2000
-@@ -84,6 +84,7 @@
+--- winframe.c.orig	2000-03-02 21:41:53.000000000 +0000
++++ winframe.c
+@@ -51,6 +51,7 @@ extern Atom AtomRightIMStatus;
+ extern int Resize_height, Resize_width;
+ 
+ extern Time TimeFresh();
++void PaintVirtualWindow(WinGenericFrame *win);
+ 
+ /***************************************************************************
+ * private data
+@@ -84,6 +85,7 @@ void FrameUpdateShape();
  static void setIMStatusText();
  #endif
  static void updateResizePositions();
@@ -10,3 +18,18 @@ $NetBSD: patch-ai,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
  
  /***************************************************************************
  * sizing and decoration positioning functions
+@@ -484,12 +486,8 @@ WinPaneFrame *frameInfo;
+  * the focus.  Also, unset the warp-back flag if the pointer has gone outside 
+  * the frame.
+  */
+-static int
+-/* ARGSUSED */
+-eventLeaveNotify(dpy, event, frameInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinPaneFrame *frameInfo;
++static void
++eventLeaveNotify(Display *dpy, XEvent *event, WinPaneFrame *frameInfo)
+ {
+     /* ignore events caused by grabs */
+     if (event->xcrossing.mode != NotifyNormal)
diff --git a/wm/olvwm/patches/patch-ak b/wm/olvwm/patches/patch-ak
index 62bc96e2223..ea7e7966a6a 100644
--- a/wm/olvwm/patches/patch-ak
+++ b/wm/olvwm/patches/patch-ak
@@ -1,8 +1,17 @@
-$NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+$NetBSD: patch-ak,v 1.2 2013/03/28 21:40:11 joerg Exp $
 
---- usermenu.c.orig	Thu Mar  2 22:41:31 2000
-+++ usermenu.c	Tue Jun  6 19:24:12 2000
-@@ -884,7 +884,7 @@
+--- usermenu.c.orig	2000-03-02 21:41:31.000000000 +0000
++++ usermenu.c
+@@ -193,7 +193,7 @@ extern int  StartDSDMFunc();
+ extern int  StopDSDMFunc();
+ 
+ extern int  GenWinMenuFunc();
+-extern int  GenDirMenuFunc();
++void GenDirMenuFunc(Display *dpy, MenuInfo *menuInfo, int bindex, MenuCache *cache, WinGeneric *winInfo, int depth);
+ extern int  StickSelnFunc();
+ extern int  MoveDesktopFunc();
+ 
+@@ -884,7 +884,7 @@ makeMenuSearchPath()
  		home = ".";
   
  	if ((owHome = getenv("OPENWINHOME")) == NULL)
@@ -11,11 +20,10 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
   
  	menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *));
   
-@@ -899,16 +899,6 @@
- 	/* $HOME/.<menufile> */
+@@ -900,16 +900,6 @@ makeMenuSearchPath()
  	sprintf(buf, "%s/.%%s", home);
  	menuSearchPath[i++] = MemNewString(buf);
--
+ 
 -#ifdef OW_I18N_L3
 -	/* $OPENWINHOME/share/locale/<locale>/olwm/<menufile> */
 -	sprintf(buf, "%s/share/locale/%%2$s/olwm/%%1$s", owHome);
@@ -25,6 +33,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
 -	sprintf(buf, "%s/lib/%%1$s.%%2$s", owHome);
 -	menuSearchPath[i++] = MemNewString(buf);
 -#endif
- 
+-
  	/* $OPENWINHOME/lib/<menufile> */
  	sprintf(buf, "%s/lib/%%s", owHome);
+ 	menuSearchPath[i++] = MemNewString(buf);
diff --git a/wm/olvwm/patches/patch-events.c b/wm/olvwm/patches/patch-events.c
new file mode 100644
index 00000000000..d5265c5828f
--- /dev/null
+++ b/wm/olvwm/patches/patch-events.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-events.c,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- events.c.orig	2013-03-28 19:14:44.000000000 +0000
++++ events.c
+@@ -38,6 +38,8 @@
+ 
+ /* ===== externs ========================================================== */
+ 
++void CheckOlvwmRC(Display *dpy);
++
+ extern void	ReapChildren();
+ 
+ /* ===== globals ========================================================== */
diff --git a/wm/olvwm/patches/patch-olwm.h b/wm/olvwm/patches/patch-olwm.h
new file mode 100644
index 00000000000..5d217e37ece
--- /dev/null
+++ b/wm/olvwm/patches/patch-olwm.h
@@ -0,0 +1,29 @@
+$NetBSD: patch-olwm.h,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- olwm.h.orig	2013-03-28 19:18:35.000000000 +0000
++++ olwm.h
+@@ -107,7 +107,6 @@ extern struct _wingeneric *NoFocusWinInf
+ extern struct _wingeneric *MakeNoFocus();
+ extern void NoFocusTakeFocus();
+ extern void NoFocusInit();
+-extern int NoFocusEventBeep();
+ 
+ /* client information and functions */
+ extern struct _List *ActiveClientList;
+@@ -147,8 +146,6 @@ extern int GFrameSetConfigFunc();
+ extern void GFrameSetStack();
+ extern void GFrameSetConfig();
+ extern int GFrameEventButtonPress();
+-extern int GFrameEventMotionNotify();
+-extern int GFrameEventButtonRelease();
+ extern int GFrameEventFocus();
+ extern int GFrameEventEnterNotify();
+ 
+@@ -187,7 +184,6 @@ extern void ColormapTransmogrify();
+ extern Bool IsSelected();
+ extern struct _client *EnumSelections();
+ extern Time TimeFresh();
+-extern int AddSelection();
+ extern Bool RemoveSelection();
+ extern Bool ToggleSelection();
+ extern void ClearSelections();
diff --git a/wm/olvwm/patches/patch-selection.c b/wm/olvwm/patches/patch-selection.c
new file mode 100644
index 00000000000..233c8f78e1d
--- /dev/null
+++ b/wm/olvwm/patches/patch-selection.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-selection.c,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- selection.c.orig	2013-03-28 19:18:31.000000000 +0000
++++ selection.c
+@@ -299,10 +299,8 @@ IsSelected(cli)
+  * Add this client to the list of clients on the PRIMARY selection and mark
+  * the client as being selected.  Acquires the PRIMARY selection if necessary.
+  */
+-int
+-AddSelection(cli, timestamp)
+-	Client *cli;
+-	Time timestamp;
++void
++AddSelection(Client *cli, Time timestamp)
+ {
+ 	List *l = selectList;
+ 	Client *tc;
diff --git a/wm/olvwm/patches/patch-selection.h b/wm/olvwm/patches/patch-selection.h
new file mode 100644
index 00000000000..1c026bc17ea
--- /dev/null
+++ b/wm/olvwm/patches/patch-selection.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-selection.h,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- selection.h.orig	2013-03-28 19:20:53.000000000 +0000
++++ selection.h
+@@ -17,7 +17,6 @@
+ extern	Time	SelectionTime;
+ 
+ extern	Bool	IsSelected(/*  client  */);
+-extern	int	AddSelection(/*  client, time  */);
+ extern	Bool	RemoveSelection(/*  client  */);
+ extern	Bool	ToggleSelection(/*  client, time  */);
+ extern	void	ClearSelections(/*  dpy  */);
diff --git a/wm/olvwm/patches/patch-slots.c b/wm/olvwm/patches/patch-slots.c
new file mode 100644
index 00000000000..2dcb3bd8924
--- /dev/null
+++ b/wm/olvwm/patches/patch-slots.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-slots.c,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- slots.c.orig	2013-03-28 19:21:20.000000000 +0000
++++ slots.c
+@@ -535,8 +535,7 @@ Bool snaptogrid;
+  * Note that if this code is changed, the similar code in SlotSetLocations
+  * may need to be changed also.
+  */
+-SlotFree(winicon)
+-WinIconFrame *winicon;
++void SlotFree(WinIconFrame *winicon)
+ {
+ 	IconGrid	*iconGrid = winicon->core.client->scrInfo->iconGrid;
+ 
+@@ -566,9 +565,7 @@ WinIconFrame *winicon;
+  * in the new order.
+  */
+ /*ARGSUSED*/
+-SlotSetLocations(dpy,iconGrid)
+-Display *dpy;
+-IconGrid *iconGrid;
++void SlotSetLocations(Display *dpy, IconGrid *iconGrid)
+ {
+ 	List *lauto, *lpos;
+ 	List **l;
diff --git a/wm/olvwm/patches/patch-slots.h b/wm/olvwm/patches/patch-slots.h
new file mode 100644
index 00000000000..587834f3f89
--- /dev/null
+++ b/wm/olvwm/patches/patch-slots.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-slots.h,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- slots.h.orig	2013-03-28 19:21:57.000000000 +0000
++++ slots.h
+@@ -45,12 +45,12 @@ extern struct _iconSlot *SlotAlloc();	/*
+ 	 * parameter; False should be passed otherwise.
+ 	 */
+ 
+-extern Bool SlotFree();		/* WinIcon * */
++void SlotFree(WinIconFrame *winicon);
+  	/* An icon is going away, so its references to slots should also go
+ 	 * away. 
+ 	 */
+ 
+-extern Bool SlotSetLocations();	/* Display *dpy */
++void SlotSetLocations(Display *dpy, IconGrid *iconGrid);
+ 	/* sets the order in which slots are allocated for icons which are
+ 	 * not explicitly positioned.  The new order is obtained from the
+ 	 * global resource vector.
diff --git a/wm/olvwm/patches/patch-st.h b/wm/olvwm/patches/patch-st.h
new file mode 100644
index 00000000000..90e8ff390ec
--- /dev/null
+++ b/wm/olvwm/patches/patch-st.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-st.h,v 1.1 2013/03/28 21:40:11 joerg Exp $
+
+--- st.h.orig	2013-03-28 19:24:02.000000000 +0000
++++ st.h
+@@ -40,7 +40,8 @@ struct st_table {
+ 
+ enum st_retval {ST_CONTINUE, ST_STOP, ST_DELETE};
+ 
+-int st_delete(), st_insert(), st_foreach(), st_free_table();
++void st_foreach(st_table *table, enum st_retval (*func)(), char *arg);
++int st_delete(), st_insert(), st_free_table();
+ int st_lookup(), st_find_or_add(), st_add_direct();
+ st_table *st_init_table(), *st_init_table_with_params();
+ 
diff --git a/wm/olvwm/patches/patch-win.h b/wm/olvwm/patches/patch-win.h
new file mode 100644
index 00000000000..2df8ec8cd59
--- /dev/null
+++ b/wm/olvwm/patches/patch-win.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-win.h,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- win.h.orig	2013-03-28 19:19:40.000000000 +0000
++++ win.h
+@@ -573,4 +573,9 @@ extern int  ShapeErrorBase;
+ 
+ extern Client *CurrentClient;
+ 
++void AddSelection(Client *cli, Time timestamp);
++void GFrameEventButtonRelease(Display *dpy, XEvent *event, WinGenericFrame *frameInfo);
++void GFrameEventMotionNotify(Display *dpy, XEvent *event, WinGenericFrame *frameInfo);
++void NoFocusEventBeep(Display *dpy, XEvent *event, WinGeneric *winInfo);
++
+ #endif /* _OLWM_WIN_H */
diff --git a/wm/olvwm/patches/patch-winbusy.c b/wm/olvwm/patches/patch-winbusy.c
new file mode 100644
index 00000000000..45b2ea4ff5e
--- /dev/null
+++ b/wm/olvwm/patches/patch-winbusy.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-winbusy.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winbusy.c.orig	2013-03-28 19:26:50.000000000 +0000
++++ winbusy.c
+@@ -30,6 +30,8 @@
+ #include "win.h"
+ #include "globals.h"
+ 
++void PaintVirtualWindow(WinGenericFrame *win);
++
+ /***************************************************************************
+ * global data
+ ***************************************************************************/
diff --git a/wm/olvwm/patches/patch-winbutton.c b/wm/olvwm/patches/patch-winbutton.c
new file mode 100644
index 00000000000..7b9ba8c814e
--- /dev/null
+++ b/wm/olvwm/patches/patch-winbutton.c
@@ -0,0 +1,46 @@
+$NetBSD: patch-winbutton.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winbutton.c.orig	2013-03-28 19:29:18.000000000 +0000
++++ winbutton.c
+@@ -81,11 +81,8 @@ doUnhilite(act, mode, winInfo)
+ /* 
+  * eventButtonPress - handle button press events on the close button window.  
+  */
+-static int
+-eventButtonPress(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinButton	*winInfo;
++static void
++eventButtonPress(Display *dpy, XEvent *event, WinButton *winInfo)
+ {
+ 	Client *cli = winInfo->core.client;
+ 	WinPaneFrame *winFrame = cli->framewin;
+@@ -139,11 +136,8 @@ WinButton	*winInfo;
+  * stop ignore events.  This is so that double-clicking on the button doesn't
+  * close and then reopen the window (or perform the default action twice).
+  */
+-static int
+-eventButtonRelease(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinButton	*winInfo;
++static void
++eventButtonRelease(Display *dpy, XEvent *event, WinButton *winInfo)
+ {
+ 	Client *cli = winInfo->core.client;
+ 	int x,y;
+@@ -187,11 +181,8 @@ WinButton	*winInfo;
+ /* 
+  * eventMotionNotify - handle motion notify events on the close button window.  
+  */
+-static int
+-eventMotionNotify(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinButton	*winInfo;
++static void
++eventMotionNotify(Display *dpy, XEvent *event, WinButton *winInfo)
+ {
+ 	int 	x,y;
+ 	Client *cli = winInfo->core.client;
diff --git a/wm/olvwm/patches/patch-wingframe.c b/wm/olvwm/patches/patch-wingframe.c
new file mode 100644
index 00000000000..f7187a8cc90
--- /dev/null
+++ b/wm/olvwm/patches/patch-wingframe.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-wingframe.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- wingframe.c.orig	2013-03-28 19:57:02.000000000 +0000
++++ wingframe.c
+@@ -275,11 +275,8 @@ int x,y,w,h;
+  * GFrameEventButtonRelease -- a button has been released
+  *
+  */
+-int
+-GFrameEventButtonRelease(dpy, event, frameInfo)
+-Display *dpy;
+-XEvent  *event;
+-WinGenericFrame *frameInfo;
++void
++GFrameEventButtonRelease(Display *dpy, XEvent *event, WinGenericFrame *frameInfo)
+ {
+         WinGenericPane	*winPane = (WinGenericPane*)frameInfo->fcore.panewin;
+         Client *cli = frameInfo->core.client;
+@@ -344,11 +341,8 @@ WinGenericFrame *frameInfo;
+ /*
+  * GFrameEventMotionNotify -- a button is down and the pointer is moving
+  */
+-int
+-GFrameEventMotionNotify(dpy, event, frameInfo)
+-Display *dpy;
+-XEvent  *event;
+-WinGenericFrame *frameInfo;
++void
++GFrameEventMotionNotify(Display *dpy, XEvent *event, WinGenericFrame *frameInfo)
+ {
+         /* We get this only after a Select press */
+         if (hadSelect == False) /* watch for erroneous motions */
diff --git a/wm/olvwm/patches/patch-winipane.c b/wm/olvwm/patches/patch-winipane.c
new file mode 100644
index 00000000000..d95439b5b72
--- /dev/null
+++ b/wm/olvwm/patches/patch-winipane.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-winipane.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winipane.c.orig	2013-03-28 19:45:55.000000000 +0000
++++ winipane.c
+@@ -72,10 +72,8 @@ static ClassPane classIconPane;
+  * drawIPane -- draw the pane window
+  */
+ /*ARGSUSED*/	/* dpy arg will be used when multiple Displays supported */
+-static int
+-drawIPane(dpy, winInfo)
+-Display	*dpy;
+-WinIconPane *winInfo;
++static void
++drawIPane(Display *dpy, WinIconPane *winInfo)
+ {
+     Window 	pane = winInfo->core.self;
+     GC 		gc;
diff --git a/wm/olvwm/patches/patch-winnofoc.c b/wm/olvwm/patches/patch-winnofoc.c
new file mode 100644
index 00000000000..98c42d7d412
--- /dev/null
+++ b/wm/olvwm/patches/patch-winnofoc.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-winnofoc.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winnofoc.c.orig	2013-03-28 19:46:38.000000000 +0000
++++ winnofoc.c
+@@ -230,11 +230,8 @@ ScreenInfo *scrInfo;
+  * NoFocusEventBeep -- beep on keyboard/mouse events for the no-focus window
+  *	Also used by busy windows
+  */
+-int
+-NoFocusEventBeep(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinGeneric *winInfo;
++void
++NoFocusEventBeep(Display *dpy, XEvent *event, WinGeneric *winInfo)
+ {
+         XEvent dummy;
+ 
diff --git a/wm/olvwm/patches/patch-winpane.c b/wm/olvwm/patches/patch-winpane.c
new file mode 100644
index 00000000000..e067ad33fac
--- /dev/null
+++ b/wm/olvwm/patches/patch-winpane.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-winpane.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winpane.c.orig	2013-03-28 19:47:39.000000000 +0000
++++ winpane.c
+@@ -156,12 +156,9 @@ WinPane	*winInfo;
+ /*
+  * eventExtension - handle extension events
+  */
+-static int
++static void
+ /* ARGSUSED */
+-eventExtension(dpy, event, winInfo)
+-    Display	*dpy;
+-    XEvent	*event;
+-    WinPane	*winInfo;
++eventExtension(Display *dpy, XEvent *event, WinPane *winInfo)
+ {
+ #ifdef SHAPE
+     XShapeEvent *se;
diff --git a/wm/olvwm/patches/patch-winpinmenu.c b/wm/olvwm/patches/patch-winpinmenu.c
new file mode 100644
index 00000000000..e2a09958353
--- /dev/null
+++ b/wm/olvwm/patches/patch-winpinmenu.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-winpinmenu.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winpinmenu.c.orig	2013-03-28 19:48:07.000000000 +0000
++++ winpinmenu.c
+@@ -84,11 +84,8 @@ afterMenuShow(win)
+ /* 
+  * eventButtonPress  - a button has gone down.
+  */
+-static int
+-eventButtonPress(dpy, event, winInfo)
+-    Display		*dpy;
+-    XEvent		*event;
+-    WinPinMenu		*winInfo;
++static void
++eventButtonPress(Display *dpy, XEvent *event, WinPinMenu *winInfo)
+ {
+     if (! StartMenuGrabs(dpy, winInfo))
+ 	return;
+@@ -99,11 +96,8 @@ eventButtonPress(dpy, event, winInfo)
+ }
+ 
+ 
+-static int
+-eventKeyEvent(dpy, event, winInfo)
+-    Display		*dpy;
+-    XEvent		*event;
+-    WinPinMenu		*winInfo;
++static void
++eventKeyEvent(Display *dpy, XEvent *event, WinPinMenu *winInfo)
+ {
+     MenuMakeFirst(winInfo->menuInfo, afterMenuShow, winInfo);
+ 
diff --git a/wm/olvwm/patches/patch-winpush.c b/wm/olvwm/patches/patch-winpush.c
new file mode 100644
index 00000000000..22cb78ed78a
--- /dev/null
+++ b/wm/olvwm/patches/patch-winpush.c
@@ -0,0 +1,32 @@
+$NetBSD: patch-winpush.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winpush.c.orig	2013-03-28 19:49:07.000000000 +0000
++++ winpush.c
+@@ -95,11 +95,8 @@ WinPushPin	*winInfo;
+ /* 
+  * eventButtonRelease - handle button release events on the pushpin window 
+  */
+-static int
+-eventButtonRelease(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinPushPin	*winInfo;
++static void
++eventButtonRelease(Display *dpy, XEvent *event, WinPushPin *winInfo)
+ {
+ 	FrameAllowEvents(winInfo->core.client, event->xbutton.time);
+ 	if (!AllButtonsUp(event))
+@@ -121,11 +118,8 @@ WinPushPin	*winInfo;
+ /* 
+  * eventMotionNotify - handle pointer moves
+  */
+-static int
+-eventMotionNotify(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinPushPin	*winInfo;
++static void
++eventMotionNotify(Display *dpy, XEvent *event, WinPushPin *winInfo)
+ {
+ 	Bool 	fInWindow;
+ 	Graphics_info	*gisNormal = WinGI(winInfo,NORMAL_GINFO);
diff --git a/wm/olvwm/patches/patch-winresize.c b/wm/olvwm/patches/patch-winresize.c
new file mode 100644
index 00000000000..97b8ced8761
--- /dev/null
+++ b/wm/olvwm/patches/patch-winresize.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-winresize.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winresize.c.orig	2013-03-28 19:49:55.000000000 +0000
++++ winresize.c
+@@ -70,11 +70,8 @@ resizeCallback(dpy, winInfo)
+ /* 
+  * eventButtonPress - handle button press events on the resize window 
+  */
+-static int
+-eventButtonPress(dpy, event, winInfo)
+-Display	*dpy;
+-XEvent	*event;
+-WinResize	*winInfo;
++static void
++eventButtonPress(Display *dpy, XEvent *event, WinResize *winInfo)
+ {
+ 	unsigned int ignoremask =
+ 	    ModMaskMap[MOD_CONSTRAIN] | ModMaskMap[MOD_INVERT];
diff --git a/wm/olvwm/patches/patch-winroot.c b/wm/olvwm/patches/patch-winroot.c
new file mode 100644
index 00000000000..cfeb595907f
--- /dev/null
+++ b/wm/olvwm/patches/patch-winroot.c
@@ -0,0 +1,75 @@
+$NetBSD: patch-winroot.c,v 1.1 2013/03/28 21:40:12 joerg Exp $
+
+--- winroot.c.orig	2013-03-28 19:50:18.000000000 +0000
++++ winroot.c
+@@ -190,11 +190,8 @@ matchKeystrokeToSpec(event,spec)
+  * crossed through the root window into a child window, and we will get the
+  * EnterNotify for that child window.
+  */
+-static int
+-eventEnterNotify(dpy, pEvent, winInfo)
+-	Display		*dpy;
+-	XEvent		*pEvent;
+-	WinRoot		*winInfo;
++static void
++eventEnterNotify(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
+ {
+         if (pEvent->xcrossing.detail == NotifyNonlinearVirtual)
+             return;
+@@ -282,11 +279,8 @@ selectInBox(dpy, winInfo, boxX, boxY, bo
+ /* 
+  * eventMotionNotify - the pointer is moving
+  */
+-static int
+-eventMotionNotify(dpy, pEvent, winInfo)
+-	Display		*dpy;
+-	XEvent		*pEvent;
+-	WinRoot		*winInfo;
++static void
++eventMotionNotify(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
+ {
+ 	int			(*selectFunc)();
+ 
+@@ -336,11 +330,8 @@ eventMotionNotify(dpy, pEvent, winInfo)
+  * If the user clicks in the window, the focus is set to the no-focus window, 
+  * and the PRIMARY and SECONDARY selections are acquired and nulled.
+  */
+-static int
+-eventButtonRelease(dpy, pEvent, winInfo)
+-	Display		*dpy;
+-	XEvent		*pEvent;
+-	WinRoot		*winInfo;
++static void
++eventButtonRelease(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
+ {
+ 	if (!AllButtonsUp(pEvent))
+ 	    return;
+@@ -368,11 +359,8 @@ eventButtonRelease(dpy, pEvent, winInfo)
+  * or by issuing an AllowEvents request, and (3) ungrab the pointer if the
+  * child's handler didn't issue a grab of its own.
+  */
+-static int
+-eventButtonPress(dpy, pEvent, winInfo)
+-	Display		*dpy;
+-	XEvent		*pEvent;
+-	WinRoot		*winInfo;
++static void
++eventButtonPress(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
+ {
+ 	SemanticAction a;
+ 	WinGeneric *child;
+@@ -442,12 +430,9 @@ eventKeyPressRelease(dpy, pEvent, winInf
+ /* 
+  * eventPropertyNotify - a root property has changed
+  */
+-static int
++static void
+ /* ARGSUSED */
+-eventPropertyNotify(dpy, pEvent, winInfo)
+-	Display		*dpy;
+-	XEvent		*pEvent;
+-	WinRoot		*winInfo;
++eventPropertyNotify(Display *dpy, XEvent *pEvent, WinRoot *winInfo)
+ {
+ 	unsigned long	nitems, remain;
+ 	char		*resourceString;