Changeset e1c4849 in mainline

Timestamp:

2006-06-02T17:16:59Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

0c6984e

Parents:

3756912

Message:

Added slighyly graphical console.

Location:

console

Files:

• Makefile (modified) (1 diff)
• console.c (modified) (5 diffs)
• gcons.c (modified) (7 diffs)
• gcons.h (added)

console/Makefile

@@ -45 +45 @@
         console.c \
         screenbuffer.c \
-        ../kbd/generic/key_buffer.c
+        ../kbd/generic/key_buffer.c \
+        gcons.c
 
 ARCH_SOURCES = 

console/console.c

@@ -42 +42 @@
 #include <sys/mman.h>
 
+#include "gcons.h"
+
 #define MAX_KEYREQUESTS_BUFFERED 32
 
@@ -178 +180 @@
 //                      if ((c >= KBD_KEY_F1) && (c < KBD_KEY_F1 + CONSOLE_COUNT)) {
                         if ((c >= '0') && (c < '0' + CONSOLE_COUNT)) {
-                                
                                 if (c == '0') {
                                         /* switch to kernel console*/
@@ -193 +194 @@
                                                 break;
                                         active_console = c;
+                                        gcons_change_console(c);
+                                
                                 }
                                 
@@ -337 +340 @@
                 usleep(10000);
         }
+
+        /* Initialize gcons */
+        gcons_init(fb_info.phone);
+        /* Synchronize, the gcons can have something in queue */
+        sync_send_2(fb_info.phone, FB_GET_CSIZE, 0, 0, NULL, NULL);
+
         
         ipc_call_sync_2(fb_info.phone, FB_GET_CSIZE, 0, 0, &(fb_info.rows), &(fb_info.cols)); 
@@ -368 +377 @@
         async_new_connection(phonehash, 0, NULL, keyboard_events);
         
-        nsend_call_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0); 
+        sync_send_2(fb_info.phone, FB_CURSOR_GOTO, 0, 0, NULL, NULL); 
         nsend_call(fb_info.phone, FB_CURSOR_VISIBILITY, 1); 
 

console/gcons.c

@@ -29 +29 @@
 #include <ipc/fb.h>
 #include <ipc/ipc.h>
+#include <async.h>
+#include <stdio.h>
 
 #include "console.h"
+#include "gcons.h"
 
 #define CONSOLE_TOP      50
@@ -39 +42 @@
 #define STATUS_HEIGHT   30
 
+#define MAIN_COLOR      0x118811
+
 static int use_gcons = 0;
 static ipcarg_t xres,yres;
@@ -44 +49 @@
 static int console_vp;
 static int cstatus_vp[CONSOLE_COUNT];
+static int cstat_row, cstat_col; /* Size of cstatus buttons */
 
 static int fbphone;
 
+enum butstate {
+        CONS_ACTIVE = 0,
+        CONS_IDLE,
+        CONS_HAS_INPUT
+};
+
+static struct {
+        int fgcolor;
+        int bgcolor;
+} stat_colors[] = {
+        {0xd0d0d0, 0x808080},
+        {0xd0d0d0, 0x0},
+        {0xd0d0d0, 0xa04040}
+};
+
+static int active_console = 0;
+
 static void vp_switch(int vp)
 {
-        ipc_call_sync_2(fbphone,FB_VIEWPORT_SWITCH, vp, 0, NULL, NULL);
+        nsend_call(fbphone,FB_VIEWPORT_SWITCH, vp);
 }
 
+/** Create view port */
 static int vp_create(unsigned int x, unsigned int y, 
-                     unsigned int width, unsgined int height)
+                     unsigned int width, unsigned int height)
 {
-        return  ipc_call_sync_2(fbphone, (x << 16) | y, (width << 16) | height,
-                                NULL, NULL);
+        /* Init function, use ipc_call_sync */
+        return ipc_call_sync_2(fbphone, FB_VIEWPORT_CREATE,
+                               (x << 16) | y, (width << 16) | height,
+                               NULL, NULL);
 }
 
-static void fb_clear(void)
+static void clear(void)
 {
-        ipc_call_sync_2(fbphone, FB_CLEAR, 0, 0, NULL, NULL);
+        nsend_call(fbphone, FB_CLEAR, 0);
         
 }
 
-static void fb_set_style(int fgcolor, int bgcolor)
+static void set_style(int fgcolor, int bgcolor)
 {
-        ipc_call_sync_2(fbphone, );
+        nsend_call_2(fbphone, FB_SET_STYLE, fgcolor, bgcolor);
+}
+
+static void putch(char c, int row, int col)
+{
+        nsend_call_3(fbphone, FB_PUTCHAR, c, row, col);
+}
+
+static void draw_stat(int consnum, enum butstate state)
+{
+        char data[5];
+        int i;
+        
+        vp_switch(cstatus_vp[consnum]);
+        set_style(stat_colors[state].fgcolor, stat_colors[state].bgcolor);
+        clear();
+        snprintf(data, 5, "%d", consnum+1);
+        for (i=0;data[i];i++)
+                putch(data[i], 0, i);
 }
 
@@ -74 +118 @@
         if (!use_gcons)
                 return;
-
+        
+        draw_stat(active_console, CONS_IDLE);
+        active_console = consnum;
+        draw_stat(consnum, CONS_ACTIVE);
         vp_switch(console_vp);
 }
@@ -86 +133 @@
 }
 
-void gcons_redraw_console(int phone)
+void gcons_redraw_console(void)
 {
+        int i;
+
         if (!use_gcons)
                 return;
         
         vp_switch(0);
-        /* Set style...*/
-        fb_clear();
-        
+        set_style(MAIN_COLOR, MAIN_COLOR);
+        clear();
+
+        for (i=0;i < CONSOLE_COUNT; i++) 
+                draw_stat(i, i == active_console ? CONS_ACTIVE : CONS_IDLE);
         vp_switch(console_vp);
 }
@@ -121 +172 @@
         /* Create status buttons */
         for (i=0; i < CONSOLE_COUNT; i++) {
-                cstatus_vp[i] = vp_create(phone, CONSOLE_MARGIN+i*(STATUS_WIDTH+STATUS_SPACE),
+                cstatus_vp[i] = vp_create(CONSOLE_MARGIN+i*(STATUS_WIDTH+STATUS_SPACE),
                                           CONSOLE_MARGIN, STATUS_WIDTH, STATUS_HEIGHT);
                 if (cstatus_vp[i] < 0)
@@ -128 +179 @@
         
         use_gcons = 1;
-        gcons_draw_console();
+        gcons_redraw_console();
 }