Changeset 3450Tweet

Timestamp:

May 14, 2009, 2:18:37 AM (13 years ago)

Author:

Sam Hocevar

Message:

Fix a few dirty rectangle bugs found with the unit tests. Let that be a
lesson to you: unit tests are good.

Location:

libcaca/trunk/caca

Files:

• attr.c (modified) (1 diff)
• canvas.c (modified) (4 diffs)
• string.c (modified) (1 diff)

libcaca/trunk/caca/attr.c

@@ -157 +157 @@
     }
 
-    caca_add_dirty_rectangle(cv, xmin, xmax, y, y);
+    caca_add_dirty_rectangle(cv, xmin, y, xmax, y);
 
     return 0;

libcaca/trunk/caca/canvas.c

@@ -322 +322 @@
  *  \param xmin A pointer to an integer where the leftmost edge of the
  *              dirty rectangle will be stored.
+ *  \param ymin A pointer to an integer where the topmost edge of the
+ *              dirty rectangle will be stored.
  *  \param xmax A pointer to an integer where the rightmost edge of the
- *              dirty rectangle will be stored.
- *  \param ymin A pointer to an integer where the topmost edge of the
  *              dirty rectangle will be stored.
  *  \param ymax A pointer to an integer where the bottommost edge of the
@@ -330 +330 @@
  *  \return This function always returns 0.
  */
-int caca_get_dirty_rectangle(caca_canvas_t *cv, int *xmin, int *xmax,
-                             int *ymin, int *ymax)
+int caca_get_dirty_rectangle(caca_canvas_t *cv, int *xmin, int *ymin,
+                             int *xmax, int *ymax)
 {
     *xmin = cv->dirty_xmin;
@@ -357 +357 @@
  *  \param cv A libcaca canvas.
  *  \param xmin The leftmost edge of the additional dirty rectangle.
+ *  \param ymin The topmost edge of the additional dirty rectangle.
  *  \param xmax The rightmost edge of the additional dirty rectangle.
- *  \param ymin The topmost edge of the additional dirty rectangle.
  *  \param ymax The bottommost edge of the additional dirty rectangle.
  *  \return This function always returns 0.
  */
-int caca_add_dirty_rectangle(caca_canvas_t *cv, int xmin, int xmax,
-                             int ymin, int ymax)
+int caca_add_dirty_rectangle(caca_canvas_t *cv, int xmin, int ymin,
+                             int xmax, int ymax)
 {
     /* Ignore empty rectangles. */
@@ -400 +400 @@
  *  \param cv A libcaca canvas.
  *  \param xmin The leftmost edge of the desired dirty rectangle.
+ *  \param ymin The topmost edge of the desired dirty rectangle.
  *  \param xmax The rightmost edge of the desired dirty rectangle.
- *  \param ymin The topmost edge of the desired dirty rectangle.
  *  \param ymax The bottommost edge of the desired dirty rectangle.
  *  \return This function always returns 0.
  */
-int caca_set_dirty_rectangle(caca_canvas_t *cv, int xmin, int xmax,
-                             int ymin, int ymax)
+int caca_set_dirty_rectangle(caca_canvas_t *cv, int xmin, int ymin,
+                             int xmax, int ymax)
 {
     /* Normalise values indicating an empty or out-of-bounds rectangle. */

libcaca/trunk/caca/string.c

@@ -171 +171 @@
          * replace its right part with a space. */
         if(x + 1 != (int)cv->width && curchar[1] == CACA_MAGIC_FULLWIDTH)
+        {
             curchar[1] = ' ';
-    }
-
-    caca_add_dirty_rectangle(cv, xmin, xmax, y, y);
+            xmax++;
+        }
+    }
+
+    caca_add_dirty_rectangle(cv, xmin, y, xmax, y);
 
     curchar[0] = ch;