X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=6d4c642c9a84064ab4d4a70379ed36f0c78a02d1;hb=7aa3190670dcc3fc0faa1088a720308ed867ac9d;hp=837c719842022d8e95913878e29caf862480685d;hpb=08c562aba797febbab80d76d8e20e6b31e0bb314;p=dotfiles.git diff --git a/.fvwm/main.m4 b/.fvwm/main.m4 index 837c719..6d4c642 100644 --- a/.fvwm/main.m4 +++ b/.fvwm/main.m4 @@ -94,11 +94,11 @@ define(`TERM_KOI8_BOTRT', `TERM_KOI8 -geometry TERM_GEOM_BOTRT') define(`TERM_RU_UTF8_BOTRT', `TERM_RU_UTF8 -geometry TERM_GEOM_BOTRT') -define(`SSH', `cgmem_nice 300 ssh -4') +define(`SSH', `cgmem_nice 300 ssh') define(`REMOTE_HOST_TERM', `$1 -e SSH $2') -define(`REMOTE_HOST_TERM_TITLE', `$1 -title $3 -n $3 -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)) @@ -275,6 +275,7 @@ 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 "deadbeef" PositionPlacement -0 -0 Style "gxmessage" PositionPlacement 50-50w +20 Style "*lock" !Title, Sticky, WindowListSkip Style "Mosaic" NoPPosition @@ -592,11 +593,11 @@ changequote([`], [']) DestroyFunc AudioPlayer AddToFunc AudioPlayer I GotoDeskAndPage 0 1 1 -+ I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 300 deadbeef ++ I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 400 deadbeef DestroyFunc Term-Iskra AddToFunc Term-Iskra I GotoDeskAndPage 1 1 2 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra scr) DestroyFunc Term-Iskra-Big AddToFunc Term-Iskra-Big I GotoDeskAndPage 1 1 2 @@ -604,7 +605,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_KOI8(oper.med.ru), oper) ++ I REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper scr) DestroyFunc Term-Oper-Big AddToFunc Term-Oper-Big I GotoDeskAndPage 1 1 2 @@ -612,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(REMOTE_SCREEN_KOI8(phdru.name), phdru.name) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name scr) DestroyFunc Term-Phdru-Big AddToFunc Term-Phdru-Big I GotoDeskAndPage 1 0 1 @@ -624,7 +625,7 @@ AddToFunc Term3Hosts I Term-Iskra + I Term-Oper + I Wait TERM + I GotoDeskAndPage 1 0 1 -+ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru.name) ++ I REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru.name scr) + I Wait TERM + I GotoDeskAndPage 1 1 2 @@ -734,16 +735,16 @@ AddToMenu TermColors "Term Colors" Title AddToMenu Systems "Systems" Title + "Iskra+Oper+Phdru" Term3Hosts + "" Nop -+ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra scr) + 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_KOI8(oper.med.ru), oper) ++ REMOTE_HOST_KOI8_BOTRT_MENU(REMOTE_SCREEN_KOI8(oper.med.ru), oper scr) + 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_KOI8(phdru.name), phdru) -+ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru SOCKS5) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(phdru.name), phdru scr) ++ REMOTE_HOST_KOI8_MENU(REMOTE_SCREEN_KOI8(-D 1080 phdru.name), phdru scr SOCKS5) + REMOTE_HOST_UTF8_BOTLT_MENU(phdru.name, phdru) + REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU) @@ -929,9 +930,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_KOI8(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)) +*FvwmButtons: (Title "phdru scr", Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(phdru.name), phdru.name scr)) +*FvwmButtons: (Title "iskra scr", Icon xterm-sgi.xpm, Action REMOTE_HOST_KOI8(REMOTE_SCREEN_KOI8(iskra-aviel.phdru.name), iskra scr)) +*FvwmButtons: (Title "oper scr", Icon xterm-linux.xpm, Action REMOTE_HOST_KOI8_BOTRT(REMOTE_SCREEN_KOI8(oper.med.ru), oper scr)) 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 -) @@ -939,7 +940,7 @@ popdef(`TERM_KOI8', `TERM_RU_UTF8') *FvwmButtons: (Title Next, Icon Jrecycle.xpm, Action Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-force) #*FvwmButtons: (Title pavucontrol, Icon mini.sound.xpm, Action Exec "Volume Control" exec cgmem_nice 200 pavucontrol) #*FvwmButtons: (Title Id3Info, Icon bell.xpm, Action Id3Info) -*FvwmButtons: (Title AudioPlayer, Icon bell.xpm, Action Exec "deadbeef" LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 300 deadbeef) +*FvwmButtons: (Title AudioPlayer, Icon bell.xpm, Action Exec "deadbeef" LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 400 deadbeef) #*FvwmButtons: (Title XLock, Icon Jxlock.xpm, Action Exec exec xscreensaver-command -lock) *FvwmButtons: (Title Skype, Icon skypeforlinux.png, Action Skype)