Changeset dc033a1 in mainline for uspace/srv/console/console.c

Timestamp:

2009-03-22T17:45:15Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

3fe00ee

Parents:

0a5116db

Message:

Get rid of FB_WRITE. We can use FB_DRAW_TEXT_DATA if we extend it just a little bit.

File:

• uspace/srv/console/console.c (modified) (18 diffs)

uspace/srv/console/console.c

@@ -63 +63 @@
 int prev_console = 0;
 
-/** Information about framebuffer
- */
+/** Information about framebuffer */
 struct {
         int phone;              /**< Framebuffer phone */
@@ -90 +89 @@
                                                  * faster virtual console
                                                  * switching */
-/** Size of fb_buf. */
-#define FB_BUF_SIZE 256
-
-/** Buffer for sending characters to FB driver. */
-static char fb_buf[FB_BUF_SIZE];
-
-/* Properties of fb_buf data. */
-static int fb_buf_row;          /**< Row where fb_buf data belong. */
-static int fb_buf_col;          /**< Column where fb_buf data start. */
-static int fb_console;          /**< VC to which fb_buf data belong. */
-int fb_bi = 0;                  /**< Number of valid chars in fb_buf. */
+
+/** Information on row-span yet unsent to FB driver. */
+struct {
+        int row;                /**< Row where the span lies. */
+        int col;                /**< Leftmost column of the span. */
+        int n;                  /**< Width of the span. */
+} fb_pending;
 
 /** Size of cwrite_buf. */
@@ -107 +102 @@
 /** Buffer for receiving data via the CONSOLE_WRITE call from the client. */
 static char cwrite_buf[CWRITE_BUF_SIZE];
+
+static void fb_putchar(char c, int row, int col);
 
 
@@ -176 +173 @@
 }
 
-/** Write a character vector to FB driver via IPC. */
-static ssize_t fb_write(const char *buf, size_t nbyte, int row, int col)
-{
-        ipcarg_t rc;
-        ipc_call_t answer;
-        aid_t req;
-
-        async_serialize_start();
-        
-        req = async_send_2(fb_info.phone, FB_WRITE, row, col, &answer);
-        rc = ipc_data_write_start(fb_info.phone, (void *) buf, nbyte);
-
-        if (rc != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return (ssize_t) rc;
-        }
-
-        async_wait_for(req, &rc);
-        async_serialize_end();
-
-        if (rc == EOK)
-                return (ssize_t) IPC_GET_ARG1(answer);
-        else
-                return -1;
-}
-
-/** Flush buffered characters to FB. */
-static void fb_buf_flush(void)
+/** Send an area of screenbuffer to the FB driver. */
+static void fb_update_area(connection_t *conn, int x, int y, int w, int h)
+{
+        int i, j;
+        int rc;
+        attrs_t *attrs;
+        keyfield_t *field;
+
+        if (interbuffer) {
+                for (j = 0; j < h; j++) {
+                        for (i = 0; i < w; i++) {
+                                interbuffer[i + j * w] =
+                                    *get_field_at(&conn->screenbuffer,
+                                        x + i, y + j);
+                        }
+                }
+
+                rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
+                    x, y, w, h);
+        } else {
+                rc = ENOTSUP;
+        }
+
+        if (rc != 0) {
+                attrs = &conn->screenbuffer.attrs;
+
+                for (j = 0; j < h; j++) {
+                        for (i = 0; i < w; i++) {
+                                field = get_field_at(&conn->screenbuffer,
+                                    x + i, y + j);
+                                if (!attrs_same(*attrs, field->attrs))
+                                        set_attrs(&field->attrs);
+                                attrs = &field->attrs;
+
+                                fb_putchar(field->character, y + j, x + i);
+                        }
+                }
+        }
+}
+
+/** Flush pending cells to FB. */
+static void fb_pending_flush(void)
 {
         screenbuffer_t *scr;
-        int i;
-
-        scr = &(connections[fb_console].screenbuffer);
-
-        if (fb_bi > 0) {
-                if (fb_write(fb_buf, fb_bi, fb_buf_row, fb_buf_col) < 0) {
-                        /* Try falling back to char-by-char. */
-                        for (i = 0; i < fb_bi; i++) {
-                                async_msg_3(fb_info.phone, FB_PUTCHAR, fb_buf[i],
-                                    fb_buf_row, fb_buf_col + i);
-                        }
-                }
-                fb_bi = 0;
-        }
-}
+
+        scr = &(connections[active_console].screenbuffer);
+
+        if (fb_pending.n > 0) {
+                fb_update_area(&connections[active_console], fb_pending.col,
+                    fb_pending.row, fb_pending.n, 1);
+                fb_pending.n = 0;
+        }
+}
+
+/** Mark a character cell as changed.
+ *
+ * This adds the cell to the pending rowspan if possible. Otherwise
+ * the old span is flushed first.
+ */
+static void cell_mark_changed(int row, int col)
+{
+        if (fb_pending.n != 0) {
+                if (row != fb_pending.row ||
+                    col != fb_pending.col + fb_pending.n) {
+                        fb_pending_flush();
+                }
+        }
+
+        if (fb_pending.n == 0) {
+                fb_pending.row = row;
+                fb_pending.col = col;
+        }
+
+        ++fb_pending.n;
+}
+
 
 /** Print a character to the active VC with buffering. */
-static void prtchr(char c, int row, int col)
-{
-        if (fb_bi >= FB_BUF_SIZE)
-                fb_buf_flush();
-
-        if (fb_bi == 0) {
-                fb_buf_row = row;
-                fb_buf_col = col;
-                fb_console = active_console;
-        }
-
-        fb_buf[fb_bi++] = c;
-}
-
-/** Check key and process special keys. 
- *
- *
- */
+static void fb_putchar(char c, int row, int col)
+{
+        async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
+}
+
+/** Process a character from the client (TTY emulation). */
 static void write_char(int console, char key)
 {
@@ -249 +264 @@
         switch (key) {
         case '\n':
-                fb_buf_flush();
+                fb_pending_flush();
                 flush_cursor = true;
                 scr->position_y++;
@@ -255 +270 @@
                 break;
         case '\r':
-                fb_buf_flush();
                 break;
         case '\t':
-                fb_buf_flush();
                 scr->position_x += 8;
                 scr->position_x -= scr->position_x % 8; 
                 break;
         case '\b':
-                fb_buf_flush();
                 if (scr->position_x == 0) 
                         break;
                 scr->position_x--;
                 if (console == active_console)
-                        prtchr(' ', scr->position_y, scr->position_x);
+                        cell_mark_changed(scr->position_y, scr->position_x);
                 screenbuffer_putchar(scr, ' ');
                 break;
         default:        
                 if (console == active_console)
-                        prtchr(key, scr->position_y, scr->position_x);
+                        cell_mark_changed(scr->position_y, scr->position_x);
 
                 screenbuffer_putchar(scr, key);
@@ -280 +292 @@
 
         if (scr->position_x >= scr->size_x) {
-                fb_buf_flush();
                 flush_cursor = true;
                 scr->position_y++;
@@ -286 +297 @@
         
         if (scr->position_y >= scr->size_y) {
+                fb_pending_flush();
                 scr->position_y = scr->size_y - 1;
                 screenbuffer_clear_line(scr, scr->top_line);
@@ -310 +322 @@
                 return;
 
-        fb_buf_flush();
+        fb_pending_flush();
 
         if (newcons == KERNEL_CONSOLE) {
@@ -338 +350 @@
                 curs_visibility(false);
                 if (interbuffer) {
-                        for (i = 0; i < conn->screenbuffer.size_x; i++)
-                                for (j = 0; j < conn->screenbuffer.size_y; j++) {
+                        for (j = 0; j < conn->screenbuffer.size_y; j++) {
+                                for (i = 0; i < conn->screenbuffer.size_x; i++) {
                                         unsigned int size_x;
                                         
                                         size_x = conn->screenbuffer.size_x; 
-                                        interbuffer[i + j * size_x] =
+                                        interbuffer[j * size_x + i] =
                                             *get_field_at(&conn->screenbuffer, i, j);
                                 }
+                        }
                         /* This call can preempt, but we are already at the end */
-                        rc = async_req_0_0(fb_info.phone, FB_DRAW_TEXT_DATA);
+                        rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
+                            0, 0, conn->screenbuffer.size_x,
+                            conn->screenbuffer.size_y);
                 }
                 
@@ -366 +381 @@
                                                 continue;
 
-                                        prtchr(field->character, j, i);
+                                        fb_putchar(field->character, j, i);
                                 }
                 }
@@ -479 +494 @@
         ipcarg_t arg1, arg2, arg3, arg4;
         connection_t *conn;
+        screenbuffer_t *scr;
         
         if ((consnum = find_free_connection()) == -1) {
@@ -535 +551 @@
                         break;
                 case CONSOLE_GOTO:
-                        fb_buf_flush();
                         screenbuffer_goto(&conn->screenbuffer,
                             IPC_GET_ARG2(call), IPC_GET_ARG1(call));
@@ -547 +562 @@
                         break;
                 case CONSOLE_FLUSH:
-                        fb_buf_flush();
-                        if (consnum == active_console)
+                        fb_pending_flush();
+                        if (consnum == active_console) {
                                 async_req_0_0(fb_info.phone, FB_FLUSH);
+
+                                scr = &(connections[consnum].screenbuffer);
+                                curs_goto(scr->position_y, scr->position_x);
+                        }
                         break;
                 case CONSOLE_SET_STYLE:
-                        fb_buf_flush();
+                        fb_pending_flush();
                         arg1 = IPC_GET_ARG1(call);
                         screenbuffer_set_style(&conn->screenbuffer, arg1);
@@ -559 +578 @@
                         break;
                 case CONSOLE_SET_COLOR:
-                        fb_buf_flush();
+                        fb_pending_flush();
                         arg1 = IPC_GET_ARG1(call);
                         arg2 = IPC_GET_ARG2(call);
@@ -569 +588 @@
                         break;
                 case CONSOLE_SET_RGB_COLOR:
-                        fb_buf_flush();
+                        fb_pending_flush();
                         arg1 = IPC_GET_ARG1(call);
                         arg2 = IPC_GET_ARG2(call);
@@ -578 +597 @@
                         break;
                 case CONSOLE_CURSOR_VISIBILITY:
-                        fb_buf_flush();
+                        fb_pending_flush();
                         arg1 = IPC_GET_ARG1(call);
                         conn->screenbuffer.is_cursor_visible = arg1;
@@ -684 +703 @@
         interbuffer = as_get_mappable_page(ib_size);
 
+        fb_pending.n = 0;
+
         if (as_area_create(interbuffer, ib_size, AS_AREA_READ |
             AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer) {