diff options
| author | Chris Feng <chris.w.feng@gmail.com> | 2018-10-14T00·00+0000 |
|---|---|---|
| committer | Chris Feng <chris.w.feng@gmail.com> | 2018-10-14T00·00+0000 |
| commit | 5c9fcc0cd4f26bb817f46afe8b87eb14f1d98d31 (patch) | |
| tree | bd4247c50d0e8a20c25a77287458b316aefbd1a2 /exwm-input.el | |
| parent | 57d0e9e1d3d254d6e82ea2ce877b0d5fe56284f2 (diff) | |
| parent | c9984ca2163a18c19f46a90c003569b628de17f0 (diff) | |
Merge branch 'medranocalvo/fix-minibuffer-only-focus-jump' into externals/exwm
Diffstat (limited to 'exwm-input.el')
| -rw-r--r-- | exwm-input.el | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/exwm-input.el b/exwm-input.el index e4c4f9ee3a53..6e8f6d814a70 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -351,17 +351,10 @@ ARGS are additional arguments to CALLBACK." (x-focus-frame (window-frame window)) ;; X input focus should be set on the previously selected ;; frame. - (x-focus-frame (window-frame (minibuffer-selected-window)))) + (x-focus-frame (window-frame (minibuffer-window)))) (exwm-input--set-active-window) (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) "Set _NET_ACTIVE_WINDOW." (exwm--log) @@ -1049,8 +1042,6 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences." (when mouse-autoselect-window (xcb:+event exwm--connection 'xcb: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' (add-hook 'pre-command-hook #'exwm-input--on-pre-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 () "Exit the input module." (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 'post-command-hook #'exwm-input--on-post-command) (remove-hook 'buffer-list-update-hook #'exwm-input--on-buffer-list-update) |