From 9d373bda9d22221968635d5750020f8e248d1209 Mon Sep 17 00:00:00 2001 From: lee Date: Thu, 6 Aug 2020 15:30:29 +0800 Subject: [PATCH 1/2] Disable evil keybindings when evil enabled in eaf buffer. --- eaf-evil.el | 72 ++++++++++++----------------------------------------- 1 file changed, 16 insertions(+), 56 deletions(-) diff --git a/eaf-evil.el b/eaf-evil.el index 8f044f6..ddcc154 100644 --- a/eaf-evil.el +++ b/eaf-evil.el @@ -37,67 +37,27 @@ ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth ;; Floor, Boston, MA 02110-1301, USA. -(defvar eaf-printable-character - (mapcar #'char-to-string (number-sequence ?! ?~)) - "printable character") +(defcustom eaf-evil-leader-key "C-SPC" + "Leader key trigger" ) -;; EAF evil Key Configuration -(defun eaf-evil-lookup-key (key) - (or (lookup-key eaf-mode-map (kbd key)) - (lookup-key (current-local-map) (kbd key)) - ;; sequence key - (when (or (string-prefix-p "C-" key) - (string-prefix-p "M-" key)) - (lookup-key (current-global-map) (kbd key))) - 'eaf-send-key)) - - -(defun eaf-generate-normal-state-key-func (key) - (lambda () (interactive) - (call-interactively (eaf-evil-lookup-key key)))) - -(defun eaf-evil-define-single-keys () - (dolist (key (append eaf-printable-character - '("" "RET" "DEL" "TAB" "SPC" "" "" "" "" "" "" "" "" "" "" "" ""))) - (evil-define-key* '(normal insert) eaf-mode-map* (kbd key) - (eaf-generate-normal-state-key-func key)))) - -(defun eaf-evil-define-ctrl-keys () - (dolist (key (seq-difference eaf-printable-character - (mapcar #'char-to-string "wWxXcChH[1234567890"))) - (evil-define-key* '(normal insert) eaf-mode-map* (kbd (format "C-%s" key)) - (eaf-generate-normal-state-key-func (format "C-%s" key))))) - - -(defun eaf-evil-define-meta-keys () - (dolist (key (seq-difference eaf-printable-character - (mapcar #'char-to-string "xX::1234567890"))) - (evil-define-key* '(normal insert) eaf-mode-map* (kbd (format "M-%s" key)) - (eaf-generate-normal-state-key-func (format "M-%s" key))))) - -(defun eaf-browser-focus-p () - (eq (eaf-call "call_function" eaf--buffer-id "is_focus") t)) - -(defun eaf-browser-focus-handler () - (if (eaf-browser-focus-p) - (unless (evil-insert-state-p) (evil-insert-state)) - (when (evil-insert-state-p) (evil-normal-state)))) +(defcustom eaf-evil-leader-keymap #'doom/leader + "Leader key bind" + :type 'keymap) (defun eaf-enable-evil-intergration () "EAF evil intergration." (interactive) - (when (featurep 'evil) - (eaf-evil-define-single-keys) - (eaf-evil-define-ctrl-keys) - (eaf-evil-define-meta-keys) - (add-to-list 'evil-insert-state-modes 'eaf-edit-mode) - (eaf-bind-key clear_focus "" eaf-browser-keybinding) - (add-hook 'eaf-browser-hook (lambda () (add-hook 'post-command-hook #'eaf-browser-focus-handler nil t))) - ;; TODO: add 'eaf-terminal-hook - ;; (add-hook 'eaf-mode-hook (lambda () () - ;; (when (string= "terminal" eaf--buffer-app-name) - ;; (evil-emacs-state)))) - )) + + (add-hook 'evil-normal-state-entry-hook + (lambda () + (define-key eaf-mode-map (kbd eaf-evil-leader-key) eaf-evil-leader-keymap) + (when (derived-mode-p 'eaf-mode) + (setq emulation-mode-map-alists + (delq 'evil-mode-map-alist emulation-mode-map-alists))))) + + (add-to-list 'evil-insert-state-modes 'eaf-edit-mode) + + (eaf-bind-key clear_focus "" eaf-browser-keybinding)) (with-eval-after-load "evil" (eaf-enable-evil-intergration)) From e1b31d4956e7581cee752279f6478b15f941d69b Mon Sep 17 00:00:00 2001 From: lee Date: Thu, 6 Aug 2020 22:26:29 +0800 Subject: [PATCH 2/2] Exit caret mode when you type key. --- eaf-evil.el | 2 +- eaf.el | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eaf-evil.el b/eaf-evil.el index ddcc154..048f243 100644 --- a/eaf-evil.el +++ b/eaf-evil.el @@ -50,8 +50,8 @@ (add-hook 'evil-normal-state-entry-hook (lambda () - (define-key eaf-mode-map (kbd eaf-evil-leader-key) eaf-evil-leader-keymap) (when (derived-mode-p 'eaf-mode) + (define-key eaf-mode-map (kbd eaf-evil-leader-key) eaf-evil-leader-keymap) (setq emulation-mode-map-alists (delq 'evil-mode-map-alist emulation-mode-map-alists))))) diff --git a/eaf.el b/eaf.el index 83944f3..fc4621a 100644 --- a/eaf.el +++ b/eaf.el @@ -319,7 +319,9 @@ Try not to modify this alist directly. Use `eaf-setq' to modify instead." ("C-y" . "caret_translate_text") ("C-q" . "caret_exit") ("c" . "insert_or_caret_at_line") - ("M-c" . "caret_toggle_browsing")) + ("M-c" . "caret_toggle_browsing") + ("" . "caret_exit") + ) "The keybinding of EAF Browser Caret Mode." :type 'cons)