From 32cf0de2a6004d8ac3af7a01d7fa15b82ce11af2 Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Sat, 26 Oct 2019 16:29:54 -0700 Subject: [PATCH 1/3] Add Ctrl-f and Ctrl-b emacs style keybindings for left and right motion --- src/handlers/common_key_events.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/handlers/common_key_events.rs b/src/handlers/common_key_events.rs index 9849ee37..ea13b10c 100644 --- a/src/handlers/common_key_events.rs +++ b/src/handlers/common_key_events.rs @@ -17,14 +17,14 @@ pub fn up_event(key: Key) -> bool { pub fn left_event(key: Key) -> bool { match key { - Key::Left | Key::Char('h') => true, + Key::Left | Key::Char('h') | Key::Ctrl('b') => true, _ => false, } } pub fn right_event(key: Key) -> bool { match key { - Key::Right | Key::Char('l') => true, + Key::Right | Key::Char('l') | Key::Ctrl('f') => true, _ => false, } } From a47ed7a208bad30d4e186c6de26f08823b45e173 Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Mon, 28 Oct 2019 03:42:59 -0700 Subject: [PATCH 2/3] Document emacs-like ui movement keybindings in help ui --- src/ui/help.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ui/help.rs b/src/ui/help.rs index 19d7181c..d483c576 100644 --- a/src/ui/help.rs +++ b/src/ui/help.rs @@ -14,10 +14,10 @@ pub fn get_help_docs() -> Vec> { vec!["Seek forwards 5 seconds", ">", "General"], vec!["Toggle shuffle", "", "General"], vec!["Cycle repeat mode", "", "General"], - vec!["Move selection left", "h | ", "General"], - vec!["Move selection down", "j | ", "General"], - vec!["Move selection up", "k | ", "General"], - vec!["Move selection right", "l | ", "General"], + vec!["Move selection left", "h | | ", "General"], + vec!["Move selection down", "j | | ", "General"], + vec!["Move selection up", "k | | ", "General"], + vec!["Move selection right", "l | | ", "General"], vec!["Enter input for search", "/", "General"], vec!["Pause/Resume playback", "", "General"], vec!["Enter active mode", "", "General"], From 10251db724bc007fc9f04f0d02a3936cace2c79f Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Mon, 28 Oct 2019 16:42:23 -0700 Subject: [PATCH 3/3] Correct formatting for new help docs --- src/ui/help.rs | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/ui/help.rs b/src/ui/help.rs index d483c576..78bb7629 100644 --- a/src/ui/help.rs +++ b/src/ui/help.rs @@ -14,10 +14,26 @@ pub fn get_help_docs() -> Vec> { vec!["Seek forwards 5 seconds", ">", "General"], vec!["Toggle shuffle", "", "General"], vec!["Cycle repeat mode", "", "General"], - vec!["Move selection left", "h | | ", "General"], - vec!["Move selection down", "j | | ", "General"], - vec!["Move selection up", "k | | ", "General"], - vec!["Move selection right", "l | | ", "General"], + vec![ + "Move selection left", + "h | | ", + "General", + ], + vec![ + "Move selection down", + "j | | ", + "General", + ], + vec![ + "Move selection up", + "k | | ", + "General", + ], + vec![ + "Move selection right", + "l | | ", + "General", + ], vec!["Enter input for search", "/", "General"], vec!["Pause/Resume playback", "", "General"], vec!["Enter active mode", "", "General"],