X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fphd.m4;h=0a75a889f0950ddbaeba60e1a5760d3589e1817a;hb=1a446c996cf6bd60d21323cc5f03be69b8c6ca89;hp=50bf40d20c70cde1b27795ccf97ab50e2f293f26;hpb=cadcb4fc7e185af5b4076fe09fcaca50fa8a51d9;p=dotfiles.git

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index 50bf40d..0a75a88 100644
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -54,8 +54,8 @@ define(`BUTTONS_FONT', PAGER_FONT)
 
 
 define(`MENU_FONT',
-ifelse(eval(WIDTH < 1024), 1, `xft:Helvetica:size=16',
-       eval(WIDTH < 1920), 1, `xft:Helvetica:size=18', `xft:Helvetica:size=22'))
+ifelse(eval(WIDTH < 1024), 1, `xft:Sans:size=16',
+       eval(WIDTH < 1920), 1, `xft:Sans:size=18', `xft:Sans:size=22'))
 define(`IDENT_FONT', MENU_FONT)
 define(`WIN_LIST_FONT', MENU_FONT)
 define(`ICON_BOX_FONT', MENU_FONT)
@@ -79,7 +79,7 @@ define(`TERM_GEOM_BOTRT', TERM_GEOM`-0-0')
 
 define(`TERM_GEOM_BIG',
 ifelse(eval(WIDTH < 1024), 1, `96x30',
-       eval(WIDTH < 1920), 1, `112x32', `126x35'))
+       eval(WIDTH < 1920), 1, `112x32+2-0', `126x35'))
 
 
 define(`TERM', `urxvt')
@@ -480,7 +480,6 @@ AddToFunc StartStandardSession
 +              I TERM_KOI8 -e su -
 +              I Wait TERM
 +              I PaVuControl
-+              I Wait "Volume Control"
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I FireFox
 +              I GotoDeskAndPage 1 0 1
@@ -504,7 +503,6 @@ AddToFunc ResumeFunction
 +              I TERM_KOI8
 +              I Wait TERM
 +              I None ("Volume Control") PaVuControl
-+              I TestRc (Match) Wait "Volume Control"
 +              I Exec sleep 10; exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +              I Wait gxmessage
@@ -582,6 +580,7 @@ AddToFunc Raise-All           I All (!"FvwmButtons|System|*clock") Raise
 DestroyFunc PaVuControl
 AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
 +                             I Exec exec pavucontrol
++                             I Wait "Volume Control"
 
 changequote([,])
 DestroyFunc Id3Info
@@ -660,7 +659,9 @@ AddToMenu Window-Ops2   "Center"        Center
 AddToMenu Terminals     "Terminals" Title
 +               "Grey term (koi8)" TERM_KOI8
 +               "Grey term (utf8)" TERM_UTF8
++               "Grey term (koi8,btlt)" TERM_KOI8_BOTLT
 +               "Grey term (koi8,btrt)" TERM_KOI8_BOTRT
++               "Grey term (utf8,btlt)" TERM_UTF8_BOTLT
 +               "Grey term (utf8,btrt)" TERM_UTF8_BOTRT
 +               "Big grey term (koi8)" TERM_KOI8 -geometry TERM_GEOM_BIG
 +                       ""      Nop