Changeset 3579 for trunk

Timestamp:

09/17/08 18:32:17 (2 months ago)

Author:

stepan

Message:

This patch adds damage detection to libpayload's tinycurses. This
significantly speeds up serial output with large windows.

It also adds the function curs_set to enable/disable the cursor (video console
only for now)

Also, use werase in one place to reduce code duplication.

Signed-off-by: Stefan Reinauer <stepan@…>
Acked-by: Jordan Crouse <jordan.crouse@…>

Files:

• trunk/payloads/libpayload/curses/tinycurses.c (modified) (15 diffs)

trunk/payloads/libpayload/curses/tinycurses.c

@@ -4 +4 @@
  * Copyright (C) 2007 Uwe Hermann <uwe@hermann-uwe.de>
  * Copyright (C) 2008 Ulf Jordan <jordan@chalmers.se>
+ * Copyright (C) 2008 coresystems GmbH
  *
  * Redistribution and use in source and binary forms, with or without
@@ -194 +195 @@
 /* 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)
+{
+        if (curses_flags & F_ENABLE_SERIAL) {
+                // TODO
+        }
+
+        if (curses_flags & F_ENABLE_CONSOLE) {
+                video_console_cursor_enable(on);
+        }
+
+        return OK;
+}
 // int def_prog_mode(void) {}
 // int def_shell_mode(void) {}
@@ -253 +265 @@
         return win;
 }
-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; }
@@ -282 +294 @@
 WINDOW *initscr(void)
 {
-        int x, y, i;
+        int i;
 
         // newterm(name, stdout, stdin);
@@ -306 +318 @@
         // 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;
@@ -474 +481 @@
 }
 // int vwscanw (WINDOW *, NCURSES_CONST char *,va_list) {}
-// int waddch (WINDOW *, const chtype) {}
 int waddch(WINDOW *win, const chtype ch)
 {
@@ -481 +487 @@
         // 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);
@@ -487 +497 @@
         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
 
@@ -507 +522 @@
         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')) {
@@ -522 +541 @@
                 // }
         }
+
+        if (win->_line[win->_cury].lastchar == _NOCHANGE || 
+                        win->_line[win->_cury].lastchar < win->_curx)
+                win->_line[win->_cury].lastchar = win->_curx;
+
         return code;
 }
@@ -604 +628 @@
                         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;
@@ -682 +709 @@
         for (y = 0; y <= win->_maxy; y++) {
 
+                if (win->_line[y].firstchar == _NOCHANGE)
+                        continue;
+
                 /* 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++) {
+                        serial_set_cursor(win->_begy + y, win->_begx +
+                                        win->_line[y].firstchar);
+
+                for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) {
                         attr_t attr = win->_line[y].text[x].attr;
 
@@ -735 +766 @@
 
                                 serial_putchar(ch);
+
                         }
 
@@ -769 +801 @@
                         }
                 }
-        }
+                win->_line[y].firstchar = _NOCHANGE;
+                win->_line[y].lastchar = _NOCHANGE;
+        }
+
+        if (curses_flags & F_ENABLE_SERIAL)
+                serial_set_cursor(win->_begy + win->_cury, win->_begx + win->_curx);
+
+        if (curses_flags & F_ENABLE_CONSOLE)
+                video_console_set_cursor(win->_begx + win->_curx, win->_begy + win->_cury);
 
         return OK;
@@ -814 +854 @@
 int wscrl(WINDOW *win, int n)
 {
+        int x, y;
+
         if (!win->_scroll)
                 return ERR;
 
-        if (n != 0) {
-                int x, y;
-
-                for (y = 0; y <= (win->_maxy - n); y++) {
-                        for (x = 0; x <= win->_maxx; x++) {
+        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++) {
+        }
+
+        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);
-        }
+        }
+
+        // _nc_scroll_window(win, n, win->_regtop, win->_regbottom, win->_nc_bkgd);
+        // _nc_synchook(win);
+
         return OK;
 }