From 05d7493888f3c4089f7b55628d60cc6b3a037f1b Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 24 Oct 2016 22:10:56 -0700 Subject: [PATCH] X.A.WindowBringer: Misc. cleanup and whitespace fixes --- XMonad/Actions/WindowBringer.hs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/XMonad/Actions/WindowBringer.hs b/XMonad/Actions/WindowBringer.hs index b658174d..69c34660 100644 --- a/XMonad/Actions/WindowBringer.hs +++ b/XMonad/Actions/WindowBringer.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE TupleSections #-} ----------------------------------------------------------------------------- -- | -- Module : XMonad.Actions.WindowBringer @@ -17,11 +18,10 @@ module XMonad.Actions.WindowBringer ( -- * Usage -- $usage - WindowBringerConfig(WindowBringerConfig), menuCommand, menuArgs, windowTitler, + WindowBringerConfig(..), gotoMenu, gotoMenuConfig, gotoMenu', gotoMenuArgs, gotoMenuArgs', bringMenu, bringMenuConfig, bringMenu', bringMenuArgs, bringMenuArgs', - windowMap, windowMap', - bringWindow, + windowMap, windowMap', bringWindow, actionMenu ) where import qualified Data.Map as M @@ -53,9 +53,9 @@ data WindowBringerConfig = WindowBringerConfig } instance Default WindowBringerConfig where - def = WindowBringerConfig{ menuCommand="dmenu" - , menuArgs=["-i"] - , windowTitler=decorateName + def = WindowBringerConfig{ menuCommand = "dmenu" + , menuArgs = ["-i"] + , windowTitler = decorateName } -- | 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{ menuCommand = cmd , menuArgs = args - , windowTitler = titler} action = windowMap' titler - >>= menuMapFunction >>= flip X.whenJust (windows . action) + , windowTitler = titler + } action + = windowMap' titler >>= menuMapFunction >>= flip X.whenJust (windows . action) where menuMapFunction :: M.Map String a -> X (Maybe a) menuMapFunction = menuMapArgs cmd args