.fvwmrc: fix MenuStyle

[dotfiles.git] / .fvwm / phd.m4

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index 9ff841840bcb6c9557d31e1e0599331e7c523d69..92bb46ddeb54b3c3133916441e678e391302087d 100644 (file)
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -5,17 +5,13 @@
 dnl The file is in m4 format, use FvwmM4 module to read it
 dnl like this: ModuleSynchronous FvwmM4 -lock .fvwm2rc
 
 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 This is to prevent FvwmM4 to shadow $HOME
 undefine(`HOME')
 

-

 dnl Echo dimension
 dnl Echo dimension

-changecom(`/*', `*/')
-# width = WIDTH
-changecom(`#')
-
+`#' 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')
 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')


@@ -37,35 +33,32 @@ define(`LARGE_FONT', `xft:Sans:size=18')
 define(`HUGE_FONT', `xft:Sans:size=20')
 
 dnl Bold TT fonts
 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
 
 
 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',
 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
+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',
 )
 
 define(`PAGER_FONT',

-`ifelse(eval(WIDTH < 1920), 1, `SMALL_FONT', `BIG_FONT'dnl
-)')
+ifelse(eval(WIDTH < 1920), 1, `SMALL_FONT', `BIG_FONT'dnl
+))

 define(`BUTTONS_FONT', PAGER_FONT)
 
 
 define(`MENU_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',dnl
+ifelse(eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'dnl
+))dnl

 )
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)
 )
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)


@@ -74,28 +67,28 @@ define(`ICON_BOX_FONT', MENU_FONT)
 
 dnl XSetBg message width and font
 define(`TEXT_WIDTH',
 
 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,dnl
+ifelse(eval(WIDTH < 1920), 1, 75, `80'dnl
+))dnl

 )
 
 )
 

-define(`MESSAGE_FONT', `Nimbus Sans L 18')'dnl
+define(`MESSAGE_FONT', `Nimbus Sans L 18')dnl

 
 
 dnl Terminal emulator
 define(`TERM_GEOM',
 
 
 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',dnl
+ifelse(eval(WIDTH < 1920), 1, `80x30', `80x32'dnl
+))dnl

 )
 
 )
 

-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')dnl
+define(`TERM_GEOM_BOTRT', `TERM_GEOM-0-0')dnl

 
 define(`TERM_GEOM_BIG',
 
 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',dnl
+ifelse(eval(WIDTH < 1920), 1, `112x32', `126x35'dnl
+))dnl

 )
 
 
 )
 
 


@@ -163,6 +156,7 @@ TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1"dnl
 define(`REMOTE_HOST_KOI8_BIG_MENU',
 "$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2)dnl
 )
 define(`REMOTE_HOST_KOI8_BIG_MENU',
 "$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2)dnl
 )

+divert

 
 
 ##########################################################################
 
 
 ##########################################################################


@@ -183,7 +177,7 @@ Style * Color Black/#60a0c0
 
 # Set colors/font for pop-up menus
 # Syntax: MenuStyle forecolor backcolor shadecolor font style(fvwm/mwm)
 
 # 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
 
 # Set fonts to use on title bar and icon label
 Style * Font              TITLE_FONT