Changeset 3448 for libcaca/trunk/caca/canvas.cTweet

Timestamp:

May 14, 2009, 2:18:23 AM (11 years ago)

Author:

Sam Hocevar

Message:

Finish the dirty rectangle architecture. They are now reliable in the sense
that anything outside the dirty rectangle is guaranteed to be unchanged, but
we currently mark far too many cells as dirty. This must be optimised.

File:

• libcaca/trunk/caca/canvas.c (modified) (6 diffs)

libcaca/trunk/caca/canvas.c

@@ -90 +90 @@
     cv->frames[0].curattr = 0;
     cv->frames[0].name = strdup("frame#00000000");
-    cv->frames[0].dirty_xmin = 0;
-    cv->frames[0].dirty_xmax = -1;
-    cv->frames[0].dirty_ymin = 0;
-    cv->frames[0].dirty_ymax = -1;
 
     _caca_load_frame_info(cv);
     caca_set_color_ansi(cv, CACA_DEFAULT, CACA_TRANSPARENT);
+
+    cv->dirty_xmin = 0;
+    cv->dirty_xmax = -1;
+    cv->dirty_ymin = 0;
+    cv->dirty_ymax = -1;
 
     cv->ff = NULL;
@@ -332 +333 @@
                              int *ymin, int *ymax)
 {
-    *xmin = cv->frames[cv->frame].dirty_xmin;
-    *xmax = cv->frames[cv->frame].dirty_xmax;
-    *ymin = cv->frames[cv->frame].dirty_ymin;
-    *ymax = cv->frames[cv->frame].dirty_ymax;
+    *xmin = cv->dirty_xmin;
+    *xmax = cv->dirty_xmax;
+    *ymin = cv->dirty_ymin;
+    *ymax = cv->dirty_ymax;
 
     return 0;
@@ -372 +373 @@
         return 0;
 
-    if(xmin < cv->frames[cv->frame].dirty_xmin)
-        cv->frames[cv->frame].dirty_xmin = xmin;
-
-    if(xmax > cv->frames[cv->frame].dirty_xmax)
-        cv->frames[cv->frame].dirty_xmax = xmax;
-
-    if(ymin < cv->frames[cv->frame].dirty_ymin)
-        cv->frames[cv->frame].dirty_ymin = ymin;
-
-    if(ymax > cv->frames[cv->frame].dirty_ymax)
-        cv->frames[cv->frame].dirty_ymax = ymax;
+    if(xmin < cv->dirty_xmin)
+        cv->dirty_xmin = xmin;
+
+    if(xmax > cv->dirty_xmax)
+        cv->dirty_xmax = xmax;
+
+    if(ymin < cv->dirty_ymin)
+        cv->dirty_ymin = ymin;
+
+    if(ymax > cv->dirty_ymax)
+        cv->dirty_ymax = ymax;
 
     return 0;
@@ -417 +418 @@
     }
 
-    cv->frames[cv->frame].dirty_xmin = xmin;
-    cv->frames[cv->frame].dirty_xmax = xmax;
-    cv->frames[cv->frame].dirty_ymin = ymin;
-    cv->frames[cv->frame].dirty_ymax = ymax;
+    cv->dirty_xmin = xmin;
+    cv->dirty_xmax = xmax;
+    cv->dirty_ymin = ymin;
+    cv->dirty_ymax = ymax;
 
     return 0;
@@ -556 +557 @@
             }
         }
+
+        caca_add_dirty_rectangle(cv, old_width, 0, width - 1, old_height - 1);
     }
     else
@@ -595 +598 @@
             }
         }
-    }
+
+        caca_add_dirty_rectangle(cv, 0, old_height, old_width - 1, height - 1);
+    }
+
+    /* XXX: technically we should not worry about the dirty rectangle in
+     * the bottom-right corner, because we only handle one dirty rectangle,
+     * but in case the API changes later, we make sure this is handled. */
+    if(width > old_width && height > old_height)
+        caca_add_dirty_rectangle(cv, old_width, old_height,
+                                 width - 1, height - 1);
 
     /* Step 4: if new area is smaller, resize memory area now. */