From f4c2b23fecc863218a395d731bd18c2afd164db4 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Tue, 8 May 2007 17:12:00 +0200 Subject: Make 'index' return Nothing, rather than error darcs-hash:20070508151200-a5988-3da2bb925de6c610ed9b7a5ab5bccedb3483d032.gz --- Operations.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Operations.hs') diff --git a/Operations.hs b/Operations.hs index ac5bcc9..c890bd5 100644 --- a/Operations.hs +++ b/Operations.hs @@ -48,7 +48,7 @@ refresh = do flip mapM_ (M.assocs (W.screen2ws ws)) $ \(scn, n) -> do let sc = genericIndex xinesc scn -- temporary coercion! (Just l) = fmap fst $ M.lookup n fls - mapM_ (\(w, rect) -> io $ moveWindowInside d w rect) $ (doLayout l) sc $ W.index n ws + whenJust (W.index n ws) $ mapM_ (\(w, rect) -> io $ moveWindowInside d w rect) . doLayout l sc whenJust (W.peekStack n ws) (io . raiseWindow d) whenJust (W.peek ws) setFocus clearEnterEvents @@ -235,7 +235,7 @@ setFocus w = do -- clear mouse button grab and border on other windows flip mapM_ (W.visibleWorkspaces ws) $ \n -> do - flip mapM_ (W.index n ws) $ \otherw -> do + flip mapM_ (fromMaybe [] $ W.index n ws) $ \otherw -> do setButtonGrab True otherw io $ setWindowBorder dpy otherw (color_pixel nbc) @@ -297,7 +297,7 @@ view n = do ws' <- gets workspace -- If the old workspace isn't visible anymore, we have to hide the windows -- in case we're switching to an empty workspace. - when (m `notElem` W.visibleWorkspaces ws') (mapM_ hide (W.index m ws)) + when (m `notElem` W.visibleWorkspaces ws') $ maybe (return ()) (mapM_ hide) $ W.index m ws clearEnterEvents setTopFocus -- cgit v1.2.3