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

Timestamp:

Nov 18, 2009, 9:42:42 PM (14 years ago)

Author:

Pascal Terjan

Message:

• Fix non ASCII input in x11 driver

File:

• libcaca/trunk/caca/driver/x11.c (modified) (4 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)
+    XIM im;
+    XIC ic;
+#endif
 };
 
@@ -254 +258 @@
     dp->drv.p->dirty_cursor_y = -1;
 
+    dp->drv.p->im = XOpenIM(dp->drv.p->dpy, NULL, NULL, NULL);
+    dp->drv.p->ic = XCreateIC(dp->drv.p->im, XNInputStyle,
+                              XIMPreeditNothing | XIMStatusNothing, NULL);
+
     return 0;
 }
@@ -269 +277 @@
     XUnmapWindow(dp->drv.p->dpy, dp->drv.p->window);
     XDestroyWindow(dp->drv.p->dpy, dp->drv.p->window);
+    XDestroyIC(dp->drv.p->ic);
+    XCloseIM(dp->drv.p->im);
     XCloseDisplay(dp->drv.p->dpy);
 
@@ -501 +511 @@
             continue;
 
+#if defined(X_HAVE_UTF8_STRING)
+        if(Xutf8LookupString(dp->drv.p->ic, &xevent.xkey, ev->data.key.utf8, 8, NULL, NULL))
+        {
+            ev->data.key.utf32 = caca_utf8_to_utf32(ev->data.key.utf8, NULL);
+            if(ev->data.key.utf32 < 0x7f)
+            {
+                ev->data.key.ch = ev->data.key.utf32;
+            } else {
+                ev->data.key.ch = 0;
+            }
+            return 1;
+        }
+#endif
         if(XLookupString(&xevent.xkey, &key, 1, NULL, NULL))
         {