.fvwmrc: Do not break out of all callers, just break this function

[dotfiles.git] / .fvwm / main.m4

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index 220ad23a8130103f7e97e4cdd3b1fac139cd4a24..cf47e275659ccbf3923bb0ab5af93770ddf9e0c7 100644 (file)
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -13,13 +13,13 @@ dnl Echo dimension
 divert(-1)
 
 dnl TrueType Fonts
-define(`VERY_SMALL_FONT', `xft:Sans:size=10')
-define(`SMALL_FONT', `xft:Sans:size=12')
-define(`MEDIUM_FONT', `xft:Sans:size=14')
-define(`BIG_FONT', `xft:Sans:size=16')
-define(`LARGE_FONT', `xft:Sans:size=18')
-define(`HUGE_FONT', `xft:Sans:size=20')
-define(`GIGANTIC_FONT', `xft:Sans:size=22')
+define(`VERY_SMALL_FONT', `"xft:Liberation Mono:size=10"')
+define(`SMALL_FONT', `"xft:Liberation Mono:size=12"')
+define(`MEDIUM_FONT', `"xft:Liberation Mono:size=14"')
+define(`BIG_FONT', `"xft:Liberation Mono:size=16"')
+define(`LARGE_FONT', `"xft:Liberation Mono:size=18"')
+define(`HUGE_FONT', `"xft:Liberation Mono:size=20"')
+define(`GIGANTIC_FONT', `"xft:Liberation Mono:size=22"')
 
 dnl Bold TT fonts
 define(`SMALL_BOLD_FONT', SMALL_FONT`:Bold')
@@ -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,6 +523,7 @@ AddToFunc StartStandardSession
 +              I GotoDeskAndPage 2 0 1
 +              I TERM_KOI8_BIG
 +              I Wait TERM
++              I Term2HostsHome
 +              I FireFox
 
 DestroyFunc ResumeFunction
@@ -535,8 +536,9 @@ 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
 
 ############################################################################
@@ -627,7 +629,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"
@@ -641,7 +643,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"
@@ -867,15 +869,16 @@ AddToMenu Browsers      "Choose one:" Title
 #+                       "Blank" Exec exec xlock -mode blank
 
 AddToMenu XScreenSaverMenu     "Choose mode:" Title
-+                       "Suspend Screen Now" Exec exec xscreensaver-command -suspend
-+                       "Blank Screen Now" Exec exec xscreensaver-command -activate
-+                       "Lock Screen Now"  Exec exec xscreensaver-command -lock
-+                       "Screen Saver Demo" Exec exec xscreensaver-command -demo
-+                       "Screen Saver Preferences"  Exec exec xscreensaver-command -prefs
-+                       "Reinitialize Screen Saver" Exec exec xscreensaver-command -restart
++                       "Suspend Screen Now" Exec exec xscreensaver-command --suspend
++                       "Activate Screen Now" Exec exec xscreensaver-command --activate
++                       "Lock Screen Now"  Exec exec xscreensaver-command --lock
 +                       "" Nop
-+                       "Kill Screen Saver"         Exec exec xscreensaver-command -exit
++                       "Screen Saver Demo" Exec exec xscreensaver-demo
++                       "Screen Saver Settings"  Exec exec xscreensaver-settings
++                       "" Nop
++                       "Kill Screen Saver"         Exec exec xscreensaver-command --exit
 +                       "Launch Screen Saver"       Exec exec xscreensaver
++                       "Reinitialize Screen Saver" Exec exec xscreensaver-command --restart
 
 AddToMenu XSetBgMenu    "XSetBg" Title
 +                       "Change wallpaper" Exec exec "$HOME"/current/projects/xsetbg/xsetbg-force