X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.fvwm%2Fphd.m4;h=898bc04306d8e23a45092fa7b775684447e0a27a;hb=b163aac6037d19ed8a2b5d5b0d3aded6483dcbc1;hp=a032232a2194386fea31ba6e81fee164e53231f8;hpb=34cf563097346c065bc423f2c88caecd56c10bc7;p=dotfiles.git

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index a032232..898bc04 100644
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -5,14 +5,13 @@
 dnl The file is in m4 format, use FvwmM4 module to read it
 dnl like this: ModuleSynchronous FvwmM4 -lock .fvwm2rc
 
-
 dnl This is to prevent FvwmM4 to shadow $HOME
 undefine(`HOME')
 
-
 dnl Echo dimension
 `#' width = WIDTH
 
+divert(-1)
 dnl koi8-r Fonts
 dnl define(`SMALL_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-100-*-*-*-*-koi8-r')
 dnl define(`MEDIUM_FONT_KOI8', `-*-fixed-medium-r-normal-*-*-120-*-*-*-*-koi8-r')
@@ -34,36 +33,27 @@ define(`LARGE_FONT', `xft:Sans:size=18')
 define(`HUGE_FONT', `xft:Sans:size=20')
 
 dnl Bold TT fonts
-define(`SMALL_BOLD_FONT', `SMALL_FONT:Bold')
-define(`MEDIUM_BOLD_FONT', `MEDIUM_FONT:Bold')
-define(`BIG_BOLD_FONT', `BIG_FONT:Bold')
+define(`SMALL_BOLD_FONT', SMALL_FONT`:Bold')
+define(`MEDIUM_BOLD_FONT', MEDIUM_FONT`:Bold')
+define(`BIG_BOLD_FONT', BIG_FONT`:Bold')
 
+define(`TITLE_FONT', MEDIUM_FONT)
+define(`ICON_FONT', LARGE_FONT)
 
 dnl Font and geometry aliases that depend on whether the screen resolution is
 dnl 800x600, 1024x768 or 1920x1200
 
-define(`TITLE_FONT', `MEDIUM_FONT')
-
-define(`ICON_FONT', `LARGE_FONT')
-
-
 define(`PAGER_GEOM',
-ifelse(eval(WIDTH < 1024), 1, `365x100+0+0',dnl
-ifelse(eval(WIDTH < 1920), 1, `365x100+0+0', `600x160+0+0'dnl
-))dnl
-)
-
-define(`PAGER_FONT',
-ifelse(eval(WIDTH < 1920), 1, `SMALL_FONT', `BIG_FONT'dnl
-))
+ifelse(eval(WIDTH < 1024), 1, `365x100+0+0',
+       eval(WIDTH < 1920), 1, `365x100+0+0', `600x160+0+0'))
+
+define(`PAGER_FONT', ifelse(eval(WIDTH < 1920), 1, SMALL_FONT, BIG_FONT))
 define(`BUTTONS_FONT', PAGER_FONT)
 
 
 define(`MENU_FONT',
-ifelse(eval(WIDTH < 1024), 1, `xft:Helvetica:size=16',dnl
-ifelse(eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'dnl
-))dnl
-)
+ifelse(eval(WIDTH < 1024), 1, `xft:Helvetica:size=16',
+       eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'))
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)
 define(`ICON_BOX_FONT', MENU_FONT)
@@ -71,29 +61,23 @@ define(`ICON_BOX_FONT', MENU_FONT)
 
 dnl XSetBg message width and font
 define(`TEXT_WIDTH',
-ifelse(eval(WIDTH < 1024), 1, 70,dnl
-ifelse(eval(WIDTH < 1920), 1, 75, `80'dnl
-))dnl
-)
+ifelse(eval(WIDTH < 1024), 1, 70,
+       eval(WIDTH < 1920), 1, 75, 80))
 
-define(`MESSAGE_FONT', `Nimbus Sans L 18')dnl
+define(`MESSAGE_FONT', `Nimbus Sans L 18')
 
 
 dnl Terminal emulator
 define(`TERM_GEOM',
-ifelse(eval(WIDTH < 1024), 1, `80x25',dnl
-ifelse(eval(WIDTH < 1920), 1, `80x30', `80x32'dnl
-))dnl
-)
+ifelse(eval(WIDTH < 1024), 1, `80x25',
+       eval(WIDTH < 1920), 1, `80x30', `80x32'))
 
-define(`TERM_GEOM_BOTLT', `TERM_GEOM+0-0')dnl
-define(`TERM_GEOM_BOTRT', `TERM_GEOM-0-0')dnl
+define(`TERM_GEOM_BOTLT', TERM_GEOM`+0-0')
+define(`TERM_GEOM_BOTRT', TERM_GEOM`-0-0')
 
 define(`TERM_GEOM_BIG',
-ifelse(eval(WIDTH < 1024), 1, `96x30',dnl
-ifelse(eval(WIDTH < 1920), 1, `112x32', `126x35'dnl
-))dnl
-)
+ifelse(eval(WIDTH < 1024), 1, `96x30',
+       eval(WIDTH < 1920), 1, `112x32', `126x35'))
 
 
 define(`TERM', `urxvt')
@@ -106,60 +90,47 @@ define(`TERM_UTF8_BOTRT', `Exec exec "$HOME"/lib/X11/utf8rxvt -geometry TERM_GEO
 
 
 define(`REMOTE_HOST_KOI8',
-TERM_KOI8 -title "$2" -n "$2" -e ssh -4 "$1"dnl
-)
+TERM_KOI8 -title "$2" -n "$2" -e ssh -4 "$1")
 
 define(`REMOTE_HOST_KOI8_MENU',
-"$2 (koi8)" REMOTE_HOST_KOI8($1, $2)dnl
-)
+"$2 (koi8)" REMOTE_HOST_KOI8($1, $2))
 
 define(`REMOTE_HOST_KOI8_BOTLT',
-TERM_KOI8_BOTLT -title "$2" -n "$2" -e ssh -4 "$1"dnl
-)
+TERM_KOI8_BOTLT -title "$2" -n "$2" -e ssh -4 "$1")
 
 define(`REMOTE_HOST_KOI8_BOTRT',
-TERM_KOI8_BOTRT -title "$2" -n "$2" -e ssh -4 "$1"dnl
-)
+TERM_KOI8_BOTRT -title "$2" -n "$2" -e ssh -4 "$1")
 
 define(`REMOTE_HOST_KOI8_BOTLT_MENU',
-"$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2)dnl
-)
+"$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2))
 
 define(`REMOTE_HOST_KOI8_BOTRT_MENU',
-"$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2)dnl
-)
+"$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2))
 
 define(`REMOTE_HOST_UTF8',
-TERM_UTF8 -e ssh -4 "$1"dnl
-)
+TERM_UTF8 -e ssh -4 "$1")
 
 define(`REMOTE_HOST_UTF8_MENU',
-"$2 (utf8)" REMOTE_HOST_UTF8($1, $2)dnl
-)
+"$2 (utf8)" REMOTE_HOST_UTF8($1, $2))
 
 define(`REMOTE_HOST_UTF8_BOTLT',
-TERM_UTF8_BOTLT -e ssh -4 "$1"dnl
-)
+TERM_UTF8_BOTLT -e ssh -4 "$1")
 
 define(`REMOTE_HOST_UTF8_BOTRT',
-TERM_UTF8_BOTRT -e ssh -4 "$1"dnl
-)
+TERM_UTF8_BOTRT -e ssh -4 "$1")
 
 define(`REMOTE_HOST_UTF8_BOTLT_MENU',
-"$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2)dnl
-)
+"$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2))
 
 define(`REMOTE_HOST_UTF8_BOTRT_MENU',
-"$2 (utf8,btrt)" REMOTE_HOST_UTF8_BOTRT($1, $2)dnl
-)
+"$2 (utf8,btrt)" REMOTE_HOST_UTF8_BOTRT($1, $2))
 
 define(`REMOTE_HOST_KOI8_BIG',
-TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1"dnl
-)
+TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1")
 
 define(`REMOTE_HOST_KOI8_BIG_MENU',
-"$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2)dnl
-)
+"$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2))
+divert
 
 
 ##########################################################################
@@ -180,7 +151,7 @@ Style * Color Black/#60a0c0
 
 # Set colors/font for pop-up menus
 # Syntax: MenuStyle forecolor backcolor shadecolor font style(fvwm/mwm)
-MenuStyle * FVWM, Foreground Black, Background grey, Greyed SlateGrey, Font MENU_FONT fvwm
+MenuStyle * FVWM, Foreground Black, Background grey, Greyed SlateGrey, Font MENU_FONT
 
 # Set fonts to use on title bar and icon label
 Style * Font              TITLE_FONT