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

GridSelect: fix infiniteness problem with diamondRestrict

Browse Source
This commit is contained in:
Roman Cheplyaka
2008-11-11 05:53:50 +00:00
parent a5ffb70fc6
commit 4908cc5efb
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
XMonad/Actions/GridSelect.hs
View File

@@ -79,17 +79,9 @@ diamondLayer n = let ul = [ (x,n-x) | x <- [0..n] ]
diamond :: (Enum a, Num a) => [(a, a)] diamond :: (Enum a, Num a) => [(a, a)]
diamond = concatMap diamondLayer [0..] diamond = concatMap diamondLayer [0..]
-- FIXME this function returns a list an infinite list with finite
-- elements, so going beyond the last proper element causes a never
-- ending computation.
diamondRestrict :: (Enum t, Num t, Ord t) => t -> t -> [(t, t)] diamondRestrict :: (Enum t, Num t, Ord t) => t -> t -> [(t, t)]
diamondRestrict x y = L.filter f diamond diamondRestrict x y = L.filter (\(x',y') -> abs x' <= x && abs y' <= y) .
where f (x',y') = (x' <= x) && L.takeWhile (\(x',y') -> abs x' + abs y' <= x+y) $ diamond
(x' >= -x) &&
(y' <= y) &&
(y' >= -y)
tupadd :: (Num t1, Num t) => (t, t1) -> (t, t1) -> (t, t1) tupadd :: (Num t1, Num t) => (t, t1) -> (t, t1) -> (t, t1)
tupadd (a,b) (c,d) = (a+c,b+d) tupadd (a,b) (c,d) = (a+c,b+d)