From 600be39bc9fd790e8b8f455bf8d0af4b7743386e Mon Sep 17 00:00:00 2001
From: Adam Vogt <vogt.adam@gmail.com>
Date: Mon, 22 Feb 2010 15:45:12 +0100
Subject: Resolve conflicts Geoff Reedy's window focus hack.

Ignore-this: a71f3cb0507642e828f4bdfdc7ccd289

darcs-hash:20100222144512-1499c-f733b3d845d3d45da0713653796caae461b09b15
---
 XMonad/Main.hsc      |  8 ++------
 XMonad/Operations.hs | 23 +++++++++++++++++++++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/XMonad/Main.hsc b/XMonad/Main.hsc
index 33838c8..0d279f9 100644
--- a/XMonad/Main.hsc
+++ b/XMonad/Main.hsc
@@ -121,12 +121,8 @@ xmonad initxmc = do
             , keyActions    = keys xmc xmc
             , buttonActions = mouseBindings xmc xmc
             , mouseFocused  = False
-            , mousePosition = Nothing }
-        st = XState
-            { windowset     = initialWinset
-            , mapped        = S.empty
-            , waitingUnmap  = M.empty
-            , dragging      = Nothing }
+            , mousePosition = Nothing
+            , currentEvent  = Nothing }
 
         st = XState
             { windowset       = initialWinset
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
-- 
cgit v1.2.3