From 36728ae60e3effdfe645a9a34cfd2e1067a37516 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Thu, 22 Oct 2009 06:11:26 +0200 Subject: Refer to modm as the current modMask Ignore-this: d097c7dc1746c55e1d4078a7148f9d5a This makes the config suggestions consistent with the current template. darcs-hash:20091022041126-1499c-5dd63076fdd71a61276cfc8e648bada81d9cc586.gz --- XMonad/Hooks/DynamicHooks.hs | 6 +++--- XMonad/Hooks/FloatNext.hs | 6 +++--- XMonad/Hooks/ManageDocks.hs | 12 ++++++------ XMonad/Hooks/Place.hs | 2 +- XMonad/Hooks/UrgencyHook.hs | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'XMonad/Hooks') diff --git a/XMonad/Hooks/DynamicHooks.hs b/XMonad/Hooks/DynamicHooks.hs index 9255b65..f4751d9 100644 --- a/XMonad/Hooks/DynamicHooks.hs +++ b/XMonad/Hooks/DynamicHooks.hs @@ -54,12 +54,12 @@ import Data.IORef -- module: -- -- > xmonad { keys = myKeys `Data.Map.union` Data.Map.fromList --- > [((modMask conf, xK_i), oneShotHook dynHooksRef +-- > [((modm, xK_i), oneShotHook dynHooksRef -- > "FFlaunchHook" (className =? "firefox") (doShift "3") -- > >> spawn "firefox") --- > ,((modMask conf, xK_u), addDynamicHook dynHooksRef +-- > ,((modm, xK_u), addDynamicHook dynHooksRef -- > (className =? "example" --> doFloat)) --- > ,((modMask conf, xK_y), updatePermanentHook dynHooksRef +-- > ,((modm, xK_y), updatePermanentHook dynHooksRef -- > (const idHook))) ] -- resets the permanent hook. -- diff --git a/XMonad/Hooks/FloatNext.hs b/XMonad/Hooks/FloatNext.hs index 36fcfea..37bdf90 100644 --- a/XMonad/Hooks/FloatNext.hs +++ b/XMonad/Hooks/FloatNext.hs @@ -86,12 +86,12 @@ floatModeMVar = unsafePerformIO $ newMVar (False, False) -- The 'floatNext' and 'toggleFloatNext' functions can be used in key -- bindings to float the next spawned window: -- --- > , ((modMask, xK_e), toggleFloatNext) +-- > , ((modm, xK_e), toggleFloatNext) -- -- 'floatAllNew' and 'toggleFloatAllNew' are similar but float all -- spawned windows until disabled again. -- --- > , ((modMask, xK_r), toggleFloatAllNew) +-- > , ((modm, xK_r), toggleFloatAllNew) -- | This 'ManageHook' will selectively float windows as set @@ -140,7 +140,7 @@ willFloatAllNew = _get snd -- that the effects of a 'floatNext'/... will be visible -- immediately: -- --- > , ((modMask, xK_e), toggleFloatNext >> runLogHook) +-- > , ((modm, xK_e), toggleFloatNext >> runLogHook) -- -- The @String -> String@ parameters to 'willFloatNextPP' and -- 'willFloatAllNewPP' will be applied to their output, you diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index 3a10be8..314b634 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -59,12 +59,12 @@ import qualified Data.Set as S -- 'AvoidStruts' also supports toggling the dock gaps; add a keybinding -- similar to: -- --- > ,((modMask x, xK_b ), sendMessage ToggleStruts) +-- > ,((modm, xK_b ), sendMessage ToggleStruts) -- -- If you have multiple docks, you can toggle their gaps individually. -- For example, to toggle only the top gap: -- --- > ,((modMask x .|. controlMask, xK_t), sendMessage $ ToggleStrut U) +-- > ,((modm .|. controlMask, xK_t), sendMessage $ ToggleStrut U) -- -- Similarly, you can use 'D', 'L', and 'R' to individually toggle -- gaps on the bottom, left, or right. @@ -165,19 +165,19 @@ instance Message ToggleStruts -- -- Show all gaps: -- --- > ,((modMask x .|. shiftMask ,xK_b),sendMessage $ SetStruts [minBound .. maxBound] []) +-- > ,((modm .|. shiftMask ,xK_b),sendMessage $ SetStruts [minBound .. maxBound] []) -- -- Hide all gaps: -- --- > ,((modMask x .|. controlMask,xK_b),sendMessage $ SetStruts [] [minBound .. maxBound]) +-- > ,((modm .|. controlMask,xK_b),sendMessage $ SetStruts [] [minBound .. maxBound]) -- -- Show only upper and left gaps: -- --- > ,((modMask x .|. controlMask .|. shiftMask,xK_b),sendMessage $ SetStruts [U,L] [minBound .. maxBound]) +-- > ,((modm .|. controlMask .|. shiftMask,xK_b),sendMessage $ SetStruts [U,L] [minBound .. maxBound]) -- -- Hide the bottom keeping whatever the other values were: -- --- > ,((modMask x .|. controlMask .|. shiftMask,xK_g),sendMessage $ SetStruts [] [D]) +-- > ,((modm .|. controlMask .|. shiftMask,xK_g),sendMessage $ SetStruts [] [D]) data SetStruts = SetStruts { addedStruts :: [Direction2D] , removedStruts :: [Direction2D] -- ^ These are removed from the currently set struts before 'addedStruts' are added. } diff --git a/XMonad/Hooks/Place.hs b/XMonad/Hooks/Place.hs index cf1186b..3c04b25 100644 --- a/XMonad/Hooks/Place.hs +++ b/XMonad/Hooks/Place.hs @@ -68,7 +68,7 @@ import Control.Monad.Trans (lift) -- You can also define a key to manually trigger repositioning with 'placeFocused' by -- adding the following to your keys definition: -- --- > , ((modMask, xK_w), placeFocused simpleSmart) +-- > , ((modm, xK_w), placeFocused simpleSmart) -- -- Both 'placeHook' and 'placeFocused' take a 'Placement' parameter, which specifies -- the placement policy to use (smart, under the mouse, fixed position, etc.). See diff --git a/XMonad/Hooks/UrgencyHook.hs b/XMonad/Hooks/UrgencyHook.hs index 45f57ec..7faacc4 100644 --- a/XMonad/Hooks/UrgencyHook.hs +++ b/XMonad/Hooks/UrgencyHook.hs @@ -251,14 +251,14 @@ urgencyConfig = UrgencyConfig { suppressWhen = Visible, remindWhen = Dont } -- | Focuses the most recently urgent window. Good for what ails ya -- I mean, your keybindings. -- Example keybinding: -- --- > , ((modMask , xK_BackSpace), focusUrgent) +-- > , ((modm , xK_BackSpace), focusUrgent) focusUrgent :: X () focusUrgent = withUrgents $ flip whenJust (windows . W.focusWindow) . listToMaybe -- | Just makes the urgents go away. -- Example keybinding: -- --- > , ((modMask .|. shiftMask, xK_BackSpace), clearUrgents) +-- > , ((modm .|. shiftMask, xK_BackSpace), clearUrgents) clearUrgents :: X () clearUrgents = adjustUrgents (const []) >> adjustReminders (const []) -- cgit v1.2.3