From efc024c8c59147f9e195796b5241e275685fcefe Mon Sep 17 00:00:00 2001
From: Lukas Mai <l.mai@web.de>
Date: Sat, 1 Mar 2008 07:16:25 +0100
Subject: XMonad.Layout.ScratchWorkspace: avoid warnings, make tests compile
again
darcs-hash:20080301061625-462cf-1074e16910784ae464922a611c979ddd355e3e4e.gz
---
XMonad/Layout/ScratchWorkspace.hs | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'XMonad')
diff --git a/XMonad/Layout/ScratchWorkspace.hs b/XMonad/Layout/ScratchWorkspace.hs
index 04b18bd..fb88ae8 100644
--- a/XMonad/Layout/ScratchWorkspace.hs
+++ b/XMonad/Layout/ScratchWorkspace.hs
@@ -39,9 +39,11 @@ toggleScratchWorkspace l =
pickRect _ [z] = z
pickRect i (z:zs) | i < 1 = z
| otherwise = pickRect (i-1) zs
+ pickRect _ [] = error "XMonad.Layout.ScratchWorkspace.toggleScratchWorkspace: internal error"
s' = case catMaybes $ map modscr $ W.current s : W.visible s of
newc:newv -> s { W.current = newc, W.visible = newv,
W.hidden = W.workspace scratch : W.hidden s}
+ [] -> error "XMonad.Layout.ScratchWorkspace.toggleScratchWorkspace: internal error"
modify $ \st -> st { windowset = s' }
refresh
Nothing ->
@@ -62,16 +64,15 @@ toggleScratchWorkspace l =
W.hidden = filter (not . isScratchW) $ W.hidden s }
modify $ \st -> st { windowset = s' }
refresh
+ where visibleScratch s = listToMaybe $ filter isScratch $ W.current s : W.visible s
+ hiddenScratch s = listToMaybe $ filter isScratchW $ W.hidden s
+ isScratchW w = scratchName == W.tag w
+ isScratch scr = scratchName == W.tag (W.workspace scr)
+-- notScratch scr = scratchName /= W.tag (W.workspace scr)
+
scratchName :: String
scratchName = "*scratch*"
-visibleScratch s = listToMaybe $ filter isScratch $ W.current s : W.visible s
-hiddenScratch s = listToMaybe $ filter isScratchW $ W.hidden s
-
-isScratchW w = scratchName == W.tag w
-isScratch scr = scratchName == W.tag (W.workspace scr)
-notScratch scr = scratchName /= W.tag (W.workspace scr)
-
-isScratchVisible :: X Bool
-isScratchVisible = gets (elem scratchName . map (W.tag . W.workspace) . W.visible . windowset)
+-- isScratchVisible :: X Bool
+-- isScratchVisible = gets (elem scratchName . map (W.tag . W.workspace) . W.visible . windowset)
--
cgit v1.2.3