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

Move ajust cols and no else braces

This commit is contained in:
Luuk van Baal 2021-07-03 00:50:51 +02:00
parent d4a4c72e00
commit 36ddbac10a
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
patches/namefirst/mainline.diff
View File

@ -4,10 +4,10 @@
# Author: Luuk van Baal # Author: Luuk van Baal
diff --git a/src/nnn.c b/src/nnn.c diff --git a/src/nnn.c b/src/nnn.c
index eabe30f0..d8dc5925 100644 index c4bced5..d1bc16d 100644
--- a/src/nnn.c --- a/src/nnn.c
+++ b/src/nnn.c +++ b/src/nnn.c
@@ -363,6 +363,10 @@ typedef struct { @@ -368,6 +368,10 @@ typedef struct {
} session_header_t; } session_header_t;
#endif #endif
@ -18,7 +18,7 @@ index eabe30f0..d8dc5925 100644
/* GLOBALS */ /* GLOBALS */
/* Configuration, contexts */ /* Configuration, contexts */
@@ -1039,10 +1043,12 @@ static char *getpwname(uid_t uid) @@ -1052,10 +1056,12 @@ static char *getpwname(uid_t uid)
static char *namecache; static char *namecache;
if (uidcache != uid) { if (uidcache != uid) {
@ -31,7 +31,7 @@ index eabe30f0..d8dc5925 100644
} }
return namecache ? namecache : xitoa(uid); return namecache ? namecache : xitoa(uid);
@@ -1054,10 +1060,12 @@ static char *getgrname(gid_t gid) @@ -1067,10 +1073,12 @@ static char *getgrname(gid_t gid)
static char *grpcache; static char *grpcache;
if (gidcache != gid) { if (gidcache != gid) {
@ -44,7 +44,7 @@ index eabe30f0..d8dc5925 100644
} }
return grpcache ? grpcache : xitoa(gid); return grpcache ? grpcache : xitoa(gid);
@@ -3509,14 +3517,13 @@ static void resetdircolor(int flags) @@ -3521,14 +3529,13 @@ static void resetdircolor(int flags)
* Max supported str length: NAME_MAX; * Max supported str length: NAME_MAX;
*/ */
#ifdef NOLC #ifdef NOLC
@ -62,7 +62,7 @@ index eabe30f0..d8dc5925 100644
{ {
wchar_t * const wbuf = (wchar_t *)g_buf; wchar_t * const wbuf = (wchar_t *)g_buf;
wchar_t *buf = wbuf; wchar_t *buf = wbuf;
@@ -3541,7 +3548,7 @@ static wchar_t *unescape(const char *str, uint_t maxcols) @@ -3553,7 +3560,7 @@ static wchar_t *unescape(const char *str, uint_t maxcols)
++buf; ++buf;
} }
@ -70,8 +70,8 @@ index eabe30f0..d8dc5925 100644
+ return len; + return len;
} }
static off_t get_size(off_t size, off_t *pval, uint_t comp) static off_t get_size(off_t size, off_t *pval, int comp)
@@ -3802,33 +3809,7 @@ static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, int @@ -3814,33 +3821,7 @@ static uchar_t get_color_pair_name_ind(const struct entry *ent, char *pind, int
static void printent(const struct entry *ent, uint_t namecols, bool sel) static void printent(const struct entry *ent, uint_t namecols, bool sel)
{ {
char ind = '\0'; char ind = '\0';
@ -106,7 +106,7 @@ index eabe30f0..d8dc5925 100644
uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs); uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs);
addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' '); addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' ');
@@ -3853,15 +3834,40 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel) @@ -3865,15 +3846,40 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
++namecols; ++namecols;
#ifndef NOLC #ifndef NOLC
@ -149,8 +149,8 @@ index eabe30f0..d8dc5925 100644
+ attroff(attrs); + attroff(attrs);
} }
static void savecurctx(settings *curcfg, char *path, char *curname, int nextctx) static void savecurctx(char *path, char *curname, int nextctx)
@@ -5849,18 +5855,6 @@ static void statusbar(char *path) @@ -5871,18 +5877,6 @@ static void statusbar(char *path)
tocursor(); tocursor();
} }
@ -169,7 +169,7 @@ index eabe30f0..d8dc5925 100644
static int adjust_cols(int n) 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 */
@@ -5868,13 +5862,10 @@ static int adjust_cols(int n) @@ -5890,11 +5884,10 @@ static int adjust_cols(int n)
n -= (g_state.oldcolor ? 0 : 1 + xstrlen(ICON_PADDING_LEFT) + xstrlen(ICON_PADDING_RIGHT)); n -= (g_state.oldcolor ? 0 : 1 + xstrlen(ICON_PADDING_LEFT) + xstrlen(ICON_PADDING_RIGHT));
#endif #endif
if (cfg.showdetail) { if (cfg.showdetail) {
@ -177,16 +177,14 @@ index eabe30f0..d8dc5925 100644
- if (n < 36) - if (n < 36)
+ if (n < (dtls.maxentln + 1 - dtls.maxnameln)) + if (n < (dtls.maxentln + 1 - dtls.maxnameln))
cfg.showdetail ^= 1; cfg.showdetail ^= 1;
- else { - else /* 2 more accounted for below */
- /* 2 more accounted for below */
- n -= 32; - n -= 32;
- }
+ else + else
+ n -= (dtls.maxentln - 2 - dtls.maxnameln); + n -= (dtls.maxentln - 2 - dtls.maxnameln);
} }
/* 2 columns for preceding space and indicator */ /* 2 columns for preceding space and indicator */
@@ -5912,8 +5903,6 @@ static void draw_line(char *path, int ncols) @@ -5932,8 +5925,6 @@ static void draw_line(char *path, int ncols)
if (dir) if (dir)
attroff(COLOR_PAIR(cfg.curctx + 1) | A_BOLD); attroff(COLOR_PAIR(cfg.curctx + 1) | A_BOLD);
@ -195,13 +193,13 @@ index eabe30f0..d8dc5925 100644
statusbar(path); statusbar(path);
} }
@@ -6005,6 +5994,21 @@ static void redraw(char *path) @@ -6042,6 +6033,21 @@ static void redraw(char *path)
attroff(A_UNDERLINE | COLOR_PAIR(cfg.curctx + 1)); onscreen = MIN(onscreen + curscroll, ndents);
+ if (cfg.showdetail) { + if (cfg.showdetail) {
+ ushort_t lenbuf = dtls.maxnameln = dtls.maxsizeln = dtls.maxuidln = dtls.maxgidln = dtls.printguid = 0; + ushort_t lenbuf = dtls.maxnameln = dtls.maxsizeln = dtls.maxuidln = dtls.maxgidln = dtls.printguid = 0;
+ for (i = curscroll; i < ndents && i < curscroll + onscreen; ++i) { + for (i = curscroll; i < onscreen; ++i) {
+ if ((lenbuf = pdents[i].nlen - 1) > dtls.maxnameln) dtls.maxnameln = lenbuf; + if ((lenbuf = pdents[i].nlen - 1) > dtls.maxnameln) dtls.maxnameln = lenbuf;
+ if ((lenbuf = xstrlen(coolsize(cfg.blkorder ? pdents[i].blocks << blk_shift : pdents[i].size))) > dtls.maxsizeln) dtls.maxsizeln = lenbuf; + if ((lenbuf = xstrlen(coolsize(cfg.blkorder ? pdents[i].blocks << blk_shift : pdents[i].size))) > dtls.maxsizeln) dtls.maxsizeln = lenbuf;
+#ifndef NOUG +#ifndef NOUG
@ -211,13 +209,13 @@ index eabe30f0..d8dc5925 100644
+ } + }
+#endif +#endif
+ } + }
+ dtls.maxentln = dtls.maxnameln + dtls.maxsizeln + (dtls.printguid ? (dtls.maxuidln + dtls.maxgidln + 29) : 26);
+ } + }
+ dtls.maxentln = dtls.maxnameln + dtls.maxsizeln + (dtls.printguid ? (dtls.maxuidln + dtls.maxgidln) : 0) + (g_state.uidgid ? 26 : 23);
+ +
ncols = adjust_cols(ncols); ncols = adjust_cols(ncols);
/* Go to first entry */ /* Print listing */
@@ -6046,8 +6050,6 @@ static void redraw(char *path) @@ -6066,8 +6072,6 @@ static void redraw(char *path)
#endif #endif
} }

8
src/nnn.c
View File

@ -5893,10 +5893,8 @@ static int adjust_cols(int n)
/* Fallback to light mode if less than 35 columns */ /* Fallback to light mode if less than 35 columns */
if (n < 36) if (n < 36)
cfg.showdetail ^= 1; cfg.showdetail ^= 1;
else { else /* 2 more accounted for below */
/* 2 more accounted for below */
n -= 32; n -= 32;
}
} }
/* 2 columns for preceding space and indicator */ /* 2 columns for preceding space and indicator */
@ -6027,8 +6025,6 @@ static void redraw(char *path)
attroff(A_UNDERLINE | COLOR_PAIR(cfg.curctx + 1)); attroff(A_UNDERLINE | COLOR_PAIR(cfg.curctx + 1));
ncols = adjust_cols(ncols);
/* Go to first entry */ /* Go to first entry */
if (curscroll > 0) { if (curscroll > 0) {
move(1, 0); move(1, 0);
@ -6046,6 +6042,8 @@ static void redraw(char *path)
onscreen = MIN(onscreen + curscroll, ndents); onscreen = MIN(onscreen + curscroll, ndents);
ncols = adjust_cols(ncols);
/* Print listing */ /* Print listing */
for (i = curscroll; i < onscreen; ++i) { for (i = curscroll; i < onscreen; ++i) {
move(++j, 0); move(++j, 0);