twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-09-01 11:23:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow dynamic width in tiling mode

Browse Source
This commit is contained in:
daniel
2007-03-21 05:42:45 +00:00
parent ebdf6bef14
commit 5bd9a74b5a
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Main.hs
View File

@@ -15,6 +15,7 @@
import Data.List import Data.List
import Data.Maybe import Data.Maybe
import Data.Ratio
import Data.Bits hiding (rotate) import Data.Bits hiding (rotate)
import qualified Data.Map as M import qualified Data.Map as M
@@ -53,6 +54,8 @@ keys = M.fromList $
, ((modMask, xK_Tab ), raise GT) , ((modMask, xK_Tab ), raise GT)
, ((modMask, xK_j ), raise GT) , ((modMask, xK_j ), raise GT)
, ((modMask, xK_k ), raise LT) , ((modMask, xK_k ), raise LT)
, ((modMask, xK_h ), changeWidth (negate defaultDelta))
, ((modMask, xK_l ), changeWidth defaultDelta)
, ((modMask .|. shiftMask, xK_c ), kill) , ((modMask .|. shiftMask, xK_c ), kill)
, ((modMask .|. shiftMask, xK_q ), io $ exitWith ExitSuccess) , ((modMask .|. shiftMask, xK_q ), io $ exitWith ExitSuccess)
, ((modMask, xK_space ), switchLayout) , ((modMask, xK_space ), switchLayout)
@@ -68,15 +71,16 @@ keys = M.fromList $
, (f, m) <- [(view, 0), (tag, shiftMask)]] , (f, m) <- [(view, 0), (tag, shiftMask)]]
-- How much to change the size of the windows on the left by default
defaultDelta :: Rational
defaultDelta = 3%100
-- --
-- The mask for the numlock key. You may need to change this on some systems. -- The mask for the numlock key. You may need to change this on some systems.
-- --
numlockMask :: KeySym numlockMask :: KeySym
numlockMask = lockMask numlockMask = lockMask
ratio :: Rational
ratio = 0.5
-- --
-- The main entry point -- The main entry point
-- --
@@ -100,6 +104,7 @@ main = do
, dimensions = (displayWidth dpy dflt, displayHeight dpy dflt) , dimensions = (displayWidth dpy dflt, displayHeight dpy dflt)
, workspace = W.empty workspaces , workspace = W.empty workspaces
, layout = Full , layout = Full
, leftWidth = 3%5
} }
xSetErrorHandler -- in C, I'm too lazy to write the binding xSetErrorHandler -- in C, I'm too lazy to write the binding
@@ -243,6 +248,7 @@ refresh = do
xinesc <- gets xineScreens xinesc <- gets xineScreens
d <- gets display d <- gets display
l <- gets layout l <- gets layout
ratio <- gets leftWidth
let move w a b c e = io $ moveResizeWindow d w a b c e let move w a b c e = io $ moveResizeWindow d w a b c e
flip mapM_ (M.assocs ws2sc) $ \(n, scn) -> do flip mapM_ (M.assocs ws2sc) $ \(n, scn) -> do
let sc = xinesc !! scn let sc = xinesc !! scn
@@ -274,6 +280,12 @@ switchLayout = do
Tile -> Full }) Tile -> Full })
refresh refresh
-- | changeWidth. Change the width of the main window in tiling mode.
changeWidth :: Rational -> X ()
changeWidth delta = do
modify (\s -> s {leftWidth = leftWidth s + delta})
refresh
-- | windows. Modify the current window list with a pure function, and refresh -- | windows. Modify the current window list with a pure function, and refresh
windows :: (WorkSpace -> WorkSpace) -> X () windows :: (WorkSpace -> WorkSpace) -> X ()
windows f = do windows f = do

2
XMonad.hs
View File

@@ -44,6 +44,8 @@ data XState = XState
, dimensions :: {-# UNPACK #-} !(Int,Int) , dimensions :: {-# UNPACK #-} !(Int,Int)
, workspace :: {-# UNPACK #-} !WorkSpace -- ^ workspace list , workspace :: {-# UNPACK #-} !WorkSpace -- ^ workspace list
, layout :: {-# UNPACK #-} !Layout , layout :: {-# UNPACK #-} !Layout
-- how much of the screen the main window should take
, leftWidth :: {-# UNPACK #-} !Rational
} }
type WorkSpace = StackSet Window type WorkSpace = StackSet Window