libpayload: fix wborder()
[coreboot.git] / payloads / libpayload / curses / tinycurses.c
index 16e06ec4738853e7c5c631d069e53dcfc63cef2c..fb492b6cea73889eed5004c3e7bc7dd74b1d3db9 100644 (file)
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2008 Ulf Jordan <jordan@chalmers.se>
+ * Copyright (C) 2008-2009 coresystems GmbH
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -70,13 +71,13 @@ static int window_count = 1;
 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. */
+/* One item bigger than SCREEN_X to reserve space for a NUL byte. */
 static NCURSES_CH_T linebuf_list[SCREEN_Y * MAX_WINDOWS][SCREEN_X + 1];
 static int linebuf_count = 0;
 
 /* Globals */
 int COLORS;            /* Currently unused? */
-int COLOR_PAIRS;
+int COLOR_PAIRS = 255;
 WINDOW *stdscr;
 WINDOW *curscr;
 WINDOW *newscr;
@@ -110,6 +111,7 @@ chtype fallback_acs_map[128] =
        '|',    '<',    '>',    '*',    '!',    'f',    'o',    ' ',
        };
 
+#ifdef CONFIG_SERIAL_CONSOLE
 #ifdef CONFIG_SERIAL_ACS_FALLBACK
 chtype serial_acs_map[128];
 #else
@@ -134,7 +136,9 @@ chtype serial_acs_map[128] =
        'x',    'y',    'z',    '{',    '|',    '}',    '~',    0,
        };
 #endif
+#endif
 
+#ifdef CONFIG_VIDEO_CONSOLE
 /* See acsc of linux. */
 chtype console_acs_map[128] =
        {
@@ -155,6 +159,7 @@ chtype console_acs_map[128] =
        '\304', '\304', '\304', '_',    '\303', '\264', '\301', '\302',
        '\263', '\363', '\362', '\343', '\330', '\234', '\376', 0,
        };
+#endif
 
 // FIXME: Ugly (and insecure!) hack!
 char sprintf_tmp[1024];
@@ -186,14 +191,30 @@ NCURSES_CH_T _nc_render(WINDOW *win, NCURSES_CH_T ch)
 int beep(void)
 {
        /* TODO: Flash the screen if beeping fails? */
+#ifdef CONFIG_SPEAKER
        speaker_tone(1760, 500);        /* 1760 == note A6 */
+#endif
        return OK;
 }
 // bool can_change_color(void) {}
 int cbreak(void) { /* TODO */ return 0; }
 /* D */ int clearok(WINDOW *win, bool flag) { win->_clear = flag; return OK; }
 // int color_content(short color, short *r, short *g, short *b) {}
-// int curs_set(int) {}
+int curs_set(int on)
+{
+#ifdef CONFIG_SERIAL_CONSOLE
+       if (curses_flags & F_ENABLE_SERIAL) {
+               serial_cursor_enable(on);
+       }
+#endif
+#ifdef CONFIG_VIDEO_CONSOLE
+       if (curses_flags & F_ENABLE_CONSOLE) {
+               video_console_cursor_enable(on);
+       }
+#endif
+
+       return OK;
+}
 // int def_prog_mode(void) {}
 // int def_shell_mode(void) {}
 // int delay_output(int) {}
@@ -213,6 +234,7 @@ int delwin(WINDOW *win)
 }
 WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
 {
+#if 0
        WINDOW *win = NULL;
        int i;
        int flags = _SUBWIN;
@@ -236,9 +258,9 @@ WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
                flags |= _ISPAD;
 
        // FIXME
-       //// if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
-       ////                        orig->_begx + begx, flags)) == 0)
-       ////     return NULL;
+       if ((win = _nc_makenew(num_lines, num_columns, orig->_begy + begy,
+                               orig->_begx + begx, flags)) == 0)
+            return NULL;
 
        win->_pary = begy;
        win->_parx = begx;
@@ -251,8 +273,11 @@ WINDOW *derwin(WINDOW *orig, int num_lines, int num_columns, int begy, int begx)
        win->_parent = orig;
 
        return win;
+#else
+       return NULL;
+#endif
 }
-int doupdate(void) { /* TODO */ return(*(int *)0); }
+int doupdate(void) { /* TODO */ return(0); }
 // WINDOW * dupwin (WINDOW *) {}
 /* D */ int echo(void) { SP->_echo = TRUE; return OK; }
 int endwin(void)
@@ -272,7 +297,7 @@ int endwin(void)
 // int flash(void) {}
 int flushinp(void) { /* TODO */ return 0; }
 // WINDOW *getwin (FILE *) {}
-bool has_colors (void) { /* TODO */ return(*(bool *)0); }
+bool has_colors (void) { return(TRUE); }
 // bool has_ic (void) {}
 // bool has_il (void) {}
 // void idcok (WINDOW *, bool) {}
@@ -281,36 +306,33 @@ void immedok(WINDOW *win, bool flag) { win->_immed = flag; }
 /** Note: Must _not_ be called twice! */
 WINDOW *initscr(void)
 {
-       int x, y, i;
+       int i;
 
        // newterm(name, stdout, stdin);
        // def_prog_mode();
 
        for (i = 0; i < 128; i++)
          acs_map[i] = (chtype) i | A_ALTCHARSET;
-
+#ifdef CONFIG_SERIAL_CONSOLE
        if (curses_flags & F_ENABLE_SERIAL) {
                serial_clear();
        }
-
+#endif
+#ifdef CONFIG_VIDEO_CONSOLE
        if (curses_flags & F_ENABLE_CONSOLE) {
                /* Clear the screen and kill the cursor */
 
                video_console_clear();
                video_console_cursor_enable(0);
        }
+#endif
 
        // Speaker init?
 
-       stdscr = newwin(SCREEN_Y, SCREEN_X + 1, 0, 0);
+       stdscr = newwin(SCREEN_Y, SCREEN_X, 0, 0);
        // TODO: curscr, newscr?
 
-       for (y = 0; y < stdscr->_maxy; y++) {
-               for (x = 0; x < stdscr->_maxx; x++) {
-                       stdscr->_line[y].text[x].chars[0] = ' ';
-                       stdscr->_line[y].text[x].attr = A_NORMAL;
-               }
-       }
+       werase(stdscr);
 
        return stdscr;
 }
@@ -473,19 +495,27 @@ int vwprintw(WINDOW *win, const char *fmt, va_list argp)
        return waddstr(win, (char *)&sprintf_tmp);
 }
 // int vwscanw (WINDOW *, NCURSES_CONST char *,va_list) {}
-// int waddch (WINDOW *, const chtype) {}
 int waddch(WINDOW *win, const chtype ch)
 {
        int code = ERR;
        // NCURSES_CH_T wch;
        // SetChar2(wch, ch);
 
+       if (win->_line[win->_cury].firstchar == _NOCHANGE ||
+                       win->_line[win->_cury].firstchar > win->_curx)
+               win->_line[win->_cury].firstchar = win->_curx;
+
        win->_line[win->_cury].text[win->_curx].chars[0] =
                ((ch) & (chtype)A_CHARTEXT);
 
        win->_line[win->_cury].text[win->_curx].attr = WINDOW_ATTRS(win);
        win->_line[win->_cury].text[win->_curx].attr |=
                ((ch) & (chtype)A_ATTRIBUTES);
+
+       if (win->_line[win->_cury].lastchar == _NOCHANGE ||
+                       win->_line[win->_cury].lastchar < win->_curx)
+               win->_line[win->_cury].lastchar = win->_curx;
+
        win->_curx++;   // FIXME
 
        // if (win && (waddch_nosync(win, wch) != ERR)) {
@@ -507,6 +537,10 @@ int waddnstr(WINDOW *win, const char *astr, int n)
        if (n < 0)
                n = strlen(astr);
 
+       if (win->_line[win->_cury].firstchar == _NOCHANGE ||
+                       win->_line[win->_cury].firstchar > win->_curx)
+               win->_line[win->_cury].firstchar = win->_curx;
+
        while ((n-- > 0) && (*str != '\0')) {
        // while (*str != '\0') {
                win->_line[win->_cury].text[win->_curx].chars[0] = *str++;
@@ -521,6 +555,11 @@ int waddnstr(WINDOW *win, const char *astr, int n)
                //      break;
                // }
        }
+
+       if (win->_line[win->_cury].lastchar == _NOCHANGE ||
+                       win->_line[win->_cury].lastchar < win->_curx)
+               win->_line[win->_cury].lastchar = win->_curx;
+
        return code;
 }
 int wattr_on(WINDOW *win, attr_t at, void *opts GCC_UNUSED)
@@ -545,6 +584,15 @@ int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, chtype bs,
 {
        int x, y;
 
+       if (ls == 0) ls = ACS_VLINE;
+       if (rs == 0) rs = ACS_VLINE;
+       if (ts == 0) ts = ACS_HLINE;
+       if (bs == 0) bs = ACS_HLINE;
+       if (tl == 0) tl = ACS_ULCORNER;
+       if (tr == 0) tr = ACS_URCORNER;
+       if (bl == 0) bl = ACS_LLCORNER;
+       if (br == 0) br = ACS_LRCORNER;
+
        for(y = 0; y <= win->_maxy; y++) {
 
                if (y == 0) {
@@ -581,7 +629,7 @@ int wborder(WINDOW *win, chtype ls, chtype rs, chtype ts, chtype bs,
        return OK;
 }
 // int wclrtobot (WINDOW *) {}
-int wclrtoeol(WINDOW *win) { /* TODO */ return(*(int *)0); }
+int wclrtoeol(WINDOW *win) { /* TODO */ return ERR; }
 int wcolor_set(WINDOW *win, short color_pair_number, void *opts)
 {
        if (!opts && (color_pair_number >= 0)
@@ -603,6 +651,9 @@ int werase(WINDOW *win)
                        win->_line[y].text[x].chars[0] = ' ';
                        win->_line[y].text[x].attr = WINDOW_ATTRS(win);
                }
+               // Should we check instead?
+               win->_line[y].firstchar = 0;
+               win->_line[y].lastchar = win->_maxx;
        }
        return OK;
 }
@@ -666,30 +717,41 @@ int whline(WINDOW *win, chtype ch, int n)
        (((c) & 0x4400) >> 2) | ((c) & 0xAA00) | (((c) & 0x1100) << 2)
 int wnoutrefresh(WINDOW *win)
 {
+#ifdef CONFIG_SERIAL_CONSOLE
        // FIXME.
        int serial_is_bold = 0;
+       int serial_is_reverse = 0;
        int serial_is_altcharset = 0;
+       int serial_cur_pair = 0;
 
+       int need_altcharset;
+       short fg, bg;
+#endif
        int x, y;
        chtype ch;
-       int need_altcharset;
 
+#ifdef CONFIG_SERIAL_CONSOLE
        serial_end_bold();
        serial_end_altcharset();
+#endif
 
        for (y = 0; y <= win->_maxy; y++) {
 
+               if (win->_line[y].firstchar == _NOCHANGE)
+                       continue;
+
                /* Position the serial cursor */
 
+#ifdef CONFIG_SERIAL_CONSOLE
                if (curses_flags & F_ENABLE_SERIAL)
-                       serial_set_cursor(win->_begy + y, win->_begx);
+                       serial_set_cursor(win->_begy + y, win->_begx +
+                                       win->_line[y].firstchar);
+#endif
 
-               for (x = 0; x <= win->_maxx; x++) {
+               for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) {
                        attr_t attr = win->_line[y].text[x].attr;
 
-                       unsigned int c =
-                               ((int)color_pairs[PAIR_NUMBER(attr)]) << 8;
-
+#ifdef CONFIG_SERIAL_CONSOLE
                        if (curses_flags & F_ENABLE_SERIAL) {
                                ch = win->_line[y].text[x].chars[0];
 
@@ -698,11 +760,32 @@ int wnoutrefresh(WINDOW *win)
                                                serial_start_bold();
                                                serial_is_bold = 1;
                                        }
-                               }
-                               else {
+                               } else {
                                        if (serial_is_bold) {
                                                serial_end_bold();
                                                serial_is_bold = 0;
+                                               /* work around serial.c
+                                                * shortcoming:
+                                                */
+                                               serial_is_reverse = 0;
+                                               serial_cur_pair = 0;
+                                       }
+                               }
+
+                               if (attr & A_REVERSE) {
+                                       if (!serial_is_reverse) {
+                                               serial_start_reverse();
+                                               serial_is_reverse = 1;
+                                       }
+                               } else {
+                                       if (serial_is_reverse) {
+                                               serial_end_reverse();
+                                               serial_is_reverse = 0;
+                                               /* work around serial.c
+                                                * shortcoming:
+                                                */
+                                               serial_is_bold = 0;
+                                               serial_cur_pair = 0;
                                        }
                                }
 
@@ -723,8 +806,20 @@ int wnoutrefresh(WINDOW *win)
                                        serial_is_altcharset = 0;
                                }
 
+                               if (serial_cur_pair != PAIR_NUMBER(attr)) {
+                                       pair_content(PAIR_NUMBER(attr),
+                                                    &fg, &bg);
+                                       serial_set_color(fg, bg);
+                                       serial_cur_pair = PAIR_NUMBER(attr);
+                               }
+
                                serial_putchar(ch);
+
                        }
+#endif
+#ifdef CONFIG_VIDEO_CONSOLE
+                       unsigned int c =
+                               ((int)color_pairs[PAIR_NUMBER(attr)]) << 8;
 
                        c = SWAP_RED_BLUE(c);
 
@@ -757,9 +852,22 @@ int wnoutrefresh(WINDOW *win)
                                c |= (chtype) (ch & 0xff);
                                video_console_putc(win->_begy + y, win->_begx + x, c);
                        }
+#endif
                }
+               win->_line[y].firstchar = _NOCHANGE;
+               win->_line[y].lastchar = _NOCHANGE;
        }
 
+#ifdef CONFIG_SERIAL_CONSOLE
+       if (curses_flags & F_ENABLE_SERIAL)
+               serial_set_cursor(win->_begy + win->_cury, win->_begx + win->_curx);
+#endif
+
+#ifdef CONFIG_VIDEO_CONSOLE
+       if (curses_flags & F_ENABLE_CONSOLE)
+               video_console_set_cursor(win->_begx + win->_curx, win->_begy + win->_cury);
+#endif
+
        return OK;
 }
 int wprintw(WINDOW *win, const char *fmt, ...)
@@ -773,7 +881,19 @@ int wprintw(WINDOW *win, const char *fmt, ...)
 
        return code;
 }
-// int wredrawln (WINDOW *,int,int) {}
+
+int wredrawln (WINDOW *win, int beg_line, int num_lines)
+{
+       int i;
+
+       for (i = beg_line; i < beg_line + num_lines; i++) {
+               win->_line[i].firstchar = 0;
+               win->_line[i].lastchar = win->_maxx;
+       }
+
+       return OK;
+}
+
 int wrefresh(WINDOW *win)
 {
        // FIXME
@@ -803,13 +923,49 @@ int wrefresh(WINDOW *win)
 // int wscanw (WINDOW *, NCURSES_CONST char *,...) {}
 int wscrl(WINDOW *win, int n)
 {
+       int x, y;
+
        if (!win->_scroll)
                return ERR;
 
-       if (n != 0) {
-               // _nc_scroll_window(win, n, win->_regtop, win->_regbottom, win->_nc_bkgd);
-               // _nc_synchook(win);
+       if (n == 0)
+               return OK;
+
+       for (y = 0; y <= (win->_maxy - n); y++) {
+               win->_line[y].firstchar = win->_line[y + n].firstchar;
+               win->_line[y].lastchar = win->_line[y + n].lastchar;
+               for (x = 0; x <= win->_maxx; x++) {
+                       if ((win->_line[y].text[x].chars[0] != win->_line[y + n].text[x].chars[0]) ||
+                                       (win->_line[y].text[x].attr != win->_line[y + n].text[x].attr)) {
+                               if (win->_line[y].firstchar == _NOCHANGE)
+                                       win->_line[y].firstchar = x;
+
+                               win->_line[y].lastchar = x;
+
+                               win->_line[y].text[x].chars[0] = win->_line[y + n].text[x].chars[0];
+                               win->_line[y].text[x].attr = win->_line[y + n].text[x].attr;
+                       }
+               }
+       }
+
+       for (y = (win->_maxy+1 - n); y <= win->_maxy; y++) {
+               for (x = 0; x <= win->_maxx; x++) {
+                       if ((win->_line[y].text[x].chars[0] != ' ') ||
+                                       (win->_line[y].text[x].attr != A_NORMAL)) {
+                               if (win->_line[y].firstchar == _NOCHANGE)
+                                       win->_line[y].firstchar = x;
+
+                               win->_line[y].lastchar = x;
+
+                               win->_line[y].text[x].chars[0] = ' ';
+                               win->_line[y].text[x].attr = A_NORMAL;
+                       }
+               }
        }
+
+       // _nc_scroll_window(win, n, win->_regtop, win->_regbottom, win->_nc_bkgd);
+       // _nc_synchook(win);
+
        return OK;
 }
 int wsetscrreg(WINDOW *win, int top, int bottom)
@@ -824,7 +980,7 @@ int wsetscrreg(WINDOW *win, int top, int bottom)
 }
 // void wsyncdown (WINDOW *) {}
 // void wsyncup (WINDOW *) {}
-/* D */ void wtimeout(WINDOW *win, int delay) { win->_delay = delay; }
+/* D */ void wtimeout(WINDOW *win, int _delay) { win->_delay = _delay; }
 /* D */ int wtouchln(WINDOW *win, int y, int n, int changed)
 {
        int i;