[update] <components>:finsh/shell.c

添加以下功能
1 ctrl+back 按单词删除
2 ctrl+左右箭头 按单词切换光标

Signed-off-by: Yucai Liu <[email protected]>

Author: illustriousness

components/finsh/shell.c

@@ -457,6 +457,35 @@ static void shell_push_history(struct finsh_shell *shell)
 }
 #endif
 
+static int find_prev_word_start(const char *line, int curpos)
+{
+    if (curpos <= 0) return 0;
+
+    // Skip whitespace
+    while (--curpos > 0 && (line[curpos] == ' ' || line[curpos] == '\t'));
+
+    // Find word start
+    while (curpos > 0 && !(line[curpos] == ' ' || line[curpos] == '\t'))
+        curpos--;
+
+    return (curpos <= 0) ? 0 : curpos + 1;
+}
+
+static int find_next_word_end(const char *line, int curpos, int max)
+{
+    if (curpos >= max) return max;
+
+    // Skip to next word
+    while (curpos < max && (line[curpos] == ' ' || line[curpos] == '\t'))
+        curpos++;
+
+    // Find word end
+    while (curpos < max && !(line[curpos] == ' ' || line[curpos] == '\t'))
+        curpos++;
+
+    return curpos;
+}
+
 #ifdef RT_USING_HOOK
 static void (*_finsh_thread_entry_hook)(void);
 
@@ -546,8 +575,35 @@ static void finsh_thread_entry(void *parameter)
         else if (shell->stat == WAIT_FUNC_KEY)
         {
             shell->stat = WAIT_NORMAL;
-
-            if (ch == 0x41) /* up key */
+            /* Add Ctrl+Left/Right handling */
+            if (ch == '1')
+            {
+                /* Read modifier sequence [1;5D/C] */
+                int next_ch = finsh_getchar();
+                if (next_ch == ';')
+                {
+                    next_ch = finsh_getchar();
+                    if (next_ch == '5')
+                    {
+                        next_ch = finsh_getchar();
+                        if (next_ch == 'D')
+                        { /* Ctrl+Left */
+                            int new_pos = find_prev_word_start(shell->line, shell->line_curpos);
+                            rt_kprintf("\033[%dD", shell->line_curpos - new_pos);
+                            shell->line_curpos = new_pos;
+                            continue;
+                        }
+                        else if (next_ch == 'C')
+                        { /* Ctrl+Right */
+                            int new_pos = find_next_word_end(shell->line, shell->line_curpos, shell->line_position);
+                            rt_kprintf("\033[%dC", new_pos - shell->line_curpos);
+                            shell->line_curpos = new_pos;
+                            continue;
+                        }
+                    }
+                }
+            }
+            else if (ch == 0x41) /* up key */
             {
 #ifdef FINSH_USING_HISTORY
                 /* prev history */
@@ -661,7 +717,38 @@ static void finsh_thread_entry(void *parameter)
 
             continue;
         }
+        /* Add Ctrl+Backspace handling */
+        else if (ch == 0x17) /* Ctrl+Backspace (typically ^W) */
+        {
+            if (shell->line_curpos == 0) continue;
+
+            int start = find_prev_word_start(shell->line, shell->line_curpos);
+            int del_count = shell->line_curpos - start;
+            int new_len = shell->line_position - del_count;
+
+            /* Delete characters with proper RT_null termination */
+            rt_memmove(&shell->line[start],
+                       &shell->line[start + del_count],
+                       new_len - start + 1); // +1 包含 RT_null 终止符
+
+            /* Clear residual data */
+            rt_memset(&shell->line[new_len], 0, shell->line_position - new_len);
 
+            /* Update positions */
+            shell->line_position = new_len;
+            shell->line_curpos = start;
+
+            /* Full redraw for affected area */
+            rt_kprintf("\033[%dD", del_count);                                     // 左移删除长度
+            rt_kprintf("%.*s", shell->line_position - start, &shell->line[start]); // 重写剩余内容
+            rt_kprintf("\033[K");                                                  // 清除行尾残留
+            if (shell->line_position > start)
+            {
+                rt_kprintf("\033[%dD", shell->line_position - start); // 复位光标
+            }
+
+            continue;
+        }
         /* handle end of line, break */
         if (ch == '\r' || ch == '\n')
         {