mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2025-02-26 03:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Calculate number of cols for name only once

Browse source
This commit is contained in:
Arun Prakash Jana 2017-09-01 19:30:25 +05:30
parent 7ec524c231
commit c248f42c31
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
nnn.c
View file

@ -1196,11 +1196,11 @@ unescape(const char *str, uint maxcols)
} }
static void static void
printent(struct entry *ent, int sel) printent(struct entry *ent, int sel, uint namecols)
{ {
static char *pname; static char *pname;
pname = unescape(ent->name, COLS - 5); pname = unescape(ent->name, namecols);
if (S_ISDIR(ent->mode)) if (S_ISDIR(ent->mode))
printw("%s%s/\n", CURSYM(sel), pname); printw("%s%s/\n", CURSYM(sel), pname);
@ -1247,12 +1247,12 @@ coolsize(off_t size)
} }
static void static void
printent_long(struct entry *ent, int sel) printent_long(struct entry *ent, int sel, uint namecols)
{ {
static char buf[18], *pname; static char buf[18], *pname;
strftime(buf, 18, "%d-%m-%Y %H:%M", localtime(&ent->t)); strftime(buf, 18, "%d-%m-%Y %H:%M", localtime(&ent->t));
pname = unescape(ent->name, COLS - 32); pname = unescape(ent->name, namecols);
if (sel) if (sel)
attron(A_REVERSE); attron(A_REVERSE);
@ -1303,7 +1303,7 @@ printent_long(struct entry *ent, int sel)
attroff(A_REVERSE); attroff(A_REVERSE);
} }
static void (*printptr)(struct entry *ent, int sel) = &printent_long; static void (*printptr)(struct entry *ent, int sel, uint namecols) = &printent_long;
static char static char
get_fileind(mode_t mode, char *desc) get_fileind(mode_t mode, char *desc)
@ -1943,7 +1943,6 @@ redraw(char *path)
DPRINTF_D(cur); DPRINTF_D(cur);
DPRINTF_S(path); DPRINTF_S(path);
/* No text wrapping in cwd line */
if (!realpath(path, g_buf)) { if (!realpath(path, g_buf)) {
printwarn(); printwarn();
return; return;
@ -1953,6 +1952,11 @@ redraw(char *path)
if (ncols > PATH_MAX) if (ncols > PATH_MAX)
ncols = PATH_MAX; ncols = PATH_MAX;
/* No text wrapping in cwd line */
/* Show CWD: - xstrlen(CWD) - 1 = 6 */
g_buf[ncols - 6] = '\0';
printw(CWD "%s\n\n", g_buf);
/* Fallback to light mode if less than 35 columns */ /* Fallback to light mode if less than 35 columns */
if (ncols < 35 && cfg.showdetail) { if (ncols < 35 && cfg.showdetail) {
cfg.showdetail ^= 1; cfg.showdetail ^= 1;
@ -1960,10 +1964,11 @@ redraw(char *path)
mode_changed = TRUE; mode_changed = TRUE;
} }
/* Calculate the number of cols available to print entry name */
/* Show CWD: - xstrlen(CWD) - 1 = 6 */ if (cfg.showdetail)
g_buf[ncols - 6] = '\0'; ncols -= 32;
printw(CWD "%s\n\n", g_buf); else
ncols -= 5;
if (cfg.showcolor) { if (cfg.showcolor) {
attron(COLOR_PAIR(1) | A_BOLD); attron(COLOR_PAIR(1) | A_BOLD);
@ -1973,17 +1978,17 @@ redraw(char *path)
/* Print listing */ /* Print listing */
if (cur < (nlines >> 1)) { if (cur < (nlines >> 1)) {
for (i = 0; i < nlines; ++i) for (i = 0; i < nlines; ++i)
printptr(&dents[i], i == cur); printptr(&dents[i], i == cur, ncols);
} else if (cur >= ndents - (nlines >> 1)) { } else if (cur >= ndents - (nlines >> 1)) {
for (i = ndents - nlines; i < ndents; ++i) for (i = ndents - nlines; i < ndents; ++i)
printptr(&dents[i], i == cur); printptr(&dents[i], i == cur, ncols);
} else { } else {
static int odd; static int odd;
odd = ISODD(nlines); odd = ISODD(nlines);
nlines >>= 1; nlines >>= 1;
for (i = cur - nlines; i < cur + nlines + odd; ++i) for (i = cur - nlines; i < cur + nlines + odd; ++i)
printptr(&dents[i], i == cur); printptr(&dents[i], i == cur, ncols);
} }
/* Must reset e.g. no files in dir */ /* Must reset e.g. no files in dir */