From 01b0b54c04d043c47184019c75cc668da2427aa8 Mon Sep 17 00:00:00 2001 From: Chris Feng Date: Sun, 21 Oct 2018 00:00:00 +0000 Subject: [PATCH] Fix single workspace invisible problem with Xephyr * exwm-workspace.el (exwm-workspace-switch): On startup EXWM switches to workspace 0 by force so the rest code can not assume the frames before and after a switch different. --- exwm-workspace.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/exwm-workspace.el b/exwm-workspace.el index 8a59c36b5..383bf530b 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -553,8 +553,9 @@ for internal use only." (exwm-workspace--set-active frame t)) ((equal output-old output-new) (exwm-workspace--set-active frame t) - (exwm-workspace--set-active old-frame nil) - (setq workspaces-to-hide (list old-frame))) + (unless (eq frame old-frame) + (exwm-workspace--set-active old-frame nil) + (setq workspaces-to-hide (list old-frame)))) (active-new) (t (dolist (w exwm-workspace--list) @@ -626,7 +627,8 @@ for internal use only." :dst-x (/ (frame-pixel-width frame) 2) :dst-y (/ (frame-pixel-height frame) 2))) (xcb:flush exwm--connection)))) - (when (frame-live-p old-frame) + (when (and (not (eq frame old-frame)) + (frame-live-p old-frame)) (with-selected-frame old-frame (run-hooks 'focus-out-hook))) (run-hooks 'focus-in-hook)