Changeset 969 for libcaca/trunk/cacaTweet

Timestamp:

May 20, 2006, 7:29:24 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Renamed the event data member "ucs4" to "utf32" for consistency with "utf8".

Location:

libcaca/trunk/caca

Files:

• caca.h (modified) (2 diffs)
• driver_conio.c (modified) (1 diff)
• driver_gl.c (modified) (2 diffs)
• driver_ncurses.c (modified) (1 diff)
• driver_slang.c (modified) (1 diff)
• driver_win32.c (modified) (1 diff)
• driver_x11.c (modified) (2 diffs)
• event.c (modified) (1 diff)

libcaca/trunk/caca/caca.h

@@ -50 +50 @@
  *      field is valid and contains either the ASCII value for the key, or
  *      an \e enum \e caca_key value. If the value is a printable ASCII
- *      character, the \e data.key.ucs4 and \e data.key.utf8 fields are
- *      also filled and contain respectively the UCS-4/UTF-32 and the UTF-8
+ *      character, the \e data.key.utf32 and \e data.key.utf8 fields are
+ *      also filled and contain respectively the UTF-32/UCS-4 and the UTF-8
  *      representations of the character. Otherwise, their content is
  *      undefined.
@@ -93 +93 @@
         struct { unsigned int x, y, button; } mouse;
         struct { unsigned int w, h; } resize;
-        struct { unsigned int ch; unsigned long int ucs4; char utf8[8]; } key;
+        struct { unsigned int ch; unsigned long int utf32; char utf8[8]; } key;
     } data;
 };

libcaca/trunk/caca/driver_conio.c

@@ -136 +136 @@
     ev->type = CACA_EVENT_KEY_PRESS;
     ev->data.key.ch = ch;
-    ev->data.key.ucs4 = (uint32_t)ch;
+    ev->data.key.utf32 = (uint32_t)ch;
     ev->data.key.utf8[0] = ch;
     ev->data.key.utf8[1] = '\0';

libcaca/trunk/caca/driver_gl.c

@@ -477 +477 @@
             ev->type = CACA_EVENT_KEY_PRESS;
             ev->data.key.ch = dp->drv.p->key;
-            ev->data.key.ucs4 = (uint32_t)dp->drv.p->key;
+            ev->data.key.utf32 = (uint32_t)dp->drv.p->key;
             ev->data.key.utf8[0] = dp->drv.p->key;
             ev->data.key.utf8[1] = '\0';
@@ -515 +515 @@
 
             ev->type = CACA_EVENT_KEY_PRESS;
-            ev->data.key.ucs4 = 0;
+            ev->data.key.utf32 = 0;
             ev->data.key.utf8[0] = '\0';
 

libcaca/trunk/caca/driver_ncurses.c

@@ -429 +429 @@
 
     ev->type = CACA_EVENT_KEY_PRESS;
-    ev->data.key.ucs4 = 0;
+    ev->data.key.utf32 = 0;
     ev->data.key.utf8[0] = '\0';
     return 1;

libcaca/trunk/caca/driver_slang.c

@@ -338 +338 @@
 
     ev->type = CACA_EVENT_KEY_PRESS;
-    ev->data.key.ucs4 = 0;
+    ev->data.key.utf32 = 0;
     ev->data.key.utf8[0] = '\0';
     return 1;

libcaca/trunk/caca/driver_win32.c

@@ -257 +257 @@
             {
                 ev->data.key.ch = rec.Event.KeyEvent.uChar.AsciiChar;
-                ev->data.key.ucs4 = (uint32_t)ev->data.key.ch;
+                ev->data.key.utf32 = (uint32_t)ev->data.key.ch;
                 ev->data.key.utf8[0] = ev->data.key.ch;
                 ev->data.key.utf8[1] = '\0';

libcaca/trunk/caca/driver_x11.c

@@ -509 +509 @@
         {
             ev->data.key.ch = key;
-            ev->data.key.ucs4 = key;
+            ev->data.key.utf32 = key;
             ev->data.key.utf8[0] = key;
             ev->data.key.utf8[1] = '\0';
@@ -549 +549 @@
         }
 
-        ev->data.key.ucs4 = 0;
+        ev->data.key.utf32 = 0;
         ev->data.key.utf8[0] = '\0';
         return 1;

libcaca/trunk/caca/event.c

@@ -202 +202 @@
         && dp->events.last_key_event.type
         && ev->data.key.ch == dp->events.last_key_event.data.key.ch
-        && ev->data.key.ucs4 == dp->events.last_key_event.data.key.ucs4)
+        && ev->data.key.utf32 == dp->events.last_key_event.data.key.utf32)
     {
         dp->events.last_key_ticks = 0;