Changeset 3494 for libcaca/trunk/caca/driver/vga.c

Timestamp:

05/21/09 22:55:13 (4 years ago)

Author:

sam

Message:

Change the dirty rectangle API once again so that calling applications get
a more natural (x,y,w,h) 4-tuple to handle.

File:

• libcaca/trunk/caca/driver/vga.c (modified) (2 diffs)

libcaca/trunk/caca/driver/vga.c

@@ -121 +121 @@
         char *screen = (char *)(intptr_t)0x000b8000;
         uint32_t const *cvchars, *cvattrs;
-        int xmin, ymin, xmax, ymax;
+        int dx, dy, dw, dh;
 
-        caca_get_dirty_rectangle(dp->cv, i, &xmin, &ymin, &xmax, &ymax);
+        caca_get_dirty_rect(dp->cv, i, &dx, &dy, &dw, &dh);
 
         cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv)
-                    + xmin + ymin * dp->cv->width;
+                    + dx + dy * dp->cv->width;
         cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv)
-                    + xmin + ymin * dp->cv->width;
+                    + dx + dy * dp->cv->width;
 
-        screen += ymin * dp->cv->width + xmin;
+        screen += dy * dp->cv->width + dx;
 
-        for(y = ymin; y <= ymax; y++)
+        for(y = dy; y < dy + dh; y++)
         {
-            for(x = xmin; x <= xmax; x++)
+            for(x = dx; x < dx + dw; x++)
             {
                 char ch = caca_utf32_to_cp437(*cvchars++);
-                if(x < xmax && *cvchars == CACA_MAGIC_FULLWIDTH)
+                if(x < dx + dw - 1 && *cvchars == CACA_MAGIC_FULLWIDTH)
                 {
                     *screen++ = '[';
@@ -149 +149 @@
             }
 
-            cvchars += dp->cv->width - (xmax - xmin) - 1;
-            cvattrs += dp->cv->width - (xmax - xmin) - 1;
-            screen += 2 * (dp->cv->width - (xmax - xmin) - 1);
+            cvchars += dp->cv->width - dw;
+            cvattrs += dp->cv->width - dw;
+            screen += 2 * (dp->cv->width - dw);
         }
     }