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

Show [selmode:num_selected] in status bar

Browse source
This commit is contained in:
Arun Prakash Jana 2019-11-18 21:46:38 +05:30
parent 084a4c77c5
commit 6d3f3ba6a2
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/nnn.c
View file

@ -274,7 +274,7 @@ static settings cfg = {
0, /* blkorder */ 0, /* blkorder */
0, /* extnorder */ 0, /* extnorder */
0, /* showhidden */ 0, /* showhidden */
1, /* selmode */ 0, /* selmode */
0, /* showdetail */ 0, /* showdetail */
1, /* ctxactive */ 1, /* ctxactive */
0, /* reserved */ 0, /* reserved */
@ -3955,9 +3955,9 @@ static void redraw(char *path)
xstrlcpy(buf, coolsize(dir_blocks << blk_shift), 12); xstrlcpy(buf, coolsize(dir_blocks << blk_shift), 12);
c = cfg.apparentsz ? 'a' : 'd'; c = cfg.apparentsz ? 'a' : 'd';
mvprintw(lastln, 0, "%d/%d [%s] %cu:%s free:%s files:%lu %lldB %s", mvprintw(lastln, 0, "%d/%d [%d:%s] %cu:%s free:%s files:%lu %lldB %s",
cur + 1, ndents, (nselected ? xitoa(nselected) : ""), c, buf, cur + 1, ndents, cfg.selmode, (nselected ? xitoa(nselected) : ""),
coolsize(get_fs_info(path, FREE)), num_files, c, buf, coolsize(get_fs_info(path, FREE)), num_files,
(ll)pent->blocks << blk_shift, ptr); (ll)pent->blocks << blk_shift, ptr);
} else { /* light or detail mode */ } else { /* light or detail mode */
/* Show filename as it may be truncated in directory listing */ /* Show filename as it may be truncated in directory listing */
@ -3968,9 +3968,9 @@ static void redraw(char *path)
strftime(buf, sizeof(buf), "%Y-%b-%d %R", localtime(&pent->t)); strftime(buf, sizeof(buf), "%Y-%b-%d %R", localtime(&pent->t));
buf[sizeof(buf)-1] = '\0'; buf[sizeof(buf)-1] = '\0';
mvprintw(lastln, 0, "%d/%d [%s] %s%s %s %s %s [%s]", mvprintw(lastln, 0, "%d/%d [%d:%s] %s%s %s %s %s [%s]",
cur + 1, ndents, (nselected ? xitoa(nselected) : ""), sort, buf, cur + 1, ndents, cfg.selmode, (nselected ? xitoa(nselected) : ""),
get_lsperms(pent->mode), coolsize(pent->size), ptr, base); sort, buf, get_lsperms(pent->mode), coolsize(pent->size), ptr, base);
} }
} else } else
printmsg("0/0"); printmsg("0/0");
@ -4614,28 +4614,23 @@ nochange:
break; break;
case SEL_HELP: case SEL_HELP:
show_help(path); show_help(path);
break; continue;
case SEL_RUNEDIT: case SEL_RUNEDIT:
spawn(editor, dents[cur].name, NULL, path, F_CLI); spawn(editor, dents[cur].name, NULL, path, F_CLI);
break; continue;
case SEL_RUNPAGE: case SEL_RUNPAGE:
spawn(pager, dents[cur].name, NULL, path, F_CLI); spawn(pager, dents[cur].name, NULL, path, F_CLI);
break; continue;
default: /* SEL_LOCK */ default: /* SEL_LOCK */
lock_terminal(); lock_terminal();
break; break;
} }
/* Do not reload in some cases if in selection mode */
if (cfg.selmode && (sel == SEL_HELP
|| sel == SEL_RUNEDIT || sel == SEL_RUNPAGE))
goto nochange;
/* In case of successful operation, reload contents */ /* In case of successful operation, reload contents */
/* Continue in navigate-as-you-type mode, if enabled */ /* Continue in navigate-as-you-type mode, if enabled */
if (cfg.filtermode && sel != SEL_REDRAW) if (cfg.filtermode && sel != SEL_REDRAW)
presel = FILTER; break;
/* Save current */ /* Save current */
if (ndents) if (ndents)