On Wed, November 11, 2015 5:16 am, Joerg Jung wrote: > On Mon, Nov 09, 2015 at 09:21:03PM -0500, trondd wrote: >> Patched the config/rc scripts to maintain the existing default font when >> using the new dmenu. > > The patch does not apply cleanly here. > However it looks right, though I'm not a wmii user. >
Hmmm...so it doesn't. Recreated the patch, resynced from cvs then it applied cleanly (barring any line wraps). Index: Makefile =================================================================== RCS file: /cvs/ports/x11/wmii/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 16 Feb 2015 22:57:14 -0000 1.20 +++ Makefile 11 Nov 2015 17:29:42 -0000 @@ -3,7 +3,7 @@ COMMENT= dynamic window manager DISTNAME= wmii-3.6 -REVISION= 5 +REVISION= 6 CATEGORIES= x11 HOMEPAGE= http://wmii.suckless.org/ Index: patches/patch-rc_rc_wmii_rc =================================================================== RCS file: patches/patch-rc_rc_wmii_rc diff -N patches/patch-rc_rc_wmii_rc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-rc_rc_wmii_rc 11 Nov 2015 17:29:42 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- rc/rc.wmii.rc.orig Fri Nov 16 08:59:15 2007 ++++ rc/rc.wmii.rc Wed Nov 11 12:27:23 2015 +@@ -37,6 +37,7 @@ LEFT=h + RIGHT=l + + WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' ++DMENU_FONT='Fixed-10' + WMII_NORMCOLORS=('#888888' '#222222' '#333333') + WMII_FOCUSCOLORS=('#ffffff' '#285577' '#4C7899') + WMII_BACKGROUND='#333333' Index: patches/patch-rc_sh_wmii =================================================================== RCS file: patches/patch-rc_sh_wmii diff -N patches/patch-rc_sh_wmii --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-rc_sh_wmii 11 Nov 2015 17:29:42 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- rc/sh.wmii.orig Fri Nov 16 08:59:15 2007 ++++ rc/sh.wmii Wed Nov 11 12:27:23 2015 +@@ -17,6 +17,7 @@ LEFT=h + RIGHT=l + + WMII_FONT=fixed ++DMENU_FONT='Fixed-10' + WMII_NORMCOLORS=('#222222' '#5FBF77' '#2A7F3F') + WMII_FOCUSCOLORS=('#ffffff' '#153F1F' '#2A7F3F') + WMII_BACKGROUND='#333333' Index: patches/patch-rc_wmiirc_sh =================================================================== RCS file: patches/patch-rc_wmiirc_sh diff -N patches/patch-rc_wmiirc_sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-rc_wmiirc_sh 11 Nov 2015 17:29:42 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ +--- rc/wmiirc.sh.orig Fri Nov 16 08:59:15 2007 ++++ rc/wmiirc.sh Wed Nov 11 12:27:23 2015 +@@ -14,9 +14,10 @@ WMII_FOCUSCOLORS='#ffffff #285577 #4c7899' + + WMII_BACKGROUND='#333333' + WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' ++DMENU_FONT='Fixed-10' + + set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS) +-WMII_MENU="dmenu -b -fn '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'" ++WMII_MENU="dmenu -b -fn '$DMENU_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'" + WMII_9MENU="wmii9menu -font '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5' -br '$6'" + WMII_TERM="xterm" + +@@ -168,7 +169,7 @@ grabmod $MODKEY + border 1 + EOF + +-export WMII_MENU WMII_9MENU WMII_FONT WMII_TERM ++export WMII_MENU WMII_9MENU WMII_FONT DMENU_FONT WMII_TERM + export WMII_FOCUSCOLORS WMII_SELCOLORS WMII_NORMCOLORS + + # Feed events to `wmiiloop' for processing
