diff options
| author | Adrián Medraño Calvo <adrian@medranocalvo.com> | 2018-10-21T12·00+0000 |
|---|---|---|
| committer | Adrián Medraño Calvo <adrian@medranocalvo.com> | 2018-10-21T12·00+0000 |
| commit | dba1ed94c2e06b46da77a2aa80aa35e17b08fdd6 (patch) | |
| tree | 100001fb37a06b68d78547d421a58c9fc7c478cb /exwm-input.el | |
| parent | 01b0b54c04d043c47184019c75cc668da2427aa8 (diff) | |
Do away with `exwm-input--input-mode'
* exwm-input.el (exwm-input--update-mode-line): Remove. (exwm-input--on-ButtonPress, exwm-input--on-KeyPress) (exwm-input--update-mode-line, exwm-input-toggle-keyboard): Use `exwm--input-mode' variable directly.
Diffstat (limited to 'exwm-input.el')
| -rw-r--r-- | exwm-input.el | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/exwm-input.el b/exwm-input.el index 6e8f6d814a70..78e74cdcf83b 100644 --- a/exwm-input.el +++ b/exwm-input.el @@ -411,7 +411,7 @@ ARGS are additional arguments to CALLBACK." (when window (select-window window)))) (with-current-buffer buffer (when (derived-mode-p 'exwm-mode) - (cl-case (exwm-input--current-input-mode) + (cl-case exwm--input-mode (line-mode (setq mode (exwm-input--on-ButtonPress-line-mode buffer button-event))) (char-mode @@ -427,7 +427,7 @@ ARGS are additional arguments to CALLBACK." (exwm--log "major-mode=%s buffer=%s" major-mode (buffer-name (current-buffer))) (if (derived-mode-p 'exwm-mode) - (cl-case (exwm-input--current-input-mode) + (cl-case exwm--input-mode (line-mode (exwm-input--on-KeyPress-line-mode obj data)) (char-mode @@ -688,17 +688,10 @@ The return value is used as event_mode to release the original button event." xcb:Allow:ReplayPointer) -(defun exwm-input--current-input-mode () - "Return current input mode. -The return value is one of the symbols \\='line-mode or \\=`char-mode. - -Current buffer must be an `exwm-mode' buffer." - exwm--input-mode) - (defun exwm-input--update-mode-line (id) "Update the propertized `mode-line-process' for window ID." (let (help-echo cmd mode) - (cl-case (exwm-input--current-input-mode) + (cl-case exwm--input-mode (line-mode (setq mode "line" help-echo "mouse-1: Switch to char-mode" @@ -784,7 +777,7 @@ Current buffer must be an `exwm-mode' buffer." (when id (exwm--log "id=#x%x" id) (with-current-buffer (exwm--id->buffer id) - (cl-case (exwm-input--current-input-mode) + (cl-case exwm--input-mode (line-mode (exwm-input-release-keyboard id)) (char-mode |