.fvwmrc: test for a window before starting browser

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index a5f1bde1e3f1cb2db70314fe52bdeb1bb01a8000..083b3e5bab771b6b9174ed5ef98934a41481868d 100644 (file)
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -605,11 +605,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 +805,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