Merge branch 'master' of https://github.com/pcbsd/lumina

1 files changed, 28 insertions, 32 deletions

diff --git a/lumina-desktop/fluxboxconf/fluxbox-keys b/lumina-desktop/fluxboxconf/fluxbox-keys
index f0ec3519..97c53b2e 100644
--- a/lumina-desktop/fluxboxconf/fluxbox-keys
+++ b/lumina-desktop/fluxboxconf/fluxbox-keys
@@ -15,24 +15,20 @@ OnTitlebar Mouse2 :StartTabbing
 OnTitlebar Double Mouse1 :Shade
 OnTitlebar Mouse3 :WindowMenu
 
-!mouse actions added by fluxbox-update_configs
-OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
-OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing BottomRight}
-
 # scroll on the toolbar to change current window
 OnToolbar Mouse4 :PrevWindow {static groups} (workspace=[current])  (iconhidden=no) !! FBCV13 !!
 OnToolbar Mouse5 :NextWindow {static groups} (workspace=[current])  (iconhidden=no) !! FBCV13 !!
 
 # alt + left/right click to move/resize a window
-OnWindow Mod1 Mouse1 :MacroCmd {Raise} {Focus} {StartMoving}
-OnWindowBorder Move1 :StartMoving
+OnWindow Mod1 Mouse1 :If {Matches (Layer=Normal)} {MacroCmd {Raise} {Focus} {StartMoving}}
+OnWindow Mod1 Mouse3 :If {Matches (Layer=Normal)} {MacroCmd {Raise} {Focus} {StartResizing NearestCorner}}
 
-OnWindow Mod1 Mouse3 :MacroCmd {Raise} {Focus} {StartResizing NearestCorner}
+OnWindowBorder Move1 :StartMoving
 OnLeftGrip Move1 :StartResizing bottomleft
 OnRightGrip Move1 :StartResizing bottomright
 
 # alt + middle click to lower the window
-OnWindow Mod1 Mouse2 :Lower
+OnWindow Mod1 Mouse2 :If {Matches (Layer=Normal)} {Lower}
 
 # control-click a window's titlebar and drag to attach windows
 OnTitlebar Control Mouse1 :StartTabbing
@@ -59,8 +55,8 @@ Mod4 Tab :NextTab
 Mod4 Shift Tab :PrevTab
 
 # Arrange/Tile Current windows
-Mod4 Left :ArrangeWindowsStackRight (Layer=Normal)
-Mod4 Right :ArrangeWindowsStackLeft (Layer=Normal)
+Mod1 Left :ArrangeWindowsStackRight (Layer=Normal)
+Mod1 Right :ArrangeWindowsStackLeft (Layer=Normal)
 
 # go to a specific tab in the current window
 Mod4 1 :Tab 1
@@ -80,23 +76,23 @@ Mod1 F1 :Exec xterm
 Mod1 F2 :Exec lumina-search
 
 # current window commands
-Mod1 F4 :Close
-Mod1 F5 :Kill
-Mod1 F9 :Minimize
-Mod1 F10 :Maximize
-Mod1 F11 :Fullscreen
+Mod1 F4 :If {Matches (Layer=Normal)} {Close}
+Mod1 F5 :If {Matches (Layer=Normal)} {Kill}
+Mod1 F9 :If {Matches (Layer=Normal)} {Minimize}
+Mod1 F10 :If {Matches (Layer=Normal)} {Maximize}
+Mod1 F11 :If {Matches (Layer=Normal)} {Fullscreen}
 
 # change to previous/next workspace
 Control Mod1 Left :PrevWorkspace
 Control Mod1 Right :NextWorkspace
 
 # send the current window to previous/next workspace
-Mod4 Left :SendToPrevWorkspace
-Mod4 Right :SendToNextWorkspace
+Mod4 Left :If {Matches (Layer=Normal)} {SendToPrevWorkspace}
+Mod4 Right :If {Matches (Layer=Normal)} {SendToNextWorkspace}
 
 # send the current window and follow it to previous/next workspace
-Control Mod4 Left :TakeToPrevWorkspace
-Control Mod4 Right :TakeToNextWorkspace
+Control Mod4 Left :If {Matches (Layer=Normal)} {TakeToPrevWorkspace}
+Control Mod4 Right :If {Matches (Layer=Normal)} {TakeToNextWorkspace}
 
 # change to a specific workspace
 Control F1 :Workspace 1
@@ -127,19 +123,19 @@ Mod4 F11 :SendToWorkspace 11
 Mod4 F12 :SendToWorkspace 12
 
 # send the current window and change to a specific workspace
-Control Mod4 F1 :TakeToWorkspace 1
-Control Mod4 F2 :TakeToWorkspace 2
-Control Mod4 F3 :TakeToWorkspace 3
-Control Mod4 F4 :TakeToWorkspace 4
-Control Mod4 F5 :TakeToWorkspace 5
-Control Mod4 F6 :TakeToWorkspace 6
-Control Mod4 F7 :TakeToWorkspace 7
-Control Mod4 F8 :TakeToWorkspace 8
-Control Mod4 F9 :TakeToWorkspace 9
-Control Mod4 F10 :TakeToWorkspace 10
-Control Mod4 F11 :TakeToWorkspace 11
-Control Mod4 F12 :TakeToWorkspace 12
+Control Mod4 F1 :If {Matches (Layer=Normal)} {TakeToWorkspace 1}
+Control Mod4 F2 :If {Matches (Layer=Normal)} {TakeToWorkspace 2}
+Control Mod4 F3 :If {Matches (Layer=Normal)} {TakeToWorkspace 3}
+Control Mod4 F4 :If {Matches (Layer=Normal)} {TakeToWorkspace 4}
+Control Mod4 F5 :If {Matches (Layer=Normal)} {TakeToWorkspace 5}
+Control Mod4 F6 :If {Matches (Layer=Normal)} {TakeToWorkspace 6}
+Control Mod4 F7 :If {Matches (Layer=Normal)} {TakeToWorkspace 7}
+Control Mod4 F8 :If {Matches (Layer=Normal)} {TakeToWorkspace 8}
+Control Mod4 F9 :If {Matches (Layer=Normal)} {TakeToWorkspace 9}
+Control Mod4 F10 :If {Matches (Layer=Normal)} {TakeToWorkspace 10}
+Control Mod4 F11 :If {Matches (Layer=Normal)} {TakeToWorkspace 11}
+Control Mod4 F12 :If {Matches (Layer=Normal)} {TakeToWorkspace 12}
 
 Print :Exec lumina-screenshot
-
+Pause :Exec xscreensaver-command -lock