X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.fvwm%2Fphd.m4;h=49c020d052dca9cd8d92e22d04947baa5bc60c7b;hb=fb77c46f8171fc0da06016825b3057fcd5bbe391;hp=a5f1bde1e3f1cb2db70314fe52bdeb1bb01a8000;hpb=81342609dd90000a4e57471555e298085e2a0d39;p=dotfiles.git

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index a5f1bde..49c020d 100644
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -481,6 +481,7 @@ AddToFunc StartStandardSession
 +              I Wait TERM
 +              I PaVuControl
 +              I Wait "Volume Control"
++              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I FireFox-Wait
 +              I GotoDeskAndPage 1 0 1
 +              I TERM_KOI8
@@ -504,7 +505,8 @@ AddToFunc ResumeFunction
 +              I Wait TERM
 +              I PaVuControl
 +              I Wait "Volume Control"
-+              I Exec $HOME/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
++              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
++              I Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +              I Wait gxmessage
 +              I None ("*Mozilla Firefox") FireFox-Wait
 +              I GotoDeskAndPage 0 1 0
@@ -605,11 +607,13 @@ AddToFunc Term-Phdru-Big      I GotoDeskAndPage 1 0 1
 +                             I REMOTE_HOST_KOI8_BIG(phdru.name, phdru.name)
 
 DestroyFunc FireFox
-AddToFunc FireFox             I GotoDeskAndPage 1 0 0
-+                             I Exec if ! pgrep firefox >/dev/null; then LC_CTYPE=ru_RU.KOI8-R exec start-browser firefox; fi
+AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
++                             I GotoDeskAndPage 1 0 0
++                             I Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser firefox
 
 DestroyFunc FireFox-Wait
-AddToFunc FireFox-Wait        I FireFox
+AddToFunc FireFox-Wait        I Any ("*Mozilla Firefox") Break
++                             I FireFox
 +                             I Wait "*Mozilla Firefox"
 
 DestroyFunc Gajim
@@ -803,8 +807,8 @@ AddToMenu Utilities     "Choose one:" Title
 DestroyMenu  Browsers
 AddToMenu Browsers      "Choose one:" Title
 +                       "FireFox" FireFox
-+                       "Chromium" Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser chromium
-+                       "Opera" Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser opera
++                       "Chromium" None ("*Chromium") Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser chromium
++                       "Opera" None ("*Opera") Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser opera
 
 # A wide variety of screenlocking options...
 #AddToMenu XlockMenu     "Choose one:" Title
@@ -868,8 +872,7 @@ changequote([`], ['])
 *FvwmButtons: Back rgb:90/80/90
 
 # Font
-*FvwmButtonsFont        BUTTONS_FONT
-*FvwmButtons: Font      BUTTONS_FONT
+*FvwmButtons: Font BUTTONS_FONT
 
 # Geometry-- really likes to pick its own size, but giving a position is OK
 *FvwmButtons: Geometry -1+1
@@ -887,19 +890,7 @@ changequote([`], ['])
 #*FvwmButtons: Kill              skull.xpm       Destroy
 #*FvwmButtons: Quit              nuke.xpm        Popup "Quit-Verify"
 
-#*FvwmButtons: (de)Iconify       eyenew.xpm      Iconify
-#*FvwmButtons: Restart eye2.xpm     Restart
-#*FvwmButtons: Xcalc   rcalc.xpm   Exec "Calculator" exec xcalc
-#*FvwmButtons: junk   3dx.xpm     Swallow "xload"  xload -bg \#908090
-#*FvwmButtons: xmter x.xpm            Swallow "xmter" xmter
-#*FvwmButtons: ""  clock.xpm   Swallow "xclock" xclock -bg \#908090 -padding 0
-#*FvwmButtons: "" 3dx.xpm Swallow "Time 3D" t3d -fg \#908090 -mag .3 -wobber 0
-
 #*FvwmButtons: (Swallow XClock 'Exec exec xclock -update 1 -geometry -3000-3000')
-#*FvwmButtons: news    page.xpm   TERM_KOI8 -title "Tin" -fn 10x20 -fg white -cr white -bg black -e tin
-#*FvwmButtons: Minicom mini-connect.xpm TERM_KOI8 -title "Minicom" -fg white -cr white -bg black -e minicom
-#*FvwmButtons: Real    bell.xpm    Exec cd /opt/audio && exec realplay
-#*FvwmButtons: Kill    rbomb.xpm    Destroy
 
 # Buttons
 *FvwmButtons: (Title Term,     Icon rterm2.xpm,      Action TERM_KOI8)