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: implement swap, extract withTargetWindow commonality

Browse Source 
Why doesn't mapWindows exist already?
This commit is contained in:
Devin Mullins 2008-05-12 06:47:15 +00:00
parent cdeb842834
commit 70caa5a67b
1 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
XMonad/Actions/WindowNavigation.hs
View File

@ -43,6 +43,7 @@ import Graphics.X11.Xlib
-- Don't use it! What, are you crazy? -- Don't use it! What, are you crazy?
-- TODO: -- TODO:
-- - 1. 2x2, top right; 2. a,j,d 3. error!
-- - implement swap -- - implement swap
-- - cleanup -- - cleanup
-- - documentation :) -- - documentation :)
@ -53,10 +54,14 @@ import Graphics.X11.Xlib
-- TODO: more flexible api -- 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),
((modMask conf, l), WNGo L), ((modMask conf , l), WNGo L),
((modMask conf, d), WNGo D), ((modMask conf , d), WNGo D),
((modMask conf, r), WNGo R) ] ((modMask conf , r), WNGo R),
((modMask conf .|. shiftMask, u), WNSwap U),
((modMask conf .|. shiftMask, l), WNSwap L),
((modMask conf .|. shiftMask, d), WNSwap D),
((modMask conf .|. shiftMask, r), WNSwap R) ]
conf conf
withWindowNavigationKeys :: [((KeyMask, KeySym), WNAction)] -> XConfig l -> IO (XConfig l) withWindowNavigationKeys :: [((KeyMask, KeySym), WNAction)] -> XConfig l -> IO (XConfig l)
@ -77,16 +82,28 @@ type WNState = Map WorkspaceId Point
-- 3. focus window -- 3. focus window
-- 4. set new position -- 4. set new position
go :: IORef WNState -> Direction -> X () go :: IORef WNState -> Direction -> X ()
go posRef dir = fromCurrentPoint $ \win pos -> do go = withTargetWindow W.focusWindow
targets <- filter ((/= win) . fst) <$> navigableTargets pos dir
whenJust (listToMaybe targets) $ \(tw, tr) -> do
windows (W.focusWindow tw)
setPosition posRef pos tr
where fromCurrentPoint f = withFocused $ \win -> do
currentPosition posRef >>= f win
swap :: IORef WNState -> Direction -> X () swap :: IORef WNState -> Direction -> X ()
swap _ _ = return () swap = withTargetWindow swapWithFocused
where swapWithFocused targetWin winSet =
case W.peek winSet of
Just currentWin -> W.focusWindow currentWin $
mapWindows (swapWin currentWin targetWin) winSet
Nothing -> winSet
mapWindows f ss = W.mapWorkspace (mapWindows' f) ss
mapWindows' f ws@(W.Workspace { W.stack = s }) = ws { W.stack = mapWindows'' f <$> s }
mapWindows'' f (W.Stack focused up down) = W.Stack (f focused) (map f up) (map f down)
swapWin win1 win2 win = if win == win1 then win2 else if win == win2 then win1 else win
withTargetWindow :: (Window -> WindowSet -> WindowSet) -> IORef WNState -> Direction -> X ()
withTargetWindow adj posRef dir = fromCurrentPoint $ \win pos -> do
targets <- filter ((/= win) . fst) <$> navigableTargets pos dir
whenJust (listToMaybe targets) $ \(targetWin, targetRect) -> do
windows (adj targetWin)
setPosition posRef pos targetRect
where fromCurrentPoint f = withFocused $ \win -> do
currentPosition posRef >>= f win
-- Gets the current position from the IORef passed in, or if nothing (say, from -- Gets the current position from the IORef passed in, or if nothing (say, from
-- a restart), derives the current position from the current window. Also, -- a restart), derives the current position from the current window. Also,