Changeset 7ce3cb2 in mainline for uspace/srv/console

Timestamp:

2009-04-02T22:04:29Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

b888d5f

Parents:

58d5a7e7

Message:

Define wchar_t in userspace. Use it in fb and console.

Location:

uspace/srv/console

Files:

• console.c (modified) (4 diffs)
• screenbuffer.c (modified) (1 diff)
• screenbuffer.h (modified) (4 diffs)

uspace/srv/console/console.c

@@ -104 +104 @@
 static char cwrite_buf[CWRITE_BUF_SIZE];
 
-static void fb_putchar(char c, int row, int col);
+static void fb_putchar(wchar_t c, int row, int col);
 
 
@@ -252 +252 @@
 
 /** Print a character to the active VC with buffering. */
-static void fb_putchar(char c, int row, int col)
+static void fb_putchar(wchar_t c, int row, int col)
 {
         async_msg_3(fb_info.phone, FB_PUTCHAR, c, row, col);
@@ -258 +258 @@
 
 /** Process a character from the client (TTY emulation). */
-static void write_char(int console, char key)
+static void write_char(int console, wchar_t ch)
 {
         bool flush_cursor = false;
         screenbuffer_t *scr = &(connections[console].screenbuffer);
 
-        switch (key) {
+        switch (ch) {
         case '\n':
                 fb_pending_flush();
@@ -288 +288 @@
                         cell_mark_changed(scr->position_y, scr->position_x);
 
-                screenbuffer_putchar(scr, key);
+                screenbuffer_putchar(scr, ch);
                 scr->position_x++;
         }

uspace/srv/console/screenbuffer.c

@@ -44 +44 @@
  * @param c     stored character
  */
-void screenbuffer_putchar(screenbuffer_t *scr, char c) 
+void screenbuffer_putchar(screenbuffer_t *scr, wchar_t ch)
 {
         keyfield_t *field;
-        
+
         field = get_field_at(scr, scr->position_x, scr->position_y);
 
-        field->character = c;
+        field->character = ch;
         field->attrs = scr->attrs;
 }

uspace/srv/console/screenbuffer.h

@@ -37 +37 @@
 
 #include <stdint.h>
+#include <sys/types.h>
 
 #define DEFAULT_FOREGROUND 0x0  /**< default console foreground color */
@@ -71 +72 @@
 /** One field on screen. It contain one character and its attributes. */
 typedef struct {
-        char character;                 /**< Character itself */
+        wchar_t character;              /**< Character itself */
         attrs_t attrs;                  /**< Character`s attributes */
 } keyfield_t;
@@ -92 +93 @@
  * @return      keyfield structure with character and its attributes on x,y
  */
-static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y) 
+static inline keyfield_t *get_field_at(screenbuffer_t *scr, unsigned int x, unsigned int y)
 {
         return scr->buffer + x + ((y + scr->top_line) % scr->size_y) * scr->size_x;
@@ -117 +118 @@
 
 
-void screenbuffer_putchar(screenbuffer_t *scr, char c);
+void screenbuffer_putchar(screenbuffer_t *scr, wchar_t c);
 screenbuffer_t *screenbuffer_init(screenbuffer_t *scr, int size_x, int size_y);