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

Reduce indentation level

Browse source
This commit is contained in:
Arun Prakash Jana 2018-07-12 19:58:53 +05:30
parent 9995facfb9
commit c19706006d
No known key found for this signature in database
GPG key ID: A75979F35C080412
2 changed files with 79 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -51,7 +51,7 @@ Have fun with it! Missing a feature? Want to contribute? Head to the rolling [To
- [Keyboard shortcuts](#keyboard-shortcuts) - [Keyboard shortcuts](#keyboard-shortcuts)
- [Filters](#filters) - [Filters](#filters)
- [Navigate-as-you-type mode](#navigate-as-you-type-mode) - [Navigate-as-you-type mode](#navigate-as-you-type-mode)
- [File type abbreviations](#file-type-abbreviations) - [File indicators](#file-indicators)
- [File handling](#file-handling) - [File handling](#file-handling)
- [Help](#help) - [Help](#help)
- [Quickstart](#quickstart) - [Quickstart](#quickstart)
@ -276,11 +276,11 @@ If `nnn` is invoked as root or the environment variable `NNN_SHOW_HIDDEN` is set
In this mode directories are opened in filter mode, allowing continuous navigation. Works best with the **arrow keys**. In this mode directories are opened in filter mode, allowing continuous navigation. Works best with the **arrow keys**.
#### File type abbreviations #### File indicators
The following abbreviations are used in the detail view: The following indicators are used in the detail view:
| Symbol | File Type | | Indicator | File Type |
| --- | --- | | --- | --- |
| `/` | Directory | | `/` | Directory |
| `*` | Executable | | `*` | Executable |

140
nnn.c
View file

@ -1210,7 +1210,8 @@ xreadline(char *fname, char *prompt)
mvaddnwstr(y, x, buf, len + 1); mvaddnwstr(y, x, buf, len + 1);
move(y, x + wcswidth(buf, pos)); move(y, x + wcswidth(buf, pos));
if ((r = get_wch(ch)) != ERR) { r = get_wch(ch);
if (r != ERR) {
if (r == OK) { if (r == OK) {
switch (*ch) { switch (*ch) {
case KEY_ENTER: //fallthrough case KEY_ENTER: //fallthrough
@ -2982,82 +2983,91 @@ nochange:
copycurname(); copycurname();
goto begin; goto begin;
case SEL_COPY: case SEL_COPY:
if (!(cfg.noxdisplay || copier)) if (!(cfg.noxdisplay || copier)) {
printmsg(messages[STR_COPY_ID]); printmsg(messages[STR_COPY_ID]);
else if (ndents) { goto nochange;
if (cfg.copymode) { }
r = mkpath(path, dents[cur].name, newpath, PATH_MAX);
if (!appendfpath(newpath, r))
goto nochange;
++ncp;
printmsg(newpath);
} else if (cfg.quote) {
g_buf[0] = '\'';
r = mkpath(path, dents[cur].name, g_buf + 1, PATH_MAX);
g_buf[r] = '\'';
g_buf[r + 1] = '\0';
if (cfg.noxdisplay) if (!ndents)
writecp(g_buf, r + 1); /* Truncate NULL from end */ goto nochange;
else
spawn(copier, g_buf, NULL, NULL, F_NOTRACE);
g_buf[r] = '\0'; if (cfg.copymode) {
printmsg(g_buf + 1); r = mkpath(path, dents[cur].name, newpath, PATH_MAX);
} else { if (!appendfpath(newpath, r))
r = mkpath(path, dents[cur].name, newpath, PATH_MAX); goto nochange;
if (cfg.noxdisplay) ++ncp;
writecp(newpath, r - 1); /* Truncate NULL from end */ printmsg(newpath);
else } else if (cfg.quote) {
spawn(copier, newpath, NULL, NULL, F_NOTRACE); g_buf[0] = '\'';
printmsg(newpath); r = mkpath(path, dents[cur].name, g_buf + 1, PATH_MAX);
} g_buf[r] = '\'';
g_buf[r + 1] = '\0';
if (cfg.noxdisplay)
writecp(g_buf, r + 1); /* Truncate NULL from end */
else
spawn(copier, g_buf, NULL, NULL, F_NOTRACE);
g_buf[r] = '\0';
printmsg(g_buf + 1);
} else {
r = mkpath(path, dents[cur].name, newpath, PATH_MAX);
if (cfg.noxdisplay)
writecp(newpath, r - 1); /* Truncate NULL from end */
else
spawn(copier, newpath, NULL, NULL, F_NOTRACE);
printmsg(newpath);
} }
goto nochange; goto nochange;
case SEL_COPYMUL: case SEL_COPYMUL:
if (!(cfg.noxdisplay || copier)) if (!(cfg.noxdisplay || copier)) {
printmsg(messages[STR_COPY_ID]); printmsg(messages[STR_COPY_ID]);
else if (ndents) { goto nochange;
cfg.copymode ^= 1; }
if (cfg.copymode) {
g_crc = crc8fast((uchar *)dents, ndents * sizeof(struct entry)); if (!ndents)
goto nochange;
cfg.copymode ^= 1;
if (cfg.copymode) {
g_crc = crc8fast((uchar *)dents, ndents * sizeof(struct entry));
copystartid = cur;
copybufpos = 0;
ncp = 0;
printmsg("multi-copy on");
DPRINTF_S("copymode on");
goto nochange;
}
if (!ncp) { /* Handle range selection */
if (cur < copystartid) {
copyendid = copystartid;
copystartid = cur; copystartid = cur;
copybufpos = 0; } else
ncp = 0; copyendid = cur;
printmsg("multi-copy on");
DPRINTF_S("copymode on");
} else {
if (!ncp) { /* Handle range selection */
if (cur < copystartid) {
copyendid = copystartid;
copystartid = cur;
} else
copyendid = cur;
if (copystartid < copyendid) { if (copystartid < copyendid) {
for (r = copystartid; r <= copyendid; ++r) for (r = copystartid; r <= copyendid; ++r)
if (!appendfpath(newpath, mkpath(path, dents[r].name, newpath, PATH_MAX))) if (!appendfpath(newpath, mkpath(path, dents[r].name, newpath, PATH_MAX)))
goto nochange; goto nochange;
snprintf(newpath, PATH_MAX, "%d files copied", copyendid - copystartid + 1); snprintf(newpath, PATH_MAX, "%d files copied", copyendid - copystartid + 1);
printmsg(newpath); printmsg(newpath);
}
}
if (copybufpos) { /* File path(s) written to the buffer */
if (cfg.noxdisplay)
writecp(pcopybuf, copybufpos - 1); /* Truncate NULL from end */
else
spawn(copier, pcopybuf, NULL, NULL, F_NOTRACE);
if (ncp) { /* Some files cherry picked */
snprintf(newpath, PATH_MAX, "%d files copied", ncp);
printmsg(newpath);
}
} else
printmsg("multi-copy off");
} }
} }
if (copybufpos) { /* File path(s) written to the buffer */
if (cfg.noxdisplay)
writecp(pcopybuf, copybufpos - 1); /* Truncate NULL from end */
else
spawn(copier, pcopybuf, NULL, NULL, F_NOTRACE);
if (ncp) { /* Some files cherry picked */
snprintf(newpath, PATH_MAX, "%d files copied", ncp);
printmsg(newpath);
}
} else
printmsg("multi-copy off");
goto nochange; goto nochange;
case SEL_QUOTE: case SEL_QUOTE:
cfg.quote ^= 1; cfg.quote ^= 1;