toki/emacs-winum
1
0
Fork 0
Code Issues Pull requests Activity

expand winum--window-vector if a higher number is assigned

Browse source 
partly fixes #4
This commit is contained in:
Alexander M 2017-04-15 16:13:11 +02:00 committed by deb0ch
parent 2efef60d1f
commit 6f52356657
1 changed files with 35 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
winum.el
View file

@ -393,13 +393,7 @@ POSITION: position in the mode-line."
(let ((windows (winum--window-list))) (let ((windows (winum--window-list)))
(setq winum--window-count (length windows) (setq winum--window-count (length windows)
winum--remaining (winum--available-numbers)) winum--remaining (winum--available-numbers))
(if (eq winum-scope 'frame-local) (winum--set-window-vector (make-vector (1+ winum--window-count) nil))
(puthash (selected-frame)
(cons (make-vector (1+ winum--window-count) nil)
(make-hash-table :size winum--window-count))
winum--frames-table)
(setq winum--window-vector (make-vector (1+ winum--window-count) nil))
(clrhash winum--numbers-table))
(when winum-assign-func (when winum-assign-func
(mapc (lambda (w) (mapc (lambda (w)
(with-selected-window w (with-selected-window w
@ -417,24 +411,38 @@ POSITION: position in the mode-line."
(defun winum--assign (window &optional number) (defun winum--assign (window &optional number)
"Assign to window WINDOW the number NUMBER. "Assign to window WINDOW the number NUMBER.
If NUMBER is not specified, determine it first based on If NUMBER is not specified, determine it first based on `winum--remaining'.
`winum--remaining'.
Returns the assigned number, or nil on error." Returns the assigned number, or nil on error."
(if number (if number
(if (aref (winum--get-window-vector) number) (progn
(progn (message "Number %s already assigned to %s, can't assign to %s" (winum--maybe-expand-window-vector number)
number (aref winum--window-vector number) window) (if (aref (winum--get-window-vector) number)
nil) (progn
(setf (aref (winum--get-window-vector) number) window) (message "Number %s already assigned to %s, can't assign to %s"
(puthash window number (winum--get-numbers-table)) number (aref winum--window-vector number) window)
(setq winum--remaining (delq number winum--remaining)) nil)
number) (setf (aref (winum--get-window-vector) number) window)
(puthash window number (winum--get-numbers-table))
(setq winum--remaining (delq number winum--remaining))
number))
;; else determine number and assign ;; else determine number and assign
(when winum--remaining (when winum--remaining
(unless (gethash window (winum--get-numbers-table)) (unless (gethash window (winum--get-numbers-table))
(let ((number (car winum--remaining))) (let ((number (car winum--remaining)))
(winum--assign window number)))))) (winum--assign window number))))))
(defun winum--maybe-expand-window-vector (number)
"Expand `winum--window-vector' if NUMBER is bigger than its size.
The size of `winum--window-vector' is normally based on the number of live
windows, however a higher number can be reserved by the user-defined
`winum-assign-func'."
(let* ((window-vector (winum--get-window-vector))
(window-vector-length (length window-vector)))
(when (> number window-vector-length)
(winum--set-window-vector
(vconcat window-vector
(make-vector (1+ (- number window-vector-length)) nil))))))
(defun winum--window-list () (defun winum--window-list ()
"Return a list of interesting windows." "Return a list of interesting windows."
(cl-remove-if (cl-remove-if
@ -467,6 +475,16 @@ Returns the assigned number, or nil on error."
"List windows in frame F using natural Emacs ordering." "List windows in frame F using natural Emacs ordering."
(window-list f 0 (frame-first-window f))) (window-list f 0 (frame-first-window f)))
(defun winum--set-window-vector (window-vector)
"Set WINDOW-VECTOR according to the current `winum-scope'."
(if (eq winum-scope 'frame-local)
(puthash (selected-frame)
(cons window-vector
(make-hash-table :size winum--window-count))
winum--frames-table)
(setq winum--window-vector window-vector)
(clrhash winum--numbers-table)))
(defun winum--get-window-vector () (defun winum--get-window-vector ()
"Return the window vector used to get a window given a number. "Return the window vector used to get a window given a number.
This vector is not stored the same way depending on the value of `winum-scope'." This vector is not stored the same way depending on the value of `winum-scope'."