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

X.L.MouseResizableTile: make everything configurable

Browse Source
This commit is contained in:
Tomas Janousek
2010-04-15 21:46:09 +00:00
parent 1e847cb65a
commit 7129622eb9
1 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
XMonad/Layout/MouseResizableTile.hs
View File

@@ -21,7 +21,12 @@ module XMonad.Layout.MouseResizableTile (
mouseResizableTileMirrored, mouseResizableTileMirrored,
MRTMessage (ShrinkSlave, ExpandSlave), MRTMessage (ShrinkSlave, ExpandSlave),
DraggerType (..), DraggerType (..),
draggerType nmaster,
masterFrac,
slaveFrac,
fracIncrement,
draggerType,
isMirrored
) where ) where
import XMonad hiding (tile, splitVertically, splitHorizontallyBy) import XMonad hiding (tile, splitVertically, splitHorizontallyBy)
@@ -90,32 +95,51 @@ data DraggerType = FixedDragger
type DraggerGeometry = (Position, Dimension, Position, Dimension) type DraggerGeometry = (Position, Dimension, Position, Dimension)
data MouseResizableTile a = MRT { nmaster :: Int, data MouseResizableTile a = MRT { nmaster :: Int,
-- ^ Get/set the number of windows in
-- master pane (default: 1). Usage:
--
-- > mouseResizableTile { nmaster = ... }
masterFrac :: Rational, masterFrac :: Rational,
-- ^ Get/set the proportion of screen
-- occupied by master pane (default: 1/2).
-- Usage:
--
-- > mouseResizableTile { masterFrac = ... }
slaveFrac :: Rational,
-- ^ Get/set the proportion of remaining
-- space in a column occupied by a slave
-- window (default: 1/2). Usage:
--
-- > mouseResizableTile { slaveFrac = ... }
fracIncrement :: Rational,
-- ^ Get/set the increment used when
-- modifying masterFrac/slaveFrac by the
-- Shrink, Expand, etc. messages (default:
-- 3/100). Usage:
--
-- > mouseResizableTile { fracIncrement = ... }
leftFracs :: [Rational], leftFracs :: [Rational],
rightFracs :: [Rational], rightFracs :: [Rational],
draggers :: [DraggerWithWin], draggers :: [DraggerWithWin],
draggerType :: DraggerType, draggerType :: DraggerType,
-- ^ Get/set dragger and gap dimensions. -- ^ Get/set dragger and gap dimensions
-- Usage: -- (default: FixedDragger 6 6). Usage:
-- --
-- > mouseResizableTile { draggerType = ... } -- > mouseResizableTile { draggerType = ... }
focusPos :: Int, focusPos :: Int,
numWindows :: Int, numWindows :: Int,
isMirrored :: Bool isMirrored :: Bool
-- ^ Get/set whether the layout is
-- mirrored (default: False). Usage:
--
-- > mouseResizableTile { isMirrored = ... }
} deriving (Show, Read) } deriving (Show, Read)
mrtFraction :: Rational
mrtFraction = 0.5
mrtDelta :: Rational
mrtDelta = 0.03
mrtDraggerGaps :: DraggerType
mrtDraggerGaps = FixedDragger 6 6
mouseResizableTile :: MouseResizableTile a mouseResizableTile :: MouseResizableTile a
mouseResizableTile = MRT 1 mrtFraction [] [] [] mrtDraggerGaps 0 0 False mouseResizableTile = MRT 1 0.5 0.5 0.03 [] [] [] (FixedDragger 6 6) 0 0 False
mouseResizableTileMirrored :: MouseResizableTile a mouseResizableTileMirrored :: MouseResizableTile a
mouseResizableTileMirrored = MRT 1 mrtFraction [] [] [] mrtDraggerGaps 0 0 True mouseResizableTileMirrored = mouseResizableTile { isMirrored = True }
instance LayoutClass MouseResizableTile Window where instance LayoutClass MouseResizableTile Window where
doLayout state sr (W.Stack w l r) = do doLayout state sr (W.Stack w l r) = do
@@ -124,8 +148,8 @@ instance LayoutClass MouseResizableTile Window where
num = length wins num = length wins
sr' = mirrorAdjust sr (mirrorRect sr) sr' = mirrorAdjust sr (mirrorRect sr)
(rects, preparedDraggers) = tile (nmaster state) (masterFrac state) (rects, preparedDraggers) = tile (nmaster state) (masterFrac state)
(leftFracs state ++ repeat mrtFraction) (leftFracs state ++ repeat (slaveFrac state))
(rightFracs state ++ repeat mrtFraction) sr' num drg (rightFracs state ++ repeat (slaveFrac state)) sr' num drg
rects' = map (mirrorAdjust id mirrorRect . sanitizeRectangle sr') rects rects' = map (mirrorAdjust id mirrorRect . sanitizeRectangle sr') rects
mapM_ deleteDragger $ draggers state mapM_ deleteDragger $ draggers state
(draggerWrs, newDraggers) <- unzip <$> mapM (draggerWrs, newDraggers) <- unzip <$> mapM
@@ -143,19 +167,21 @@ instance LayoutClass MouseResizableTile Window where
| Just (IncMasterN d) <- fromMessage m = | Just (IncMasterN d) <- fromMessage m =
return $ Just $ state { nmaster = max 0 (nmaster state + d) } return $ Just $ state { nmaster = max 0 (nmaster state + d) }
| Just Shrink <- fromMessage m = | Just Shrink <- fromMessage m =
return $ Just $ state { masterFrac = max 0 (masterFrac state - mrtDelta) } return $ Just $ state { masterFrac = max 0 (masterFrac state - fracIncrement state) }
| Just Expand <- fromMessage m = | Just Expand <- fromMessage m =
return $ Just $ state { masterFrac = min 1 (masterFrac state + mrtDelta) } return $ Just $ state { masterFrac = min 1 (masterFrac state + fracIncrement state) }
| Just ShrinkSlave <- fromMessage m = | Just ShrinkSlave <- fromMessage m =
return $ Just $ modifySlave state (-mrtDelta) return $ Just $ modifySlave state (- fracIncrement state)
| Just ExpandSlave <- fromMessage m = | Just ExpandSlave <- fromMessage m =
return $ Just $ modifySlave state mrtDelta return $ Just $ modifySlave state (fracIncrement state)
| Just (SetMasterFraction f) <- fromMessage m = | Just (SetMasterFraction f) <- fromMessage m =
return $ Just $ state { masterFrac = max 0 (min 1 f) } return $ Just $ state { masterFrac = max 0 (min 1 f) }
| Just (SetLeftSlaveFraction pos f) <- fromMessage m = | Just (SetLeftSlaveFraction pos f) <- fromMessage m =
return $ Just $ state { leftFracs = replaceAtPos (leftFracs state) pos (max 0 (min 1 f)) } return $ Just $ state { leftFracs = replaceAtPos (slaveFrac state)
(leftFracs state) pos (max 0 (min 1 f)) }
| Just (SetRightSlaveFraction pos f) <- fromMessage m = | Just (SetRightSlaveFraction pos f) <- fromMessage m =
return $ Just $ state { rightFracs = replaceAtPos (rightFracs state) pos (max 0 (min 1 f)) } return $ Just $ state { rightFracs = replaceAtPos (slaveFrac state)
(rightFracs state) pos (max 0 (min 1 f)) }
| Just e <- fromMessage m :: Maybe Event = handleResize (draggers state) (isMirrored state) e >> return Nothing | Just e <- fromMessage m :: Maybe Event = handleResize (draggers state) (isMirrored state) e >> return Nothing
| Just Hide <- fromMessage m = releaseResources >> return (Just $ state { draggers = [] }) | Just Hide <- fromMessage m = releaseResources >> return (Just $ state { draggers = [] })
@@ -189,27 +215,28 @@ modifySlave state delta =
nmaster' = nmaster state nmaster' = nmaster state
leftFracs' = leftFracs state leftFracs' = leftFracs state
rightFracs' = rightFracs state rightFracs' = rightFracs state
slFrac = slaveFrac state
draggersLeft = nmaster' - 1 draggersLeft = nmaster' - 1
draggersRight = (num - nmaster') - 1 draggersRight = (num - nmaster') - 1
in if pos < nmaster' in if pos < nmaster'
then if draggersLeft > 0 then if draggersLeft > 0
then let draggerPos = min (draggersLeft - 1) pos then let draggerPos = min (draggersLeft - 1) pos
oldFraction = (leftFracs' ++ repeat mrtFraction) !! draggerPos oldFraction = (leftFracs' ++ repeat slFrac) !! draggerPos
in state { leftFracs = replaceAtPos leftFracs' draggerPos in state { leftFracs = replaceAtPos slFrac leftFracs' draggerPos
(max 0 (min 1 (oldFraction + delta))) } (max 0 (min 1 (oldFraction + delta))) }
else state else state
else if draggersRight > 0 else if draggersRight > 0
then let draggerPos = min (draggersRight - 1) (pos - nmaster') then let draggerPos = min (draggersRight - 1) (pos - nmaster')
oldFraction = (rightFracs' ++ repeat mrtFraction) !! draggerPos oldFraction = (rightFracs' ++ repeat slFrac) !! draggerPos
in state { rightFracs = replaceAtPos rightFracs' draggerPos in state { rightFracs = replaceAtPos slFrac rightFracs' draggerPos
(max 0 (min 1 (oldFraction + delta))) } (max 0 (min 1 (oldFraction + delta))) }
else state else state
replaceAtPos :: (Num t) => [Rational] -> t -> Rational -> [Rational] replaceAtPos :: (Num t) => Rational -> [Rational] -> t -> Rational -> [Rational]
replaceAtPos [] 0 x' = [x'] replaceAtPos _ [] 0 x' = [x']
replaceAtPos [] pos x' = mrtFraction : replaceAtPos [] (pos - 1) x' replaceAtPos d [] pos x' = d : replaceAtPos d [] (pos - 1) x'
replaceAtPos (_:xs) 0 x' = x' : xs replaceAtPos _ (_:xs) 0 x' = x' : xs
replaceAtPos (x:xs) pos x' = x : replaceAtPos xs (pos -1 ) x' replaceAtPos d (x:xs) pos x' = x : replaceAtPos d xs (pos -1 ) x'
sanitizeRectangle :: Rectangle -> Rectangle -> Rectangle sanitizeRectangle :: Rectangle -> Rectangle -> Rectangle
sanitizeRectangle (Rectangle sx sy swh sht) (Rectangle x y wh ht) = sanitizeRectangle (Rectangle sx sy swh sht) (Rectangle x y wh ht) =