[coreboot] r3336 - trunk/payloads/libpayload/curses
svn at coreboot.org
svn at coreboot.org
Tue May 20 22:08:11 CEST 2008
Author: jcrouse
Date: 2008-05-20 22:08:11 +0200 (Tue, 20 May 2008)
New Revision: 3336
Modified:
trunk/payloads/libpayload/curses/tinycurses.c
Log:
libpayload: Fix curses subwindows
This fixes subwindows in curses so that they draw and refresh correctly.
Signed-off-by: Jordan Crouse <jordan.crouse at amd.com>
Acked-by: Myles Watson <mylesgw at gmail.com>
Modified: trunk/payloads/libpayload/curses/tinycurses.c
===================================================================
--- trunk/payloads/libpayload/curses/tinycurses.c 2008-05-20 18:10:24 UTC (rev 3335)
+++ trunk/payloads/libpayload/curses/tinycurses.c 2008-05-20 20:08:11 UTC (rev 3336)
@@ -66,7 +66,7 @@
static int window_count = 1;
// struct ldat foo;
-static struct ldat ldat_list[3];
+static struct ldat ldat_list[MAX_WINDOWS][SCREEN_Y];
static int ldat_count = 0;
/* One item bigger than SCREEN_X to reverse place for a NUL byte. */
@@ -306,7 +306,7 @@
win->_begx = begx;
// win->_yoffset = SP->_topstolen;
- win->_line = &ldat_list[ldat_count++];
+ win->_line = ldat_list[ldat_count++];
/* FIXME: Is this right? Should the window attributes be normal? */
win->_color = PAIR_NUMBER(0);
@@ -523,8 +523,8 @@
int werase(WINDOW *win)
{
int x, y;
- for (y = 0; y < win->_maxy; y++) {
- for (x = 0; x < win->_maxx; x++) {
+ for (y = 0; y <= win->_maxy; y++) {
+ for (x = 0; x <= win->_maxx; x++) {
win->_line[y].text[x].chars[0] = ' ';
win->_line[y].text[x].attr = WINDOW_ATTRS(win);
}
@@ -591,8 +591,8 @@
// FIXME.
int x, y;
- for (y = 0; y < win->_maxy; y++) {
- for (x = 0; x < win->_maxx; x++) {
+ for (y = 0; y <= win->_maxy; y++) {
+ for (x = 0; x <= win->_maxx; x++) {
if (curses_flags & F_ENABLE_SERIAL)
serial_putchar(win->_line[y].text[x].chars[0]);
@@ -619,7 +619,7 @@
* but this will break wide characters!
*/
c |= (chtype) (win->_line[y].text[x].chars[0] & 0xff);
- video_console_putc(y, x, c);
+ video_console_putc(win->_begy + y, win->_begx + x, c);
}
}
}
More information about the coreboot
mailing list