X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=fe687bdfacd9feb6841f830f8f0c22edebf6f4be;hb=ea67a44958313afc23f02bdeb1cb3d60c071ed94;hp=75de9a691229ab8cf368599c473812eb47ba6632;hpb=932a10fba78a235831605ad01bc6083bea858e20;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 75de9a6..fe687bd 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -92,11 +92,11 @@ define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT')
 define(`TERM_UTF8_BOTRT', `TERM_UTF8 -geometry TERM_GEOM_BOTRT')
 
 
-define(`REMOTE_HOST_TERM',
-`$1 -e ssh -4 $2')
+define(`SSH', `ssh -4')
 
-define(`REMOTE_HOST_TERM_TITLE',
-`$1 -title $3 -n $3 -e ssh -4 $2')
+define(`REMOTE_HOST_TERM', `$1 -e SSH $2')
+
+define(`REMOTE_HOST_TERM_TITLE', `$1 -title $3 -n $3 -e SSH $2')
 
 define(`REMOTE_HOST_KOI8',
 REMOTE_HOST_TERM_TITLE(TERM_KOI8, $1, $2))
@@ -135,7 +135,7 @@ define(`REMOTE_HOST_UTF8_BOTRT_MENU',
 "$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")
+TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e SSH "$1")
 
 define(`REMOTE_HOST_KOI8_BIG_MENU',
 "$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2))
@@ -494,27 +494,22 @@ AddToFunc StartStandardSession
 +              I GotoDeskAndPage 1 0 1
 +              I TERM_KOI8
 +              I Wait TERM
-+              I GotoDeskAndPage 1 1 0
-#+              I TERM_UTF8 -iconic -name term-im-remote
-#+              I Wait term-im-remote
-+              I TERM_KOI8 -geometry 60x25-5-5 -iconic -name term-im-local
-+              I Wait term-im-local
 +              I GotoDeskAndPage 2 0 1
 +              I TERM_KOI8 -geometry TERM_GEOM_BIG
 +              I Wait TERM
 +              I FireFox
-+              I Schedule 4500 GotoDeskAndPage 0 1 0
 
 DestroyFunc ResumeFunction
 AddToFunc ResumeFunction
 +              I GotoDeskAndPage 0 0 0
 +              I TERM_KOI8
 +              I Wait TERM
++              I Exec exec pulseaudio --start
 +              I None ("Volume Control") PaVuControl
 +              I Exec sleep 10; exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I XsetbgFilename
 +              I Wait gxmessage
-+              I Any ("*Mozilla Firefox") GotoDeskAndPage 0 1 0
++              I Any ("*Mozilla Firefox") GotoDeskAndPage 0 0 0
 +              I TestRc (Match) Break
 +              I None ("*Mozilla Firefox") FireFox
 
@@ -609,10 +604,7 @@ AddToFunc Term-Phdru-Big      I GotoDeskAndPage 1 0 1
 DestroyFunc FireFox
 AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
 +                             I GotoDeskAndPage 1 0 0
-+                             I Exec exec start-browser firefox
-+                             I Wait "*Mozilla Firefox"
-+                             I All ("*Mozilla Firefox") Iconify true
-+                             I Exec webbrowserX -n file:///home/phd/Internet/WWW/dashboard/index.html
++                             I Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser firefox
 +                             I Wait "*Mozilla Firefox"
 
 DestroyFunc Gajim