twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 11:30:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove -XScopedTypeVariables requirement with L.SubLayouts

Browse Source 
This should keep the code -Wall clean on ghc-6.8 in addition to ghc-6.10
This commit is contained in:
Adam Vogt 2009-04-28 22:27:49 +00:00
parent 115cd5af95
commit 06a997aaf9
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
XMonad/Layout/SubLayouts.hs
View File

@ -1,4 +1,4 @@
{-# LANGUAGE PatternGuards, ParallelListComp, DeriveDataTypeable, FlexibleInstances, FlexibleContexts, MultiParamTypeClasses, TypeSynonymInstances, ScopedTypeVariables #-} {-# LANGUAGE PatternGuards, ParallelListComp, DeriveDataTypeable, FlexibleInstances, FlexibleContexts, MultiParamTypeClasses, TypeSynonymInstances #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : XMonad.Layout.SubLayouts -- Module : XMonad.Layout.SubLayouts
@ -46,12 +46,13 @@ import XMonad
import Control.Applicative((<$>)) import Control.Applicative((<$>))
import Control.Arrow(Arrow(second, (&&&))) import Control.Arrow(Arrow(second, (&&&)))
import Control.Monad(Monad(return), Functor(..), import Control.Monad(Monad(return), Functor(..),
MonadPlus(mplus), (=<<), sequence, foldM, guard, when) MonadPlus(mplus), (=<<), sequence, foldM, guard, when, join)
import Data.Function((.), ($), flip, id, on) import Data.Function((.), ($), flip, id, on)
import Data.List((++), foldr, filter, map, concatMap, elem, import Data.List((++), foldr, filter, map, concatMap, elem,
notElem, null, nubBy, (\\), find) notElem, null, nubBy, (\\), find)
import Data.Maybe(Maybe(..), maybe, fromMaybe, listToMaybe, import Data.Maybe(Maybe(..), maybe, fromMaybe, listToMaybe,
mapMaybe) mapMaybe)
import Data.Traversable(sequenceA)
import qualified XMonad.Layout.BoringWindows as B import qualified XMonad.Layout.BoringWindows as B
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
@ -305,13 +306,6 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
return $ if null ms' then Nothing return $ if null ms' then Nothing
else Just $ Sublayout (I $ ms' ++ ms) defl sls else Just $ Sublayout (I $ ms' ++ ms) defl sls
-- ReleaseResources and Hide
| Just (m' :: LayoutMessages) <- fromMessage m = do
ms' <- zip (repeat $ SomeMessage m') . W.integrate'
<$> currentStack
return $ if null ms' then Nothing
else Just $ Sublayout (I $ ms' ++ ms) defl sls
| Just B.UpdateBoring <- fromMessage m = do | Just B.UpdateBoring <- fromMessage m = do
let bs = concatMap unfocused $ M.elems gs let bs = concatMap unfocused $ M.elems gs
ws <- gets (W.workspace . W.current . windowset) ws <- gets (W.workspace . W.current . windowset)
@ -350,12 +344,23 @@ instance (Read (l Window), Show (l Window), LayoutClass l Window) => LayoutModif
fgs . M.fromList . map (W.focus &&& id) . M.elems fgs . M.fromList . map (W.focus &&& id) . M.elems
$ M.mapMaybe (W.filter (x/=)) gs $ M.mapMaybe (W.filter (x/=)) gs
| otherwise = return Nothing | otherwise = fmap join $ sequenceA $ catchLayoutMess <$> fromMessage m
where gs = toGroups sls where gs = toGroups sls
fgs gs' = do fgs gs' = do
st <- currentStack st <- currentStack
Just . Sublayout (I ms) defl <$> fromGroups defl st gs' sls Just . Sublayout (I ms) defl <$> fromGroups defl st gs' sls
-- catchLayoutMess :: LayoutMessages -> X (Maybe (Sublayout l Window))
-- This l must be the same as from the instance head,
-- -XScopedTypeVariables should bring it into scope, but we are
-- trying to avoid warnings with ghc-6.8.2 and avoid CPP
catchLayoutMess x = do
let m' = x `asTypeOf` (undefined :: LayoutMessages)
ms' <- zip (repeat $ SomeMessage m') . W.integrate'
<$> currentStack
return $ do guard $ not $ null ms'
Just $ Sublayout (I $ ms' ++ ms) defl sls
currentStack :: X (Maybe (W.Stack Window)) currentStack :: X (Maybe (W.Stack Window))
currentStack = gets (W.stack . W.workspace . W.current . windowset) currentStack = gets (W.stack . W.workspace . W.current . windowset)