Changeset 6071a8f in mainline

Timestamp:

2009-04-07T19:03:18Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

9eb3623

Parents:

2845930

Message:

Read UCS chars in bdsh and encode them. (bdsh is still largely ignorant of UCS but it will work somehow with the characters now).

File:

• uspace/app/bdsh/input.c (modified) (4 diffs)

uspace/app/bdsh/input.c

@@ -37 +37 @@
 #include <kbd/kbd.h>
 #include <kbd/keycode.h>
+#include <errno.h>
+#include <bool.h>
 
 #include "config.h"
@@ -100 +102 @@
 {
         kbd_event_t ev;
-        int chars;
+        size_t offs, otmp;
+        wchar_t dec;
 
-        chars = 0;
-        while (chars < n - 1) {
+        offs = 0;
+        while (true) {
                 fflush(stdout);
                 if (kbd_get_event(&ev) < 0)
@@ -113 +116 @@
                         break;
                 if (ev.key == KC_BACKSPACE) {
-                        if (chars > 0) {
+                        if (offs > 0) {
+                                /*
+                                 * Back up until we reach valid start of
+                                 * character.
+                                 */
+                                while (offs > 0) {
+                                        --offs; otmp = offs;
+                                        dec = str_decode(buffer, &otmp, n);
+                                        if (dec != U_SPECIAL)
+                                                break;
+                                }
                                 putchar('\b');
-                                --chars;
                         }
                         continue;
@@ -121 +133 @@
                 if (ev.c >= ' ') {
                         //putchar(ev.c);
-                        console_putchar(ev.c);
-                        buffer[chars++] = ev.c;
+                        if (chr_encode(ev.c, buffer, &offs, n - 1) == EOK)
+                                console_putchar(ev.c);
                 }
         }
         putchar('\n');
-        buffer[chars] = '\0';
+        buffer[offs] = '\0';
 }