Changeset 2453Tweet

Timestamp:

Jun 18, 2008, 11:42:50 PM (14 years ago)

Author:

Pascal Terjan

Message:

• Oops revert parts of 2451 which should not have been commited

Location:

neercs/trunk/src

Files:

• main.c (modified) (1 diff)
• neercs.h (modified) (1 diff)
• term.c (modified) (2 diffs)

neercs/trunk/src/main.c

@@ -211 +211 @@
         if(ret && (caca_get_event_type(&ev) & CACA_EVENT_KEY_PRESS))
         {
-            unsigned int c = caca_get_event_key_utf32(&ev);
+            unsigned int c = caca_get_event_key_ch(&ev);
 
             if(command)

neercs/trunk/src/neercs.h

@@ -170 +170 @@
 
 
-#if 1
+#if 0
 #   define debug(f, z...) fprintf(stderr, f "\n", z)
 #else

neercs/trunk/src/term.c

@@ -344 +344 @@
         {
             unsigned int bytes;
-            char tmp[7];
 
             if(i + 6 < size)
@@ -351 +350 @@
             {
                 /* Add a trailing zero to what we're going to read */
+                char tmp[7];
                 memcpy(tmp, buffer + i, size - i);
                 tmp[size - i] = '\0';
                 ch = cucul_utf8_to_utf32(tmp, &bytes);
             }
-            /* FIXME awful for perfs
-               should get a better way to know if utf8 was valid */
-            memset(tmp, 0, 7);
-            cucul_utf32_to_utf8(tmp, ch);
-            if(strncmp(tmp, (char const *)(buffer + i), strlen(tmp)))
-                bytes = 0;
+
             if(!bytes)
             {
                 /* If the Unicode is invalid, assume it was latin1. */
                 ch = buffer[i];
-                debug("Invalid UTF-8 : %c", ch);
                 bytes = 1;
             }