diff options
author | Adam Vogt <vogt.adam@gmail.com> | 2010-02-22 15:45:12 +0100 |
---|---|---|
committer | Adam Vogt <vogt.adam@gmail.com> | 2010-02-22 15:45:12 +0100 |
commit | 600be39bc9fd790e8b8f455bf8d0af4b7743386e (patch) | |
tree | 1fd5ed844cab3b3dfddb9d398ece4524e9308810 /XMonad/Operations.hs | |
parent | 3b6eb5f1ccca57a92df885f45b5d361bda572379 (diff) | |
download | metatile-600be39bc9fd790e8b8f455bf8d0af4b7743386e.tar metatile-600be39bc9fd790e8b8f455bf8d0af4b7743386e.zip |
Resolve conflicts Geoff Reedy's window focus hack.
Ignore-this: a71f3cb0507642e828f4bdfdc7ccd289
darcs-hash:20100222144512-1499c-f733b3d845d3d45da0713653796caae461b09b15
Diffstat (limited to 'XMonad/Operations.hs')
-rw-r--r-- | XMonad/Operations.hs | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/XMonad/Operations.hs b/XMonad/Operations.hs index 048434d..401a812 100644 --- a/XMonad/Operations.hs +++ b/XMonad/Operations.hs @@ -325,8 +325,27 @@ setFocusX w = withWindowSet $ \ws -> do -- If we ungrab buttons on the root window, we lose our mouse bindings. whenX (not <$> isRoot w) $ setButtonGrab False w - io $ do setInputFocus dpy w revertToPointerRoot 0 - -- raiseWindow dpy w + + hints <- io $ getWMHints dpy w + protocols <- io $ getWMProtocols dpy w + wmprot <- atom_WM_PROTOCOLS + wmtf <- atom_WM_TAKE_FOCUS + currevt <- asks currentEvent + let inputHintSet = wmh_flags hints `testBit` inputHintBit + + when ((inputHintSet && wmh_input hints) || (not inputHintSet)) $ + io $ do setInputFocus dpy w revertToPointerRoot 0 + when (wmtf `elem` protocols) $ + io $ allocaXEvent $ \ev -> do + setEventType ev clientMessage + setClientMessageEvent ev w wmprot 32 wmtf $ maybe currentTime event_time currevt + sendEvent dpy w False noEventMask ev + where event_time ev = + if (ev_event_type ev) `elem` timedEvents then + ev_time ev + else + currentTime + timedEvents = [ keyPress, keyRelease, buttonPress, buttonRelease, enterNotify, leaveNotify, selectionRequest ] ------------------------------------------------------------------------ -- Message handling |