Changeset 6d5005c in mainline for console/console.c

Timestamp:

2006-06-04T21:51:39Z (18 years ago)

Author:

Josef Cejka <malyzelenyhnus@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0aa024b1

Parents:

ec9623d

Message:

Fixed and improved dummy console switch.

File:

• console/console.c (modified) (3 diffs)

console/console.c

@@ -206 +206 @@
         static int console_pixmap = -1;
         int i, j;
+        keyfield_t *field;
+        style_t *style;
         char c;
 
@@ -242 +244 @@
         set_style(&conn->screenbuffer.style);
         curs_goto(conn->screenbuffer.position_y, conn->screenbuffer.position_x);
+        curs_visibility(0);
+        
         if (interbuffer) {
                 for (i = 0; i < conn->screenbuffer.size_x; i++)
@@ -247 +251 @@
                                 interbuffer[i + j*conn->screenbuffer.size_x] = *get_field_at(&(conn->screenbuffer),i, j);
                 /* This call can preempt, but we are already at the end */
-                sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);                
-                curs_visibility(conn->screenbuffer.is_cursor_visible);
-        } else {
+                j = sync_send_2(fb_info.phone, FB_DRAW_TEXT_DATA, 0, 0, NULL, NULL);            
+        };
+        
+        if ((!interbuffer) || (j != 0)){
+                set_style(&conn->screenbuffer.style);
                 clrscr();
-                
-                for (i = 0; i < conn->screenbuffer.size_x; i++)
-                        for (j = 0; j < conn->screenbuffer.size_y; j++) {
-                                c = get_field_at(&(conn->screenbuffer),i, j)->character;
-                                if (c && c != ' ')
-                                        prtchr(c, j, i);
+                style = &conn->screenbuffer.style;
+
+                for (j = 0; j < conn->screenbuffer.size_y; j++) 
+                        for (i = 0; i < conn->screenbuffer.size_x; i++) {
+                                field = get_field_at(&(conn->screenbuffer),i, j);
+                                if (!style_same(*style, field->style))
+                                        set_style(&field->style);
+                                style = &field->style;
+                                if ((field->character == ' ') && (style_same(field->style, conn->screenbuffer.style)))
+                                        continue;
+
+                                prtchr(field->character, j, i);
                         }
-                
-                curs_visibility(conn->screenbuffer.is_cursor_visible);
-        }
+        }
+        
+        curs_visibility(conn->screenbuffer.is_cursor_visible);
 }