From 30b2c029e2f363fbe476e078faf0afea784935ba Mon Sep 17 00:00:00 2001 From: Don Stewart Date: Mon, 12 Mar 2007 02:23:50 +0100 Subject: comments, move isRoot into XMonad darcs-hash:20070312012350-9c5c1-1753dcb9d066d8954fe5d2f2ed8f5d06a6f976aa --- Main.hs | 4 ---- XMonad.hs | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Main.hs b/Main.hs index c023853..8091714 100644 --- a/Main.hs +++ b/Main.hs @@ -270,10 +270,6 @@ setTopFocus = do Just new -> setFocus new Nothing -> gets theRoot >>= setFocus --- | True if the given window is the root window -isRoot :: Window -> X Bool -isRoot w = liftM (w==) (gets theRoot) - -- | raise. focus to window at offset 'n' in list. -- The currently focused window is always the head of the list raise :: Ordering -> X () diff --git a/XMonad.hs b/XMonad.hs index 8e03d78..24c7899 100644 --- a/XMonad.hs +++ b/XMonad.hs @@ -15,7 +15,9 @@ -- module XMonad ( - X, WorkSpace, XState(..),runX, withDisplay, io, spawn, trace, whenJust + X, WorkSpace, XState(..),runX, + io, withDisplay, isRoot, + spawn, trace, whenJust ) where import StackSet (StackSet) @@ -49,11 +51,19 @@ newtype X a = X (StateT XState IO a) runX :: XState -> X a -> IO () runX st (X a) = runStateT a st >> return () +-- --------------------------------------------------------------------- +-- Convenient wrappers to state + -- | Run a monad action with the current display settings withDisplay :: (Display -> X ()) -> X () withDisplay f = gets display >>= f ------------------------------------------------------------------------- +-- | True if the given window is the root window +isRoot :: Window -> X Bool +isRoot w = liftM (w==) (gets theRoot) + +-- --------------------------------------------------------------------- +-- Utilities -- | Lift an IO action into the X monad io :: IO a -> X a -- cgit v1.2.3