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

refactor(3p/exwm): Remove `exwm-input--skip-buffer-list-update'

Browse source 
* exwm-input.el: (exwm-input--on-buffer-list-update): Stop
	checking `exwm-input--skip-buffer-list-update'; it's no longer
	needed now that we keep track of the last selected window and
	buffer.
	(exwm-input--skip-buffer-list-update): Remove variable.

	* exwm-manage.el (exwm-manage--manage-window): Remove binding of
	`exwm-input--skip-buffer-list-update'.

Imported from https://github.com/ch11ng/exwm/pull/737

Change-Id: Iacbdb8b607a82352e5b55509b0aba93f1d87a9f2
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3562
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
Adrián Medraño Calvo 2020-04-15 00:00:00 +00:00 committed by tazjin
parent e74f12f85b
commit c6ad2b638e
2 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
third_party/exwm/exwm-input.el vendored
View file

@ -117,9 +117,6 @@ defined in `exwm-mode-map' here."
(defvar exwm-input--simulation-keys nil "Simulation keys in line-mode.") (defvar exwm-input--simulation-keys nil "Simulation keys in line-mode.")
(defvar exwm-input--skip-buffer-list-update nil
"Skip the upcoming 'buffer-list-update'.")
(defvar exwm-input--temp-line-mode nil (defvar exwm-input--temp-line-mode nil
"Non-nil indicates it's in temporary line-mode for char-mode.") "Non-nil indicates it's in temporary line-mode for char-mode.")
@ -315,7 +312,6 @@ ARGS are additional arguments to CALLBACK."
(let* ((win (selected-window)) (let* ((win (selected-window))
(buf (window-buffer win))) (buf (window-buffer win)))
(when (and (not (exwm-workspace--client-p)) (when (and (not (exwm-workspace--client-p))
(not exwm-input--skip-buffer-list-update)
(not (and (eq exwm-input--update-focus-window win) (not (and (eq exwm-input--update-focus-window win)
(eq exwm-input--update-focus-window-buffer buf)))) (eq exwm-input--update-focus-window-buffer buf))))
(exwm--log "selected-window=%S current-buffer=%S" win buf) (exwm--log "selected-window=%S current-buffer=%S" win buf)

7
third_party/exwm/exwm-manage.el vendored
View file

@ -151,7 +151,6 @@ want to match against EXWM internal variables such as `exwm-title',
(defvar exwm-manage--ping-lock nil (defvar exwm-manage--ping-lock nil
"Non-nil indicates EXWM is pinging a window.") "Non-nil indicates EXWM is pinging a window.")
(defvar exwm-input--skip-buffer-list-update)
(defvar exwm-input-prefix-keys) (defvar exwm-input-prefix-keys)
(defvar exwm-workspace--current) (defvar exwm-workspace--current)
(defvar exwm-workspace--id-struts-alist) (defvar exwm-workspace--id-struts-alist)
@ -263,8 +262,7 @@ want to match against EXWM internal variables such as `exwm-title',
(make-instance 'xcb:ChangeSaveSet (make-instance 'xcb:ChangeSaveSet
:mode xcb:SetMode:Insert :mode xcb:SetMode:Insert
:window id)) :window id))
(with-current-buffer (let ((exwm-input--skip-buffer-list-update t)) (with-current-buffer (generate-new-buffer "*EXWM*")
(generate-new-buffer "*EXWM*"))
;; Keep the oldest X window first. ;; Keep the oldest X window first.
(setq exwm--id-buffer-alist (setq exwm--id-buffer-alist
(nconc exwm--id-buffer-alist `((,id . ,(current-buffer))))) (nconc exwm--id-buffer-alist `((,id . ,(current-buffer)))))
@ -349,8 +347,7 @@ want to match against EXWM internal variables such as `exwm-title',
:stack-mode xcb:StackMode:Below))) :stack-mode xcb:StackMode:Below)))
(xcb:flush exwm--connection) (xcb:flush exwm--connection)
(setq exwm--id-buffer-alist (assq-delete-all id exwm--id-buffer-alist)) (setq exwm--id-buffer-alist (assq-delete-all id exwm--id-buffer-alist))
(let ((kill-buffer-query-functions nil) (let ((kill-buffer-query-functions nil))
(exwm-input--skip-buffer-list-update t))
(kill-buffer (current-buffer))) (kill-buffer (current-buffer)))
(throw 'return 'ignored)) (throw 'return 'ignored))
(let ((index (plist-get exwm--configurations 'workspace))) (let ((index (plist-get exwm--configurations 'workspace)))