From ffc686d7f48d90ae4a3d1e4951fbac137877beec Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Fri, 11 Jan 2019 00:20:14 -0800
Subject: [PATCH] P4: Add remaining bindings

---
 evil-collection-p4.el | 73 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 4 deletions(-)

diff --git a/evil-collection-p4.el b/evil-collection-p4.el
index 98ffa99..0baf1f3 100644
--- a/evil-collection-p4.el
+++ b/evil-collection-p4.el
@@ -31,18 +31,36 @@
 (require 'evil-collection)
 
 (defvar p4-basic-mode-map)
+(defvar p4-basic-list-mode-map)
+(defvar p4-opened-list-mode-map)
+(defvar p4-status-list-mode-map)
+(defvar p4-filelog-mode-map)
+(defvar p4-diff-mode-map)
+(defvar p4-annotate-mode-map)
 
-(defconst evil-collection-p4-maps '(p4-basic-mode-map))
+(defconst evil-collection-p4-maps '(p4-basic-mode-map
+                                    p4-basic-list-mode-map
+                                    p4-opened-list-mode-map
+                                    p4-status-list-mode-map
+                                    p4-filelog-mode-map
+                                    p4-diff-mode-map
+                                    p4-annotate-mode-map))
 
 ;;;###autoload
 (defun evil-collection-p4-setup ()
   "Set up `evil' bindings for `p4'."
   (evil-set-initial-state 'p4-basic-mode 'normal)
+  (evil-set-initial-state 'p4-basic-list-mode 'normal)
+  (evil-set-initial-state 'p4-opened-list-mode-map 'normal)
+  (evil-set-initial-state 'p4-status-list-mode-map 'normal)
+  (evil-set-initial-state 'p4-filelog-mode-map 'normal)
+  (evil-set-initial-state 'p4-diff-mode-map 'normal)
+  (evil-set-initial-state 'p4-annotate-mode-map 'normal)
 
   (evil-collection-define-key 'normal 'p4-basic-mode-map
     [mouse-1] 'p4-buffer-mouse-clicked
-    "k" 'p4-scroll-down-1-line
-    "j" 'p4-scroll-up-1-line
+    "k" 'evil-previous-line
+    "j" 'evil-next-line
     (kbd "C-j") 'p4-forward-active-link
     (kbd "C-k") 'p4-backward-active-link
     (kbd "<return>") 'p4-buffer-commands
@@ -52,7 +70,54 @@
     "[" 'p4-scroll-up-1-window
     "gg" 'p4-top-of-buffer
     "G" 'p4-bottom-of-buffer
-    "=" 'delete-other-windows))
+    "=" 'delete-other-windows)
+
+  (evil-collection-define-key 'normal 'p4-basic-list-mode-map
+    (kbd "RET") 'p4-basic-list-activate)
+
+  (evil-collection-define-key 'normal 'p4-opened-list-mode-map
+    "R" 'p4-revert
+    "T" 'p4-opened-list-type
+    "C" 'p4-opened-list-change)
+
+  (evil-collection-define-key 'normal 'p4-status-list-mode-map
+    (kbd "RET") 'p4-status-list-activate)
+
+  (evil-collection-define-key 'normal 'p4-filelog-mode-map
+    "d" 'p4-diff2
+    "gf" 'p4-find-file-other-window
+    "S" 'p4-filelog-short-format
+    "L" 'p4-filelog-long-format
+    " " 'p4-scroll-up-1-window-other-w
+    "gg" 'p4-top-of-buffer-other-w
+    "G" 'p4-bottom-of-buffer-other-w
+    "=" 'p4-delete-other-windows
+    "]" 'p4-goto-next-change
+    "[" 'p4-goto-prev-change
+    (kbd "C-j") 'p4-goto-next-change
+    (kbd "C-k") 'p4-goto-prev-change)
+
+  (evil-collection-define-key 'normal 'p4-diff-mode-map
+    "]" 'diff-hunk-next
+    (kbd "C-j") 'diff-hunk-next
+    (kbd "M-j") 'diff-file-next
+    "[" 'diff-hunk-prev
+    (kbd "C-k") 'diff-hunk-prev
+    (kbd "M-k") 'diff-file-prev
+    "\t" 'diff-hunk-next
+    [backtab] 'diff-hunk-prev
+    "}" 'diff-file-next
+    "{" 'diff-file-prev
+    "\C-m" 'p4-buffer-commands
+    [mouse-2] 'p4-buffer-commands
+    "gb" 'p4-buffer-commands)
+
+  (evil-collection-define-key 'normal 'p4-annotate-mode-map
+    "]" 'p4-next-change-rev-line
+    "[" 'p4-prev-change-rev-line
+    (kbd "C-j") 'p4-next-change-rev-line
+    (kbd "C-k") 'p4-prev-change-rev-line
+    "L" 'p4-toggle-line-wrap))
 
 (provide 'evil-collection-p4)
 ;;; evil-collection-p4.el ends here