mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #998: remove ^Space keybind

Browse source 
netbsd-curses sends a NULL (key value 0) following the KEY_RESIZE.
The keybind ^Space also issues a 0. It seems even the key ^@ sends
the same. Dropping this ambiguous keybind in favour of alternative
key m (more appropriate for 'm'ark anyway). Keys with value 0 will
now be ignored in the filter function.
This commit is contained in:
Arun Prakash Jana 2021-05-12 10:07:29 +05:30
parent 1f95c355a9
commit 907616a058
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nnn.c
View file

@ -2935,6 +2935,7 @@ static int filterentries(char *path, char *lastname)
switch (*ch) { switch (*ch) {
#ifdef KEY_RESIZE #ifdef KEY_RESIZE
case 0: // fallthrough
case KEY_RESIZE: case KEY_RESIZE:
clearoldprompt(); clearoldprompt();
redraw(path); redraw(path);
@ -3002,11 +3003,8 @@ static int filterentries(char *path, char *lastname)
break; break;
/* Handle all control chars in main loop */ /* Handle all control chars in main loop */
if (*ch < ASCII_MAX && keyname(*ch)[0] == '^' && *ch != '^') { if (*ch < ASCII_MAX && keyname(*ch)[0] == '^' && *ch != '^')
if (keyname(*ch)[1] == '@')
*ch = 'm';
goto end; goto end;
}
if (len == 1) { if (len == 1) {
if (*ch == '?') /* Help and config key, '?' is an invalid regex */ if (*ch == '?') /* Help and config key, '?' is an invalid regex */
@ -4590,7 +4588,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 sel\n" "5Space ^J (Un)select%-12cm-m Mark range/clear sel\n"
"ca Select all%-14cA Invert sel\n" "ca Select all%-14cA Invert sel\n"
"9p ^P Copy sel here%-8cw ^W Cp/mv sel as\n" "9p ^P Copy sel here%-8cw ^W Cp/mv sel as\n"
"9v ^V Move sel here%-11cE Edit sel\n" "9v ^V Move sel here%-11cE Edit sel\n"

1
src/nnn.h
View file

@ -213,7 +213,6 @@ static struct key bindings[] = {
{ ' ', SEL_SEL }, { ' ', SEL_SEL },
/* Toggle select multiple files */ /* Toggle select multiple files */
{ 'm', SEL_SELMUL }, { 'm', SEL_SELMUL },
{ CONTROL(' '), SEL_SELMUL },
/* Select all files in current dir */ /* Select all files in current dir */
{ 'a', SEL_SELALL }, { 'a', SEL_SELALL },
/* Invert selection in current dir */ /* Invert selection in current dir */