X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=9d7803f794f73a1fd83f0d9f353fc10fb37b1c2e;hb=3eb4baf8d278f70d0918eb855d55a7256edf8c96;hp=d809c062ad5f14ed7cb3569e50465843bd0e2b26;hpb=ed5d9a5f11cb3990e9cfef5677fba3fabf191871;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index d809c06..9d7803f 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -94,7 +94,7 @@ 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')
 
@@ -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
@@ -487,9 +488,6 @@ AddToFunc StartStandardSession
 +              I GotoDeskAndPage 0 0 0
 +              I TERM_KOI8
 +              I Wait TERM
-#+              I GotoDeskAndPage 0 0 1
-#+              I TERM_RU_UTF8 -geometry 38x30+0-0
-#+              I Wait URxvt
 +              I Exec exec cgmem_nice 200 pulseaudio --start
 +              I PaVuControl
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
@@ -595,7 +593,7 @@ changequote([`], ['])
 
 DestroyFunc AudioPlayer
 AddToFunc AudioPlayer         I GotoDeskAndPage 0 1 1
-+                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 200 audacious
++                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 400 deadbeef
 
 DestroyFunc Term-Iskra
 AddToFunc Term-Iskra          I GotoDeskAndPage 1 1 2
@@ -621,10 +619,20 @@ DestroyFunc Term-Phdru-Big
 AddToFunc Term-Phdru-Big      I GotoDeskAndPage 1 0 1
 +                             I REMOTE_HOST_KOI8_BIG(phdru.name, phdru.name)
 
+DestroyFunc Term3Hosts
+AddToFunc Term3Hosts          I Term-Iskra
++                             I Wait TERM
++                             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 Wait TERM
++                             I GotoDeskAndPage 1 1 2
+
 DestroyFunc FireFox
 AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
 +                             I GotoDeskAndPage 1 0 0
-+                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 start-browser firefox
++                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 start-browser firefox -P phd
 +                             I Wait "*Mozilla Firefox"
 +                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 firefox --new-window
 +                             I Wait "*Mozilla Firefox"
@@ -725,6 +733,8 @@ AddToMenu TermColors    "Term Colors" Title
 +                       "Term: white/black" TERM_KOI8 -fg white -cr white -bg black
 
 AddToMenu Systems       "Systems" Title
++                       "Iskra+Oper+Phdru" Term3Hosts
++                       ""        Nop
 +                       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)
@@ -734,6 +744,7 @@ AddToMenu Systems       "Systems" Title
 +                       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_UTF8_BOTLT_MENU(phdru.name, phdru)
 +                       REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU)
 
@@ -919,7 +930,7 @@ 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(-D 1080 phdru.name), phdru.name))
+*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))
 popdef(`TERM_KOI8', `TERM_RU_UTF8')
@@ -929,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 "Audacious" LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 200 audacious)
+*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)