mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #936: name col len in old color mode and icons

This commit is contained in:
Arun Prakash Jana 2021-04-06 10:53:04 +05:30
parent b0fd7a5ffe
commit 0223d53584
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/nnn.c
View File

@ -779,6 +779,8 @@ static int (*nftw_fn)(const char *fpath, const struct stat *sb, int typeflag, st
static void move_cursor(int target, int ignore_scrolloff); static void move_cursor(int target, int ignore_scrolloff);
static char *load_input(int fd, const char *path); static char *load_input(int fd, const char *path);
static int set_sort_flags(int r); static int set_sort_flags(int r);
static void (*printptr)(const struct entry *ent, uint_t namecols, bool sel);
static void printent_long(const struct entry *ent, uint_t namecols, bool sel);
#ifndef NOFIFO #ifndef NOFIFO
static void notify_fifo(bool force); static void notify_fifo(bool force);
#endif #endif
@ -3681,9 +3683,6 @@ static uchar_t get_color_pair(const struct entry *ent, bool detailed)
return C_UND; return C_UND;
} }
static void (*printptr)(const struct entry *ent, uint_t namecols, bool sel);
static void printent_long(const struct entry *ent, uint_t namecols, bool sel);
static void printent(const struct entry *ent, uint_t namecols, bool sel) static void printent(const struct entry *ent, uint_t namecols, bool sel)
{ {
uchar_t color_pair = get_color_pair(ent, (printptr == &printent_long)); uchar_t color_pair = get_color_pair(ent, (printptr == &printent_long));
@ -3713,12 +3712,11 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
color_pair = C_MIS; color_pair = C_MIS;
if (color_pair && fcolors[color_pair]) if (color_pair && fcolors[color_pair])
attrs |= COLOR_PAIR(color_pair); attrs |= COLOR_PAIR(color_pair);
}
#ifdef ICONS_ENABLED #ifdef ICONS_ENABLED
if (!g_state.oldcolor)
print_icon(ent, attrs); print_icon(ent, attrs);
#endif #endif
}
if (sel) if (sel)
attrs |= A_REVERSE; attrs |= A_REVERSE;
@ -5664,28 +5662,27 @@ static void statusbar(char *path)
tocursor(); tocursor();
} }
static int adjust_cols(int ncols) static int adjust_cols(int n)
{ {
/* Calculate the number of cols available to print entry name */ /* Calculate the number of cols available to print entry name */
if (cfg.showdetail) { if (cfg.showdetail) {
/* Fallback to light mode if less than 35 columns */ /* Fallback to light mode if less than 35 columns */
if (ncols < 36) { if (n < 36) {
cfg.showdetail ^= 1; cfg.showdetail ^= 1;
printptr = &printent; printptr = &printent;
} else { } else {
/* 3 more accounted for below */ /* 3 more accounted for below */
ncols -= 32; n -= 32;
} }
} }
/* 3 = Preceding space, indicator, newline */ /* 3 = Preceding space, indicator, newline */
#ifdef ICONS_ENABLED #ifdef ICONS_ENABLED
ncols -= 3 + xstrlen(ICON_PADDING_LEFT) + xstrlen(ICON_PADDING_RIGHT) + 1; return (n - (g_state.oldcolor ? 3
: 3 + xstrlen(ICON_PADDING_LEFT) + xstrlen(ICON_PADDING_RIGHT) + 1));
#else #else
ncols -= 3; return (n - 3);
#endif #endif
return ncols;
} }
static void draw_line(char *path, int ncols) static void draw_line(char *path, int ncols)