Changeset 4140 for libcaca/trunk/caca/driver/x11.cTweet

Timestamp:

Dec 17, 2009, 2:46:22 AM (13 years ago)

Author:

Sam Hocevar

Message:

Allow the X11 driver to display Unicode characters if they are in the
current font (addresses #21).

File:

• libcaca/trunk/caca/driver/x11.c (modified) (5 diffs)

libcaca/trunk/caca/driver/x11.c

@@ -65 +65 @@
     int cursor_flags;
     int dirty_cursor_x, dirty_cursor_y;
-#if defined(X_HAVE_UTF8_STRING)
+#if defined X_HAVE_UTF8_STRING
     XIM im;
     XIC ic;
@@ -511 +511 @@
             continue;
 
-#if defined(X_HAVE_UTF8_STRING)
+#if defined X_HAVE_UTF8_STRING
         if(Xutf8LookupString(dp->drv.p->ic, &xevent.xkey, ev->data.key.utf8, 8, NULL, NULL))
         {
@@ -666 +666 @@
     Pixmap px = dp->drv.p->pixmap;
     GC gc = dp->drv.p->gc;
+    XChar2b ch16;
     int fw;
-    XChar2b ch16;
 
     /* Underline */
@@ -822 +822 @@
     }
 
+#if defined X_HAVE_UTF8_STRING
+    if(ch >= 0x00000020)
+#else
     if(ch >= 0x00000020 && ch <= dp->drv.p->max_char)
-    {
-        /* ascii, latin-1 or unicode font (might draw a blank square) */
-        ch16.byte1 = (ch) >> 8;
-        ch16.byte2 = (ch) & 0xff;
+#endif
+    {
+        ch16.byte1 = (uint8_t)(ch >> 8);
+        ch16.byte2 = (uint8_t)ch;
     }
     else
@@ -834 +837 @@
     }
 
-    XDrawString16(dpy, px, gc, x + (ch16.byte1 ? 0 : (fw - w) / 2), yoff, &ch16, 1);
+    XDrawString16(dpy, px, gc,
+                  x + (ch16.byte1 ? 0 : (fw - w) / 2), yoff, &ch16, 1);
 }