twin/xmonad
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad.git synced 2025-08-01 12:41:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

removed refocus; moved functionality to setFocus

Browse Source
This commit is contained in:
Jason Creighton
2007-03-31 00:34:42 +00:00
parent 207bd516e1
commit e743ef0c2d
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Main.hs
View File

@@ -127,7 +127,6 @@ safeFocus w = do ws <- gets workspace
then setFocus w then setFocus w
else do b <- isRoot w else do b <- isRoot w
when b setTopFocus when b setTopFocus
refocus
handle :: Event -> X () handle :: Event -> X ()

24
Operations.hs
View File

@@ -56,16 +56,6 @@ refresh = do
zipWithM_ (\i a -> move a (sx + lw) (sy + i * rh) rw (fromIntegral rh)) [0..] s zipWithM_ (\i a -> move a (sx + lw) (sy + i * rh) rw (fromIntegral rh)) [0..] s
whenJust (W.peek ws) (io . raiseWindow d) -- this is always Just whenJust (W.peek ws) (io . raiseWindow d) -- this is always Just
whenJust (W.peek ws) setFocus whenJust (W.peek ws) setFocus
refocus
refocus :: X ()
refocus = do
ws2sc <- gets wsOnScreen
ws <- gets workspace
flip mapM_ (M.keys ws2sc) $ \n -> do
mapM_ (setButtonGrab True) (W.index n ws)
when (n == W.current ws) $
maybe (return ()) (setButtonGrab False) (W.peekStack n ws)
-- | switchLayout. Switch to another layout scheme. Switches the current workspace. -- | switchLayout. Switch to another layout scheme. Switches the current workspace.
switchLayout :: X () switchLayout :: X ()
@@ -149,16 +139,20 @@ withServerX f = withDisplay $ \dpy -> do
-- | Explicitly set the keyboard focus to the given window -- | Explicitly set the keyboard focus to the given window
setFocus :: Window -> X () setFocus :: Window -> X ()
setFocus w = do setFocus w = do
-- Remove the border for the window no longer in focus.
ws <- gets workspace ws <- gets workspace
whenJust (W.peek ws) (\oldw -> setBorder oldw 0xdddddd) ws2sc <- gets wsOnScreen
-- Set focus to the given window. -- clear mouse button grab and border on other windows
flip mapM_ (M.keys ws2sc) $ \n -> do
flip mapM_ (W.index n ws) $ \otherw -> do
setButtonGrab True otherw
setBorder otherw 0xdddddd
withDisplay $ \d -> io $ setInputFocus d w revertToPointerRoot 0 withDisplay $ \d -> io $ setInputFocus d w revertToPointerRoot 0
setButtonGrab False w
setBorder w 0xff0000
-- This does not use 'windows' intentionally. 'windows' calls refresh, -- This does not use 'windows' intentionally. 'windows' calls refresh,
-- which means infinite loops. -- which means infinite loops.
modify (\s -> s { workspace = W.raiseFocus w (workspace s) }) modify (\s -> s { workspace = W.raiseFocus w (workspace s) })
-- Set new border for raised window.
setBorder w 0xff0000
-- | Set the focus to the window on top of the stack, or root -- | Set the focus to the window on top of the stack, or root
setTopFocus :: X () setTopFocus :: X ()