X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=ff102234b001da750a5d2cd3e33dbc356dfba994;hb=b3b4f2c74ba747a7979809ba12e06435ca11838a;hp=7812b7281fdaa31ec14dc6de7ad91e8325e66255;hpb=ec8a56b3aa806fa26d1f67f8aa441d21db278edb;p=dotfiles.git diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 7812b72..ff10223 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -103,10 +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_HOST_KOI8_SCREEN', -REMOTE_HOST_KOI8(REMOTE_SCREEN($1), $2)) +define(`REMOTE_SCREEN_KOI8', `-t $1 exec /usr/bin/screen -xRR -S default-koi8') +define(`REMOTE_SCREEN_UTF8', `-t $1 exec /usr/bin/screen -xRR -S default-utf8') define(`REMOTE_HOST_KOI8_MENU', "$2 (koi8)" REMOTE_HOST_KOI8($1, $2)) @@ -114,15 +112,9 @@ define(`REMOTE_HOST_KOI8_MENU', define(`REMOTE_HOST_KOI8_BOTLT', REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTLT, $1, $2)) -define(`REMOTE_HOST_KOI8_SCREEN_BOTLT', -REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTLT, REMOTE_SCREEN($1), $2)) - define(`REMOTE_HOST_KOI8_BOTRT', REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTRT, $1, $2)) -define(`REMOTE_HOST_KOI8_SCREEN_BOTRT', -REMOTE_HOST_TERM_TITLE(TERM_KOI8_BOTRT, REMOTE_SCREEN($1), $2)) - define(`REMOTE_HOST_KOI8_BOTLT_MENU', "$2 (koi8,btlt)" REMOTE_HOST_KOI8_BOTLT($1, $2)) @@ -130,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)) @@ -283,7 +275,6 @@ Style "*MPlayer*" Layer 6, PositionPlacement 250p 100p Style "*mpv" Layer 6, PositionPlacement 250p 100p Style "*clock" !Title, Sticky, WindowListSkip, Color Black/#40c040, NeverFocus, PositionPlacement 50-50w +1p, Layer 2 -Style "emacs" NoPPosition Style "gxmessage" PositionPlacement 50-50w +20 Style "*lock" !Title, Sticky, WindowListSkip Style "Mosaic" NoPPosition @@ -504,13 +495,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 @@ -522,7 +511,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 @@ -608,15 +597,15 @@ AddToFunc AudioPlayer I GotoDeskAndPage 0 1 1 DestroyFunc Term-Iskra AddToFunc Term-Iskra I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8(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 -+ I REMOTE_HOST_KOI8_BIG(iskra-aviel.phdru.name, iskra) ++ I REMOTE_HOST_KOI8_BIG(iskra-aviel.phdru.name, ISKRA) DestroyFunc Term-Oper AddToFunc Term-Oper I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8_BOTRT(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 @@ -624,7 +613,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(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 @@ -730,15 +719,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(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(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(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) @@ -811,10 +800,17 @@ AddToMenu RootMenu "Root Menu" Title + "XSetBg" Popup XSetBgMenu + "Fvwm Commands" Popup FvwmCommands +DestroyMenu OSMenu +AddToMenu OSMenu "OS commands:" Title ++ "Suspend to ram" Exec exec s2r ++ "Suspend to disk" Exec exec s2d ++ "Suspend to both" Exec exec s2b + # This menu will fire up some often used programs -DestroyMenu Utilities +DestroyMenu Utilities AddToMenu Utilities "Choose one:" Title -+ "qPDFview" Exec LC_CTYPE=ru_RU.KOI8-R exec qpdfview ++ "OS" Popup OSMenu ++ "Evince" Exec LC_CTYPE=ru_RU.KOI8-R exec evince + "FBReader" Exec LC_CTYPE=ru_RU.KOI8-R exec fbreader + "" Nop + "GVim (koi8)" Exec LC_CTYPE=ru_RU.KOI8-R exec gvim @@ -827,21 +823,17 @@ AddToMenu Utilities "Choose one:" Title + "AudioPlayer" AudioPlayer + "Id3Info" Id3Info + "" Nop -+ "Gajim" Gajim -+ "Pidgin" Pidgin -+ "" Nop + "xload" Exec exec xload -geometry =136x136+0+0 + "Top" TERM_KOI8 -T Top -n Top -e top + "" Nop + "Refresh Screen" Refresh + "xrefresh" Exec exec xrefresh + "" Nop -#+ "xcalc" Exec exec xcalc ++ "Pidgin" Pidgin ++ "xcalc" Exec exec xcalc ++ "" Nop + "xclipboard" Exec exec xclipboard + "xcutsel" Exec exec xcutsel -#+ "xman" Exec exec xman -notopbox -geometry +150+102 -#+ "emacs" Exec emacs -geometry 81x35+150+34 -#+ "xv" Function warp-or-run xv "Exec exec xv -ncols 240 -geometry +0+0" DestroyMenu Browsers AddToMenu Browsers "Choose one:" Title @@ -936,9 +928,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_SCREEN(-D 1080 phdru.name, phdru.name)) -*FvwmButtons: (Title iskra, Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8_SCREEN(iskra-aviel.phdru.name, iskra)) -*FvwmButtons: (Title oper, Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_SCREEN_BOTRT(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 -)