!386 chore: shell体验优化

Merge pull request !386 from huangshan/chore

components/shell/src/base/shmsg.c

@@ -42,6 +42,8 @@
 EVENT_CB_S g_shellInputEvent;
 #define SHELL_CMD_MAX_SIZE 64
 
+#define VISIABLE_CHAR(ch) ((ch) > 0x1F && (ch) < 0x7F)
+
 UINT32 ShellMsgTypeGet(CmdParsed *cmdParsed, const CHAR *cmdType)
 {
     CmdItemNode *curCmdItem = (CmdItemNode *)NULL;
@@ -232,9 +234,17 @@ VOID ShellTaskEntry(VOID)
     CHAR buf[SHELL_CMD_MAX_SIZE] = {0};
     CHAR *ptr = buf;
     PRINTK("OHOS # ");
-    while(1) {
+    while (1) {
         (VOID)LOS_EventRead(&g_shellInputEvent, 0x1, LOS_WAITMODE_AND | LOS_WAITMODE_CLR, LOS_WAIT_FOREVER);
-        while((*ptr = (UINT8)UartGetc()) != 0 && *ptr != 13) {
+        while ((*ptr = (UINT8)UartGetc()) != 0 && *ptr != 13) {
+            if (*ptr == '\x03') { /* ctrl + c */
+                PRINTK("^C\n\rOHOS # ", *ptr);
+                ptr = buf;
+                break;
+            }
+            if (!VISIABLE_CHAR(*ptr)) {
+                break;
+            }
             PRINTK("%c", *ptr);
             if ((ptr - buf) == (sizeof(buf) - 1)) {
                 break;
@@ -243,14 +253,13 @@ VOID ShellTaskEntry(VOID)
         }
         if (ptr != buf) {
             if (*ptr == 13 || ((ptr - buf) == (sizeof(buf) - 1))) {
-                PRINTK("%c", *ptr);
                 *ptr = '\0';
                 ptr = buf;
-                PRINTK("\n\r", buf);
+                PRINTK("\n\r");
                 ExecCmdline(buf);
                 PRINTK("OHOS # ");
             }
-        } else {
+        } else if (*ptr == 13) {
             PRINTK("\n\rOHOS # ");
         }
     }

components/shell/src/cmds/shell_shellcmd.c

@@ -31,6 +31,10 @@
 
 #include "shcmd.h"
 
+#define DEFAULT_SCREEN_WIDTH 80
+#define MAX_CMD_KEY_WIDTH    8
+#define CMD_ITEM_PER_LINE    (DEFAULT_SCREEN_WIDTH / (MAX_CMD_KEY_WIDTH + 1))
+
 INT32 OsShellCmdHelp(INT32 argc, const CHAR **argv)
 {
     UINT32 loop = 0;
@@ -45,10 +49,10 @@ INT32 OsShellCmdHelp(INT32 argc, const CHAR **argv)
 
     PRINTK("*******************shell commands:*************************\n");
     LOS_DL_LIST_FOR_EACH_ENTRY(curCmdItem, &(cmdInfo->cmdList.list), CmdItemNode, list) {
-        if ((loop & (8 - 1)) == 0) { /* 8 - 1:just align print */
+        if ((loop % CMD_ITEM_PER_LINE) == 0) { /* just align print */
             PRINTK("\n");
         }
-        PRINTK("%-12s  ", curCmdItem->cmd->cmdKey);
+        PRINTK("%-8s ", curCmdItem->cmd->cmdKey);
 
         loop++;
     }