# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1492769985 -10800
# Node ID 1d03fdde00817b1e591e46657f1ed3b8ab6c9910
# Parent  04cb764675f36d43ca02a42470b2691aeb8ba033# Parent  ea8451937bb4a29ef40aa9ca7888cfd39a14f72f
merged

diff -r 04cb764675f3 -r 1d03fdde0081 .fvwm/config
--- a/.fvwm/config	Fri Apr 14 10:16:12 2017 +0300
+++ b/.fvwm/config	Fri Apr 21 13:19:45 2017 +0300
@@ -380,14 +380,14 @@
 # F9  - left              F12 - right
 #             F10 - down
 
-DestroyFunc myGotoPage
-AddToFunc myGotoPage
+DestroyFunc myGotoPageHoriz
+AddToFunc myGotoPageHoriz
 + I Next (CirculateHit, FvwmPager, Shaded) WindowShade "False"
-+ I GotoPage $0 $1
++ I GotoPage wrapx $0 +0p
 + I Next (CurrentPage) Focus
 
-Key F9 A C myGotoPage -1p -0p
-Key F12 A C myGotoPage +1p +0p
+Key F9  A 3C myGotoPageHoriz -1p
+Key F12 A 3C myGotoPageHoriz +1p
 
 # Move across pages up, if there are no more page go to last page of prev desk.
 DestroyFunc myGotoPageUp
@@ -401,7 +401,7 @@
 + I UnSetEnv fvwm_page_ny
 + I Next (CurrentPage) Focus
 
-Key F11 A C myGotoPageUp
+Key F11 A 3C myGotoPageUp
 
 # Move across pages down, if there are no more pages go to first page of next desk.
 DestroyFunc myGotoPageDown
@@ -415,7 +415,7 @@
 + I UnSetEnv fvwm_page_ny
 + I Next (CurrentPage) Focus
 
-Key F10 A C myGotoPageDown
+Key F10 A 3C myGotoPageDown
 
 # Move window across pages left.
 DestroyFunc myMovePageLeft
@@ -423,11 +423,11 @@
 + I Next (CirculateHit, FvwmPager, Shaded) WindowShade "False"
 + I Focus
 + I SetEnv fvwm_curr_w $[w.id]
-+ I MoveToPage -1p +0p
++ I WindowId $[fvwm_curr_w] MoveToPage wrapx -1p +0p
 + I WindowId $[fvwm_curr_w] Focus
 + I UnSetEnv fvwm_curr_w
 
-Key F9 A M myMovePageLeft
+Key F9 A 3M myMovePageLeft
 
 # Move window across pages right.
 DestroyFunc myMovePageRight
@@ -435,11 +435,11 @@
 + I Next (CirculateHit, FvwmPager, Shaded) WindowShade "False"
 + I Focus
 + I SetEnv fvwm_curr_w $[w.id]
-+ I MoveToPage +1p +0p
++ I WindowId $[fvwm_curr_w] MoveToPage wrapx +1p +0p
 + I WindowId $[fvwm_curr_w] Focus
 + I UnSetEnv fvwm_curr_w
 
-Key F12 A M myMovePageRight
+Key F12 A 3M myMovePageRight
 
 # Move window across pages down, if there is no more pages go to first page of next desk.
 DestroyFunc myMovePageDown
@@ -450,12 +450,12 @@
 + I SetEnv fvwm_page_ny $[page.ny]
 + I Test (EnvMatch fvwm_page_ny 2) WindowId $[fvwm_curr_w] MoveToDesk +1 0 4
 + I Test (EnvMatch fvwm_page_ny 2) WindowId $[fvwm_curr_w] MoveToPage +0p 0
-+ I Test (!EnvMatch fvwm_page_ny 2) WindowId $[fvwm_curr_w] MoveToPage 0 +1p
++ I Test (!EnvMatch fvwm_page_ny 2) WindowId $[fvwm_curr_w] MoveToPage +0p +1p
 + I WindowId $[fvwm_curr_w] Focus
 + I UnSetEnv fvwm_page_ny
 + I UnSetEnv fvwm_curr_w
 
-Key F10 A M myMovePageDown
+Key F10 A 3M myMovePageDown
 
 # Move window across pages up, if there is no more pages go to last page of the previous desk.
 DestroyFunc myMovePageUp
@@ -471,7 +471,7 @@
 + I UnSetEnv fvwm_page_ny
 + I UnSetEnv fvwm_curr_w
 
-Key F11 A M myMovePageUp
+Key F11 A 3M myMovePageUp
 
 
 Key F9 A S CursorMove -50p +0p
@@ -510,6 +510,7 @@
 + &Emacs%emacs.png%  Exec  exec emacs
 + &Firefox%iceweasel.png%  Exec  exec firefox
 + &VLC%vlc.png%  Exec  exec vlc
++ &Audacious%audacious.png%  Exec  exec audacious
 + &Skype%skype.png%  Exec  exec env QT_X11_NO_MITSHM=1 skype
 + &Goldendict%goldendict.png%  Exec  exec goldendict
 + xkill           Exec  exec xkill