Changeset 1837Tweet

Timestamp:

Oct 20, 2007, 12:22:13 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Implemented caca_set_cursor() on the X11, ncurses and S-Lang drivers.
• Use caca_set_cursor() in test/input.c.

Location:

libcaca/trunk

Files:

• caca/driver_ncurses.c (modified) (3 diffs)
• caca/driver_slang.c (modified) (3 diffs)
• caca/driver_x11.c (modified) (5 diffs)
• test/input.c (modified) (2 diffs)

libcaca/trunk/caca/driver_ncurses.c

@@ -351 +351 @@
         }
     }
+    
+    x = cucul_get_cursor_x(dp->cv);
+    y = cucul_get_cursor_y(dp->cv);
+    move(y, x);
+
     refresh();
 }
@@ -532 +537 @@
 }
 
+static void ncurses_set_cursor(caca_display_t *dp, int flags)
+{
+    curs_set(flags ? 2 : 0);
+}
+
 /*
  * XXX: following functions are local
@@ -804 +814 @@
     dp->drv.get_event = ncurses_get_event;
     dp->drv.set_mouse = NULL;
-    dp->drv.set_cursor = NULL;
+    dp->drv.set_cursor = ncurses_set_cursor;
 
     return 0;

libcaca/trunk/caca/driver_slang.c

@@ -259 +259 @@
         }
     }
+    SLsmg_gotorc(cucul_get_cursor_y(dp->cv), cucul_get_cursor_x(dp->cv));
     SLsmg_refresh();
 }
@@ -401 +402 @@
     ev->data.key.utf8[0] = '\0';
     return 1;
+}
+
+static void slang_set_cursor(caca_display_t *dp, int flags)
+{
+    SLtt_set_cursor_visibility(flags ? 1 : 0);
 }
 
@@ -523 +529 @@
     dp->drv.get_event = slang_get_event;
     dp->drv.set_mouse = NULL;
-    dp->drv.set_cursor = NULL;
+    dp->drv.set_cursor = slang_set_cursor;
 
     return 0;

libcaca/trunk/caca/driver_x11.c

@@ -65 +65 @@
 #endif
     uint32_t max_char;
+    int cursor_flags;
 };
 
@@ -243 +244 @@
                                             DefaultScreen(dp->drv.p->dpy)));
     dp->drv.p->pointer = None;
+
+    dp->drv.p->cursor_flags = 0;
 
     return 0;
@@ -328 +331 @@
                           *attrs, *chars);
         }
+    }
+
+    /* Print the cursor if necessary */
+    if(dp->drv.p->cursor_flags)
+    {
+        XSetForeground(dp->drv.p->dpy, dp->drv.p->gc,
+                       dp->drv.p->colors[0xfff]);
+        x = cucul_get_cursor_x(dp->cv);
+        y = cucul_get_cursor_y(dp->cv);
+        XFillRectangle(dp->drv.p->dpy, dp->drv.p->pixmap, dp->drv.p->gc,
+                       x * dp->drv.p->font_width, y * dp->drv.p->font_height,
+                       dp->drv.p->font_width, dp->drv.p->font_height);
     }
 
@@ -537 +552 @@
 }
 
+static void x11_set_cursor(caca_display_t *dp, int flags)
+{
+    dp->drv.p->cursor_flags = flags;
+}
+
 /*
  * XXX: following functions are local
@@ -771 +791 @@
     dp->drv.get_event = x11_get_event;
     dp->drv.set_mouse = x11_set_mouse;
-    dp->drv.set_cursor = NULL;
+    dp->drv.set_cursor = x11_set_cursor;
 
     return 0;

libcaca/trunk/test/input.c

@@ -55 +55 @@
         return -1;
     }
+    caca_set_cursor(dp, 1);
 
     cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
@@ -88 +89 @@
 
         /* Put the cursor on the active textentry */
-        cucul_set_color_ansi(cv, CUCUL_LIGHTRED, CUCUL_LIGHTRED);
-        cucul_put_char(cv, 2 + entries[e].cursor, 3 * e + 4, ' ');
+        cucul_gotoxy(cv, 2 + entries[e].cursor, 3 * e + 4);
 
         caca_refresh_display(dp);