From 5be2076fe273051e8018d6b1c894bd9e9f18ec60 Mon Sep 17 00:00:00 2001 From: wirtwolff Date: Fri, 20 Mar 2009 03:46:24 +0100 Subject: man_xmonad.hs: import Data.Monoid for mempty, keybinding edits Ignore-this: dc8477ffcfdd404f4f60d2cdaf3812d9 Bring mempty into scope. Add commented ToggleStruts binding. Replace shadowed modMask in keybindings with modm instead. darcs-hash:20090320024624-d17f0-464a497898687e5be8a8a03537472a9928e331e1 --- man/xmonad.hs | 68 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) (limited to 'man') diff --git a/man/xmonad.hs b/man/xmonad.hs index 0cbdc04..db89d59 100644 --- a/man/xmonad.hs +++ b/man/xmonad.hs @@ -8,6 +8,7 @@ -- import XMonad +import Data.Monoid import System.Exit import qualified XMonad.StackSet as W @@ -67,73 +68,76 @@ myFocusedBorderColor = "#ff0000" ------------------------------------------------------------------------ -- Key bindings. Add, modify or remove key bindings here. -- -myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ +myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $ -- launch a terminal - [ ((modMask .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) + [ ((modm .|. shiftMask, xK_Return), spawn $ XMonad.terminal conf) -- launch dmenu - , ((modMask, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") + , ((modm, xK_p ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") -- launch gmrun - , ((modMask .|. shiftMask, xK_p ), spawn "gmrun") + , ((modm .|. shiftMask, xK_p ), spawn "gmrun") -- close focused window - , ((modMask .|. shiftMask, xK_c ), kill) + , ((modm .|. shiftMask, xK_c ), kill) -- Rotate through the available layout algorithms - , ((modMask, xK_space ), sendMessage NextLayout) + , ((modm, xK_space ), sendMessage NextLayout) -- Reset the layouts on the current workspace to default - , ((modMask .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) + , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf) -- Resize viewed windows to the correct size - , ((modMask, xK_n ), refresh) + , ((modm, xK_n ), refresh) -- Move focus to the next window - , ((modMask, xK_Tab ), windows W.focusDown) + , ((modm, xK_Tab ), windows W.focusDown) -- Move focus to the next window - , ((modMask, xK_j ), windows W.focusDown) + , ((modm, xK_j ), windows W.focusDown) -- Move focus to the previous window - , ((modMask, xK_k ), windows W.focusUp ) + , ((modm, xK_k ), windows W.focusUp ) -- Move focus to the master window - , ((modMask, xK_m ), windows W.focusMaster ) + , ((modm, xK_m ), windows W.focusMaster ) -- Swap the focused window and the master window - , ((modMask, xK_Return), windows W.swapMaster) + , ((modm, xK_Return), windows W.swapMaster) -- Swap the focused window with the next window - , ((modMask .|. shiftMask, xK_j ), windows W.swapDown ) + , ((modm .|. shiftMask, xK_j ), windows W.swapDown ) -- Swap the focused window with the previous window - , ((modMask .|. shiftMask, xK_k ), windows W.swapUp ) + , ((modm .|. shiftMask, xK_k ), windows W.swapUp ) -- Shrink the master area - , ((modMask, xK_h ), sendMessage Shrink) + , ((modm, xK_h ), sendMessage Shrink) -- Expand the master area - , ((modMask, xK_l ), sendMessage Expand) + , ((modm, xK_l ), sendMessage Expand) -- Push window back into tiling - , ((modMask, xK_t ), withFocused $ windows . W.sink) + , ((modm, xK_t ), withFocused $ windows . W.sink) -- Increment the number of windows in the master area - , ((modMask , xK_comma ), sendMessage (IncMasterN 1)) + , ((modm , xK_comma ), sendMessage (IncMasterN 1)) -- Deincrement the number of windows in the master area - , ((modMask , xK_period), sendMessage (IncMasterN (-1))) + , ((modm , xK_period), sendMessage (IncMasterN (-1))) - -- toggle the status bar gap - -- TODO, update this binding with avoidStruts , ((modMask , xK_b ), + -- Toggle the status bar gap + -- Use this binding with avoidStruts from Hooks.ManageDocks. + -- See also the statusBar function from Hooks.DynamicLog. + -- + -- , ((modm , xK_b ), sendMessage ToggleStruts) -- Quit xmonad - , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) + , ((modm .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- Restart xmonad - , ((modMask , xK_q ), spawn "xmonad --recompile; xmonad --restart") + , ((modm , xK_q ), spawn "xmonad --recompile; xmonad --restart") ] ++ @@ -141,7 +145,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ -- mod-[1..9], Switch to workspace N -- mod-shift-[1..9], Move client to workspace N -- - [((m .|. modMask, k), windows $ f i) + [((m .|. modm, k), windows $ f i) | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] ++ @@ -150,7 +154,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3 -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3 -- - [((m .|. modMask, key), screenWorkspace sc >>= flip whenJust (windows . f)) + [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f)) | (key, sc) <- zip [xK_w, xK_e, xK_r] [0..] , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]] @@ -158,18 +162,18 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ ------------------------------------------------------------------------ -- Mouse bindings: default actions bound to mouse events -- -myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $ +myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $ -- mod-button1, Set the window to floating mode and move by dragging - [ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w - >> windows W.shiftMaster)) + [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w + >> windows W.shiftMaster)) -- mod-button2, Raise the window to the top of the stack - , ((modMask, button2), (\w -> focus w >> windows W.shiftMaster)) + , ((modm, button2), (\w -> focus w >> windows W.shiftMaster)) -- mod-button3, Set the window to floating mode and resize by dragging - , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w - >> windows W.shiftMaster)) + , ((modm, button3), (\w -> focus w >> mouseResizeWindow w + >> windows W.shiftMaster)) -- you may also bind events to the mouse scroll wheel (button4 and button5) ] -- cgit v1.2.3