X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fmain.m4;h=eefa60692013410eb0b84f0931fe8f6073d44741;hb=HEAD;hp=14b575f48f101ea6c8c93744af2a44ef6cf51ac3;hpb=2c4a51e1106194a3526fe6c6ca9eea657dd208a1;p=dotfiles.git

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 14b575f..8e7c740 100644
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -299,7 +299,7 @@ Style "*Mozilla*"       PositionPlacement +0 -0
 Style "*Chromium*"      PositionPlacement +0 -0
 
 # Video player(s)
-Style "*mpv"            Layer 6, PositionPlacement 250p 100p
+Style "*mpv"            Layer 6, PositionPlacement 200p 150p
 
 Style "*clock"          !Title, Sticky, WindowListSkip, Color Black/#40c040, NeverFocus, PositionPlacement 50-50w +1p, Layer 2
 Style "deadbeef"        PositionPlacement -0 -0
@@ -505,7 +505,7 @@ AddToFunc RestartFunction
 DestroyFunc UrgencyFunc
 AddToFunc UrgencyFunc
 +                             I Iconify off
-+                             I ThisWindow ("*Downloads|Skype") Break
++                             I ThisWindow ("*Downloads|Skype") Break 1
 +                             I FlipFocus
 +                             I Raise
 +                             I WarpToWindow 5p 5p
@@ -523,7 +523,6 @@ AddToFunc StartStandardSession
 +              I GotoDeskAndPage 2 0 1
 +              I TERM_KOI8_BIG
 +              I Wait TERM
-+              I Term2HostsHome
 +              I FireFox
 
 DestroyFunc ResumeFunction
@@ -536,9 +535,8 @@ AddToFunc ResumeFunction
 +              I Exec sleep 10; exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I XsetbgFilename
 +              I Wait gxmessage
-+              I Term2HostsHome
 +              I Any ("*Mozilla Firefox") GotoDeskAndPage 0 1 1
-+              I TestRc (Match) Break
++              I TestRc (Match) Break 1
 +              I None ("*Mozilla Firefox") FireFox
 
 ############################################################################
@@ -614,13 +612,12 @@ AddToFunc PaVuControl         I GotoDeskAndPage 0 1 1
 +                             I Exec exec cgmem_nice 200 pavucontrol
 +                             I Wait "Volume Control"
 
-changequote([,])dnl
 DestroyFunc Id3Info
-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([`], ['])dnl
+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 -
 
 DestroyFunc Term2HostsHome
 AddToFunc Term2HostsHome      I GotoDeskAndPage 1 1 2
++                             I PipeRead 'test -n "$(ip address show tun0 up 2>/dev/null)" || test -n "$(ip address show wg0 up 2>/dev/null)" || { echo Exec exec gxmessage -buttons Ok -default Ok "ERROR: Cannot find tun0/wg0 interfaces!"; echo Wait gxmessage; echo Break 1; }'
 +                             I TERM_KOI8_SSH_SCREEN(iskra-aviel.phdru.name, iskra)
 +                             I Wait TERM
 +                             I GotoDeskAndPage 1 0 1
@@ -629,7 +626,7 @@ AddToFunc Term2HostsHome      I GotoDeskAndPage 1 1 2
 +                             I GotoDeskAndPage 1 1 2
 
 DestroyFunc FireFox
-AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
+AddToFunc FireFox             I Any ("*Mozilla Firefox") Break 1
 +                             I GotoDeskAndPage 1 0 0
 +                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 4000 start-browser firefox -P phd
 +                             I Wait "*Mozilla Firefox"
@@ -643,7 +640,7 @@ AddToFunc ResumeFireFox       I Exec exec pkill -CONT firefox
 +                             I All ("*Mozilla Firefox") Iconify False
 
 DestroyFunc Chromium
-AddToFunc Chromium            I Any ("*Chromium") Break
+AddToFunc Chromium            I Any ("*Chromium") Break 1
 +                             I GotoDeskAndPage 1 1 0
 +                             I Exec LC_CTYPE=ru_RU.KOI8-R exec cgmem_nice 2000 start-browser chromium
 +                             I Wait "*Chromium"
@@ -869,8 +866,9 @@ AddToMenu Browsers      "Choose one:" Title
 #+                       "Blank" Exec exec xlock -mode blank
 
 AddToMenu XScreenSaverMenu     "Choose mode:" Title
-+                       "Suspend Screen Now" Exec exec xscreensaver-command --suspend
-+                       "Activate Screen Now" Exec exec xscreensaver-command --activate
++                       "Blank Screen via xset" Exec xset dpms force off
+#+                       "Blank Screen Now" Exec exec xscreensaver-command --suspend
++                       "Activate A Hack Now" Exec exec xscreensaver-command --activate
 +                       "Lock Screen Now"  Exec exec xscreensaver-command --lock
 +                       "" Nop
 +                       "Screen Saver Demo" Exec exec xscreensaver-demo
@@ -886,18 +884,16 @@ AddToMenu XSetBgMenu    "XSetBg" Title
 +                       "Stop" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-stop
 +                       "Restart" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-http-restart
 +                       ""       Nop
-changequote([,])
-+                       "Xli" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
-+                       "Xli (scaled)" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
-+                       "Open in browser" Exec exec cgmem_nice 4000 webbrowserX -n "`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r`"
++                       "Xli" Exec fn="$($HOME/current/projects/xsetbg/print-filename.py -e koi8-r)" && exec xli -title "$(echo $fn | sed 's/[ .]/_/g')" "$fn"
++                       "Xli (scaled)" Exec fn="$($HOME/current/projects/xsetbg/print-filename.py -e koi8-r)" && exec xli -title "$(echo $fn | sed 's/[ .]/_/g')" -zoom auto "$fn"
++                       "Open in browser" Exec exec cgmem_nice 4000 webbrowserX -n "$($HOME/current/projects/xsetbg/print-filename.py -e koi8-r)"
 +                       "Filename" Exec exec "$HOME"/current/projects/xsetbg/print-filename.py -e koi8-r
 +                       "XFilename" Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +                       "XFilename (wrapped)" XSetbgFilename
 +                       ""       Nop
-+                       "Xli (prev.)" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r 1`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" "$fn"
-+                       "Xli (prev., scaled)" Exec fn="`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r 1`" && exec xli -title "`echo $fn | sed 's/ /_/g'`" -zoom auto "$fn"
-+                       "Open in browser (prev.)" Exec exec cgmem_nice 4000 webbrowserX -n "`$HOME/current/projects/xsetbg/print-filename.py -e koi8-r 1`"
-changequote([`], ['])
++                       "Xli (prev.)" Exec fn="$($HOME/current/projects/xsetbg/print-filename.py -e koi8-r 1)" && exec xli -title "$(echo $fn | sed 's/[ .]/_/g')" "$fn"
++                       "Xli (prev., scaled)" Exec fn="$($HOME/current/projects/xsetbg/print-filename.py -e koi8-r 1)" && exec xli -title "$(echo $fn | sed 's/[ .]/_/g')" -zoom auto "$fn"
++                       "Open in browser (prev.)" Exec exec cgmem_nice 4000 webbrowserX -n "$($HOME/current/projects/xsetbg/print-filename.py -e koi8-r 1)"
 +                       "Filename (prev.)" Exec exec "$HOME"/current/projects/xsetbg/print-filename.py -e koi8-r 1
 +                       "XFilename (prev.)" Exec "$HOME"/current/projects/xsetbg/print-filename.py 1 | text-wrap.py | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +                       "XFilename (prev., wrapped)" Exec "$HOME"/current/projects/xsetbg/print-filename.py 1 | text-wrap.py -w TEXT_WIDTH -s | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -