Ignore window entries while moving windows. This should fix all the focus preservation problems.

darcs-hash:20070413083702-a5988-20863eaa042f45a1421a6f171d9a8c42a7854883

1 files changed, 11 insertions, 0 deletions

diff --git a/Operations.hs b/Operations.hs
index ffdaa0a..dcb4710 100644
--- a/Operations.hs
+++ b/Operations.hs
@@ -51,6 +51,16 @@ refresh = do
                 Wide -> vtile (tileFraction fl) sc $ W.index n ws
         whenJust (W.peekStack n ws) (io . raiseWindow d)
     whenJust (W.peek ws) setFocus
+    clearEnterEvents
+
+-- | clearEnterEvents.  Remove all window entry events from the event queue.
+clearEnterEvents :: X ()
+clearEnterEvents = do
+    d <- gets display
+    io $ sync d False
+    io $ allocaXEvent $ \p -> fix $ \again -> do
+        more <- checkMaskEvent d enterWindowMask p
+        when more again
 
 -- | tile.  Compute the positions for windows in horizontal layout
 -- mode.
@@ -251,6 +261,7 @@ view n = do
     -- If the old workspace isn't visible anymore, we have to hide the windows
     -- in case we're switching to an empty workspace.
     when (m `notElem` (W.visibleWorkspaces ws')) (mapM_ hide (W.index m ws))
+    clearEnterEvents
     setTopFocus
 
 -- | 'screenWorkspace sc' returns the workspace number viewed by 'sc'.