From 595021f9a0b70483a7e26337bab8b2da68cd4757 Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Sun, 5 Jul 2009 22:12:05 +0200 Subject: Remove trailing whitespace from many modules Ignore-this: 1e28ff0974578d329bd3d593c1a5125e darcs-hash:20090705201205-1499c-581bd0bb43ab6096eccded6edbd54a7a2007b0d9.gz --- XMonad/Hooks/DynamicHooks.hs | 18 +++++----- XMonad/Hooks/EwmhDesktops.hs | 2 +- XMonad/Hooks/FloatNext.hs | 16 ++++----- XMonad/Hooks/Place.hs | 80 ++++++++++++++++++++++---------------------- XMonad/Hooks/XPropManage.hs | 4 +-- 5 files changed, 60 insertions(+), 60 deletions(-) (limited to 'XMonad/Hooks') diff --git a/XMonad/Hooks/DynamicHooks.hs b/XMonad/Hooks/DynamicHooks.hs index 002853d..9255b65 100644 --- a/XMonad/Hooks/DynamicHooks.hs +++ b/XMonad/Hooks/DynamicHooks.hs @@ -53,11 +53,11 @@ import Data.IORef -- You must include this @dynHooksRef@ value when using the functions in this -- module: -- --- > xmonad { keys = myKeys `Data.Map.union` Data.Map.fromList --- > [((modMask conf, xK_i), oneShotHook dynHooksRef --- > "FFlaunchHook" (className =? "firefox") (doShift "3") +-- > xmonad { keys = myKeys `Data.Map.union` Data.Map.fromList +-- > [((modMask conf, xK_i), oneShotHook dynHooksRef +-- > "FFlaunchHook" (className =? "firefox") (doShift "3") -- > >> spawn "firefox") --- > ,((modMask conf, xK_u), addDynamicHook dynHooksRef +-- > ,((modMask conf, xK_u), addDynamicHook dynHooksRef -- > (className =? "example" --> doFloat)) -- > ,((modMask conf, xK_y), updatePermanentHook dynHooksRef -- > (const idHook))) ] -- resets the permanent hook. @@ -66,7 +66,7 @@ import Data.IORef data DynamicHooks = DynamicHooks { transients :: [(Query Bool, ManageHook)] , permanent :: ManageHook } - + -- | Creates the 'IORef' that stores the dynamically created 'ManageHook's. initDynamicHooks :: IO (IORef DynamicHooks) @@ -80,7 +80,7 @@ initDynamicHooks = newIORef (DynamicHooks { transients = [], -- doFloat and doIgnore are idempotent. -- | Master 'ManageHook' that must be in your @xmonad.hs@ 'ManageHook'. dynamicMasterHook :: IORef DynamicHooks -> ManageHook -dynamicMasterHook ref = return True --> +dynamicMasterHook ref = return True --> (ask >>= \w -> liftX (do dh <- io $ readIORef ref (Endo f) <- runQuery (permanent dh) w @@ -99,7 +99,7 @@ addDynamicHook ref m = updateDynamicHook ref (<+> m) -- | Modifies the permanent 'ManageHook' with an arbitrary function. updateDynamicHook :: IORef DynamicHooks -> (ManageHook -> ManageHook) -> X () -updateDynamicHook ref f = +updateDynamicHook ref f = io $ modifyIORef ref $ \dh -> dh { permanent = f (permanent dh) } @@ -108,10 +108,10 @@ updateDynamicHook ref f = -- -- > className =? "example" --> doFloat -- --- you must call 'oneShotHook' as +-- you must call 'oneShotHook' as -- -- > oneShotHook dynHooksRef (className =? "example) doFloat --- +-- oneShotHook :: IORef DynamicHooks -> Query Bool -> ManageHook -> X () oneShotHook ref q a = io $ modifyIORef ref diff --git a/XMonad/Hooks/EwmhDesktops.hs b/XMonad/Hooks/EwmhDesktops.hs index ade1b94..744beb8 100644 --- a/XMonad/Hooks/EwmhDesktops.hs +++ b/XMonad/Hooks/EwmhDesktops.hs @@ -100,7 +100,7 @@ ewmhDesktopsLogHookCustom f = withWindowSet $ \s -> do setWindowDesktop win curr forM_ (W.hidden s) $ \w -> - case elemIndex (W.tag w) (map W.tag ws) of + case elemIndex (W.tag w) (map W.tag ws) of Nothing -> return () Just wn -> forM_ (W.integrate' (W.stack w)) $ \win -> do setWindowDesktop win wn diff --git a/XMonad/Hooks/FloatNext.hs b/XMonad/Hooks/FloatNext.hs index 5527689..36fcfea 100644 --- a/XMonad/Hooks/FloatNext.hs +++ b/XMonad/Hooks/FloatNext.hs @@ -8,7 +8,7 @@ -- Stability : unstable -- Portability : unportable -- --- Hook and keybindings for automatically sending the next +-- Hook and keybindings for automatically sending the next -- spawned window(s) to the floating layer. -- ----------------------------------------------------------------------------- @@ -72,11 +72,11 @@ floatModeMVar = unsafePerformIO $ newMVar (False, False) -- $usage -- This module provides actions (that can be set as keybindings) --- to automatically send the next spawned window(s) to the floating +-- to automatically send the next spawned window(s) to the floating -- layer. -- -- You can use it by including the following in your @~\/.xmonad\/xmonad.hs@: --- +-- -- > import XMonad.Hooks.FloatNext -- -- and adding 'floatNextHook' to your 'ManageHook': @@ -130,23 +130,23 @@ willFloatAllNew = _get snd -- $pp -- The following functions are used to display the current --- state of 'floatNext' and 'floatAllNew' in your +-- state of 'floatNext' and 'floatAllNew' in your -- 'XMonad.Hooks.DynamicLog.dynamicLogWithPP'. -- 'willFloatNextPP' and 'willFloatAllNewPP' should be added --- to the 'XMonad.Hooks.DynamicLog.ppExtras' field of your +-- to the 'XMonad.Hooks.DynamicLog.ppExtras' field of your -- 'XMonad.Hooks.DynamicLog.PP'. -- -- Use 'runLogHook' to refresh the output of your 'logHook', so -- that the effects of a 'floatNext'/... will be visible -- immediately: --- +-- -- > , ((modMask, xK_e), toggleFloatNext >> runLogHook) -- -- The @String -> String@ parameters to 'willFloatNextPP' and --- 'willFloatAllNewPP' will be applied to their output, you +-- 'willFloatAllNewPP' will be applied to their output, you -- can use them to set the text color, etc., or you can just -- pass them 'id'. - + willFloatNextPP :: (String -> String) -> X (Maybe String) willFloatNextPP = _pp fst "Next" diff --git a/XMonad/Hooks/Place.hs b/XMonad/Hooks/Place.hs index 9211f93..cf1186b 100644 --- a/XMonad/Hooks/Place.hs +++ b/XMonad/Hooks/Place.hs @@ -14,7 +14,7 @@ module XMonad.Hooks.Place ( -- * Usage -- $usage - + -- * Placement actions placeFocused , placeHook @@ -53,7 +53,7 @@ import Control.Monad.Trans (lift) -- as an 'X' action to manually trigger repositioning. -- -- You can use this module by including the following in your @~\/.xmonad\/xmonad.hs@: --- +-- -- > import XMonad.Hooks.Place -- -- and adding 'placeHook' to your 'manageHook', for example: @@ -61,7 +61,7 @@ import Control.Monad.Trans (lift) -- > main = xmonad $ defaultConfig { manageHook = placeHook simpleSmart -- > <+> manageHook defaultConfig } -- --- Note that 'placeHook' should be applied after most other hooks, especially hooks +-- Note that 'placeHook' should be applied after most other hooks, especially hooks -- such as 'doFloat' and 'doShift'. Since hooks combined with '<+>' are applied from -- right to left, this means that 'placeHook' should be the /first/ hook in your chain. -- @@ -71,7 +71,7 @@ import Control.Monad.Trans (lift) -- > , ((modMask, 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 +-- the placement policy to use (smart, under the mouse, fixed position, etc.). See -- 'Placement' for a list of available policies. @@ -118,12 +118,12 @@ simpleSmart = inBounds $ smart (0,0) -- | Place windows at a fixed position -fixed :: (Rational, Rational) -- ^ Where windows should go. - -- - -- * (0,0) -> top left of the screen - -- +fixed :: (Rational, Rational) -- ^ Where windows should go. + -- + -- * (0,0) -> top left of the screen + -- -- * (1,0) -> top right of the screen - -- + -- -- * etc -> Placement fixed = Fixed @@ -136,14 +136,14 @@ underMouse :: (Rational, Rational) -- ^ Where the pointer should be relative to underMouse = UnderMouse --- | Apply the given placement policy, constraining the +-- | Apply the given placement policy, constraining the -- placed windows inside the screen boundaries. -inBounds :: Placement -> Placement +inBounds :: Placement -> Placement inBounds = Bounds (0,0,0,0) -- | Same as 'inBounds', but allows specifying gaps along the screen's edges -withGaps :: (Dimension, Dimension, Dimension, Dimension) +withGaps :: (Dimension, Dimension, Dimension, Dimension) -- ^ top, right, bottom and left gaps -> Placement -> Placement withGaps = Bounds @@ -160,7 +160,7 @@ placeFocused :: Placement -> X () placeFocused p = withFocused $ \window -> do info <- gets $ screenInfo . S.current . windowset floats <- gets $ M.keys . S.floating . windowset - + r'@(Rectangle x' y' _ _) <- placeWindow p window info floats -- use X.A.FloatKeys if the window is floating, send @@ -182,8 +182,8 @@ placeHook p = do window <- ask floats = M.keys $ S.floating theWS guard(window `elem` floats ) - - -- Look for the workspace(s) on which the window is to be + + -- Look for the workspace(s) on which the window is to be -- spawned. Each of them also needs an associated screen -- rectangle; for hidden workspaces, we use the current -- workspace's screen. @@ -191,7 +191,7 @@ placeHook p = do window <- ask $ [screenInfo $ S.current theWS] ++ (map screenInfo $ S.visible theWS) ++ zip (S.hidden theWS) (repeat currentRect) - + guard(not $ null infos) let (workspace, screen) = head infos @@ -223,7 +223,7 @@ purePlaceWindow :: Placement -- ^ The placement strategy -> (Position, Position) -- ^ The pointer's position. -> Rectangle -- ^ The window to be placed -> Rectangle -purePlaceWindow (Bounds (t,r,b,l) p') (Rectangle sx sy sw sh) rs p w +purePlaceWindow (Bounds (t,r,b,l) p') (Rectangle sx sy sw sh) rs p w = let s' = (Rectangle (sx + fi l) (sy + fi t) (sw - l - r) (sh - t - b)) in checkBounds s' $ purePlaceWindow p' s' rs p w @@ -267,9 +267,9 @@ fi = fromIntegral r2rr :: Rectangle -> Rectangle -> S.RationalRect r2rr (Rectangle x0 y0 w0 h0) (Rectangle x y w h) - = S.RationalRect ((fi x-fi x0) % fi w0) - ((fi y-fi y0) % fi h0) - (fi w % fi w0) + = S.RationalRect ((fi x-fi x0) % fi w0) + ((fi y-fi y0) % fi h0) + (fi w % fi w0) (fi h % fi h0) @@ -286,7 +286,7 @@ getWindowRectangle :: Window -> X Rectangle getWindowRectangle window = do d <- asks display (_, x, y, w, h, _, _) <- io $ getGeometry d window - + -- We can't use the border width returned by -- getGeometry because it will be 0 if the -- window isn't mapped yet. @@ -305,11 +305,11 @@ getAllRectangles = do ws <- gets windowset return $ M.fromList $ zip allWindows allRects organizeClients :: S.Workspace a b Window -> Window -> [Window] -> [Window] -organizeClients ws w floats - = let (floatCs, layoutCs) = partition (`elem` floats) $ filter (/= w) +organizeClients ws w floats + = let (floatCs, layoutCs) = partition (`elem` floats) $ filter (/= w) $ stackContents $ S.stack ws in reverse layoutCs ++ reverse floatCs - -- About the ordering: the smart algorithm will overlap windows + -- About the ordering: the smart algorithm will overlap windows -- starting ith the head of the list. So: -- - we put the non-floating windows first since they'll -- probably be below the floating ones, @@ -323,18 +323,18 @@ getPointer window = do d <- asks display -- | Return values are, in order: window's rectangle, -- other windows' rectangles and pointer's coordinates. -getNecessaryData :: Window +getNecessaryData :: Window -> S.Workspace WorkspaceId (Layout Window) Window -> [Window] -> X (Rectangle, [Rectangle], (Position, Position)) getNecessaryData window ws floats = do r <- getWindowRectangle window - + rs <- return (organizeClients ws window floats) >>= mapM getWindowRectangle pointer <- getPointer window - + return (r, rs, pointer) @@ -343,7 +343,7 @@ getNecessaryData window ws floats {- Smart placement algorithm -} -- | Alternate representation for rectangles. -data SmartRectangle a = SR +data SmartRectangle a = SR { sr_x0, sr_y0 :: a -- ^ Top left coordinates, inclusive , sr_x1, sr_y1 :: a -- ^ Bottom right coorsinates, exclusive } deriving (Show, Eq) @@ -380,12 +380,12 @@ placeSmart :: (Rational, Rational) -- ^ point of the screen where windows -> Rectangle placeSmart (rx, ry) s@(Rectangle sx sy sw sh) rs w h = let free = map sr2r $ findSpace (r2sr s) (map r2sr rs) (fi w) (fi h) - in position free (scale rx sx (sx + fi sw - fi w)) - (scale ry sy (sy + fi sh - fi h)) + in position free (scale rx sx (sx + fi sw - fi w)) + (scale ry sy (sy + fi sh - fi h)) w h --- | Second part of the algorithm: --- Chooses the best position in which to place a window, +-- | Second part of the algorithm: +-- Chooses the best position in which to place a window, -- according to a list of free areas and an ideal position for -- the top-left corner. -- We can't use semi-open surfaces for this, so we go back to @@ -395,17 +395,17 @@ position :: [Rectangle] -- ^ Free areas -> Dimension -> Dimension -- ^ Width and height of the window -> Rectangle position rs x y w h = minimumBy distanceOrder $ map closest rs - where distanceOrder r1 r2 + where distanceOrder r1 r2 = compare (distance (rect_x r1,rect_y r1) (x,y) :: Dimension) (distance (rect_x r2,rect_y r2) (x,y) :: Dimension) - distance (x1,y1) (x2,y2) = truncate $ (sqrt :: Double -> Double) - $ fi $ (x1 - x2)^(2::Int) + distance (x1,y1) (x2,y2) = truncate $ (sqrt :: Double -> Double) + $ fi $ (x1 - x2)^(2::Int) + (y1 - y2)^(2::Int) closest r = checkBounds r (Rectangle x y w h) -- | First part of the algorithm: --- Tries to find an area in which to place a new +-- Tries to find an area in which to place a new -- rectangle so that it overlaps as little as possible with -- other rectangles already present. The first rectangles in -- the list will be overlapped first. @@ -425,10 +425,10 @@ findSpace total rs@(_:rs') w h -- | Subtracts smaller rectangles from a total rectangle -- , returning a list of remaining rectangular areas. -subtractRects :: Real a => SmartRectangle a +subtractRects :: Real a => SmartRectangle a -> [SmartRectangle a] -> [SmartRectangle a] subtractRects total [] = [total] -subtractRects total (r:rs) +subtractRects total (r:rs) = do total' <- subtractRects total rs filter (not . isEmpty) [ total' {sr_y1 = min (sr_y1 total') (sr_y0 r)} -- Above @@ -439,7 +439,7 @@ subtractRects total (r:rs) -- | "Nubs" a list of rectangles, dropping all those that are --- already contained in another rectangle of the list. +-- already contained in another rectangle of the list. cleanup :: Real a => [SmartRectangle a] -> [SmartRectangle a] cleanup rs = foldr dropIfContained [] $ sortBy sizeOrder rs @@ -453,7 +453,7 @@ sizeOrder r1 r2 | w1 < w2 = LT h1 = height r1 h2 = height r2 -dropIfContained :: Real a => SmartRectangle a +dropIfContained :: Real a => SmartRectangle a -> [SmartRectangle a] -> [SmartRectangle a] dropIfContained r rs = if any (`contains` r) rs then rs diff --git a/XMonad/Hooks/XPropManage.hs b/XMonad/Hooks/XPropManage.hs index adfe27b..50678a5 100644 --- a/XMonad/Hooks/XPropManage.hs +++ b/XMonad/Hooks/XPropManage.hs @@ -34,7 +34,7 @@ import XMonad.ManageHook ((-->)) -- > import XMonad.Actions.TagWindows -- > import Data.List -- --- > manageHook = xPropManageHook xPropMatches +-- > manageHook = xPropManageHook xPropMatches -- > -- > xPropMatches :: [XPropMatch] -- > xPropMatches = [ ([ (wM_CLASS, any ("gimp"==))], (\w -> float w >> return (W.shift "2"))) @@ -71,7 +71,7 @@ xPropManageHook tms = mconcat $ map propToHook tms where propToHook (ms, f) = fmap and (mapM mkQuery ms) --> mkHook f mkQuery (a, tf) = fmap tf (getQuery a) - mkHook func = ask >>= Query . lift . fmap Endo . func + mkHook func = ask >>= Query . lift . fmap Endo . func getProp :: Display -> Window -> Atom -> X ([String]) getProp d w p = do -- cgit v1.2.3