mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-top: Fix unicode character clipping

Browse source 
Instead of using snprintf to clip the node line to the terminal width,
causing multibyte characters to be split improperly, this lets curses
wrap the text as it normally would, and then overwrites the wrapped
text with the next line, simulating clipping.
This commit is contained in:
Tasos Sahanidis 2022-02-28 17:19:40 +02:00 • committed by Wim Taymans
parent ab353a8057
commit daf85f1cd6
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/tools/pw-top.c
View file

@ -241,9 +241,8 @@ static const char *print_perc(char *buf, size_t len, float val, float quantum)
return buf; return buf;
} }
static void print_node(struct data *d, struct driver *i, struct node *n) static void print_node(struct data *d, struct driver *i, struct node *n, int y)
{ {
char line[1024];
char buf1[64]; char buf1[64];
char buf2[64]; char buf2[64];
char buf3[64]; char buf3[64];
@ -264,7 +263,7 @@ static void print_node(struct data *d, struct driver *i, struct node *n)
waiting = (n->measurement.awake - n->measurement.signal) / 1000000000.f, waiting = (n->measurement.awake - n->measurement.signal) / 1000000000.f,
busy = (n->measurement.finish - n->measurement.awake) / 1000000000.f, busy = (n->measurement.finish - n->measurement.awake) / 1000000000.f,
snprintf(line, sizeof(line), "%s %4.1u %6.1u %6.1u %s %s %s %s %3.1u %s%s", mvwprintw(d->win, y, 0, "%s %4.1u %6.1u %6.1u %s %s %s %s %3.1u %s%s",
n->measurement.status != 3 ? "!" : " ", n->measurement.status != 3 ? "!" : " ",
n->id, n->id,
frac.num, frac.denom, frac.num, frac.denom,
@ -275,13 +274,12 @@ static void print_node(struct data *d, struct driver *i, struct node *n)
i->xrun_count + n->errors, i->xrun_count + n->errors,
n->driver == n ? "" : " + ", n->driver == n ? "" : " + ",
n->name); n->name);
wprintw(d->win, "%.*s\n", COLS-1, line);
} }
static void do_refresh(struct data *d) static void do_refresh(struct data *d)
{ {
struct node *n, *t, *f; struct node *n, *t, *f;
int y = 1;
wclear(d->win); wclear(d->win);
wattron(d->win, A_REVERSE); wattron(d->win, A_REVERSE);
@ -293,15 +291,25 @@ static void do_refresh(struct data *d)
if (n->driver != n) if (n->driver != n)
continue; continue;
print_node(d, &n->info, n); print_node(d, &n->info, n, y++);
if(y > LINES)
break;
spa_list_for_each(f, &d->node_list, link) { spa_list_for_each(f, &d->node_list, link) {
if (f->driver != n || f == n) if (f->driver != n || f == n)
continue; continue;
print_node(d, &n->info, f); print_node(d, &n->info, f, y++);
if(y > LINES)
break;
} }
} }
// Clear from last line to the end of the window to hide text wrapping from the last node
wmove(d->win, y, 0);
wclrtobot(d->win);
wrefresh(d->win); wrefresh(d->win);
} }