(setq serverp (erc--server-buffer-p))
(setq chanp (erc-channel-p (erc-default-target)))
(setq queryp (erc-query-buffer-p)))
- (cond (serverp
+ (defvar erc-nickbar-mode)
+ (cond ((and erc-nickbar-mode (null (get-buffer-window speedbar-buffer)))
+ (run-at-time 0 nil #'erc-nickbar-mode -1))
+ (serverp
(erc-speedbar-channel-buttons nil 0 buffer))
(chanp
(erc-speedbar-insert-target buffer 0)
'erc-current-nick-face
'erc-my-nick-face))
(v v))
- ;; FIXME overload `erc-channel-user-owner-p' and friends to
- ;; accept an `erc-channel-user' object and replace this unrolled
- ;; stuff with a single call to `erc-get-user-mode-prefix'.
- (and cuser (or (erc-channel-user-owner cuser)
- (erc-channel-user-admin cuser)
- (erc-channel-user-op cuser)
- (erc-channel-user-halfop cuser)
- (erc-channel-user-voice cuser))
- erc-button-nickname-face))))
+ (or (and cuser (not (zerop (erc-channel-user-status cuser)))
+ erc-button-nickname-face)
+ 'erc-default-face))))
(defun erc-speedbar--on-click (nick sbtoken _indent)
;; 0: finger, 1: name, 2: info, 3: buffer-name
(speedbar-use-images . nil)
(speedbar-hide-button-brackets-flag . t)))
-(defvar erc-speedbar--hidden-speedbar-frame nil)
+(defvar erc-speedbar--hidden-speedbar-frame nil
+ "The original `speedbar-frame', which `erc-nickbar-mode' deletes.
+It keeps a reference to it in order to run upstream teardown
+procedures without having to create a dummy frame for that
+purpose.")
(defun erc-speedbar--emulate-sidebar-set-window-preserve-size ()
(let ((erc-status-sidebar-buffer-name (buffer-name speedbar-buffer))
#'erc-speedbar--emulate-sidebar-set-window-preserve-size))
(defun erc-speedbar--emulate-sidebar ()
+ "Perform local setup for `erc-nickbar-mode' in a new `speedbar-buffer'."
(require 'erc-status-sidebar)
(cl-assert speedbar-frame)
(cl-assert (eq speedbar-buffer (current-buffer)))
(add-function :around (local 'erc-speedbar--nick-face-function)
#'erc-speedbar--compose-nicks-face))))
-(defun erc-speedbar--toggle-nicknames-sidebar (arg)
- (let ((force (numberp arg)))
- (if speedbar-buffer
- (progn
- (cl-assert (buffer-live-p speedbar-buffer))
- (if (or (and force (< arg 0))
- (and (not force) (get-buffer-window speedbar-buffer nil)))
- ;; Close associated windows and stop updating but leave timer.
- (progn
- (dolist (window (get-buffer-window-list speedbar-buffer nil t))
- (unless (frame-root-window-p window)
- (when erc-speedbar--hidden-speedbar-frame
- (cl-assert
- (not (eq (window-frame window)
- erc-speedbar--hidden-speedbar-frame))))
- (delete-window window)))
- (with-current-buffer speedbar-buffer
- (setq speedbar-update-flag nil)
- (speedbar-set-mode-line-format)))
- (when (or (not force) (>= arg 0))
- (with-selected-frame speedbar-frame
- (erc-speedbar--emulate-sidebar-set-window-preserve-size)
- (erc-speedbar-toggle-nicknames-window-lock -1)))))
- (when-let (((or (not force) (>= arg 0)))
+(defun erc-speedbar--handle-delete-frame (event)
+ "Disable the nickbar if EVENT is deleting the proxy frame."
+ (when (and speedbar-frame
+ (cdr (frame-list))
+ (pcase event
+ (`(delete-frame (,frame)) (eq frame speedbar-frame))))
+ (erc-nickbar-mode -1)))
+
+(defun erc-speedbar--ensure (&optional forcep)
+ "Perform common setup for `erc-nickbar-mode'.
+Without FORCEP, return early when the calling context isn't
+associated with an ERC session."
+ (save-excursion
+ (when (or (erc-server-buffer) forcep)
+ (when erc-track-mode
+ (cl-pushnew '(derived-mode . speedbar-mode)
+ erc-track--switch-fallback-blockers :test #'equal))
+ (unless speedbar-update-flag
+ (erc-button--display-error-notice-with-keys
+ (erc-server-buffer)
+ "Module `nickbar' needs `speedbar-update-flag' to be non-nil"
+ (and (not (display-graphic-p)) " in text terminals")
+ ". Setting to t for the current Emacs session."
+ " Customize it permanently to avoid this message.")
+ (setq speedbar-update-flag t))
+ (when-let (((null speedbar-buffer))
(speedbar-frame-parameters (backquote-list*
'(visibility . nil)
'(no-other-frame . t)
;; created twice.
(speedbar-change-initial-expansion-list "ERC")
(speedbar-frame-mode 1)
- ;; If we put the remaining parts in the "create hook" along
- ;; with everything else, the frame with `window-main-window'
- ;; gets raised and steals focus if you've switched away from
- ;; Emacs in the meantime.
- (make-frame-invisible speedbar-frame)
- (select-frame (setq speedbar-frame (previous-frame)))
+ ;; The setup steps below can't go in the "create hook" because
+ ;; the frame with `window-main-window' will be raised and
+ ;; steal focus if you switch away from Emacs in the meantime.
+ (let ((frame speedbar-frame))
+ (cl-assert (not (eq speedbar-frame (selected-frame))))
+ (select-frame (setq speedbar-frame (selected-frame)))
+ (delete-frame frame))
+ ;; Allow deleting (our) `speedbar-frame' with the mouse.
+ (with-current-buffer speedbar-buffer
+ (kill-local-variable 'dframe-delete-frame-function)
+ (setq dframe-delete-frame-function
+ #'erc-speedbar--handle-delete-frame)))
+ (with-selected-frame speedbar-frame
(erc-speedbar--emulate-sidebar-set-window-preserve-size)
- (erc-speedbar-toggle-nicknames-window-lock -1))))
- (cl-assert (not (cdr (erc-speedbar--get-timers))) t))
-
-(defun erc-speedbar--ensure (&optional force)
- (when (or (erc-server-buffer) force)
- (when erc-track-mode
- (cl-pushnew '(derived-mode . speedbar-mode)
- erc-track--switch-fallback-blockers :test #'equal))
- (unless speedbar-update-flag
- (erc-button--display-error-notice-with-keys
- (erc-server-buffer)
- "Module `nickbar' needs `speedbar-update-flag' to be non-nil"
- (and (not (display-graphic-p)) " in text terminals")
- ". Setting to t for the current Emacs session."
- " Customize it permanently to avoid this message.")
- (setq speedbar-update-flag t))
- (erc-speedbar--toggle-nicknames-sidebar +1)
- (with-current-buffer speedbar-buffer
- (setq speedbar-update-flag t)
- (speedbar-set-mode-line-format))))
+ (erc-speedbar-toggle-nicknames-window-lock -1))
+ (cl-assert (null (cdr (erc-speedbar--get-timers))))
+ (with-current-buffer speedbar-buffer
+ (setq speedbar-update-flag t)
+ (speedbar-set-mode-line-format)))))
-(defvar erc-speedbar--shutting-down-p nil)
-(defvar erc-speedbar--force-update-interval-secs 5 "Speedbar update period.")
+(defvar erc-speedbar--force-update-interval-secs 5
+ "Speedbar update period.")
(defvar-local erc-speedbar--last-ran nil
"When non-nil, a lisp timestamp updated when the speedbar timer runs.")
-(defun erc-speedbar--run-timer-on-post-insert ()
- "Refresh speedbar if idle for `erc-speedbar--force-update-interval-secs'."
- (when speedbar-buffer
+(defun erc-speedbar--prod-dframe-timer (&rest _)
+ "Refresh speedbar if dormant for `erc-speedbar--force-update-interval-secs'."
+ (when (buffer-live-p speedbar-buffer)
(with-current-buffer speedbar-buffer
- (when-let
- ((dframe-timer)
- ((erc--check-msg-prop 'erc--cmd 'PRIVMSG))
- (interval erc-speedbar--force-update-interval-secs)
- ((or (null erc-speedbar--last-ran)
- (time-less-p erc-speedbar--last-ran
- (time-subtract (current-time) interval)))))
- (run-at-time 0 nil #'dframe-timer-fn)))))
+ (when
+ (and dframe-timer
+ (or (null erc-speedbar--last-ran)
+ (time-less-p erc-speedbar--last-ran
+ (time-subtract
+ (current-time)
+ erc-speedbar--force-update-interval-secs))))
+ (run-at-time 0 nil #'dframe-timer-fn))))
+ nil)
(defun erc-speedbar--reset-last-ran-on-timer ()
"Reset `erc-speedbar--last-ran'."
"Show nicknames for current target buffer in a side window.
When enabling, create a speedbar session if one doesn't exist and
show its buffer in an `erc-status-sidebar' window instead of a
-separate frame. When disabling, close the window or, with a
-negative prefix arg, destroy the session.
+separate frame. If ERC doesn't yet have any live connections,
+defer activation until such time. This means the variable
+`erc-nickbar-mode' may be t even though no actual speedbar yet
+exists. When disabling, destroy the speedbar session.
For controlling whether the speedbar window is selectable with
-`other-window', see `erc-nickbar-toggle-nicknames-window-lock'.
-Note that during initialization, this module may produce unwanted
-side effects, like the raising of frames or the stealing of input
-focus. If you witness such a thing and can reproduce it, please
-file a bug report with \\[erc-bug]."
+`other-window', see `erc-nickbar-toggle-nicknames-window-lock'."
((add-hook 'erc--setup-buffer-hook #'erc-speedbar--ensure)
- (add-hook 'erc-insert-post-hook #'erc-speedbar--run-timer-on-post-insert)
(add-hook 'speedbar-timer-hook #'erc-speedbar--reset-last-ran-on-timer)
+ (add-hook 'erc-insert-post-hook #'erc-speedbar--prod-dframe-timer)
+ (add-hook 'erc-server-PONG-functions #'erc-speedbar--prod-dframe-timer)
(erc-speedbar--ensure)
(unless (or erc--updating-modules-p
- (and-let* ((speedbar-buffer)
- (win (get-buffer-window speedbar-buffer 'all-frames))
- ((eq speedbar-frame (window-frame win))))))
+ (and speedbar-buffer
+ (eq speedbar-frame
+ (window-frame (get-buffer-window speedbar-buffer t)))))
(when-let ((buf (or (and (derived-mode-p 'erc-mode) (current-buffer))
(car (erc-buffer-filter #'erc--server-buffer-p)))))
(with-current-buffer buf
- (erc-speedbar--ensure 'force)))))
+ (erc-speedbar--ensure 'forcep)))))
((remove-hook 'erc--setup-buffer-hook #'erc-speedbar--ensure)
- (remove-hook 'erc-insert-post-hook #'erc-speedbar--run-timer-on-post-insert)
(remove-hook 'speedbar-timer-hook #'erc-speedbar--reset-last-ran-on-timer)
+ (remove-hook 'erc-insert-post-hook #'erc-speedbar--prod-dframe-timer)
+ (remove-hook 'erc-server-PONG-functions #'erc-speedbar--prod-dframe-timer)
(when erc-track-mode
(setq erc-track--switch-fallback-blockers
(remove '(derived-mode . speedbar-mode)
erc-track--switch-fallback-blockers)))
- (erc-speedbar--toggle-nicknames-sidebar -1)
- (when-let (((not erc-speedbar--shutting-down-p))
- (arg erc--module-toggle-prefix-arg)
- ((numberp arg))
- ((< arg 0)))
- (with-current-buffer speedbar-buffer
- (dframe-close-frame)
- (setq erc-speedbar--hidden-speedbar-frame nil)))))
+ (cl-assert speedbar-buffer)
+ ;; Close associated windows and stop updating but leave timer.
+ (dolist (window (get-buffer-window-list speedbar-buffer nil t))
+ (unless (frame-root-window-p window)
+ (when erc-speedbar--hidden-speedbar-frame
+ (cl-assert (not (eq (window-frame window)
+ erc-speedbar--hidden-speedbar-frame))))
+ (delete-window window)))
+ (with-current-buffer speedbar-buffer
+ (setq speedbar-update-flag nil)
+ (speedbar-set-mode-line-format)
+ (unless (eq erc--module-toggle-prefix-arg most-negative-fixnum)
+ (dframe-close-frame)))))
(defun erc-speedbar--get-timers ()
(cl-remove #'dframe-timer-fn timer-idle-list
(cl-assert (eq speedbar-buffer (current-buffer))))
(when (and erc-speedbar--hidden-speedbar-frame (numberp arg) (< arg 0))
(when erc-nickbar-mode
- (let ((erc-speedbar--shutting-down-p t))
- (erc-nickbar-mode -1)))
+ (erc-nickbar-mode most-negative-fixnum))
(setq speedbar-frame erc-speedbar--hidden-speedbar-frame
erc-speedbar--hidden-speedbar-frame nil)
- ;; It's unknown whether leaving the frame invisible interferes
- ;; with the upstream teardown sequence.
- (when (display-graphic-p)
- (make-frame-visible speedbar-frame))
(speedbar-frame-mode arg) ; -1
;; As of Emacs 29, `dframe-set-timer' can't remove `dframe-timer'.
(cl-assert (= 1 (length (erc-speedbar--get-timers))) t)
(cancel-function-timers #'dframe-timer-fn)
;; `dframe-close-frame' kills the buffer but no function in
;; erc-speedbar.el resets this to nil.
- (setq speedbar-buffer nil)))
+ (setq erc-speedbar--hidden-speedbar-frame nil
+ speedbar-buffer nil
+ speedbar-frame nil)))
(defun erc-speedbar-toggle-nicknames-window-lock (arg)
"Toggle whether nicknames window is selectable with \\[other-window].
projects / emacs.git / commitdiff