diff options
Diffstat (limited to 'wm/olvwm/patches/patch-ad')
| -rw-r--r-- | wm/olvwm/patches/patch-ad | 53 |
1 files changed, 48 insertions, 5 deletions
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; |