X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=4a12891c0a2b0ba1fd19d6d46d12d65901af2759;hb=9179da7b2b377a8bd9992e00ad90a071febadb51;hp=4ec6d08a80cf64c6b5bc28826c14c6e57ce722bb;hpb=884132f1531aa93222be418209118983e9fcbc66;p=dotfiles.git diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 4ec6d08..4a12891 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -103,7 +103,8 @@ 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)) -define(`REMOTE_SCREEN', `-t $1 exec screen -xRR -S default') +define(`REMOTE_SCREEN_KOI8', `-t $1 exec screen -xRR -S default-koi8') +define(`REMOTE_SCREEN_UTF8', `-t $1 exec screen -xRR -S default-utf8') define(`REMOTE_HOST_KOI8_MENU', "$2 (koi8)" REMOTE_HOST_KOI8($1, $2)) @@ -121,16 +122,16 @@ define(`REMOTE_HOST_KOI8_BOTRT_MENU', "$2 (koi8,btrt)" REMOTE_HOST_KOI8_BOTRT($1, $2)) define(`REMOTE_HOST_UTF8', -REMOTE_HOST_TERM(TERM_RU_UTF8, $1)) +REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8, $1, $2)) define(`REMOTE_HOST_UTF8_MENU', "$2 (utf8)" REMOTE_HOST_UTF8($1, $2)) define(`REMOTE_HOST_UTF8_BOTLT', -REMOTE_HOST_TERM(TERM_RU_UTF8_BOTLT, $1)) +REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8_BOTLT, $1, $2)) define(`REMOTE_HOST_UTF8_BOTRT', -REMOTE_HOST_TERM(TERM_RU_UTF8_BOTRT, $1)) +REMOTE_HOST_TERM_TITLE(TERM_RU_UTF8_BOTRT, $1, $2)) define(`REMOTE_HOST_UTF8_BOTLT_MENU', "$2 (utf8,btlt)" REMOTE_HOST_UTF8_BOTLT($1, $2)) @@ -495,13 +496,11 @@ AddToFunc StartStandardSession + I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off + I XsetbgFilename + I Wait gxmessage -+ I GotoDeskAndPage 1 0 1 -+ I TERM_KOI8 -+ I Wait TERM + I GotoDeskAndPage 2 0 1 + I TERM_KOI8 -geometry TERM_GEOM_BIG + I Wait TERM + I FireFox ++ I GotoDeskAndPage 0 1 1 DestroyFunc ResumeFunction AddToFunc ResumeFunction @@ -513,7 +512,7 @@ AddToFunc ResumeFunction + 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 0 0 ++ I Any ("*Mozilla Firefox") GotoDeskAndPage 0 1 1 + I TestRc (Match) Break + I None ("*Mozilla Firefox") FireFox @@ -599,7 +598,7 @@ AddToFunc AudioPlayer I GotoDeskAndPage 0 1 1 DestroyFunc Term-Iskra AddToFunc Term-Iskra I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN(iskra-aviel.phdru.name), iskra) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra) DestroyFunc Term-Iskra-Big AddToFunc Term-Iskra-Big I GotoDeskAndPage 1 1 2 @@ -607,7 +606,7 @@ AddToFunc Term-Iskra-Big I GotoDeskAndPage 1 1 2 DestroyFunc Term-Oper AddToFunc Term-Oper I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN(oper.med.ru), oper) ++ I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper) DestroyFunc Term-Oper-Big AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 @@ -615,7 +614,7 @@ AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 DestroyFunc Term-Phdru AddToFunc Term-Phdru I GotoDeskAndPage 1 0 1 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN(phdru.name), phdru.name) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name) DestroyFunc Term-Phdru-Big AddToFunc Term-Phdru-Big I GotoDeskAndPage 1 0 1 @@ -721,15 +720,15 @@ AddToMenu TermColors "Term Colors" Title + "Term: white/black" TERM_KOI8 -fg white -cr white -bg black AddToMenu Systems "Systems" Title -+ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN(iskra-aviel.phdru.name), iskra) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra) + REMOTE_HOST_UTF8_BOTLT_MENU(iskra-aviel.phdru.name, iskra) + REMOTE_HOST_KOI8_BIG_MENU(iskra-aviel.phdru.name, ISKRA) + "" Nop -+ REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN(oper.med.ru), oper) ++ REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN_KOI8(oper.med.ru), oper) + REMOTE_HOST_UTF8_BOTRT_MENU(oper.med.ru, oper) + REMOTE_HOST_KOI8_BIG_MENU(oper.med.ru, OPER) + "" Nop -+ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN(phdru.name), phdru) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(phdru.name), phdru) + REMOTE_HOST_UTF8_BOTLT_MENU(phdru.name, phdru) + REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU) @@ -927,9 +926,9 @@ pushdef(`TERM_KOI8', `Exec "TERM" LC_CTYPE=ru_RU.KOI8-R exec TERM') pushdef(`TERM_RU_UTF8', `Exec "URxvt" LC_CTYPE=ru_RU.UTF-8 exec TERM -name URxvt') *FvwmButtons: (Title Term, Icon rterm2.xpm, Action TERM_KOI8) *FvwmButtons: (Title UTF-8, Icon rterm2.xpm, Action TERM_RU_UTF8) -*FvwmButtons: (Title phdru, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN(-D 1080 phdru.name), phdru.name)) -*FvwmButtons: (Title iskra, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN(iskra-aviel.phdru.name), iskra)) -*FvwmButtons: (Title oper, Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN(oper.med.ru), oper)) +*FvwmButtons: (Title phdru, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru.name)) +*FvwmButtons: (Title iskra, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra)) +*FvwmButtons: (Title oper, Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper)) popdef(`TERM_KOI8', `TERM_RU_UTF8') *FvwmButtons: (Title Wallpaper, Icon find1.xpm, Action Exec "gxmessage" "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -)