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

PositionStoreHook: take decoration into account

Browse Source
This commit is contained in:
Jan Vornberger
2010-06-02 22:30:15 +00:00
parent 12cc1dc53e
commit af24766a83
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
XMonad/Config/Bluetile.hs
View File

@@ -177,7 +177,7 @@ isFloating w = do
bluetileManageHook :: ManageHook bluetileManageHook :: ManageHook
bluetileManageHook = composeAll bluetileManageHook = composeAll
[ workspaceByPos, positionStoreManageHook [ workspaceByPos, positionStoreManageHook (Just defaultThemeWithButtons)
, className =? "MPlayer" --> doFloat , className =? "MPlayer" --> doFloat
, isFullscreen --> doFullFloat , isFullscreen --> doFullFloat
, manageDocks] , manageDocks]

26
XMonad/Hooks/PositionStoreHooks.hs
View File

@@ -36,8 +36,8 @@ module XMonad.Hooks.PositionStoreHooks (
import XMonad import XMonad
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import XMonad.Util.PositionStore import XMonad.Util.PositionStore
import XMonad.Util.XUtils (fi)
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
import XMonad.Layout.Decoration
import System.Random(randomRIO) import System.Random(randomRIO)
import Control.Applicative((<$>)) import Control.Applicative((<$>))
@@ -52,9 +52,13 @@ import qualified Data.Set as S
-- > import XMonad.Hooks.PositionStoreHooks -- > import XMonad.Hooks.PositionStoreHooks
-- --
-- and adding 'positionStoreManageHook' to your 'ManageHook' as well -- and adding 'positionStoreManageHook' to your 'ManageHook' as well
-- as 'positionStoreEventHook' to your event hooks: -- as 'positionStoreEventHook' to your event hooks. To be accurate
-- about window sizes, the module needs to know if any decoration is in effect.
-- This is specified with the first argument: Supply 'Nothing' for no decoration,
-- otherwise use 'Just defaultTheme' or similar to inform the module about the
-- decoration theme used.
-- --
-- > myManageHook = positionStoreManageHook <+> manageHook defaultConfig -- > myManageHook = positionStoreManageHook Nothing <+> manageHook defaultConfig
-- > myHandleEventHook = positionStoreEventHook -- > myHandleEventHook = positionStoreEventHook
-- > -- >
-- > main = xmonad defaultConfig { manageHook = myManageHook -- > main = xmonad defaultConfig { manageHook = myManageHook
@@ -62,11 +66,13 @@ import qualified Data.Set as S
-- > } -- > }
-- --
positionStoreManageHook :: ManageHook positionStoreManageHook :: Maybe Theme -> ManageHook
positionStoreManageHook = ask >>= liftX . positionStoreInit >> idHook positionStoreManageHook mDecoTheme = ask >>= liftX . positionStoreInit mDecoTheme >> idHook
positionStoreInit :: Window -> X () positionStoreInit :: Maybe Theme -> Window -> X ()
positionStoreInit w = withDisplay $ \d -> do positionStoreInit mDecoTheme w = withDisplay $ \d -> do
let decoH = maybe 0 decoHeight mDecoTheme -- take decoration into account, which - in its current
-- form - makes windows smaller to make room for it
wa <- io $ getWindowAttributes d w wa <- io $ getWindowAttributes d w
ws <- gets windowset ws <- gets windowset
arbitraryOffsetX <- randomIntOffset arbitraryOffsetX <- randomIntOffset
@@ -78,7 +84,7 @@ positionStoreInit w = withDisplay $ \d -> do
(Rectangle (srX + fi arbitraryOffsetX) (Rectangle (srX + fi arbitraryOffsetX)
(srY + fi arbitraryOffsetY) (srY + fi arbitraryOffsetY)
(fi $ wa_width wa) (fi $ wa_width wa)
(fi $ wa_height wa)) sr ) (decoH + fi (wa_height wa))) sr )
else do else do
sc <- fromMaybe (W.current ws) <$> pointScreen (fi $ wa_x wa) (fi $ wa_y wa) sc <- fromMaybe (W.current ws) <$> pointScreen (fi $ wa_x wa) (fi $ wa_y wa)
let sr = screenRect . W.screenDetail $ sc let sr = screenRect . W.screenDetail $ sc
@@ -86,8 +92,8 @@ positionStoreInit w = withDisplay $ \d -> do
-- a somewhat unfortunate inter-dependency -- a somewhat unfortunate inter-dependency
-- with 'XMonad.Hooks.ManageDocks' -- with 'XMonad.Hooks.ManageDocks'
modifyPosStore (\ps -> posStoreInsert ps w modifyPosStore (\ps -> posStoreInsert ps w
(Rectangle (fi $ wa_x wa) (fi $ wa_y wa) (Rectangle (fi $ wa_x wa) (fi (wa_y wa) - fi decoH)
(fi $ wa_width wa) (fi $ wa_height wa)) sr' ) (fi $ wa_width wa) (decoH + fi (wa_height wa))) sr' )
where where
randomIntOffset :: X (Int) randomIntOffset :: X (Int)
randomIntOffset = io $ randomRIO (42, 242) randomIntOffset = io $ randomRIO (42, 242)