Changeset 56fa418 in mainline

Timestamp:

2009-04-05T15:50:53Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

0175246

Parents:

726ef849

Message:

Make Czech layout work partially in bdsh.

Location:

uspace

Files:

• app/bdsh/input.c (modified) (3 diffs)
• app/tester/print/print4.c (modified) (1 diff)
• lib/libc/Makefile.toolchain (modified) (1 diff)
• lib/libc/generic/console.c (modified) (3 diffs)
• lib/libc/generic/io/io.c (modified) (2 diffs)
• lib/libc/include/console.h (modified) (2 diffs)
• srv/kbd/layout/cz.c (modified) (3 diffs)

uspace/app/bdsh/input.c

@@ -35 +35 @@
 #include <io/stream.h>
 #include <console.h>
+#include <kbd/kbd.h>
+#include <kbd/keycode.h>
 
 #include "config.h"
@@ -97 +99 @@
 static void read_line(char *buffer, int n)
 {
-        char c;
+        kbd_event_t ev;
         int chars;
 
         chars = 0;
         while (chars < n - 1) {
-                c = getchar();
-                if (c < 0)
+                fflush(stdout);
+                if (kbd_get_event(&ev) < 0)
                         return;
-                if (c == '\n')
+                if (ev.type == KE_RELEASE)
+                        continue;
+
+                if (ev.key == KC_ENTER || ev.key == KC_NENTER)
                         break;
-                if (c == '\b') {
+                if (ev.key == KC_BACKSPACE) {
                         if (chars > 0) {
                                 putchar('\b');
@@ -114 +119 @@
                         continue;
                 }
-                if (c >= ' ') {
-                        putchar(c);
-                        buffer[chars++] = c;
+                if (ev.c >= ' ') {
+                        //putchar(ev.c);
+                        console_putchar(ev.c);
+                        buffer[chars++] = ev.c;
                 }
         }

uspace/app/tester/print/print4.c

@@ -82 +82 @@
                 printf("Russian:  %ls\n", L"Леннон познакомился с художницей-авангардисткой");
                 printf("Armenian: %ls\n", L"Սկսեց հրատարակվել Երուսաղեմի հայկական");
+
+                printf("Test: [%d] '%lc'\n", L'\x0161', L'\x0161');
         }
 

uspace/lib/libc/Makefile.toolchain

@@ -27 +27 @@
 #
 
-CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
+CFLAGS = -fno-builtin -Wall -Werror-implicit-function-declaration\
+    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32 -finput-charset=UTF-8\
+    -Wmissing-prototypes -O3 -nostdlib -nostdinc -imacros\
+    $(LIBC_PREFIX)/../../../config.h -I$(LIBC_PREFIX)/include -pipe -g
 LFLAGS = -M -N $(SOFTINT_PREFIX)/libsoftint.a
 AFLAGS =

uspace/lib/libc/generic/console.c

@@ -58 +58 @@
 
 static ssize_t cons_write(const char *buf, size_t nbyte);
-static void cons_putchar(int c);
+static void cons_putchar(wchar_t c);
 
 static void cbuffer_flush(void);
@@ -120 +120 @@
 }
 
-void console_putchar(int c)
-{
-        cbuffer_putc(c);
+void console_putchar(wchar_t c)
+{
+//      cbuffer_putc(c);
+        cbuffer_flush();
+        cons_putchar(c);
 }
 
@@ -163 +165 @@
 
 /** Write one character to the console via IPC. */
-static void cons_putchar(int c)
+static void cons_putchar(wchar_t c)
 {
         int cons_phone = console_phone_get(true);

uspace/lib/libc/generic/io/io.c

@@ -37 +37 @@
 #include <stdio.h>
 #include <io/io.h>
+#include <string.h>
+#include <errno.h>
 
 const static char nl = '\n';
@@ -88 +90 @@
 int putchar(int c)
 {
-        unsigned char ch = c;
-        if (write_stdout((void *) &ch, 1) == 1)
+        char buf[STR_BOUNDS(1)];
+        size_t offs;
+
+        offs = 0;
+        if (chr_encode(c, buf, &offs, STR_BOUNDS(1)) != EOK)
+                return EOF;
+
+        if (write_stdout((void *) buf, offs) == offs)
                 return c;
-        
+
         return EOF;
 }

uspace/lib/libc/include/console.h

@@ -38 +38 @@
 #include <console/style.h>
 #include <console/color.h>
+#include <sys/types.h>
 #include <bool.h>
 
@@ -48 +49 @@
 extern void console_clear(void);
 extern void console_goto(int, int);
-extern void console_putchar(int);
+extern void console_putchar(wchar_t);
 extern ssize_t console_write(const char *buf, size_t nbyte);
 extern void console_putstr(const char *s);

uspace/srv/kbd/layout/cz.c

@@ -38 +38 @@
 
 static wchar_t map_lcase[] = {
-        [KC_2] = 'ě',
-        [KC_3] = 'š',
-        [KC_4] = 'č',
-        [KC_5] = 'ř',
-        [KC_6] = 'ž',
-        [KC_7] = 'ý',
-        [KC_8] = 'á',
-        [KC_9] = 'í',
-        [KC_0] = 'é',
-
-        [KC_LBRACKET] = 'ú',
-        [KC_SEMICOLON] = 'ů',
+        [KC_2] = L'ě',
+        [KC_3] = L'š',
+        [KC_4] = L'č',
+        [KC_5] = L'ř',
+        [KC_6] = L'ž',
+        [KC_7] = L'ý',
+        [KC_8] = L'á',
+        [KC_9] = L'í',
+        [KC_0] = L'é',
+
+        [KC_LBRACKET] = L'ú',
+        [KC_SEMICOLON] = L'ů',
 
         [KC_Q] = 'q',
@@ -82 +82 @@
 
 static wchar_t map_ucase[] = {
-        [KC_2] = 'Ě',
-        [KC_3] = 'Š',
-        [KC_4] = 'Č',
-        [KC_5] = 'Ř',
-        [KC_6] = 'Ž',
-        [KC_7] = 'Ý',
-        [KC_8] = 'Á',
-        [KC_9] = 'Í',
-        [KC_0] = 'É',
-
-        [KC_LBRACKET] = 'Ú',
-        [KC_SEMICOLON] = 'Ů',
+        [KC_2] = L'Ě',
+        [KC_3] = L'Š',
+        [KC_4] = L'Č',
+        [KC_5] = L'Ř',
+        [KC_6] = L'Ž',
+        [KC_7] = L'Ý',
+        [KC_8] = L'Á',
+        [KC_9] = L'Í',
+        [KC_0] = L'É',
+
+        [KC_LBRACKET] = L'Ú',
+        [KC_SEMICOLON] = L'Ů',
 
         [KC_Q] = 'Q',
@@ -134 +134 @@
         [KC_RBRACKET] = ')',
 
-        [KC_QUOTE] = '§',
+        [KC_QUOTE] = L'§',
 
         [KC_COMMA] = ',',