.fvwmrc: merge FireFox-Wait into FireFox

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

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index f8135199f02c0182977df6171c972fb473cc4c50..f9db87c46ebe0fc8be0500f2bad36b817d510194 100644 (file)
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -85,10 +85,10 @@ ifelse(eval(WIDTH < 1024), 1, `96x30',
 define(`TERM', `urxvt')
 define(`TERM_KOI8', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM')
 define(`TERM_UTF8', `Exec exec "$HOME"/lib/X11/utf8rxvt')
-define(`TERM_KOI8_BOTLT', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM -geometry TERM_GEOM_BOTLT')
-define(`TERM_UTF8_BOTLT', `Exec exec "$HOME"/lib/X11/utf8rxvt -geometry TERM_GEOM_BOTLT')
-define(`TERM_KOI8_BOTRT', `Exec LC_CTYPE=ru_RU.KOI8-R exec TERM -geometry TERM_GEOM_BOTRT')
-define(`TERM_UTF8_BOTRT', `Exec exec "$HOME"/lib/X11/utf8rxvt -geometry TERM_GEOM_BOTRT')
+define(`TERM_KOI8_BOTLT', `TERM_KOI8 -geometry TERM_GEOM_BOTLT')
+define(`TERM_UTF8_BOTLT', `TERM_UTF8 -geometry TERM_GEOM_BOTLT')
+define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT')
+define(`TERM_UTF8_BOTRT', `TERM_UTF8 -geometry TERM_GEOM_BOTRT')
 
 
 define(`REMOTE_HOST_KOI8',
@@ -101,7 +101,7 @@ define(`REMOTE_HOST_KOI8_BOTLT',
 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")
+`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))
@@ -482,7 +482,7 @@ AddToFunc StartStandardSession
 +              I PaVuControl
 +              I Wait "Volume Control"
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
-+              I FireFox-Wait
++              I FireFox
 +              I GotoDeskAndPage 1 0 1
 +              I TERM_KOI8
 +              I Wait TERM
@@ -505,10 +505,10 @@ AddToFunc ResumeFunction
 +              I Wait TERM
 +              I PaVuControl
 +              I Wait "Volume Control"
-+              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
++              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
-+              I None ("*Mozilla Firefox") FireFox-Wait
++              I None ("*Mozilla Firefox") FireFox
 +              I GotoDeskAndPage 0 1 0
 
 ############################################################################
@@ -602,10 +602,6 @@ DestroyFunc FireFox
 AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
 +                             I GotoDeskAndPage 1 0 0
 +                             I Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser firefox
-
-DestroyFunc FireFox-Wait
-AddToFunc FireFox-Wait        I Any ("*Mozilla Firefox") Break
-+                             I FireFox
 +                             I Wait "*Mozilla Firefox"
 
 DestroyFunc Gajim