void text_screen_draw(struct text_screen *screen)
{
- int max_y, i;
+ int max_y, max_x, i, len;
max_y = getmaxy(screen->scr.sub_ncw);
+ max_x = getmaxx(screen->scr.sub_ncw) - 1;
max_y = min(max_y, screen->scroll_y + screen->n_lines);
- for (i = screen->scroll_y; i < max_y; i++)
- mvwaddstr(screen->scr.sub_ncw, i, 1, screen->lines[i]);
+ for (i = screen->scroll_y; i < max_y; i++) {
+ len = strncols(screen->lines[i]) > max_x ? max_x : -1;
+ mvwaddnstr(screen->scr.sub_ncw, i, 1, screen->lines[i], len);
+ }
wrefresh(screen->scr.sub_ncw);
}
static void text_screen_scroll(struct text_screen *screen, int key)
{
int win_lines = getmaxy(screen->scr.sub_ncw);
- int delta;
+ int win_cols = getmaxx(screen->scr.sub_ncw) - 1;
+ int delta, len, i;
if (key == KEY_UP)
delta = -1;
screen->scroll_y += delta;
wscrl(screen->scr.sub_ncw, delta);
+
if (delta > 0) {
- mvwaddstr(screen->scr.sub_ncw, win_lines - 1, 1,
- screen->lines[screen->scroll_y+win_lines-1]);
+ i = screen->scroll_y + win_lines - 1;
+ len = strncols(screen->lines[i]) > win_cols ? win_cols : -1;
+ mvwaddnstr(screen->scr.sub_ncw, win_lines - 1, 1,
+ screen->lines[i], len);
} else if (delta < 0) {
- mvwaddstr(screen->scr.sub_ncw, 0, 1,
- screen->lines[screen->scroll_y]);
+ i = screen->scroll_y;
+ len = strncols(screen->lines[i]) > win_cols ? win_cols : -1;
+ mvwaddnstr(screen->scr.sub_ncw, 0, 1, screen->lines[i], len);
}
wrefresh(screen->scr.sub_ncw);
void text_screen_set_text(struct text_screen *screen, const char *text)
{
- fold_text(text, getmaxx(screen->scr.sub_ncw), text_screen_fold_cb,
+ fold_text(text, getmaxx(screen->scr.sub_ncw) - 1, text_screen_fold_cb,
screen);
}