Mirrors/exwm
2
0
Fork 0
mirror of https://github.com/ch11ng/exwm.git synced 2024-11-23 19:47:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential naming conflicts

Browse source 
Buffers may share a same name (without the possible leading space) when created
in different workspaces.
This commit is contained in:
Chris Feng 2015-07-26 16:04:21 +08:00
parent 36e8361b9b
commit f4416a10e3
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
exwm-workspace.el
View file

@ -119,9 +119,9 @@ The optional FORCE option is for internal use only "
(dolist (i exwm--id-buffer-alist) (dolist (i exwm--id-buffer-alist)
(with-current-buffer (cdr i) (with-current-buffer (cdr i)
(let ((name (replace-regexp-in-string "^\\s-*" "" (buffer-name)))) (let ((name (replace-regexp-in-string "^\\s-*" "" (buffer-name))))
(rename-buffer (if (eq (selected-frame) exwm--frame) (exwm-workspace-rename-buffer (if (eq (selected-frame) exwm--frame)
name name
(concat " " name)))))) (concat " " name))))))
;; Update demands attention flag ;; Update demands attention flag
(set-frame-parameter (selected-frame) 'exwm--urgency nil) (set-frame-parameter (selected-frame) 'exwm--urgency nil)
;; Update switch workspace history ;; Update switch workspace history
@ -151,7 +151,7 @@ The optional FORCE option is for internal use only "
(let ((frame (elt exwm-workspace--list index))) (let ((frame (elt exwm-workspace--list index)))
(with-current-buffer (exwm--id->buffer id) (with-current-buffer (exwm--id->buffer id)
(setq exwm--frame frame) (setq exwm--frame frame)
(rename-buffer (exwm-workspace-rename-buffer
(concat " " (replace-regexp-in-string "^\\s-*" "" (buffer-name)))) (concat " " (replace-regexp-in-string "^\\s-*" "" (buffer-name))))
(if exwm--floating-frame (if exwm--floating-frame
;; Move the floating frame is enough ;; Move the floating frame is enough
@ -172,6 +172,19 @@ The optional FORCE option is for internal use only "
(xcb:flush exwm--connection) (xcb:flush exwm--connection)
(exwm-workspace--update-switch-history))) (exwm-workspace--update-switch-history)))
(defun exwm-workspace-rename-buffer (newname)
"Rename a buffer."
(if (/= ? (aref newname 0))
(rename-buffer newname t)
;; If a buffer name is prefixed with a space, Emacs append a random
;; number before renaming it. This is not desired behavior.
(let ((name (replace-regexp-in-string "<[0-9]+>$" "" newname))
(counter 1))
(while (and (get-buffer newname)
(not (eq (get-buffer newname) (current-buffer))))
(setq newname (format "%s<%d>" name (cl-incf counter)))))
(rename-buffer newname)))
(defun exwm-workspace--init () (defun exwm-workspace--init ()
"Initialize workspace module." "Initialize workspace module."
(cl-assert (and (< 0 exwm-workspace-number) (>= 10 exwm-workspace-number))) (cl-assert (and (< 0 exwm-workspace-number) (>= 10 exwm-workspace-number)))