diff options
author | David Roundy <droundy@darcs.net> | 2007-06-12 15:30:27 +0200 |
---|---|---|
committer | David Roundy <droundy@darcs.net> | 2007-06-12 15:30:27 +0200 |
commit | f0acb2ef136cb269da499a67004459b4e14fbb02 (patch) | |
tree | 72e5b58b29829225b02eddf4fba1734adf8077cc | |
parent | c17644cd3b46eeddef2d7f0a4098c2237d891544 (diff) | |
download | XMonadContrib-f0acb2ef136cb269da499a67004459b4e14fbb02.tar.gz XMonadContrib-f0acb2ef136cb269da499a67004459b4e14fbb02.tar.xz XMonadContrib-f0acb2ef136cb269da499a67004459b4e14fbb02.zip |
make combo sort of work with new doLayout.
For some reason (not entirely clear to me) this doesn't work properly just
yet with the tabbed layout. :( But at least it'll compile. The trouble is
that we have no way of tracking which tab ought to be visible without
adding a *lot* of infrastructure. I'd rather have that infrastructure in
xmonad proper than reimplement all the focus-handling in combo, so for now
I'll just delay upgrading my xmonad at work...
darcs-hash:20070612133027-72aca-666344cb28934cd2b226240fec42d1c1b3a5a12c.gz
Diffstat (limited to '')
-rw-r--r-- | Combo.hs | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -6,19 +6,21 @@ module XMonadContrib.Combo where import XMonad +import StackSet ( integrate, differentiate ) combo :: [(Layout, Int)] -> Layout -> Layout -combo origls super = Layout { doLayout = arrange, modifyLayout = message } +combo origls super = Layout { doLayout = \r s -> arrange r (integrate s), modifyLayout = message } where arrange _ [] = return [] arrange r [w] = return [(w,r)] arrange rinput origws = - do rs <- map snd `fmap` doLayout super rinput (take (length origls) origws) + do rs <- map snd `fmap` doLayout super rinput (differentiate $ take (length origls) origws) let wss [] _ = [] wss [_] ws = [ws] wss (n:ns) ws = take len1 ws : wss ns (drop len1 ws) where len1 = min n (length ws - length ns) out <- sequence $ zipWith3 doLayout (map fst origls) rs - (wss (take (length rs) $ map snd origls) origws) + (map differentiate $ + wss (take (length rs) $ map snd origls) origws) return $ concat out message m = do msuper' <- modifyLayout super m case msuper' of |