xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #7029 from taosdata/fix/TD-5533 

[TD-5533]<feature>:add 'ctrl+u' and 'ctrl+k' shortcut for taosshell
This commit is contained in:
Haojun Liao 2021-07-27 18:02:34 +08:00 committed by GitHub
parent c866582971 753135de69
commit 96cd039f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kit/shell/inc/shellCommand.h
View File

@ -35,6 +35,8 @@ struct Command {
}; };
extern void backspaceChar(Command *cmd); extern void backspaceChar(Command *cmd);
extern void clearLineBefore(Command *cmd);
extern void clearLineAfter(Command *cmd);
extern void deleteChar(Command *cmd); extern void deleteChar(Command *cmd);
extern void moveCursorLeft(Command *cmd); extern void moveCursorLeft(Command *cmd);
extern void moveCursorRight(Command *cmd); extern void moveCursorRight(Command *cmd);

22
src/kit/shell/src/shellCommand.c
View File

@ -102,6 +102,28 @@ void backspaceChar(Command *cmd) {
} }
} }
void clearLineBefore(Command *cmd) {
assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
memmove(cmd->command, cmd->command + cmd->cursorOffset,
cmd->commandSize - cmd->cursorOffset);
cmd->commandSize -= cmd->cursorOffset;
cmd->cursorOffset = 0;
cmd->screenOffset = 0;
cmd->endOffset = cmd->commandSize;
showOnScreen(cmd);
}
void clearLineAfter(Command *cmd) {
assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);
clearScreen(cmd->endOffset + prompt_size, cmd->screenOffset + prompt_size);
cmd->commandSize -= cmd->endOffset - cmd->cursorOffset;
cmd->endOffset = cmd->cursorOffset;
showOnScreen(cmd);
}
void deleteChar(Command *cmd) { void deleteChar(Command *cmd) {
assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset); assert(cmd->cursorOffset <= cmd->commandSize && cmd->endOffset >= cmd->screenOffset);

6
src/kit/shell/src/shellDarwin.c
View File

@ -238,10 +238,16 @@ int32_t shellReadCommand(TAOS *con, char *command) {
updateBuffer(&cmd); updateBuffer(&cmd);
} }
break; break;
case 11: // Ctrl + K;
clearLineAfter(&cmd);
break;
case 12: // Ctrl + L; case 12: // Ctrl + L;
system("clear"); system("clear");
showOnScreen(&cmd); showOnScreen(&cmd);
break; break;
case 21: // Ctrl + U
clearLineBefore(&cmd);
break;
} }
} else if (c == '\033') { } else if (c == '\033') {
c = getchar(); c = getchar();

6
src/kit/shell/src/shellLinux.c
View File

@ -238,10 +238,16 @@ int32_t shellReadCommand(TAOS *con, char *command) {
updateBuffer(&cmd); updateBuffer(&cmd);
} }
break; break;
case 11: // Ctrl + K;
clearLineAfter(&cmd);
break;
case 12: // Ctrl + L; case 12: // Ctrl + L;
system("clear"); system("clear");
showOnScreen(&cmd); showOnScreen(&cmd);
break; break;
case 21: // Ctrl + U;
clearLineBefore(&cmd);
break;
} }
} else if (c == '\033') { } else if (c == '\033') {
c = (char)getchar(); c = (char)getchar();