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: simplify inr somewhat

Browse Source
This commit is contained in:
Devin Mullins 2008-05-12 09:06:47 +00:00
parent 95e5210d95
commit 864f3382ce
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
XMonad/Actions/WindowNavigation.hs
View File

@ -143,7 +143,7 @@ navigableTargets point dir = navigable dir point <$> windowRects
-- Filters and sorts the windows in terms of what is closest from the Point in -- Filters and sorts the windows in terms of what is closest from the Point in
-- the Direction. -- the Direction.
navigable :: Direction -> Point -> [(Window, Rectangle)] -> [(Window, Rectangle)] navigable :: Direction -> Point -> [(Window, Rectangle)] -> [(Window, Rectangle)]
navigable d pt = sortby d . filter (inr d (fromPoint pt) . snd) 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
@ -163,23 +163,18 @@ windowRect win = withDisplay $ \dpy -> do
return $ Just $ (win, Rectangle x y w h) return $ Just $ (win, Rectangle x y w h)
`catchX` return Nothing `catchX` return Nothing
fromPoint :: Point -> FPoint -- Modified from droundy's implementation of WindowNavigation.
fromPoint p = P (fromIntegral $ pt_x p) (fromIntegral $ pt_y p)
-- Stolen from droundy's implementation of WindowNavigation. -- TODO: simplify this
-- TODO: refactor, perhaps inr :: Direction -> Point -> Rectangle -> Bool
inr D (Point px py) (Rectangle rx ry w h) = px >= rx && px < rx + fromIntegral w &&
data FPoint = P Double Double py < ry + fromIntegral h
inr U (Point px py) (Rectangle rx ry w _) = px >= rx && px < rx + fromIntegral w &&
inr :: Direction -> FPoint -> Rectangle -> Bool py > ry
inr D (P x y) (Rectangle l yr w h) = x >= fromIntegral l && x < fromIntegral l + fromIntegral w && inr R (Point px py) (Rectangle rx ry _ h) = px < rx &&
y < fromIntegral yr + fromIntegral h py >= ry && py < ry + fromIntegral h
inr U (P x y) (Rectangle l yr w _) = x >= fromIntegral l && x < fromIntegral l + fromIntegral w && inr L (Point px py) (Rectangle rx ry w h) = px > rx + fromIntegral w &&
y > fromIntegral yr py >= ry && py < ry + fromIntegral h
inr R (P a x) (Rectangle b l _ w) = x >= fromIntegral l && x < fromIntegral l + fromIntegral w &&
a < fromIntegral b
inr L (P a x) (Rectangle b l c w) = x >= fromIntegral l && x < fromIntegral l + fromIntegral w &&
a > fromIntegral b + fromIntegral c
sortby :: Direction -> [(a,Rectangle)] -> [(a,Rectangle)] sortby :: Direction -> [(a,Rectangle)] -> [(a,Rectangle)]
sortby D = sortBy $ comparing (rect_y . snd) sortby D = sortBy $ comparing (rect_y . snd)