X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=fe687bdfacd9feb6841f830f8f0c22edebf6f4be;hb=6ee9039d3fc164787b579a4f7b86ece6a736bbb8;hp=87d3f696507d7007fc61f9d11bda187c9400420f;hpb=bd025173f66f6c9e17b5ee6894d8688a33f5576e;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 87d3f69..fe687bd 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -80,7 +80,7 @@ define(`TERM_GEOM_BOTRT', TERM_GEOM`-0-0')
 
 define(`TERM_GEOM_BIG',
 ifelse(eval(WIDTH < 1024), 1, `96x30',
-       eval(WIDTH < 1920), 1, `112x32+2-0', `126x35'))
+       eval(WIDTH < 1920), 1, `112x32+2-0', `119x32+1-0'))
 
 
 define(`TERM', `urxvt')
@@ -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))
@@ -486,9 +486,7 @@ AddToFunc StartStandardSession
 +              I GotoDeskAndPage 0 0 1
 +              I TERM_UTF8 -geometry 38x30+0-0
 +              I Wait URxvt
-+              I GotoDeskAndPage 0 1 0
-+              I TERM_KOI8 -e su -
-+              I Wait TERM
++              I Exec exec pulseaudio --start
 +              I PaVuControl
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I XsetbgFilename
@@ -496,30 +494,24 @@ 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
-+              I Schedule 4500 GotoDeskAndPage 0 1 0
 
 ############################################################################
 # COMPLEX FUNCTIONS
@@ -594,12 +586,12 @@ AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
 
 changequote([,])
 DestroyFunc Id3Info
-AddToFunc Id3Info             I Exec "$HOME"/lib/audio/mp3/id3info.py "`deadbeef --nowplaying '%F'`" | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
+AddToFunc Id3Info             I Exec "$HOME"/lib/audio/mp3/id3info.py "`audtool --current-song-filename`" | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 changequote([`], ['])
 
-DestroyFunc DeadBeef
-AddToFunc DeadBeef            I GotoDeskAndPage 0 1 1
-+                             I Exec exec deadbeef
+DestroyFunc AudioPlayer
+AddToFunc AudioPlayer         I GotoDeskAndPage 0 1 1
++                             I Exec exec audacious
 
 DestroyFunc Term-Phdru
 AddToFunc Term-Phdru          I GotoDeskAndPage 1 0 1
@@ -612,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
@@ -709,7 +698,7 @@ AddToMenu TermColors    "Term Colors" Title
 
 AddToMenu Systems       "Systems" Title
 +                       REMOTE_HOST_KOI8_MENU(phdru.name, phdru)
-+                       REMOTE_HOST_UTF8_MENU(phdru.name, phdru)
++                       REMOTE_HOST_UTF8_BOTLT_MENU(phdru.name, phdru)
 +                       REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU)
 
 AddToMenu FvwmCommands  "Fvwm Commands" Title
@@ -793,7 +782,7 @@ AddToMenu Utilities     "Choose one:" Title
 #+                       "xbuffy" Exec exec xbuffy -fn 'XBUFFY_FONT' -geometry +0+125 -boxfile mail/misc/.xbuffyrc
 #+                       ""       Nop
 +                       "pavucontrol" PaVuControl
-+                       "DeadBeef"    DeadBeef
++                       "AudioPlayer" AudioPlayer
 +                       "Id3Info"     Id3Info
 +                       ""       Nop
 +                       "Gajim"       Gajim
@@ -913,7 +902,7 @@ popdef(`TERM_KOI8', `TERM_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 pavucontrol)
 #*FvwmButtons: (Title Id3Info,  Icon bell.xpm,         Action Id3Info)
-*FvwmButtons: (Title DeadBeef,  Icon bell.xpm,         Action Exec "DeaDBeeF-*" exec deadbeef)
+*FvwmButtons: (Title AudioPlayer,  Icon bell.xpm,      Action Exec "Audacious" exec audacious)
 #*FvwmButtons: (Title XLock,     Icon Jxlock.xpm,      Action Exec exec xscreensaver-command -lock)
 
 ############################################################################