diff options
| -rw-r--r-- | exwm-floating.el | 6 | ||||
| -rw-r--r-- | exwm-input.el | 4 | ||||
| -rw-r--r-- | exwm-layout.el | 17 | ||||
| -rw-r--r-- | exwm-workspace.el | 35 |
4 files changed, 32 insertions, 30 deletions
diff --git a/exwm-floating.el b/exwm-floating.el index f408cc16b6cb..408cf372dcbf 100644 --- a/exwm-floating.el +++ b/exwm-floating.el @@ -69,8 +69,10 @@ ;; Create new frame (frame (with-current-buffer (or (get-buffer "*scratch*") - (prog1 (get-buffer-create "*scratch*") - (set-buffer-major-mode "*scratch*"))) + (progn + (set-buffer-major-mode + (get-buffer-create "*scratch*")) + (get-buffer "*scratch*"))) (prog2 (exwm--lock) (make-frame diff --git a/exwm-input.el b/exwm-input.el index f0bf6aa8b66c..8a9d089e2f5b 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -111,9 +111,7 @@ It's updated in several occasions, and only used by `exwm-input--set-focus'.") (defun exwm-input--update-focus () "Update input focus." - (when (and exwm-input--focus-window - ;; The Emacs window may have been deleted - (window-buffer exwm-input--focus-window)) + (when (window-live-p exwm-input--focus-window) (with-current-buffer (window-buffer exwm-input--focus-window) (if (eq major-mode 'exwm-mode) (if (not (eq exwm--frame exwm-workspace--current)) diff --git a/exwm-layout.el b/exwm-layout.el index 1d11dbcdca07..ffe1f1d0c4fd 100644 --- a/exwm-layout.el +++ b/exwm-layout.el @@ -215,18 +215,19 @@ "Refresh layout." (let ((frame (selected-frame)) (placeholder (or (get-buffer "*scratch*") - (prog1 (get-buffer-create "*scratch*") - (set-buffer-major-mode "*scratch*")))) + (progn + (set-buffer-major-mode + (get-buffer-create "*scratch*")) + (get-buffer "*scratch*")))) windows) (if (not (memq frame exwm-workspace--list)) (if (frame-parameter frame 'exwm-window-id) ;; Refresh a floating frame - (progn - (when (eq major-mode 'exwm-mode) - (let ((window (frame-first-window frame))) - (with-current-buffer (window-buffer window) - (exwm--log "Refresh floating window #x%x" exwm--id) - (exwm-layout--show exwm--id window))))) + (when (eq major-mode 'exwm-mode) + (let ((window (frame-first-window frame))) + (with-current-buffer (window-buffer window) + (exwm--log "Refresh floating window #x%x" exwm--id) + (exwm-layout--show exwm--id window)))) ;; Other frames (e.g. terminal/graphical frame of emacsclient) ;; We shall bury all `exwm-mode' buffers in this case (unless placeholder ;create the *scratch* buffer if it's killed diff --git a/exwm-workspace.el b/exwm-workspace.el index 641ba7e680ef..8000b0ba7fcb 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -100,10 +100,6 @@ (defvar exwm-workspace-current-index 0 "Index of current active workspace.") (defvar exwm-workspace-show-all-buffers nil "Non-nil to show buffers on other workspaces.") -(defvar exwm-workspace--switch-count 0 - "`exwm-workspace-switch' execution counts. - -Consumed by `exwm-workspace--on-focus-in.'") ;;;###autoload (defun exwm-workspace-switch (index &optional force) @@ -129,7 +125,6 @@ The optional FORCE option is for internal use only." (let ((frame (elt exwm-workspace--list index))) (setq exwm-workspace--current frame exwm-workspace-current-index index) - (unless force (cl-incf exwm-workspace--switch-count)) (select-frame-set-input-focus frame) ;; Move mouse when necessary (let ((position (mouse-pixel-position)) @@ -167,14 +162,14 @@ The optional FORCE option is for internal use only." (defun exwm-workspace--on-focus-in () "Fix unexpected frame switch." - (let ((index (cl-position (selected-frame) exwm-workspace--list))) - (exwm--log "Focus on workspace %s" index) - ;; Close the (possible) active minibuffer - (when (active-minibuffer-window) (abort-recursive-edit)) - (when (and index (/= index exwm-workspace-current-index)) - (exwm--log "Workspace was switched unexpectedly") - (if (< 0 exwm-workspace--switch-count) - (cl-decf exwm-workspace--switch-count) + ;; `focus-in-hook' is run by `handle-switch-frame' + (unless (eq this-command 'handle-switch-frame) + (let ((index (cl-position (selected-frame) exwm-workspace--list))) + (exwm--log "Focus on workspace %s" index) + (when (and index (/= index exwm-workspace-current-index)) + (exwm--log "Workspace was switched unexpectedly") + ;; Close the (possible) active minibuffer + (when (active-minibuffer-window) (abort-recursive-edit)) (exwm-workspace-switch index))))) ;;;###autoload @@ -221,8 +216,10 @@ The optional FORCE option is for internal use only." (bury-buffer) (set-window-buffer (get-buffer-window (current-buffer) t) (or (get-buffer "*scratch*") - (prog1 (get-buffer-create "*scratch*") - (set-buffer-major-mode "*scratch*"))))) + (progn + (set-buffer-major-mode + (get-buffer-create "*scratch*")) + (get-buffer "*scratch*"))))) (exwm-layout--hide id) (xcb:+request exwm--connection (make-instance 'xcb:ReparentWindow @@ -335,8 +332,12 @@ The optional FORCE option is for internal use only." (select-frame-set-input-focus (car exwm-workspace--list)) (dolist (i exwm-workspace--list) (set-frame-parameter i 'visibility t) - (lower-frame i) - (set-frame-parameter i 'fullscreen 'fullboth)) + (lower-frame i)) + ;; Delay making the workspaces fullscreen until Emacs becomes idle + (run-with-idle-timer 0 nil + (lambda () + (dolist (i exwm-workspace--list) + (set-frame-parameter i 'fullscreen 'fullboth)))) (raise-frame (car exwm-workspace--list)) ;; Handle unexpected frame switch (add-hook 'focus-in-hook #'exwm-workspace--on-focus-in) |