Merge pull request #15 from zevorn/feat/tui-keymap-header-vim-jumps

Improve interaction logic, panne switch, add keymap

Author: ChenMiaoi

README-zh.md

@@ -198,13 +198,16 @@ criew tui
 #### 键位
 
 - `:` 打开命令栏
+- 顶部状态栏会显示当前 keymap 方案：`default`、`vim` 或 `custom`
+- 数字前缀可重复垂直移动：`default/custom` 使用 `数字 + i/k`，`vim` 使用 `数字 + j/k`
 - `y` / `n` 启用或禁用当前订阅
-- `Enter` 打开当前 mailbox 或 thread
+- `Enter` 打开当前 mailbox 或 thread，并自动切到 threads 或 preview pane
 - `a` apply 当前 patch series
 - `d` 导出当前 patch series
 - `u` 撤销本次会话中最近一次成功 apply
 - `r` 或 `e` 打开回信面板
 - `Tab` 在 Mail 页面和 Code Browser 页面之间切换
+- 当 `ui.keymap = "vim"` 时，`gg` 跳到当前 pane 行首，`G` 跳到行尾，`qq` 快速退出
 
 #### 命令栏命令
 

README.md

@@ -211,13 +211,16 @@ criew tui
 Inside the TUI:
 
 - `:` opens the command palette
+- the header shows the active keymap scheme (`default`, `vim`, or `custom`)
+- a numeric prefix repeats vertical movement: `count+i/k` for `default`/`custom`, `count+j/k` for `vim`
 - `y` / `n` enable or disable the selected subscription
-- `Enter` opens the selected mailbox or thread
+- `Enter` opens the selected mailbox or thread and moves focus to threads or preview
 - `a` applies the current patch series
 - `d` exports the current patch series
 - `u` undoes the most recent successful apply from the current session
 - `r` or `e` opens the reply panel
 - `Tab` switches between the mail page and the code browser
+- with `ui.keymap = "vim"`, `gg` jumps to the first line in the active pane, `G` jumps to the last line, and `qq` exits quickly
 
 ##### Background sync
 

docs/reference/config.example.toml

@@ -56,7 +56,10 @@ filter = "info"
 # startup_sync = true
 
 # Optional. Main-page navigation scheme.
-# Supported: "default" (j/l focus, i/k move), "vim" (h/l focus, j/k move).
+# Supported:
+#   "default" (j/l focus, i/k move)
+#   "vim" (h/l focus, j/k move, gg/G jump, qq quit)
+#   "custom" (header shows custom; navigation currently falls back to default bindings)
 # Default: "default"
 # keymap = "default"
 

src/infra/config.rs

@@ -31,7 +31,7 @@ mailbox = "linux-kernel"
 
 [ui]
 startup_sync = true
-# keymap = "default" # Supported: default, vim
+# keymap = "default" # Supported: default, vim, custom
 # inbox_auto_sync_interval_secs = 30
 
 [logging]
@@ -63,13 +63,15 @@ pub enum UiKeymap {
     #[default]
     Default,
     Vim,
+    Custom,
 }
 
 impl UiKeymap {
     pub fn as_str(self) -> &'static str {
         match self {
             Self::Default => "default",
             Self::Vim => "vim",
+            Self::Custom => "custom",
         }
     }
 }
@@ -735,6 +737,27 @@ trees = ["./linux-next"]
         let _ = fs::remove_dir_all(home);
     }
 
+    #[test]
+    fn loads_custom_ui_keymap_from_config() {
+        let base = temp_dir("config-custom-keymap");
+        let config_path = base.join("config.toml");
+
+        fs::write(
+            &config_path,
+            r#"
+[ui]
+keymap = "custom"
+"#,
+        )
+        .expect("write config");
+
+        let loaded = load(Some(&config_path)).expect("load config");
+
+        assert_eq!(loaded.ui_keymap, UiKeymap::Custom);
+
+        let _ = fs::remove_dir_all(base);
+    }
+
     #[test]
     fn falls_back_to_config_alias_filename_when_present() {
         let home = temp_dir("config-legacy-home");