X.A.WindowBringer: Misc. cleanup and whitespace fixes

This commit is contained in:
Ivan Malison
2016-10-24 22:10:56 -07:00
parent 4983ecfd23
commit 05d7493888

View File

@@ -1,3 +1,4 @@
{-# LANGUAGE TupleSections #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : XMonad.Actions.WindowBringer -- Module : XMonad.Actions.WindowBringer
@@ -17,11 +18,10 @@
module XMonad.Actions.WindowBringer ( module XMonad.Actions.WindowBringer (
-- * Usage -- * Usage
-- $usage -- $usage
WindowBringerConfig(WindowBringerConfig), menuCommand, menuArgs, windowTitler, WindowBringerConfig(..),
gotoMenu, gotoMenuConfig, gotoMenu', gotoMenuArgs, gotoMenuArgs', gotoMenu, gotoMenuConfig, gotoMenu', gotoMenuArgs, gotoMenuArgs',
bringMenu, bringMenuConfig, bringMenu', bringMenuArgs, bringMenuArgs', bringMenu, bringMenuConfig, bringMenu', bringMenuArgs, bringMenuArgs',
windowMap, windowMap', windowMap, windowMap', bringWindow, actionMenu
bringWindow,
) where ) where
import qualified Data.Map as M import qualified Data.Map as M
@@ -53,9 +53,9 @@ data WindowBringerConfig = WindowBringerConfig
} }
instance Default WindowBringerConfig where instance Default WindowBringerConfig where
def = WindowBringerConfig{ menuCommand="dmenu" def = WindowBringerConfig{ menuCommand = "dmenu"
, menuArgs=["-i"] , menuArgs = ["-i"]
, windowTitler=decorateName , windowTitler = decorateName
} }
-- | Pops open a dmenu with window titles. Choose one, and you will be -- | Pops open a dmenu with window titles. Choose one, and you will be
@@ -124,8 +124,9 @@ bringWindow w ws = W.shiftWin (W.currentTag ws) w ws
actionMenu :: WindowBringerConfig -> (Window -> X.WindowSet -> X.WindowSet) -> X () actionMenu :: WindowBringerConfig -> (Window -> X.WindowSet -> X.WindowSet) -> X ()
actionMenu WindowBringerConfig{ menuCommand = cmd actionMenu WindowBringerConfig{ menuCommand = cmd
, menuArgs = args , menuArgs = args
, windowTitler = titler} action = windowMap' titler , windowTitler = titler
>>= menuMapFunction >>= flip X.whenJust (windows . action) } action
= windowMap' titler >>= menuMapFunction >>= flip X.whenJust (windows . action)
where where
menuMapFunction :: M.Map String a -> X (Maybe a) menuMapFunction :: M.Map String a -> X (Maybe a)
menuMapFunction = menuMapArgs cmd args menuMapFunction = menuMapArgs cmd args