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

Fix infinite loop in ResizableTile serialization

Browse Source
This commit is contained in:
Jamie Webb
2007-10-02 00:12:54 +00:00
parent 59e4cc28f7
commit 51d0fddb66
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ResizableTile.hs
View File

@@ -34,7 +34,7 @@ import Control.Monad
-- --
-- and redefine "tiled" as: -- and redefine "tiled" as:
-- --
-- > tiled = T.Tall nmaster delta ratio (repeat 1) -- > tiled = T.Tall nmaster delta ratio []
data MirrorResize = MirrorShrink | MirrorExpand deriving Typeable data MirrorResize = MirrorShrink | MirrorExpand deriving Typeable
instance Message MirrorResize instance Message MirrorResize
@@ -43,7 +43,7 @@ data Tall a = Tall Int Rational Rational [Rational] deriving (Show, Read)
instance Layout Tall a where instance Layout Tall a where
doLayout (Tall nmaster _ frac mfrac) r = doLayout (Tall nmaster _ frac mfrac) r =
return . (\x->(x,Nothing)) . return . (\x->(x,Nothing)) .
ap zip (tile frac mfrac r nmaster . length) . W.integrate ap zip (tile frac (mfrac ++ repeat 1) r nmaster . length) . W.integrate
handleMessage (Tall nmaster delta frac mfrac) m = handleMessage (Tall nmaster delta frac mfrac) m =
do ms <- (W.stack . W.workspace . W.current) `fmap` gets windowset do ms <- (W.stack . W.workspace . W.current) `fmap` gets windowset
case ms of case ms of
@@ -57,10 +57,9 @@ instance Layout Tall a where
mresize MirrorExpand s = mresize' s (0-delta) mresize MirrorExpand s = mresize' s (0-delta)
mresize' s d = let n = length $ W.up s mresize' s d = let n = length $ W.up s
total = n + (length $ W.down s) + 1 total = n + (length $ W.down s) + 1
in Tall nmaster delta frac pos = if n == (nmaster-1) || n == (total-1) then n-1 else n
(modifymfrac mfrac d (if n == (nmaster-1) || n == (total-1) mfrac' = modifymfrac (mfrac ++ repeat 1) d pos
then n-1 in Tall nmaster delta frac $ take total mfrac'
else n))
modifymfrac [] _ _ = [] modifymfrac [] _ _ = []
modifymfrac (f:fx) d n | n == 0 = f+d : fx modifymfrac (f:fx) d n | n == 0 = f+d : fx
| otherwise = f : modifymfrac fx d (n-1) | otherwise = f : modifymfrac fx d (n-1)