summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Stewart <dons@cse.unsw.edu.au>2007-06-17 07:23:22 +0200
committerDon Stewart <dons@cse.unsw.edu.au>2007-06-17 07:23:22 +0200
commit978672cf780e1e60050160ef559fcceb2a239e7c (patch)
tree12a8b8af358f745eabc67066db6f2b49ce08f136
parent430f163014b6a53cd87863df490ae34497d7aa9a (diff)
downloadmetatile-978672cf780e1e60050160ef559fcceb2a239e7c.tar
metatile-978672cf780e1e60050160ef559fcceb2a239e7c.zip
-Wall police, and turn on -fno-warn-orphans
darcs-hash:20070617052322-9c5c1-9cd715825d376163cbf341993bc0f132e50ef3b6
-rw-r--r--Operations.hs4
-rw-r--r--StackSet.hs7
2 files changed, 3 insertions, 8 deletions
diff --git a/Operations.hs b/Operations.hs
index 1526fa2..296f0c2 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fglasgow-exts #-}
+{-# OPTIONS -fno-warn-orphans -fglasgow-exts #-}
-- \^^ deriving Typeable
-- --------------------------------------------------------------------------
-- |
@@ -166,7 +166,7 @@ windows f = do
(floor (toRational sw*rw)) (floor (toRational sh*rh))
io $ restackWindows d (flt ++
- maybe [] (\s@(W.Stack f _ _) -> f : delete f (W.integrate s)) tiled)
+ maybe [] (\s@(W.Stack foc _ _) -> foc : delete foc (W.integrate s)) tiled)
-- return the visible windows for this workspace:
return (map fst rs ++ flt)
diff --git a/StackSet.hs b/StackSet.hs
index 8f5311a..614e95d 100644
--- a/StackSet.hs
+++ b/StackSet.hs
@@ -15,7 +15,7 @@ module StackSet (
StackSet(..), Workspace(..), Screen(..), StackOrNot, Stack(..), RationalRect(..),
-- * Construction
-- $construction
- new, view,
+ new, view,
-- * Xinerama operations
-- $xinerama
lookupWorkspace,
@@ -105,11 +105,6 @@ import qualified Data.Map as M (Map,insert,delete,empty)
-- 'delete'.
--
-import Prelude hiding (filter)
-import Data.Maybe (listToMaybe)
-import qualified Data.List as L (delete,find,genericSplitAt,filter)
-import qualified Data.Map as M (Map,insert,delete,empty)
-
-- |
-- API changes from xmonad 0.1:
-- StackSet constructor arguments changed. StackSet workspace window screen