Changeset 688 for libcaca/trunkTweet

Timestamp:

Mar 24, 2006, 5:25:39 PM (15 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Fixed bug in show/hide cursor, implemented X11 cursor

Location:

libcaca/trunk/caca

Files:

• driver_x11.c (modified) (1 diff)
• graphics.c (modified) (1 diff)

libcaca/trunk/caca/driver_x11.c

@@ -540 +540 @@
 static void x11_show_cursor(caca_t *kk)
 {
-
+    XDefineCursor(kk->drv.p->dpy,kk->drv.p->window, 0);
 }
 
 static void x11_hide_cursor(caca_t *kk)
 {
-    XFreeCursor( kk->drv.p->dpy, kk->drv.p->pointer );
-    kk->drv.p->pointer = None;
-    XUndefineCursor( kk->drv.p->dpy, kk->drv.p->window );
-    XSync( kk->drv.p->dpy, False ); /* optional */
+    Cursor no_ptr;
+    Pixmap bm_no;
+    XColor black, dummy;
+    Colormap colormap;
+    static char empty[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+    colormap = DefaultColormap(kk->drv.p->dpy, DefaultScreen(kk->drv.p->dpy));
+    if ( !XAllocNamedColor(kk->drv.p->dpy, colormap, "black", &black, &dummy) )
+    {
+      return;
+    }
+    bm_no = XCreateBitmapFromData(kk->drv.p->dpy, kk->drv.p->window, empty, 8, 8);
+    no_ptr = XCreatePixmapCursor(kk->drv.p->dpy, bm_no, bm_no, &black, &black, 0, 0);
+    XDefineCursor(kk->drv.p->dpy,  kk->drv.p->window, no_ptr);
+    XFreeCursor(kk->drv.p->dpy, no_ptr);
+    if (bm_no != None)
+        XFreePixmap(kk->drv.p->dpy, bm_no);
+    XFreeColors(kk->drv.p->dpy,colormap,&black.pixel,1,0);
+
+    XSync(kk->drv.p->dpy, False);
 
 }

libcaca/trunk/caca/graphics.c

@@ -162 +162 @@
 void caca_hide_cursor(caca_t *kk)
 {
-    if(kk->drv.show_cursor)
-        kk->drv.show_cursor(kk);
+    if(kk->drv.hide_cursor)
+        kk->drv.hide_cursor(kk);
 }