--- #xmonad on Freenode for this function (2010-06-13 12:45 CEST), modified to
--- take list of layouts to switch to, not layouts to exclude.
-nextLayoutIncluding descs =
- do broadcastMessage NextLayout
- d <- gets (description . W.layout . W.workspace . W.current . windowset)
- if d `elem` descs
- then refresh
- else nextLayoutIncluding descs
+-- #xmonad on Freenode for this function (2011-06-13 12:45 CEST) and
+-- rootzlevel in #xmonad on Freenode for fixes (2011-06-13 15:20 CEST),
+-- modified to take list of layouts to switch to, not layouts to exclude.
+nextLayoutIncluding :: [String] -> X ()
+nextLayoutIncluding layouts = do
+ cws <- gets (W.workspace . W.current . windowset)
+ sendMessageWithNoRefresh NextLayout cws
+ nextLayoutIncluding' layouts
+
+nextLayoutIncluding' :: [String] -> X ()
+nextLayoutIncluding' layouts = do
+ cws <- gets (W.workspace . W.current . windowset)
+ if not $ (description $ W.layout cws) `elem` layouts
+ -- Skip over excluded layouts.
+ then do
+ sendMessageWithNoRefresh NextLayout cws
+ nextLayoutIncluding' layouts
+ -- Found allowed layout, show it.
+ else refresh