emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: stop neglecting potential utf8 field descriptions

Browse Source 
And I thought those strange characters I saw with only
certain translations in Fields Management descriptions
were resulting from my terminal emulator deficiencies.

Turns out that ol' top wasn't addressing possibilities
of such descriptions ending with multi-byte sequences.

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2017-10-08 00:00:00 -05:00 committed by Craig Small
parent a02a31f7e9
commit b5104910b1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
top/top.c
View File

@ -2014,16 +2014,17 @@ static void display_fields (int focus, int extend) {
#define mkERR { putp("\n"); putp(N_txt(XTRA_winsize_txt)); return; } #define mkERR { putp("\n"); putp(N_txt(XTRA_winsize_txt)); return; }
#define mxCOL ( (Screen_cols / 11) > 0 ? (Screen_cols / 11) : 1 ) #define mxCOL ( (Screen_cols / 11) > 0 ? (Screen_cols / 11) : 1 )
#define yRSVD 4 #define yRSVD 4
#define xSUFX 22 #define xEQUS 2 // length of suffix beginning '= '
#define xSUFX 22 // total suffix length, incl xEQUS
#define xPRFX (10 + xadd) #define xPRFX (10 + xadd)
#define xTOTL (xPRFX + xSUFX) #define xTOTL (xPRFX + xSUFX)
static int col_sav, row_sav;
WIN_t *w = Curwin; // avoid gcc bloat with a local copy WIN_t *w = Curwin; // avoid gcc bloat with a local copy
int i; // utility int (a row, tot cols, ix) int i; // utility int (a row, tot cols, ix)
int smax; // printable width of xSUFX int smax; // printable width of xSUFX
int xadd = 0; // spacing between data columns int xadd = 0; // spacing between data columns
int cmax = Screen_cols; // total data column width int cmax = Screen_cols; // total data column width
int rmax = Screen_rows - yRSVD; // total useable rows int rmax = Screen_rows - yRSVD; // total useable rows
static int col_sav, row_sav;
i = (EU_MAXPFLGS % mxCOL) ? 1 : 0; i = (EU_MAXPFLGS % mxCOL) ? 1 : 0;
if (rmax < i + (EU_MAXPFLGS / mxCOL)) mkERR; if (rmax < i + (EU_MAXPFLGS / mxCOL)) mkERR;
@ -2047,15 +2048,15 @@ static void display_fields (int focus, int extend) {
int b = FLDviz(w, i), x = (i / rmax) * cmax, y = (i % rmax) + yRSVD; int b = FLDviz(w, i), x = (i / rmax) * cmax, y = (i % rmax) + yRSVD;
const char *e = (i == focus && extend) ? w->capclr_hdr : ""; const char *e = (i == focus && extend) ? w->capclr_hdr : "";
FLG_t f = FLDget(w, i); FLG_t f = FLDget(w, i);
char sbuf[xSUFX+1]; char sbuf[xSUFX*4]; // 4 = max multi-byte
int xcol, xfld; int xcol, xfld;
// prep sacrificial suffix (allowing for beginning '= ') ...
snprintf(sbuf, sizeof(sbuf), "= %.*s", utf8_embody(N_fld(f), smax - xEQUS), N_fld(f));
// obtain translated deltas (if any) ... // obtain translated deltas (if any) ...
xcol = utf8_delta(fmtmk("%.*s", utf8_embody(N_col(f), 7), N_col(f))); xcol = utf8_delta(fmtmk("%.*s", utf8_embody(N_col(f), 7), N_col(f)));
xfld = utf8_delta(fmtmk("%.*s", utf8_embody(N_fld(f), smax), N_fld(f))); xfld = utf8_delta(sbuf + xEQUS); // ignore beginning '= '
// prep sacrificial suffix ...
snprintf(sbuf, sizeof(sbuf), "= %s", N_fld(f));
PUTT("%s%c%s%s %s%-*.*s%s%s%s %-*.*s%s" PUTT("%s%c%s%s %s%-*.*s%s%s%s %-*.*s%s"
, tg2(x, y) , tg2(x, y)
@ -2077,6 +2078,7 @@ static void display_fields (int focus, int extend) {
#undef mkERR #undef mkERR
#undef mxCOL #undef mxCOL
#undef yRSVD #undef yRSVD
#undef xEQUS
#undef xSUFX #undef xSUFX
#undef xPRFX #undef xPRFX
#undef xTOTL #undef xTOTL