about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Feng <chris.w.feng@gmail.com>2020-05-10T00·00+0000
committerChris Feng <chris.w.feng@gmail.com>2020-05-10T00·00+0000
commitab1d02af535b4af81dd66c02d3593506c80b5d60 (patch)
treedaae39119a2822863f6e311708ef8d86c9bdd3d9
parentc0931b5c6604d8816bcee1e4dc2c13a262cb93eb (diff)
parentc7c42582b7342f20c22b8a040eab72d3ce9f37b5 (diff)
Merge branch 'medranocalvo/prevent-jump-back-workspace' into externals/exwm
-rw-r--r--exwm-workspace.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/exwm-workspace.el b/exwm-workspace.el
index f63a0a36ebaf..cff17f3a113a 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -587,6 +587,11 @@ for internal use only."
     (when (or force (not (eq frame exwm-workspace--current)))
       (unless (window-live-p window)
         (setq window (frame-selected-window frame)))
+    (when (and (not (eq frame old-frame))
+               (frame-live-p old-frame))
+      (with-selected-frame old-frame
+        (funcall exwm-workspace--original-handle-focus-out
+                 (list 'focus-out frame))))
       ;; Raise this frame.
       (xcb:+request exwm--connection
           (make-instance 'xcb:ConfigureWindow
@@ -680,11 +685,6 @@ for internal use only."
                              :dst-x (/ (frame-pixel-width frame) 2)
                              :dst-y (/ (frame-pixel-height frame) 2)))
           (xcb:flush exwm--connection))))
-    (when (and (not (eq frame old-frame))
-               (frame-live-p old-frame))
-      (with-selected-frame old-frame
-        (funcall exwm-workspace--original-handle-focus-out
-                 (list 'focus-out frame))))
     (funcall exwm-workspace--original-handle-focus-in (list 'focus-in frame))
     (run-hooks 'exwm-workspace-switch-hook)))