[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/exwm dba1ed9 1/3: Do away with `exwm-input--input-mode'

From: Adrián Medraño Calvo
Subject: [elpa] externals/exwm dba1ed9 1/3: Do away with `exwm-input--input-mode'
Date: Thu, 25 Oct 2018 10:40:40 -0400 (EDT)

branch: externals/exwm
commit dba1ed94c2e06b46da77a2aa80aa35e17b08fdd6
Author: Adrián Medraño Calvo <address@hidden>
Commit: Adrián Medraño Calvo <address@hidden>

    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.
 exwm-input.el  | 15 ++++-----------
 exwm-layout.el |  3 +--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/exwm-input.el b/exwm-input.el
index 6e8f6d8..78e74cd 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
                     (setq mode (exwm-input--on-ButtonPress-line-mode buffer 
@@ -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
            (exwm-input--on-KeyPress-line-mode obj data))
@@ -688,17 +688,10 @@ The return value is used as event_mode to release the 
 button event."
-(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
        (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
          (exwm-input-release-keyboard id))
diff --git a/exwm-layout.el b/exwm-layout.el
index 90988fa..fe394e2 100644
--- a/exwm-layout.el
+++ b/exwm-layout.el
@@ -45,7 +45,6 @@
 (defvar exwm-layout--timer nil "Timer used to track echo area changes.")
 (defvar exwm-workspace--current)
-(declare-function exwm-input--current-input-mode "exwm-input.el")
 (declare-function exwm-input--release-keyboard "exwm-input.el")
 (declare-function exwm-input--grab-keyboard "exwm-input.el")
 (declare-function exwm-input-grab-keyboard "exwm-input.el")
@@ -200,7 +199,7 @@
         (make-instance 'xcb:ewmh:set-_NET_WM_STATE :window exwm--id :data []))
     (xcb:flush exwm--connection)
     (set-window-dedicated-p (get-buffer-window) nil)
-    (when (eq 'line-mode (exwm-input--current-input-mode))
+    (when (eq 'line-mode exwm--input-mode)
       (exwm-input--grab-keyboard exwm--id))))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]