about summary refs log tree commit diff
path: root/exwm-input.el
diff options
context:
space:
mode:
authorChris Feng <chris.w.feng@gmail.com>2019-10-02T00·00+0000
committerChris Feng <chris.w.feng@gmail.com>2019-10-02T00·00+0000
commit9eed52ee2b5a1366dfa5fdd3ad45328c554b356c (patch)
tree3371102009067b7f15a08693c136ac06acbe1458 /exwm-input.el
parent7778766af824326d89cf4bce7541823218d43adc (diff)
Avoid calling `x-focus-frame' on non-graphical frames
* exwm-workspace.el (exwm-workspace--client-p): Also account for
non-graphical frames.
* exwm-input.el (exwm-input--on-minibuffer-setup)
(exwm-input--on-minibuffer-exit): Exclude emacsclient frames.
Diffstat (limited to 'exwm-input.el')
-rw-r--r--exwm-input.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/exwm-input.el b/exwm-input.el
index 7833130d7811..2d3b48189826 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -1046,6 +1046,7 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences."
   (with-current-buffer
       (window-buffer (frame-selected-window exwm-workspace--current))
     (when (and (derived-mode-p 'exwm-mode)
+               (not (exwm-workspace--client-p))
                (eq exwm--selected-input-mode 'char-mode))
       (exwm-input--grab-keyboard exwm--id))))
 
@@ -1055,6 +1056,7 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences."
   (with-current-buffer
       (window-buffer (frame-selected-window exwm-workspace--current))
     (when (and (derived-mode-p 'exwm-mode)
+               (not (exwm-workspace--client-p))
                (eq exwm--selected-input-mode 'char-mode)
                (eq exwm--input-mode 'line-mode))
       (exwm-input--release-keyboard exwm--id))))