twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-08 16:01:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix window ordering bug in L.LimitWindows

Browse Source
This commit is contained in:
Adam Vogt
2009-06-22 00:43:09 +00:00
parent 708b8a7d96
commit 41d8b2b22a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
XMonad/Layout/LimitWindows.hs
View File

@@ -28,6 +28,7 @@ import XMonad.Layout.LayoutModifier
import XMonad import XMonad
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import Control.Monad((<=<),guard) import Control.Monad((<=<),guard)
import Data.Maybe(fromJust)
-- $usage -- $usage
-- To use this module, add the following import to @~\/.xmonad\/xmonad.hs@: -- To use this module, add the following import to @~\/.xmonad\/xmonad.hs@:
@@ -43,6 +44,9 @@ import Control.Monad((<=<),guard)
-- --
-- For detailed instructions on editing your key bindings, see -- For detailed instructions on editing your key bindings, see
-- "XMonad.Doc.Extending#Editing_key_bindings". -- "XMonad.Doc.Extending#Editing_key_bindings".
--
-- See also 'XMonad.Layout.BoringWindows.boringAuto' for keybindings that skip
-- the hidden windows.
increaseLimit :: X () increaseLimit :: X ()
increaseLimit = sendMessage $ LimitChange succ increaseLimit = sendMessage $ LimitChange succ
@@ -73,7 +77,7 @@ instance Message LimitChange
instance LayoutModifier LimitWindows a where instance LayoutModifier LimitWindows a where
pureMess (LimitWindows s n) = pureMess (LimitWindows s n) =
fmap (LimitWindows s) . pos <=< (`app` n) . unLC <=< fromMessage fmap (LimitWindows s) . pos <=< (`app` n) . unLC <=< fromMessage
where pos x = guard (x>=0) >> return x where pos x = guard (x>=1) >> return x
app f x = guard (f x /= x) >> return (f x) app f x = guard (f x /= x) >> return (f x)
modifyLayout (LimitWindows style n) ws r = modifyLayout (LimitWindows style n) ws r =
@@ -83,9 +87,8 @@ instance LayoutModifier LimitWindows a where
Slice -> slice Slice -> slice
firstN :: Int -> W.Stack a -> W.Stack a firstN :: Int -> W.Stack a -> W.Stack a
firstN n st = W.Stack f (reverse u) d firstN n st = upfocus $ fromJust $ W.differentiate $ take (max 1 n) $ W.integrate st
where (u,f:d) = splitAt (min (n-1) $ length $ W.up st) where upfocus = foldr (.) id $ replicate (length (W.up st)) W.focusDown'
$ take n $ W.integrate st
-- | A non-wrapping, fixed-size slice of a stack around the focused element -- | A non-wrapping, fixed-size slice of a stack around the focused element
slice :: Int -> W.Stack t -> W.Stack t slice :: Int -> W.Stack t -> W.Stack t