From 71bb40156a81b4e10f3a9b2bf78bd80c18323583 Mon Sep 17 00:00:00 2001
From: Audun Skaugen <audun@skaugen.name>
Date: Sun, 23 Oct 2011 10:29:40 +0000
Subject: [PATCH] Small bugfix to XMonad.Layout.Fullscreen
Fixed a small bug in the layout modifers where
windows entering fullscreen were not refreshed.
Also fixed some funny whitespace characters.
---
XMonad/Layout/Fullscreen.hs | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/XMonad/Layout/Fullscreen.hs b/XMonad/Layout/Fullscreen.hs
index 6a8e130c..08dcaf5c 100644
--- a/XMonad/Layout/Fullscreen.hs
+++ b/XMonad/Layout/Fullscreen.hs
@@ -83,9 +83,10 @@ data FullscreenFloat a = FullscreenFloat W.RationalRect (M.Map a (W.RationalRect
deriving (Read, Show)
instance LayoutModifier FullscreenFull Window where
- pureMess (FullscreenFull frect fulls) m = case fromMessage m of
- Just (AddFullscreen win) -> Just $ FullscreenFull frect $ nub $ win:fulls
- Just (RemoveFullscreen win) -> Just $ FullscreenFull frect $ delete win $ fulls
+ pureMess ff@(FullscreenFull frect fulls) m = case fromMessage m of
+ Just (AddFullscreen win) -> Just $ FullscreenFull frect $ nub $ win:fulls
+ Just (RemoveFullscreen win) -> Just $ FullscreenFull frect $ delete win $ fulls
+ Just FullscreenChanged -> Just ff
_ -> Nothing
pureModifier (FullscreenFull frect fulls) rect _ list =
@@ -95,9 +96,10 @@ instance LayoutModifier FullscreenFull Window where
rect' = scaleRationalRect rect frect
instance LayoutModifier FullscreenFocus Window where
- pureMess (FullscreenFocus frect fulls) m = case fromMessage m of
+ pureMess ff@(FullscreenFocus frect fulls) m = case fromMessage m of
Just (AddFullscreen win) -> Just $ FullscreenFocus frect $ nub $ win:fulls
Just (RemoveFullscreen win) -> Just $ FullscreenFocus frect $ delete win $ fulls
+ Just FullscreenChanged -> Just ff
_ -> Nothing
pureModifier (FullscreenFocus frect fulls) rect (Just (W.Stack {W.focus = f})) list
@@ -125,7 +127,7 @@ instance LayoutModifier FullscreenFloat Window where
flt = W.floating ws
flt' = M.intersectionWith doFull fulls flt
put state {windowset = ws {W.floating = M.union flt' flt}}
- return $ Just $ FullscreenFloat frect $ M.filter snd fulls
+ return $ Just $ FullscreenFloat frect $ M.filter snd fulls
where doFull (_, True) _ = frect
doFull (rect, False) _ = rect
@@ -195,10 +197,10 @@ fullscreenEventHook (ClientMessageEvent _ _ _ dpy win typ (action:dats)) = do
fullscreenEventHook (DestroyWindowEvent {ev_window = w}) = do
-- When a window is destroyed, the layouts should remove that window
-- from their states.
- broadcastMessage $ RemoveFullscreen w
+ broadcastMessage $ RemoveFullscreen w
cw <- (W.workspace . W.current) `fmap` gets windowset
sendMessageWithNoRefresh FullscreenChanged cw
- return $ All True
+ return $ All True
fullscreenEventHook _ = return $ All True
@@ -210,7 +212,7 @@ fullscreenManageHook = fullscreenManageHook' isFullscreen
-- | A version of fullscreenManageHook that lets you specify
-- your own query to decide whether a window should be fullscreen.
fullscreenManageHookWith :: Query Bool -> ManageHook
-fullscreenManageHookWith h = fullscreenManageHook' $ isFullscreen <||> h
+fullscreenManageHookWith h = fullscreenManageHook' $ isFullscreen <||> h
fullscreenManageHook' :: Query Bool -> ManageHook
fullscreenManageHook' isFull = isFull --> do