From 01b925d43acf8101a955ca7e7f9284a3b21ddf89 Mon Sep 17 00:00:00 2001 From: Klaus Weidner Date: Fri, 2 May 2008 19:56:03 +0200 Subject: Remember if focus changes were caused by mouse actions or by key commands If the user used the mouse to change window focus (moving into or clicking on a window), this should be handled differently than focus changes due to keyboard commands. Specifically, it's inappropriate to discard window enter/leave events while the mouse is moving. This fixes the bug where a fast mouse motion across multiple windows resulted in the wrong window keeping focus. It's also helpful information for contrib modules such as UpdatePointer - it's supposed to move the mouse pointer only in response to keyboard actions, not if the user was moving the mouse. darcs-hash:20080502175603-e41d7-0ac41e5353fcd8aed71ee3beb7f5511337225155 --- XMonad/Operations.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'XMonad/Operations.hs') diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs index 1e6e322..4c2623b 100644 --- a/XMonad/Operations.hs +++ b/XMonad/Operations.hs @@ -165,7 +165,8 @@ windows f = do -- will overwrite withdrawnState with iconicState mapM_ (flip setWMState withdrawnState) (W.allWindows old \\ W.allWindows ws) - clearEvents enterWindowMask + isMouseFocused <- asks mouseFocused + unless isMouseFocused $ clearEvents enterWindowMask -- | setWMState. set the WM_STATE property setWMState :: Window -> Int -> X () @@ -294,7 +295,9 @@ setTopFocus = withWindowSet $ maybe (setFocusX =<< asks theRoot) setFocusX . W.p -- the mouse to a new screen). focus :: Window -> X () focus w = withWindowSet $ \s -> do - if W.member w s then when (W.peek s /= Just w) $ windows (W.focusWindow w) + if W.member w s then when (W.peek s /= Just w) $ do + local (\c -> c { mouseFocused = True }) $ do + windows (W.focusWindow w) else whenX (isRoot w) $ setFocusX w -- | Call X to set the keyboard focus details. -- cgit v1.2.3