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

Minor refactor

Browse source
This commit is contained in:
Arun Prakash Jana 2020-04-11 23:16:59 +05:30
parent 0b66191dd5
commit 2115d75ac6
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/nnn.c
View file

@ -5000,7 +5000,7 @@ static void redraw(char *path)
int ncols = (xcols <= PATH_MAX) ? xcols : PATH_MAX; int ncols = (xcols <= PATH_MAX) ? xcols : PATH_MAX;
int onscreen = xlines - 4; int onscreen = xlines - 4;
int i, attrs; int i;
char *ptr = path; char *ptr = path;
// Fast redraw // Fast redraw
@ -5031,16 +5031,12 @@ static void redraw(char *path)
addch('['); addch('[');
for (i = 0; i < CTX_MAX; ++i) { for (i = 0; i < CTX_MAX; ++i) {
if (!g_ctx[i].c_cfg.ctxactive) { if (!g_ctx[i].c_cfg.ctxactive)
addch(i + '1'); addch(i + '1');
} else { else
attrs = COLOR_PAIR(i + 1) | A_BOLD addch((i + '1') | (COLOR_PAIR(i + 1) | A_BOLD
/* active: underline, current: reverse */ /* active: underline, current: reverse */
| ((cfg.curctx != i) ? A_UNDERLINE : A_REVERSE ); | ((cfg.curctx != i) ? A_UNDERLINE : A_REVERSE)));
attron(attrs);
addch(i + '1');
attroff(attrs);
}
addch(' '); addch(' ');
} }
addstr("\b] "); /* 10 chars printed for contexts - "[1 2 3 4] " */ addstr("\b] "); /* 10 chars printed for contexts - "[1 2 3 4] " */
@ -5052,13 +5048,11 @@ static void redraw(char *path)
if ((i + MIN_DISPLAY_COLS) <= ncols) if ((i + MIN_DISPLAY_COLS) <= ncols)
addnstr(path, ncols - MIN_DISPLAY_COLS); addnstr(path, ncols - MIN_DISPLAY_COLS);
else { else {
char *base = xmemrchr((uchar *)path, '/', i);; char *base = xmemrchr((uchar *)path, '/', i);
if ((base - ptr) <= 1) i = 0;
addnstr(path, ncols - MIN_DISPLAY_COLS);
else { if (base != ptr) {
i = 0;
--base;
while (ptr < base) { while (ptr < base) {
if (*ptr == '/') { if (*ptr == '/') {
i += 2; /* 2 characters added */ i += 2; /* 2 characters added */
@ -5072,9 +5066,9 @@ static void redraw(char *path)
} }
++ptr; ++ptr;
} }
addnstr(base, ncols - (MIN_DISPLAY_COLS + i));
} }
addnstr(base, ncols - (MIN_DISPLAY_COLS + i));
} }
attroff(A_UNDERLINE); attroff(A_UNDERLINE);