Changeset 3581

Timestamp:

07/26/09 21:17:20 (4 years ago)

Author:

sam

Message:

Do not add a dirty rectangle at the cursor's position. It's up to the
display driver to clean up its shit. Fixed X11 driver accordingly.

Location:

libcaca/trunk/caca

Files:

• driver/x11.c (modified) (5 diffs)
• string.c (modified) (1 diff)

libcaca/trunk/caca/driver/x11.c

@@ -64 +64 @@
     uint32_t max_char;
     int cursor_flags;
+    int dirty_cursor_x, dirty_cursor_y;
 };
 
@@ -250 +251 @@
 
     dp->drv.p->cursor_flags = 0;
+    dp->drv.p->dirty_cursor_x = -1;
+    dp->drv.p->dirty_cursor_y = -1;
 
     return 0;
@@ -297 +300 @@
     int x, y, i, len;
 
-    for(i = 0; i < caca_get_dirty_rect_count(dp->cv); i++)
+    /* XXX: the magic value -1 is used to handle the cursor area */
+    for(i = -1; i < caca_get_dirty_rect_count(dp->cv); i++)
     {
         int dx, dy, dw, dh;
 
-        caca_get_dirty_rect(dp->cv, i, &dx, &dy, &dw, &dh);
+        /* Get the dirty rectangle coordinates, either from the previous
+         * cursor position, or from the canvas's list. */
+        if(i == -1)
+        {
+            if(dp->drv.p->dirty_cursor_x < 0 || dp->drv.p->dirty_cursor_y < 0
+                || dp->drv.p->dirty_cursor_x >= width
+                || dp->drv.p->dirty_cursor_y >= height)
+                continue;
+
+            dx = dp->drv.p->dirty_cursor_x;
+            dy = dp->drv.p->dirty_cursor_y;
+            dw = dh = 1;
+
+            dp->drv.p->dirty_cursor_x = -1;
+            dp->drv.p->dirty_cursor_y = -1;
+        }
+        else
+        {
+            caca_get_dirty_rect(dp->cv, i, &dx, &dy, &dw, &dh);
+        }
 
         /* First draw the background colours. Splitting the process in two
@@ -349 +372 @@
     }
 
-    /* Print the cursor if necessary. FIXME: handle dirty rectangles! */
+    /* Print the cursor if necessary. */
     if(dp->drv.p->cursor_flags)
     {
@@ -359 +382 @@
                        x * dp->drv.p->font_width, y * dp->drv.p->font_height,
                        dp->drv.p->font_width, dp->drv.p->font_height);
+
+        /* Mark the area as dirty */
+        dp->drv.p->dirty_cursor_x = x;
+        dp->drv.p->dirty_cursor_y = y;
     }
 

libcaca/trunk/caca/string.c

@@ -54 +54 @@
 int caca_gotoxy(caca_canvas_t *cv, int x, int y)
 {
-    /* FIXME Not needed if cursor is invisible */
-    caca_add_dirty_rect(cv, cv->frames[cv->frame].x, cv->frames[cv->frame].y, 1, 1);
-    caca_add_dirty_rect(cv, x, y, 1, 1);
-
     cv->frames[cv->frame].x = x;
     cv->frames[cv->frame].y = y;