diff options
author | Ismael Carnales <icarnales@gmail.com> | 2009-02-05 02:30:31 +0100 |
---|---|---|
committer | Ismael Carnales <icarnales@gmail.com> | 2009-02-05 02:30:31 +0100 |
commit | 6dde16269006a318e1a1ef5a5ff6d089854db6d2 (patch) | |
tree | dceb4fbb8a2ef997116afe3b58a89749b59f76ea /XMonad/Hooks/ManageDocks.hs | |
parent | 2dac4c38e43815dbfa59fb4e810f3379a5ee8842 (diff) | |
download | XMonadContrib-6dde16269006a318e1a1ef5a5ff6d089854db6d2.tar.gz XMonadContrib-6dde16269006a318e1a1ef5a5ff6d089854db6d2.tar.xz XMonadContrib-6dde16269006a318e1a1ef5a5ff6d089854db6d2.zip |
X.U.WindowProperties: Add getProp32 and getProp32s, helpers to get properties from windows
Ignore-this: c5481fd5d97b15ca049e2da2605f65c1
darcs-hash:20090205013031-6553f-d106b609838d4ccf3fe4afa448910b897cd5b87c.gz
Diffstat (limited to 'XMonad/Hooks/ManageDocks.hs')
-rw-r--r-- | XMonad/Hooks/ManageDocks.hs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/XMonad/Hooks/ManageDocks.hs b/XMonad/Hooks/ManageDocks.hs index 6ca6141..88c3f0d 100644 --- a/XMonad/Hooks/ManageDocks.hs +++ b/XMonad/Hooks/ManageDocks.hs @@ -27,6 +27,7 @@ import XMonad import Foreign.C.Types (CLong) import Control.Monad import XMonad.Layout.LayoutModifier +import XMonad.Util.WindowProperties (getProp32s) import Data.List (delete) @@ -100,10 +101,9 @@ manageDocks = checkDock --> doIgnore -- | Checks if a window is a DOCK or DESKTOP window checkDock :: Query Bool checkDock = ask >>= \w -> liftX $ do - a <- getAtom "_NET_WM_WINDOW_TYPE" dock <- getAtom "_NET_WM_WINDOW_TYPE_DOCK" desk <- getAtom "_NET_WM_WINDOW_TYPE_DESKTOP" - mbr <- getProp a w + mbr <- getProp32s "_NET_WM_WINDOW_TYPE" w case mbr of Just [r] -> return $ elem (fromIntegral r) [dock, desk] _ -> return False @@ -111,12 +111,10 @@ checkDock = ask >>= \w -> liftX $ do -- | Gets the STRUT config, if present, in xmonad gap order getStrut :: Window -> X [Strut] getStrut w = do - spa <- getAtom "_NET_WM_STRUT_PARTIAL" - sa <- getAtom "_NET_WM_STRUT" - msp <- getProp spa w + msp <- getProp32s "_NET_WM_STRUT_PARTIAL" w case msp of Just sp -> return $ parseStrutPartial sp - Nothing -> fmap (maybe [] parseStrut) $ getProp sa w + Nothing -> fmap (maybe [] parseStrut) $ getProp32s "_NET_WM_STRUT" w where parseStrut xs@[_, _, _, _] = parseStrutPartial . take 12 $ xs ++ cycle [minBound, maxBound] parseStrut _ = [] @@ -126,10 +124,6 @@ getStrut w = do [(L, l, ly1, ly2), (R, r, ry1, ry2), (U, t, tx1, tx2), (D, b, bx1, bx2)] parseStrutPartial _ = [] --- | Helper to read a property -getProp :: Atom -> Window -> X (Maybe [CLong]) -getProp a w = withDisplay $ \dpy -> io $ getWindowProperty32 dpy a w - -- | Goes through the list of windows and find the gap so that all -- STRUT settings are satisfied. calcGap :: [Direction] -> X (Rectangle -> Rectangle) |