diff options
| author | Devin Mullins <me@twifkak.com> | 2008-05-12 19:04:10 +0200 |
|---|---|---|
| committer | Devin Mullins <me@twifkak.com> | 2008-05-12 19:04:10 +0200 |
| commit | 4c31d2097b7ea3ae20a01897d094bd2417238b7c (patch) | |
| tree | d69990e4a48cfcf3783d6ea16c30ea133a080a09 | |
| parent | c484dd25009881c9a050d08d2aea1faa621e3b50 (diff) | |
| download | XMonadContrib-4c31d2097b7ea3ae20a01897d094bd2417238b7c.tar.gz XMonadContrib-4c31d2097b7ea3ae20a01897d094bd2417238b7c.tar.xz XMonadContrib-4c31d2097b7ea3ae20a01897d094bd2417238b7c.zip | |
X.A.WindowNavigation: minor cleanup
darcs-hash:20080512170410-78224-328d3a7380fec2172b0605d770c542ebd0bc7f34.gz
| -rw-r--r-- | XMonad/Actions/WindowNavigation.hs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/XMonad/Actions/WindowNavigation.hs b/XMonad/Actions/WindowNavigation.hs index 8f24258..bad7a66 100644 --- a/XMonad/Actions/WindowNavigation.hs +++ b/XMonad/Actions/WindowNavigation.hs @@ -37,6 +37,7 @@ import Data.Map (Map()) import qualified Data.Map as M import Data.Maybe (catMaybes, fromMaybe, listToMaybe) import Data.Ord (comparing) +import qualified Data.Set as S import Graphics.X11.Xlib -- $usage @@ -44,13 +45,14 @@ import Graphics.X11.Xlib -- Don't use it! What, are you crazy? -- TODO: +-- - screen 1: 2x2, screen 2: 1 fs, move from scr 2 to scr 1 +-- - fix setPosition to use WNState -- - cleanup -- - documentation :) -- - tests? (esp. for edge cases in currentPosition) -- - solve the 2+3, middle right to bottom left problem -- - manageHook to draw window decos? --- TODO: more flexible api withWindowNavigation :: (KeySym, KeySym, KeySym, KeySym) -> XConfig l -> IO (XConfig l) withWindowNavigation (u,l,d,r) conf = 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 -- adjusted based on screen position relative to the current screen, because I'm -- 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 = do - wins <- gets (visibleWindows . windowset) - catMaybes <$> mapM windowRect wins - where visibleWindows wset = concatMap (W.integrate' . W.stack . W.workspace) - (W.current wset : W.visible wset) +windowRects = fmap catMaybes . mapM windowRect . S.toList =<< gets mapped windowRect :: Window -> X (Maybe (Window, Rectangle)) windowRect win = withDisplay $ \dpy -> do |