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

  */
 #include <libc.h>
 #include <fb.h>
 #include <ipc/ipc.h>
-#include <keys.h>
+#include <kbd.h>
+#include <kbd/keycode.h>
 #include <ipc/fb.h>
 #include <ipc/services.h>
 #include <errno.h>
 #include <key_buffer.h>
-#include <console.h>
+#include <ipc/console.h>
 #include <unistd.h>
 #include <async.h>
 #include <libadt/fifo.h>
 #include <screenbuffer.h>
 #include <sys/mman.h>
 #include <stdio.h>
+#include <sysinfo.h>
+#include "console.h"
 #include "gcons.h"
 #define MAX_KEYREQUESTS_BUFFERED 32
 #define NAME "console"
 /** Index of currently used virtual console.
  */
 int active_console = 0;
+int prev_console = 0;
 /** Information about framebuffer
  */
 struct {
     int phone;      /**< Framebuffer phone */
 static keyfield_t *interbuffer = NULL;      /**< Pointer to memory shared
                          * with framebufer used for
                          * faster virtual console
                          * switching */
-static int kernel_pixmap = -1;  /**< Number of fb pixmap, where kernel
-                 * console is stored */
 /** Find unused virtual console.
+ *
  */
 static int find_free_connection(void)
 static void clrscr(void)
+{
     async_msg_0(fb_info.phone, FB_CLEAR);
+}
-static void curs_visibility(int v)
+static void curs_visibility(bool visible)
+{
+    async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, visible);
+}
+static void curs_hide_sync(void)
+{
-    async_msg_1(fb_info.phone, FB_CURSOR_VISIBILITY, v);
+    ipc_call_sync_1_0(fb_info.phone, FB_CURSOR_VISIBILITY, false);
+}
 static void curs_goto(int row, int col)
+{
     async_msg_2(fb_info.phone, FB_CURSOR_GOTO, row, col);
+}
-static void set_style(style_t *style)
+static void set_style(int style)
+{
+    async_msg_1(fb_info.phone, FB_SET_STYLE, style);
+}
+static void set_color(int fgcolor, int bgcolor, int flags)
+{
-    async_msg_2(fb_info.phone, FB_SET_STYLE, style->fg_color,
+    async_msg_3(fb_info.phone, FB_SET_COLOR, fgcolor, bgcolor, flags);
-        style->bg_color);
+}
-static void set_style_col(int fgcolor, int bgcolor)
+static void set_rgb_color(int fgcolor, int bgcolor)
+{
-    async_msg_2(fb_info.phone, FB_SET_STYLE, fgcolor, bgcolor);
+    async_msg_2(fb_info.phone, FB_SET_RGB_COLOR, fgcolor, bgcolor);
+}
+static void set_attrs(attrs_t *attrs)
+{
+    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;
+    }
+}
 static void prtchr(char c, int row, int col)
+{
     async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
     if (console == active_console)
         curs_goto(scr->position_y, scr->position_x);
+}
-/** Save current screen to pixmap, draw old pixmap
- *
- * @param oldpixmap Old pixmap
- * @return ID of pixmap of current screen
- */
-static int switch_screens(int oldpixmap)
-{
-    int newpmap;
-    /* Save screen */
-    newpmap = async_req_0_0(fb_info.phone, FB_VP2PIXMAP);
-    if (newpmap < 0)
-        return -1;
-    if (oldpixmap != -1) {
-        /* Show old screen */
-        async_msg_2(fb_info.phone, FB_VP_DRAW_PIXMAP, 0, oldpixmap);
-        /* Drop old pixmap */
-        async_msg_1(fb_info.phone, FB_DROP_PIXMAP, oldpixmap);
-    }
-    return newpmap;
-}
 /** Switch to new console */
 static void change_console(int newcons)
+{
     connection_t *conn;
-    static int console_pixmap = -1;
     int i, j, rc;
     keyfield_t *field;
-    style_t *style;
+    attrs_t *attrs;
     if (newcons == active_console)
         return;
     if (newcons == KERNEL_CONSOLE) {
-        if (active_console == KERNEL_CONSOLE)
-            return;
-        active_console = KERNEL_CONSOLE;
-        curs_visibility(0);
         async_serialize_start();
-        if (kernel_pixmap == -1) {
-            /* store/restore unsupported */
-            set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
-            clrscr();
+        curs_hide_sync();
-        } else {
-            gcons_in_kernel();
+        gcons_in_kernel();
-            console_pixmap = switch_screens(kernel_pixmap);
-            kernel_pixmap = -1;
-        }
         async_serialize_end();
-        __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
+        if (__SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE)) {
-        return;
-    }
-    async_serialize_start();
+            prev_console = active_console;
-    if (console_pixmap != -1) {
+            active_console = KERNEL_CONSOLE;
-        kernel_pixmap = switch_screens(console_pixmap);
-        console_pixmap = -1;
-    }
+        } else
-    active_console = newcons;
-    gcons_change_console(newcons);
-    conn = &connections[active_console];
+            newcons = active_console;
-    set_style(&conn->screenbuffer.style);
-    curs_visibility(0);
-    if (interbuffer) {
-        for (i = 0; i < conn->screenbuffer.size_x; i++)
-            for (j = 0; j < conn->screenbuffer.size_y; j++) {
-                unsigned int size_x;
-                size_x = conn->screenbuffer.size_x;
-                interbuffer[i + j * size_x] =
-                    *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);
+    }
+    if (newcons != KERNEL_CONSOLE) {
+        async_serialize_start();
+        if (active_console == KERNEL_CONSOLE)
+            gcons_redraw_console();
+        active_console = newcons;
+        gcons_change_console(newcons);
+        conn = &connections[active_console];
+        set_attrs(&conn->screenbuffer.attrs);
+        curs_visibility(false);
+        if (interbuffer) {
+            for (i = 0; i < conn->screenbuffer.size_x; i++)
+                for (j = 0; j < conn->screenbuffer.size_y; j++) {
+                    unsigned int size_x;
+                    size_x = conn->screenbuffer.size_x;
+                    interbuffer[i + j * size_x] =
+                        *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);
+        }
-    if ((!interbuffer) || (rc != 0)) {
+        if ((!interbuffer) || (rc != 0)) {
-        set_style(&conn->screenbuffer.style);
+            set_attrs(&conn->screenbuffer.attrs);
-        clrscr();
+            clrscr();
-        style = &conn->screenbuffer.style;
+            attrs = &conn->screenbuffer.attrs;
-        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++) {
+                for (i = 0; i < conn->screenbuffer.size_x; i++) {
-                field = get_field_at(&conn->screenbuffer, i, j);
+                    field = get_field_at(&conn->screenbuffer, i, j);
-                if (!style_same(*style, field->style))
+                    if (!attrs_same(*attrs, field->attrs))
-                    set_style(&field->style);
+                        set_attrs(&field->attrs);
-                style = &field->style;
+                    attrs = &field->attrs;
-                if ((field->character == ' ') &&
+                    if ((field->character == ' ') &&
-                    (style_same(field->style,
+                        (attrs_same(field->attrs,
-                    conn->screenbuffer.style)))
+                        conn->screenbuffer.attrs)))
-                    continue;
+                        continue;
-                prtchr(field->character, j, i);
+                    prtchr(field->character, j, i);
-            }
+                }
+        }
+        curs_goto(conn->screenbuffer.position_y,
+            conn->screenbuffer.position_x);
+        curs_visibility(conn->screenbuffer.is_cursor_visible);
+        async_serialize_end();
+    }
-    curs_goto(conn->screenbuffer.position_y,
-        conn->screenbuffer.position_x);
-    curs_visibility(conn->screenbuffer.is_cursor_visible);
-    async_serialize_end();
+}
 /** Handler for keyboard */
 static void keyboard_events(ipc_callid_t iid, ipc_call_t *icall)
+{
     ipc_callid_t callid;
     ipc_call_t call;
     int retval;
-    int c;
+    kbd_event_t ev;
     connection_t *conn;
     int newcon;
     /* Ignore parameters, the connection is alread opened */
     while (1) {
         case KBD_MS_MOVE:
             gcons_mouse_move(IPC_GET_ARG1(call),
                 IPC_GET_ARG2(call));
             retval = 0;
             break;
-        case KBD_PUSHCHAR:
+        case KBD_EVENT:
-            /* got key from keyboard driver */
+            /* Got event from keyboard driver. */
             retval = 0;
+            ev.type = IPC_GET_ARG1(call);
+            ev.key = IPC_GET_ARG2(call);
+            ev.mods = IPC_GET_ARG3(call);
-            c = IPC_GET_ARG1(call);
+            ev.c = IPC_GET_ARG4(call);
             /* switch to another virtual console */
             conn = &connections[active_console];
-/*
- *          if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 +
+            if ((ev.key >= KC_F1) && (ev.key < KC_F1 +
- *              CONSOLE_COUNT)) {
+                CONSOLE_COUNT)) {
- */
-            if ((c >= 0x101) && (c < 0x101 + CONSOLE_COUNT)) {
-                if (c == 0x112)
+                if (ev.key == KC_F12)
                     change_console(KERNEL_CONSOLE);
                 else
-                    change_console(c - 0x101);
+                    change_console(ev.key - KC_F1);
                 break;
+            }
             /* if client is awaiting key, send it */
             if (conn->keyrequest_counter > 0) {
                 conn->keyrequest_counter--;
-                ipc_answer_1(fifo_pop(conn->keyrequests), EOK,
+                ipc_answer_4(fifo_pop(conn->keyrequests), EOK,
-                    c);
+                    ev.type, ev.key, ev.mods, ev.c);
                 break;
+            }
-            keybuffer_push(&conn->keybuffer, c);
+            keybuffer_push(&conn->keybuffer, &ev);
             retval = 0;
             break;
         default:
             retval = ENOENT;
+        }
         ipc_answer_0(callid, retval);
 static void client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
     ipc_callid_t callid;
     ipc_call_t call;
     int consnum;
-    ipcarg_t arg1, arg2;
+    ipcarg_t arg1, arg2, arg3, arg4;
     connection_t *conn;
     if ((consnum = find_free_connection()) == -1) {
         ipc_answer_0(iid, ELIMIT);
         return;
+    }
     conn = &connections[consnum];
     conn->client_phone = IPC_GET_ARG5(*icall);
     screenbuffer_clear(&conn->screenbuffer);
     /* Accept the connection */
     ipc_answer_0(iid, EOK);
     while (1) {
         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 */
             while (conn->keyrequest_counter > 0) {
                 conn->keyrequest_counter--;
                 ipc_answer_0(fifo_pop(conn->keyrequests),
                     ENOENT);
                 break;
+            }
             if (consnum == active_console)
                 async_req_0_0(fb_info.phone, FB_FLUSH);
             break;
         case CONSOLE_SET_STYLE:
             arg1 = IPC_GET_ARG1(call);
+            screenbuffer_set_style(&conn->screenbuffer, arg1);
+            if (consnum == active_console)
+                set_style(arg1);
+            break;
+        case CONSOLE_SET_COLOR:
+            arg1 = IPC_GET_ARG1(call);
+            arg2 = IPC_GET_ARG2(call);
+            arg3 = IPC_GET_ARG3(call);
+            screenbuffer_set_color(&conn->screenbuffer, arg1,
+                arg2, arg3);
+            if (consnum == active_console)
+                set_color(arg1, arg2, arg3);
+            break;
+        case CONSOLE_SET_RGB_COLOR:
+            arg1 = IPC_GET_ARG1(call);
             arg2 = IPC_GET_ARG2(call);
-            screenbuffer_set_style(&conn->screenbuffer, arg1,
+            screenbuffer_set_rgb_color(&conn->screenbuffer, arg1,
                 arg2);
             if (consnum == active_console)
-                set_style_col(arg1, arg2);
+                set_rgb_color(arg1, arg2);
             break;
         case CONSOLE_CURSOR_VISIBILITY:
             arg1 = IPC_GET_ARG1(call);
             conn->screenbuffer.is_cursor_visible = arg1;
             if (consnum == active_console)
                 curs_visibility(arg1);
             break;
-        case CONSOLE_GETCHAR:
+        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);
                     */
                     ipc_answer_0(callid, ELIMIT);
+                }
                 continue;
+            }
+            kbd_event_t ev;
-            keybuffer_pop(&conn->keybuffer, (int *) &arg1);
+            keybuffer_pop(&conn->keybuffer, &ev);
+            arg1 = ev.type;
+            arg2 = ev.key;
+            arg3 = ev.mods;
+            arg4 = ev.c;
             break;
+        }
-        ipc_answer_2(callid, EOK, arg1, arg2);
+        ipc_answer_4(callid, EOK, arg1, arg2, arg3, arg4);
+    }
+}
+static void interrupt_received(ipc_callid_t callid, ipc_call_t *call)
+{
+    change_console(prev_console);
+}
 int main(int argc, char *argv[])
+{
     printf(NAME ": HelenOS Console service\n");
     ipcarg_t phonehash;
     int kbd_phone;
+    size_t ib_size;
     int i;
     async_set_client_connection(client_connection);
     /* Connect to keyboard driver */
-    kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+    kbd_phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
-    while (kbd_phone < 0) {
+    if (kbd_phone < 0) {
+        printf(NAME ": Failed to connect to keyboard service\n");
-        usleep(10000);
+        return -1;
-        kbd_phone = ipc_connect_me_to(PHONE_NS, SERVICE_KEYBOARD, 0, 0);
+    }
-    if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
+    if (ipc_connect_to_me(kbd_phone, SERVICE_CONSOLE, 0, 0, &phonehash) != 0) {
+        printf(NAME ": Failed to create callback from keyboard service\n");
         return -1;
+    }
     async_new_connection(phonehash, 0, NULL, keyboard_events);
     /* Connect to framebuffer driver */
-    fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
+    fb_info.phone = ipc_connect_me_to_blocking(PHONE_NS, SERVICE_VIDEO, 0, 0);
-    while (fb_info.phone < 0) {
+    if (fb_info.phone < 0) {
+        printf(NAME ": Failed to connect to video service\n");
-        usleep(10000);
+        return -1;
-        fb_info.phone = ipc_connect_me_to(PHONE_NS, SERVICE_VIDEO, 0, 0);
+    }
-    /* Save old kernel screen */
+    /* Disable kernel output to the console */
-    kernel_pixmap = switch_screens(-1);
+    __SYSCALL0(SYS_DEBUG_DISABLE_CONSOLE);
     /* Initialize gcons */
     gcons_init(fb_info.phone);
     /* Synchronize, the gcons can have something in queue */
     async_req_0_0(fb_info.phone, FB_FLUSH);
-    /* Enable double buffering */
-    async_msg_2(fb_info.phone, FB_VIEWPORT_DB, (sysarg_t) -1, 1);
     async_req_0_2(fb_info.phone, FB_GET_CSIZE, &fb_info.rows,
         &fb_info.cols);
-    set_style_col(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
+    set_rgb_color(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
     clrscr();
     /* Init virtual consoles */
     for (i = 0; i < CONSOLE_COUNT; i++) {
         connections[i].used = 0;
             /* FIXME: handle error */
             return -1;
+        }
+    }
     connections[KERNEL_CONSOLE].used = 1;
-    interbuffer = mmap(NULL,
+    /* Set up shared memory buffer. */
-        sizeof(keyfield_t) * fb_info.cols * fb_info.rows,
+    ib_size = sizeof(keyfield_t) * fb_info.cols * fb_info.rows;
+    interbuffer = as_get_mappable_page(ib_size);
+    if (as_area_create(interbuffer, ib_size, AS_AREA_READ |
-        PROTO_READ | PROTO_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
+        AS_AREA_WRITE | AS_AREA_CACHEABLE) != interbuffer) {
+        interbuffer = NULL;
+    }
-    if (!interbuffer) {
+    if (interbuffer) {
         if (ipc_share_out_start(fb_info.phone, interbuffer,
             AS_AREA_READ) != EOK) {
-            munmap(interbuffer,
+            as_area_destroy(interbuffer);
-                sizeof(keyfield_t) * fb_info.cols * fb_info.rows);
             interbuffer = NULL;
+        }
+    }
     curs_goto(0, 0);
     curs_visibility(
         connections[active_console].screenbuffer.is_cursor_visible);
     /* Register at NS */
     if (ipc_connect_to_me(PHONE_NS, SERVICE_CONSOLE, 0, 0, &phonehash) != 0)
         return -1;
+    /* Receive kernel notifications */
+//  if (sysinfo_value("kconsole.present")) {
+//      int inr = sysinfo_value("kconsole.inr");
+//      if (ipc_register_irq(inr, device_assign_devno(), 0, NULL) != 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();
     return 0;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/network/uspace/srv/console/console.c – Rev 3386 → 4153