From 513afcf4f8cd67275bad59251d1ee2a845d0ddca Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Wed, 28 Aug 2002 17:28:36 +0000 Subject: hurd/ 2002-08-28 Marcus Brinkmann * console.h (struct cons_display): Fix comment on CUR_LINE. console/ 2002-08-28 Marcus Brinkmann * display.c (screen_fill): Take CUR_LINES modulo LINES. (screen_shift_left): Likewise. (screen_shift_right): Likewise. (linefeed): Don't take CUR_LINES modulo LINES here. libcons/ 2002-08-28 Marcus Brinkmann * file-changed.c (cons_S_file_changed): Take NEW_CUR_LINE modulo VCONS->state.screen.lines where appropriate. Adapt calculation of SCROLLING, and limit it to the screen size. Only scroll at all if there is something to scroll. Fix calculation of scrolled-in area. * vcons-refresh.c (cons_vcons_refresh): Take VCONS->state.screen.cur_line modulo VCONS->state.screen.lines. --- libcons/vcons-refresh.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'libcons/vcons-refresh.c') diff --git a/libcons/vcons-refresh.c b/libcons/vcons-refresh.c index 34f0de88..35e74224 100644 --- a/libcons/vcons-refresh.c +++ b/libcons/vcons-refresh.c @@ -37,21 +37,25 @@ cons_vcons_refresh (vcons_t vcons) vcons->state.changes.written = vcons->display->changes.written; cons_vcons_write (vcons, vcons->state.screen.matrix - + vcons->state.screen.cur_line * vcons->state.screen.width, - ((vcons->state.screen.lines - vcons->state.screen.cur_line + + (vcons->state.screen.cur_line % vcons->state.screen.lines) + * vcons->state.screen.width, + ((vcons->state.screen.lines + - (vcons->state.screen.cur_line % vcons->state.screen.lines) < vcons->state.screen.height) - ? vcons->state.screen.lines - vcons->state.screen.cur_line + ? vcons->state.screen.lines + - (vcons->state.screen.cur_line % vcons->state.screen.lines) : vcons->state.screen.height) * vcons->state.screen.width, 0, 0); - if (vcons->state.screen.lines - vcons->state.screen.cur_line + if (vcons->state.screen.lines + - (vcons->state.screen.cur_line % vcons->state.screen.lines) < vcons->state.screen.height) cons_vcons_write (vcons, vcons->state.screen.matrix, vcons->state.screen.height * vcons->state.screen.width - (vcons->state.screen.lines - - vcons->state.screen.cur_line) + - (vcons->state.screen.cur_line % vcons->state.screen.lines)) * vcons->state.screen.width, 0, vcons->state.screen.lines - - vcons->state.screen.cur_line); + - (vcons->state.screen.cur_line % vcons->state.screen.lines)); cons_vcons_set_cursor_pos (vcons, vcons->state.cursor.col, vcons->state.cursor.row); -- cgit v1.2.3