Skip to content

Fix and simplify detection of selected window #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stiell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix and simplify detection of selected window #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 6 additions & 35 deletions powerline.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,44 +493,15 @@ static char * %s[] = {

(defvar pl/default-mode-line mode-line-format)

(defvar pl/minibuffer-selected-window-list '())

(defun pl/minibuffer-selected-window ()
"Return the selected window when entereing the minibuffer."
(when pl/minibuffer-selected-window-list
(car pl/minibuffer-selected-window-list)))

(defun pl/minibuffer-setup ()
"Save the `minibuffer-selected-window' to `pl/minibuffer-selected-window'."
(push (minibuffer-selected-window) pl/minibuffer-selected-window-list))

(add-hook 'minibuffer-setup-hook 'pl/minibuffer-setup)

(defun pl/minibuffer-exit ()
"Set `pl/minibuffer-selected-window' to nil."
(pop pl/minibuffer-selected-window-list))

(add-hook 'minibuffer-exit-hook 'pl/minibuffer-exit)

(defvar powerline-selected-window (frame-selected-window))
(defun powerline-set-selected-window ()
"sets the variable `powerline-selected-window` appropriately"
(when (not (minibuffer-window-active-p (frame-selected-window)))
(setq powerline-selected-window (frame-selected-window))))

(defun powerline-unset-selected-window ()
"Unsets the variable `powerline-selected-window` and updates the modeline"
(setq powerline-selected-window nil)
(force-mode-line-update))

(add-hook 'window-configuration-change-hook 'powerline-set-selected-window)

;; focus-in-hook was introduced in emacs v24.4.
;; Gets evaluated in the last frame's environment.
(add-hook 'focus-in-hook 'powerline-set-selected-window)

;; focus-out-hook was introduced in emacs v24.4.
(add-hook 'focus-out-hook 'powerline-unset-selected-window)
(let ((w (if (eq (active-minibuffer-window) (selected-window))
(minibuffer-selected-window)
(selected-window))))
(unless (eq powerline-selected-window w)
(setq powerline-selected-window w)
(force-mode-line-update t))))

;; Executes after the window manager requests that the user's events
;; be directed to a different frame.
Expand Down