mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve robustness

Browse source 
* exwm-input.el (exwm-input--update-focus, exwm-input--on-ButtonPress):
  Make sure Emacs windows are alive before manipulating them.
This commit is contained in:
Chris Feng 2015-10-11 11:39:10 +08:00
parent 1aeec4abf4
commit 46461d994b
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
exwm-input.el
View file

@ -111,7 +111,9 @@ It's updated in several occasions, and only used by `exwm-input--set-focus'.")
(defun exwm-input--update-focus ()
"Update input focus."
(when exwm-input--focus-window
(when (and exwm-input--focus-window
;; The Emacs window may have been deleted
(window-buffer 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))
@ -203,7 +205,12 @@ It's updated in several occasions, and only used by `exwm-input--set-focus'.")
;; The floating X window is on another workspace
(exwm-workspace-switch
(cl-position exwm--frame exwm-workspace--list))))))
(select-window window)))
;; It has been reported that the `window' may have be deleted
(if (window-live-p window)
(select-window window)
(setq window
(get-buffer-window (exwm--id->buffer event) t))
(when window (select-window window)))))
;; The event should be replayed
(setq mode xcb:Allow:ReplayPointer))))
(xcb:+request exwm--connection