mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #775: quit on double Esc

This commit is contained in:
Arun Prakash Jana 2020-11-10 19:13:38 +05:30
parent 1418ecde0d
commit c674cb5934
No known key found for this signature in database
GPG Key ID: A75979F35C080412
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/nnn.c
View File

@ -774,6 +774,9 @@ static int (*nftw_fn)(const char *fpath, const struct stat *sb, int typeflag, st
static void move_cursor(int target, int ignore_scrolloff); static void move_cursor(int target, int ignore_scrolloff);
static char *load_input(int fd, const char *path); static char *load_input(int fd, const char *path);
static int set_sort_flags(int r); static int set_sort_flags(int r);
#ifndef NOFIFO
static void notify_fifo(bool force);
#endif
/* Functions */ /* Functions */
@ -2549,8 +2552,10 @@ static int nextsel(int presel)
#endif #endif
int c = presel; int c = presel;
uint i; uint i;
bool escaped = FALSE;
if (c == 0 || c == MSGWAIT) { if (c == 0 || c == MSGWAIT) {
try_quit:
c = getch(); c = getch();
//DPRINTF_D(c); //DPRINTF_D(c);
//DPRINTF_S(keyname(c)); //DPRINTF_S(keyname(c));
@ -2566,9 +2571,19 @@ static int nextsel(int presel)
ungetch(c); ungetch(c);
c = ';'; c = ';';
} }
} else settimeout();
c = ESC; } else if (escaped) {
settimeout(); settimeout();
c = CONTROL('Q');
} else {
#ifndef NOFIFO
/* Send hovered path to NNN_FIFO */
notify_fifo(TRUE);
#endif
escaped = TRUE;
settimeout();
goto try_quit;
}
} }
if (c == ERR && presel == MSGWAIT) if (c == ERR && presel == MSGWAIT)
@ -4582,7 +4597,7 @@ static void show_help(const char *path)
"a1-4 Context 1-4%-7c(Sh)Tab Cycle context\n" "a1-4 Context 1-4%-7c(Sh)Tab Cycle context\n"
"aEsc Send to FIFO%-11c^L Redraw\n" "aEsc Send to FIFO%-11c^L Redraw\n"
"c? Help, conf%-13c^G QuitCD\n" "c? Help, conf%-13c^G QuitCD\n"
"cq Quit context%-7c^Q (Q) Quit (with err)\n" "2^Q 2Esc (Q) Quit (with err)%-9cq Quit context\n"
"1FILTER & PROMPT\n" "1FILTER & PROMPT\n"
"c/ Filter%-12cAlt+Esc Clear filter & redraw\n" "c/ Filter%-12cAlt+Esc Clear filter & redraw\n"
"aEsc Exit prompt%-12c^L Clear prompt/last filter\n" "aEsc Exit prompt%-12c^L Clear prompt/last filter\n"
@ -4593,7 +4608,7 @@ static void show_help(const char *path)
"b^R Rename/dup%-14cr Batch rename\n" "b^R Rename/dup%-14cr Batch rename\n"
"cz Archive%-17ce Edit file\n" "cz Archive%-17ce Edit file\n"
"c* Toggle exe%-14c> Export list\n" "c* Toggle exe%-14c> Export list\n"
"5Space ^J (Un)select%-7cm ^Space Mark range/clear\n" "5Space ^J (Un)select%-7cm ^Space Mark range/clear sel\n"
"9p ^P Copy sel here%-11ca Select all\n" "9p ^P Copy sel here%-11ca Select all\n"
"9v ^V Move sel here%-8cw ^W Cp/mv sel as\n" "9v ^V Move sel here%-8cw ^W Cp/mv sel as\n"
"9x ^X Delete%-18cE Edit sel\n" "9x ^X Delete%-18cE Edit sel\n"
@ -7068,11 +7083,6 @@ nochange:
selbufpos = 0; selbufpos = 0;
} }
return sel == SEL_QUITFAIL ? EXIT_FAILURE : EXIT_SUCCESS; return sel == SEL_QUITFAIL ? EXIT_FAILURE : EXIT_SUCCESS;
#ifndef NOFIFO
case SEL_FIFO:
notify_fifo(TRUE);
goto nochange;
#endif
default: default:
if (xlines != LINES || xcols != COLS) if (xlines != LINES || xcols != COLS)
continue; continue;

7
src/nnn.h
View File

@ -112,9 +112,6 @@ enum action {
SEL_QUITCD, SEL_QUITCD,
SEL_QUIT, SEL_QUIT,
SEL_QUITFAIL, SEL_QUITFAIL,
#ifndef NOFIFO
SEL_FIFO,
#endif
#ifndef NOMOUSE #ifndef NOMOUSE
SEL_CLICK, SEL_CLICK,
#endif #endif
@ -274,10 +271,6 @@ static struct key bindings[] = {
{ CONTROL('Q'), SEL_QUIT }, { CONTROL('Q'), SEL_QUIT },
/* Quit with an error code */ /* Quit with an error code */
{ 'Q', SEL_QUITFAIL }, { 'Q', SEL_QUITFAIL },
#ifndef NOFIFO
/* Send hovered path to NNN_FIFO */
{ ESC, SEL_FIFO },
#endif
#ifndef NOMOUSE #ifndef NOMOUSE
{ KEY_MOUSE, SEL_CLICK }, { KEY_MOUSE, SEL_CLICK },
#endif #endif