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

Merge branch 'medranocalvo/fix-minibuffer-only-focus-jump' into externals/exwm

Browse source
This commit is contained in:
Chris Feng 2018-10-14 00:00:00 +00:00
commit 5c9fcc0cd4
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
exwm-input.el
View file

@ -351,17 +351,10 @@ ARGS are additional arguments to CALLBACK."
(x-focus-frame (window-frame window)) (x-focus-frame (window-frame window))
;; X input focus should be set on the previously selected ;; X input focus should be set on the previously selected
;; frame. ;; frame.
(x-focus-frame (window-frame (minibuffer-selected-window)))) (x-focus-frame (window-frame (minibuffer-window))))
(exwm-input--set-active-window) (exwm-input--set-active-window)
(xcb:flush exwm--connection))))))) (xcb:flush exwm--connection)))))))
(defun exwm-input--on-minibuffer-setup ()
"Run in `minibuffer-setup-hook' to set input focus."
(exwm--log)
(unless (exwm-workspace--client-p)
;; Set input focus on the Emacs frame
(x-focus-frame (window-frame (minibuffer-selected-window)))))
(defun exwm-input--set-active-window (&optional id) (defun exwm-input--set-active-window (&optional id)
"Set _NET_ACTIVE_WINDOW." "Set _NET_ACTIVE_WINDOW."
(exwm--log) (exwm--log)
@ -1049,8 +1042,6 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences."
(when mouse-autoselect-window (when mouse-autoselect-window
(xcb:+event exwm--connection 'xcb:EnterNotify (xcb:+event exwm--connection 'xcb:EnterNotify
#'exwm-input--on-EnterNotify)) #'exwm-input--on-EnterNotify))
;; The input focus should be set on the frame when minibuffer is active.
(add-hook 'minibuffer-setup-hook #'exwm-input--on-minibuffer-setup)
;; Control `exwm-input--during-command' ;; Control `exwm-input--during-command'
(add-hook 'pre-command-hook #'exwm-input--on-pre-command) (add-hook 'pre-command-hook #'exwm-input--on-pre-command)
(add-hook 'post-command-hook #'exwm-input--on-post-command) (add-hook 'post-command-hook #'exwm-input--on-post-command)
@ -1064,7 +1055,6 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences."
(defun exwm-input--exit () (defun exwm-input--exit ()
"Exit the input module." "Exit the input module."
(exwm-input--unset-simulation-keys) (exwm-input--unset-simulation-keys)
(remove-hook 'minibuffer-setup-hook #'exwm-input--on-minibuffer-setup)
(remove-hook 'pre-command-hook #'exwm-input--on-pre-command) (remove-hook 'pre-command-hook #'exwm-input--on-pre-command)
(remove-hook 'post-command-hook #'exwm-input--on-post-command) (remove-hook 'post-command-hook #'exwm-input--on-post-command)
(remove-hook 'buffer-list-update-hook #'exwm-input--on-buffer-list-update) (remove-hook 'buffer-list-update-hook #'exwm-input--on-buffer-list-update)