WebSVN – HelenOS – Diff – /branches/dd/uspace/srv/console/console.c

  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /** @addtogroup console
  * @{
  */
 /** @file
  */
 #include <libc.h>
 #include <event.h>
 #include "console.h"
 #include "gcons.h"
-#define MAX_KEYREQUESTS_BUFFERED 32
+#define NAME  "console"
+#define MAX_KEYREQUESTS_BUFFERED  32
+/** Size of cwrite_buf. */
-#define NAME "console"
+#define CWRITE_BUF_SIZE  256
 /** Index of currently used virtual console.
  */
 int active_console = 0;
 int prev_console = 0;
 /** Phone to the keyboard driver. */
 static int kbd_phone;
 /** Information about framebuffer */
 struct {
-    int phone;      /**< Framebuffer phone */
+    int phone;      /**< Framebuffer phone */
-    ipcarg_t rows;      /**< Framebuffer rows */
+    ipcarg_t rows;  /**< Framebuffer rows */
-    ipcarg_t cols;      /**< Framebuffer columns */
+    ipcarg_t cols;  /**< Framebuffer columns */
 } fb_info;
 typedef struct {
-    keybuffer_t keybuffer;      /**< Buffer for incoming keys. */
+    keybuffer_t keybuffer;        /**< Buffer for incoming keys. */
     /** Buffer for unsatisfied request for keys. */
     FIFO_CREATE_STATIC(keyrequests, ipc_callid_t,
         MAX_KEYREQUESTS_BUFFERED);
-    int keyrequest_counter;     /**< Number of requests in buffer. */
+    int keyrequest_counter;       /**< Number of requests in buffer. */
-    int client_phone;       /**< Phone to connected client. */
+    int client_phone;             /**< Phone to connected client. */
-    int used;           /**< 1 if this virtual console is
+    int used;                     /**< 1 if this virtual console is
-                     * connected to some client.*/
+                                       connected to some client. */
-    screenbuffer_t screenbuffer;    /**< Screenbuffer for saving screen
+    screenbuffer_t screenbuffer;  /**< Screenbuffer for saving screen
-                     * contents and related settings. */
+                                       contents and related settings. */
 } connection_t;
-static connection_t connections[CONSOLE_COUNT]; /**< Array of data for virtual
-                         * consoles */
+/** Array of data for virtual consoles */
-static keyfield_t *interbuffer = NULL;      /**< Pointer to memory shared
+static connection_t connections[CONSOLE_COUNT];
-                         * with framebufer used for
+/** Pointer to memory shared with framebufer used for
-                         * faster virtual console
+    faster virtual console switching */
-                         * switching */
+static keyfield_t *interbuffer = NULL;
 /** Information on row-span yet unsent to FB driver. */
 struct {
-    int row;        /**< Row where the span lies. */
+    int row;  /**< Row where the span lies. */
-    int col;        /**< Leftmost column of the span. */
+    int col;  /**< Leftmost column of the span. */
-    int n;          /**< Width of the span. */
+    int cnt;  /**< Width of the span. */
 } fb_pending;
-/** Size of cwrite_buf. */
-#define CWRITE_BUF_SIZE 256
 /** Buffer for receiving data via the CONSOLE_WRITE call from the client. */
 static char cwrite_buf[CWRITE_BUF_SIZE];
-static void fb_putchar(wchar_t c, int row, int col);
 /** Find unused virtual console.
+ *
  */
 static int find_free_connection(void)
+{
     for (i = 0; i < CONSOLE_COUNT; i++) {
         if (!connections[i].used)
             return i;
+    }
     return -1;
+}
 static void clrscr(void)
+{
+{
     switch (attrs->t) {
     case at_style:
         set_style(attrs->a.s.style);
         break;
     case at_idx:
         set_color(attrs->a.i.fg_color, attrs->a.i.bg_color,
             attrs->a.i.flags);
         break;
     case at_rgb:
         set_rgb_color(attrs->a.r.fg_color, attrs->a.r.bg_color);
         break;
+    }
+}
 /** 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 i;
-    int rc;
+    int j;
     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,
+                    *get_field_at(&conn->screenbuffer, x + i, y + j);
-                    x + i, y + j);
+            }
+        }
-        rc = async_req_4_0(fb_info.phone, FB_DRAW_TEXT_DATA,
+        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;
+    screenbuffer_t *scr
-    scr = &(connections[active_console].screenbuffer);
+        = &(connections[active_console].screenbuffer);
-    if (fb_pending.n > 0) {
+    if (fb_pending.cnt > 0) {
         fb_update_area(&connections[active_console], fb_pending.col,
-            fb_pending.row, fb_pending.n, 1);
+            fb_pending.row, fb_pending.cnt, 1);
-        fb_pending.n = 0;
+        fb_pending.cnt = 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 (fb_pending.cnt != 0) {
-        if (row != fb_pending.row ||
+        if ((row != fb_pending.row)
-            col != fb_pending.col + fb_pending.n) {
+            || (col != fb_pending.col + fb_pending.cnt)) {
             fb_pending_flush();
+        }
+    }
-    if (fb_pending.n == 0) {
+    if (fb_pending.cnt == 0) {
         fb_pending.row = row;
         fb_pending.col = col;
+    }
-    ++fb_pending.n;
+    fb_pending.cnt++;
+}
 /** Print a character to the active VC with buffering. */
 static void fb_putchar(wchar_t 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, wchar_t ch)
+{
     bool flush_cursor = false;
     screenbuffer_t *scr = &(connections[console].screenbuffer);
     switch (ch) {
     case '\n':
         fb_pending_flush();
         flush_cursor = true;
         scr->position_y++;
         break;
     case '\r':
         break;
     case '\t':
         scr->position_x += 8;
         scr->position_x -= scr->position_x % 8;
         break;
     case '\b':
         if (scr->position_x == 0)
             break;
         scr->position_x--;
         if (console == active_console)
             cell_mark_changed(scr->position_y, scr->position_x);
         screenbuffer_putchar(scr, ' ');
         break;
     default:
         if (console == active_console)
             cell_mark_changed(scr->position_y, scr->position_x);
         screenbuffer_putchar(scr, ch);
         scr->position_x++;
+    }
     if (scr->position_x >= scr->size_x) {
         flush_cursor = true;
         scr->position_y++;
+    }
         screenbuffer_clear_line(scr, scr->top_line);
         scr->top_line = (scr->top_line + 1) % scr->size_y;
         if (console == active_console)
             async_msg_1(fb_info.phone, FB_SCROLL, 1);
+    }
     scr->position_x = scr->position_x % scr->size_x;
     if (console == active_console && flush_cursor)
         curs_goto(scr->position_y, scr->position_x);
+}
 /** Switch to new console */
 static void change_console(int newcons)
+{
     connection_t *conn;
+    int i;
+    int j;
-    int i, j, rc;
+    int rc;
     keyfield_t *field;
     attrs_t *attrs;
     if (newcons == active_console)
         return;
     fb_pending_flush();
     if (newcons == KERNEL_CONSOLE) {
         async_serialize_start();
         curs_hide_sync();
         gcons_in_kernel();
         screen_yield();
         kbd_yield();
         async_serialize_end();
         if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
             prev_console = active_console;
             active_console = KERNEL_CONSOLE;
         } else
                     field = get_field_at(&conn->screenbuffer, i, j);
                     if (!attrs_same(*attrs, field->attrs))
                         set_attrs(&field->attrs);
                     attrs = &field->attrs;
                     if ((field->character == ' ') &&
-                        (attrs_same(field->attrs,
-                        conn->screenbuffer.attrs)))
+                        (attrs_same(field->attrs, conn->screenbuffer.attrs)))
                         continue;
                     fb_putchar(field->character, j, i);
+                }
+        }
         curs_goto(conn->screenbuffer.position_y,
     kbd_event_t ev;
     connection_t *conn;
     int newcon;
     /* Ignore parameters, the connection is alread opened */
-    while (1) {
+    while (true) {
         callid = async_get_call(&call);
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             /* TODO: Handle hangup */
             return;
             ev.type = IPC_GET_ARG1(call);
             ev.key = IPC_GET_ARG2(call);
             ev.mods = IPC_GET_ARG3(call);
             ev.c = IPC_GET_ARG4(call);
-            /* switch to another virtual console */
+            /* Switch to another virtual console */
             conn = &connections[active_console];
             if ((ev.key >= KC_F1) && (ev.key < KC_F1 +
                 CONSOLE_COUNT) && ((ev.mods & KM_CTRL) == 0)) {
                 if (ev.key == KC_F12)
                     change_console(KERNEL_CONSOLE);
                 else
                     change_console(ev.key - KC_F1);
                 break;
+            }
-            /* if client is awaiting key, send it */
+            /* If client is awaiting key, send it */
             if (conn->keyrequest_counter > 0) {
                 conn->keyrequest_counter--;
                 ipc_answer_4(fifo_pop(conn->keyrequests), EOK,
                     ev.type, ev.key, ev.mods, ev.c);
                 break;
+            }
             keybuffer_push(&conn->keybuffer, &ev);
             retval = 0;
             break;
         default:
             retval = ENOENT;
+        }
         ipc_answer_0(callid, retval);
+{
     ipc_callid_t callid;
     size_t size;
     wchar_t ch;
     size_t off;
     if (!ipc_data_write_receive(&callid, &size)) {
         ipc_answer_0(callid, EINVAL);
         ipc_answer_0(rid, EINVAL);
         return;
+    }
     if (size > CWRITE_BUF_SIZE)
         size = CWRITE_BUF_SIZE;
     (void) ipc_data_write_finalize(callid, cwrite_buf, size);
     async_serialize_start();
     off = 0;
     while (off < size) {
         ch = str_decode(cwrite_buf, &off, size);
         write_char(consnum, ch);
+    }
     async_serialize_end();
     gcons_notify_char(consnum);
     ipc_answer_1(rid, EOK, size);
+}
 /** Default thread for new connections */
         clrscr();
     /* Accept the connection */
     ipc_answer_0(iid, EOK);
-    while (1) {
+    while (true) {
         async_serialize_end();
         callid = async_get_call(&call);
         async_serialize_start();
         arg1 = 0;
         arg2 = 0;
         arg3 = 0;
         arg4 = 0;
         switch (IPC_GET_METHOD(call)) {
         case IPC_M_PHONE_HUNGUP:
             gcons_notify_disconnect(consnum);
             /* Answer all pending requests */
             break;
         case CONSOLE_FLUSH:
             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:
             break;
         case CONSOLE_GETKEY:
             if (keybuffer_empty(&conn->keybuffer)) {
                 /* buffer is empty -> store request */
                 if (conn->keyrequest_counter <
                     MAX_KEYREQUESTS_BUFFERED) {
                     fifo_push(conn->keyrequests, callid);
                     conn->keyrequest_counter++;
                 } else {
                     /*
                      * No key available and too many
             /* FIXME: handle error */
             return -1;
+        }
+    }
     connections[KERNEL_CONSOLE].used = 1;
     /* Set up shared memory buffer. */
     ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows;
     interbuffer = as_get_mappable_page(ib_size);
-    fb_pending.n = 0;
+    fb_pending.cnt = 0;
     if (as_area_create(interbuffer, ib_size, AS_AREA_READ |
         AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer) {
         interbuffer = NULL;
+    }
     if (interbuffer) {
         if (ipc_share_out_start(fb_info.phone, interbuffer,
             AS_AREA_READ) != EOK) {
             as_area_destroy(interbuffer);
             interbuffer = NULL;
         return -1;
     /* Receive kernel notifications */
     if (event_subscribe(EVENT_KCONSOLE, 0) != EOK)
         printf(NAME ": Error registering kconsole notifications\n");
     async_set_interrupt_received(interrupt_received);
     // FIXME: avoid connectiong to itself, keep using klog
     // printf(NAME ": Accepting connections\n");
     async_manager();

Subversion Repositories HelenOS

(root)/branches/dd/uspace/srv/console/console.c – Rev 4420 → 4439