Mirrors/exwm2
2
0
Fork 0
mirror of https://github.com/emacs-exwm/exwm.git synced 2024-11-30 16:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mattbeshara.github.com/less-consy-workspace--client-p' into externals/exwm

Browse source
This commit is contained in:
Adrián Medraño Calvo 2021-10-30 00:00:00 +00:00
commit 1bc66b6438
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
exwm-workspace.el
View file

@ -165,10 +165,21 @@ NIL if FRAME is not a workspace"
"Return t if FRAME is a workspace." "Return t if FRAME is a workspace."
(memq frame exwm-workspace--list)) (memq frame exwm-workspace--list))
(defvar exwm-workspace--client-p-hash-table
(make-hash-table :test 'eq :weakness 'key)
"Used to cache the results of calling ‘exwm-workspace--client-p’.")
(defsubst exwm-workspace--client-p (&optional frame) (defsubst exwm-workspace--client-p (&optional frame)
"Return non-nil if FRAME is an emacsclient frame." "Return non-nil if FRAME is an emacsclient frame."
(let* ((frame (or frame (selected-frame)))
(cached-value
(gethash frame exwm-workspace--client-p-hash-table 'absent)))
(if (eq cached-value 'absent)
(puthash frame
(or (frame-parameter frame 'client) (or (frame-parameter frame 'client)
(not (display-graphic-p frame)))) (not (display-graphic-p frame)))
exwm-workspace--client-p-hash-table)
cached-value)))
(defvar exwm-workspace--switch-map nil (defvar exwm-workspace--switch-map nil
"Keymap used for interactively selecting workspace.") "Keymap used for interactively selecting workspace.")
@ -1458,7 +1469,8 @@ the next workspace."
;; care of converting a workspace into a regular unmanaged frame. ;; care of converting a workspace into a regular unmanaged frame.
(let ((exwm-workspace--create-silently t)) (let ((exwm-workspace--create-silently t))
(make-frame))) (make-frame)))
(exwm-workspace--remove-frame-as-workspace frame)))) (exwm-workspace--remove-frame-as-workspace frame)
(remhash frame exwm--client-p-hash-table))))
(defun exwm-workspace--on-after-make-frame (frame) (defun exwm-workspace--on-after-make-frame (frame)
"Hook run upon `make-frame' that configures FRAME as a workspace." "Hook run upon `make-frame' that configures FRAME as a workspace."