From 3b4706591ce3d31628fad8953beba10a97529642 Mon Sep 17 00:00:00 2001 From: Jordan Crouse Date: Fri, 20 Jun 2008 00:01:42 +0000 Subject: libpayload: Support curses for serial Support the curses interface over serial by supporting a minimal vt100 terminal. Signed-off-by: Jordan Crouse Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3370 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/curses/keyboard.c | 82 ++++++++++++++++++++++++++++++++- payloads/libpayload/curses/tinycurses.c | 40 ++++++++++++++-- 2 files changed, 116 insertions(+), 6 deletions(-) (limited to 'payloads/libpayload/curses') diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index 0f55614f39..facf2ace19 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -43,11 +43,89 @@ static int _halfdelay = 0; /* ============== Serial ==================== */ -/* FIXME: Cook the serial correctly */ +/* We treat serial like a vt100 terminal. For now we + do the cooking in here, but we should probably eventually + pass it to dedicated vt100 code */ + +static int getkeyseq(char *buffer, int len) +{ + int i; + + for(i = 0; i < 75; i++) { + if (serial_havechar()) + break; + mdelay(1); + } + + if (i == 75) + return len; + + buffer[len++] = serial_getchar(); + return getkeyseq(buffer, len); +} + +static struct { + char *seq; + int key; +} escape_codes[] = { + { "[A", KEY_UP }, + { "[B", KEY_DOWN }, + { "[C", KEY_RIGHT }, + { "[D", KEY_LEFT }, + { "OP", KEY_F(1) }, + { "OQ", KEY_F(2) }, + { "OR", KEY_F(3) }, + { "OS", KEY_F(4) }, + { "[15~", KEY_F(5) }, + { "[17~", KEY_F(6) }, + { "[18~", KEY_F(7) }, + { "[19~", KEY_F(8) }, + { "[20~", KEY_F(9) }, + { "[21~", KEY_F(10) }, + { "[24~", KEY_F(12) }, + { NULL }, +}; + +static int handle_escape(void) +{ + char buffer[5]; + int len = getkeyseq(buffer, 0); + int i, t; + + if (len == 0) + return 27; + + for(i = 0; escape_codes[i].seq != NULL; i++) { + char *p = escape_codes[i].seq; + + for(t = 0; t < len; t++) { + if (!*p || *p != buffer[t]) + break; + p++; + } + + if (t == len) + return escape_codes[i].key; + } + + return 0; +} static int cook_serial(unsigned char ch) { - return (int) ch; + switch(ch) { + case 8: + return KEY_BACKSPACE; + + case 13: + return KEY_ENTER; + + case 27: + return handle_escape(); + + default: + return ch; + } } /* ================ Keyboard ================ */ diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index a51efb2974..9e9b3cdec0 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -218,6 +218,10 @@ WINDOW *initscr(void) // newterm(name, stdout, stdin); // def_prog_mode(); + if (curses_flags & F_ENABLE_SERIAL) { + serial_clear(); + } + if (curses_flags & F_ENABLE_CONSOLE) { /* Clear the screen and kill the cursor */ @@ -586,20 +590,48 @@ int whline(WINDOW *win, chtype ch, int n) win->_flags |= _HASMOVED; return OK; } + int wnoutrefresh(WINDOW *win) { // FIXME. + int serial_is_bold = 0; + int x, y; + serial_end_bold(); + for (y = 0; y <= win->_maxy; y++) { + + /* Position the serial cursor */ + + if (curses_flags & F_ENABLE_SERIAL) + serial_set_cursor(win->_begy + y, win->_begx); + for (x = 0; x <= win->_maxx; x++) { - if (curses_flags & F_ENABLE_SERIAL) + attr_t attr = win->_line[y].text[x].attr; + + unsigned int c = + ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; + + if (curses_flags & F_ENABLE_SERIAL) { + + if (attr & A_BOLD) { + if (!serial_is_bold) { + serial_start_bold(); + serial_is_bold = 1; + } + } + else { + if (serial_is_bold) { + serial_end_bold(); + serial_is_bold = 0; + } + } + serial_putchar(win->_line[y].text[x].chars[0]); + } if (curses_flags & F_ENABLE_CONSOLE) { - attr_t attr = win->_line[y].text[x].attr; - unsigned int c = - ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; /* Handle some of the attributes. */ if (attr & A_BOLD) -- cgit v1.2.3