diff options
| author | Jim Warner <james.warner@comcast.net> | 2022-06-15 00:00:00 -0500 |
|---|---|---|
| committer | Craig Small <csmall@dropbear.xyz> | 2022-06-19 20:58:51 +1000 |
| commit | 55453f5af206fa7e28f259b1308457a7438515bb (patch) | |
| tree | 458881d021860b2cffec8df1cad03c008b5a1723 | |
| parent | b4c17fd544b578d96ba8a397575c4f2e30097b50 (diff) | |
| download | procps-ng-55453f5af206fa7e28f259b1308457a7438515bb.tar.gz | |
top: enable bottom 'window' multi-byte char capability <=== port of newlib 723b418c
______________________________ original newlib message
If the special bottom 'window' routines remain unaware
of potential multi-byte characters, that heading could
be truncated prematurely and unnecessary blank line(s)
added to the reserved rows at the bottom of a display.
So, in both cases, this patch will now account for any
difference between string lengths and display columns.
Signed-off-by: Jim Warner <james.warner@comcast.net>
| -rw-r--r-- | top/top.c | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -5134,10 +5134,14 @@ static int bot_focus_str (const char *hdr, const char *str) { if (n >= sizeof(Bot_buf)) n = sizeof(Bot_buf) - 1; if (!*str || !strcmp(str, "-")) strcpy(Bot_buf, "n/a"); else memccpy(Bot_buf, str, '\0', n); - Bot_rsvd = 1 + BOT_RSVD + (strlen(Bot_buf) / Screen_cols); + Bot_rsvd = 1 + BOT_RSVD + ((strlen(Bot_buf) - utf8_delta(Bot_buf)) / Screen_cols); if (Bot_rsvd > maxRSVD) Bot_rsvd = maxRSVD; // somewhere down call chain fmtmk() may be used, so we'll old school it - snprintf(tmp, sizeof(tmp), "%s%s%-*s", tg2(0, SCREEN_ROWS), Curwin->capclr_hdr, Screen_cols, hdr); + snprintf(tmp, sizeof(tmp), "%s%s%-*s" + , tg2(0, SCREEN_ROWS) + , Curwin->capclr_hdr + , Screen_cols + utf8_delta(hdr) + , hdr); putp(tmp); } // now fmtmk is safe to use ... @@ -5181,16 +5185,21 @@ static int bot_focus_strv (const char *hdr, const char **strv) { memcpy(Bot_buf, strv[0], n); if (!Bot_buf[0] || (!strcmp(Bot_buf, "-") && n <= sizeof(char *))) strcpy(Bot_buf, "n/a"); - for (nsav= 0, p = Bot_buf; strv[nsav] != NULL; nsav++) { + for (nsav= 0, p = Bot_buf, x = 0; strv[nsav] != NULL; nsav++) { p += strlen(strv[nsav]) + 1; if ((p - Bot_buf) >= sizeof(Bot_buf)) break; - n = p - Bot_buf; + x += utf8_delta(strv[nsav]); } + n = (p - Bot_buf) - (x + 1); Bot_rsvd = 1 + BOT_RSVD + (n / Screen_cols); if (Bot_rsvd > maxRSVD) Bot_rsvd = maxRSVD; // somewhere down call chain fmtmk() may be used, so we'll old school it - snprintf(tmp, sizeof(tmp), "%s%s%-*s", tg2(0, SCREEN_ROWS), Curwin->capclr_hdr, Screen_cols, hdr); + snprintf(tmp, sizeof(tmp), "%s%s%-*s" + , tg2(0, SCREEN_ROWS) + , Curwin->capclr_hdr + , Screen_cols + utf8_delta(hdr) + , hdr); putp(tmp); } // now fmtmk is safe to use ... |