From: antirez Date: Wed, 1 Dec 2010 10:18:59 +0000 (+0100) Subject: added support for ctrl-l and clear command into redis-cli. To clear the screen is... X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/bbac56c2f823a6ab2170e1b00b93a620188b76da added support for ctrl-l and clear command into redis-cli. To clear the screen is a good idea from time to time :). Also linenoise updated to the current version to support this new feature. --- diff --git a/deps/linenoise/linenoise.c b/deps/linenoise/linenoise.c index b6f4d4f9..dd434136 100644 --- a/deps/linenoise/linenoise.c +++ b/deps/linenoise/linenoise.c @@ -9,6 +9,8 @@ * the 2010 UNIX computers around. * * Copyright (c) 2010, Salvatore Sanfilippo + * Copyright (c) 2010, Pieter Noordhuis + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -66,6 +68,17 @@ * CUF (CUrsor Forward) * Sequence: ESC [ n C * Effect: moves cursor forward of n chars + * + * The following are used to clear the screen: ESC [ H ESC [ 2 J + * This is actually composed of two sequences: + * + * cursorhome + * Sequence: ESC [ H + * Effect: moves the cursor to upper left corner + * + * ED2 (Clear entire screen) + * Sequence: ESC [ 2 J + * Effect: clear the whole screen * */ @@ -265,6 +278,10 @@ static int completeLine(int fd, const char *prompt, char *buf, size_t buflen, si return c; /* Return last read character */ } +void linenoiseClearScreen(void) { + write(STDIN_FILENO,"\x1b[H\x1b[2J",7); +} + static int linenoisePrompt(int fd, char *buf, size_t buflen, const char *prompt) { size_t plen = strlen(prompt); size_t pos = 0; @@ -432,6 +449,9 @@ up_down_arrow: pos = len; refreshLine(fd,prompt,buf,len,pos,cols); break; + case 12: /* ctrl+l, clear screen */ + linenoiseClearScreen(); + refreshLine(fd,prompt,buf,len,pos,cols); } } return len; diff --git a/deps/linenoise/linenoise.h b/deps/linenoise/linenoise.h index c44bc3ad..76a703c2 100644 --- a/deps/linenoise/linenoise.h +++ b/deps/linenoise/linenoise.h @@ -4,6 +4,8 @@ * See linenoise.c for more information. * * Copyright (c) 2010, Salvatore Sanfilippo + * Copyright (c) 2010, Pieter Noordhuis + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -48,5 +50,6 @@ int linenoiseHistoryAdd(const char *line); int linenoiseHistorySetMaxLen(int len); int linenoiseHistorySave(char *filename); int linenoiseHistoryLoad(char *filename); +void linenoiseClearScreen(void); #endif /* __LINENOISE_H */ diff --git a/src/redis-cli.c b/src/redis-cli.c index a3987472..2aedcc4a 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -561,6 +561,8 @@ static void repl() { config.hostip = sdsnew(argv[1]); config.hostport = atoi(argv[2]); cliConnect(1); + } else if (argc == 1 && !strcasecmp(argv[0],"clear")) { + linenoiseClearScreen(); } else { long long start_time = mstime(), elapsed;