diff options
| author | Chris Feng <chris.w.feng@gmail.com> | 2019-10-02T00·00+0000 |
|---|---|---|
| committer | Chris Feng <chris.w.feng@gmail.com> | 2019-10-02T00·00+0000 |
| commit | 9eed52ee2b5a1366dfa5fdd3ad45328c554b356c (patch) | |
| tree | 3371102009067b7f15a08693c136ac06acbe1458 | |
| parent | 7778766af824326d89cf4bce7541823218d43adc (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.
| -rw-r--r-- | exwm-input.el | 2 | ||||
| -rw-r--r-- | exwm-workspace.el | 3 |
2 files changed, 4 insertions, 1 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)))) diff --git a/exwm-workspace.el b/exwm-workspace.el index 41343187ed86..736f46f82c59 100644 --- a/exwm-workspace.el +++ b/exwm-workspace.el @@ -167,7 +167,8 @@ NIL if FRAME is not a workspace" (defsubst exwm-workspace--client-p (&optional frame) "Return non-nil if FRAME is an emacsclient frame." - (frame-parameter frame 'client)) + (or (frame-parameter frame 'client) + (not (display-graphic-p frame)))) (defvar exwm-workspace--switch-map nil "Keymap used for interactively selecting workspace.") |