twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.A.WindowNavigation: minor cleanup

Browse Source
This commit is contained in:
Devin Mullins 2008-05-12 17:04:10 +00:00
parent 864f3382ce
commit bb5fd00967
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XMonad/Actions/WindowNavigation.hs
View File

@ -37,6 +37,7 @@ import Data.Map (Map())
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe (catMaybes, fromMaybe, listToMaybe) import Data.Maybe (catMaybes, fromMaybe, listToMaybe)
import Data.Ord (comparing) import Data.Ord (comparing)
import qualified Data.Set as S
import Graphics.X11.Xlib import Graphics.X11.Xlib
-- $usage -- $usage
@ -44,13 +45,14 @@ import Graphics.X11.Xlib
-- Don't use it! What, are you crazy? -- Don't use it! What, are you crazy?
-- TODO: -- TODO:
-- - screen 1: 2x2, screen 2: 1 fs, move from scr 2 to scr 1
-- - fix setPosition to use WNState
-- - cleanup -- - cleanup
-- - documentation :) -- - documentation :)
-- - tests? (esp. for edge cases in currentPosition) -- - tests? (esp. for edge cases in currentPosition)
-- - solve the 2+3, middle right to bottom left problem -- - solve the 2+3, middle right to bottom left problem
-- - manageHook to draw window decos? -- - manageHook to draw window decos?
-- TODO: more flexible api
withWindowNavigation :: (KeySym, KeySym, KeySym, KeySym) -> XConfig l -> IO (XConfig l) withWindowNavigation :: (KeySym, KeySym, KeySym, KeySym) -> XConfig l -> IO (XConfig l)
withWindowNavigation (u,l,d,r) conf = withWindowNavigation (u,l,d,r) conf =
withWindowNavigationKeys [ ((modMask conf , u), WNGo U), withWindowNavigationKeys [ ((modMask conf , u), WNGo U),
@ -148,14 +150,8 @@ navigable d pt = sortby d . filter (inr d pt . snd)
-- Produces a list of normal-state windows, on any screen. Rectangles are -- Produces a list of normal-state windows, on any screen. Rectangles are
-- adjusted based on screen position relative to the current screen, because I'm -- adjusted based on screen position relative to the current screen, because I'm
-- bad like that. -- bad like that.
-- TODO: only the visible windows
-- TODO: adjust rectangles based on screen position? (perhaps this is already handled)
windowRects :: X [(Window, Rectangle)] windowRects :: X [(Window, Rectangle)]
windowRects = do windowRects = fmap catMaybes . mapM windowRect . S.toList =<< gets mapped
wins <- gets (visibleWindows . windowset)
catMaybes <$> mapM windowRect wins
where visibleWindows wset = concatMap (W.integrate' . W.stack . W.workspace)
(W.current wset : W.visible wset)
windowRect :: Window -> X (Maybe (Window, Rectangle)) windowRect :: Window -> X (Maybe (Window, Rectangle))
windowRect win = withDisplay $ \dpy -> do windowRect win = withDisplay $ \dpy -> do