Changeset 3489Tweet

Timestamp:

May 20, 2009, 12:48:12 AM (11 years ago)

Author:

Sam Hocevar

Message:

Add dirty rectangle support to the ncurses and VGA drivers.

Location:

libcaca/trunk

Files:

• AUTHORS (modified) (1 diff)
• caca/driver/ncurses.c (modified) (2 diffs)
• caca/driver/vga.c (modified) (2 diffs)
• caca/driver/win32.c (modified) (2 diffs)

libcaca/trunk/AUTHORS

@@ -1 +1 @@
 /* $Id$ */ /** \page libcaca-authors Libcaca authors
 
-Sam Hocevar <sam@zoy.org>
+Sam Hocevar <sam@hocevar.net>
  - main programmer
 

libcaca/trunk/caca/driver/ncurses.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
  *                2007 Ben Wiley Sittler <bsittler@gmail.com>
  *                All Rights Reserved
@@ -346 +346 @@
 static void ncurses_display(caca_display_t *dp)
 {
-    uint32_t const *cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv);
-    uint32_t const *cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv);
-    int width = caca_get_canvas_width(dp->cv);
-    int height = caca_get_canvas_height(dp->cv);
-    int x, y;
-
-    for(y = 0; y < (int)height; y++)
-    {
-        move(y, 0);
-        for(x = width; x--; )
+    int x, y, i;
+
+    for(i = 0; i < caca_get_dirty_rectangle_count(dp->cv); i++)
+    {
+        uint32_t const *cvchars, *cvattrs;
+        int xmin, ymin, xmax, ymax;
+
+        caca_get_dirty_rectangle(dp->cv, i, &xmin, &ymin, &xmax, &ymax);
+
+        cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv)
+                    + xmin + ymin * dp->cv->width;
+        cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv)
+                    + xmin + ymin * dp->cv->width;
+
+        for(y = ymin; y <= ymax; y++)
         {
-            attrset(dp->drv.p->attr[caca_attr_to_ansi(*cvattrs++)]);
-            ncurses_write_utf32(*cvchars++);
+            move(y, xmin);
+            for(x = xmin; x <= xmax; x++)
+            {
+                attrset(dp->drv.p->attr[caca_attr_to_ansi(*cvattrs++)]);
+                ncurses_write_utf32(*cvchars++);
+            }
+
+            cvchars += dp->cv->width - (xmax - xmin) - 1;
+            cvattrs += dp->cv->width - (xmax - xmin) - 1;
         }
     }
-    
+
     x = caca_get_cursor_x(dp->cv);
     y = caca_get_cursor_y(dp->cv);

libcaca/trunk/caca/driver/vga.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -115 +115 @@
 static void vga_display(caca_display_t *dp)
 {
-    char *screen = (char *)(intptr_t)0x000b8000;
-    uint32_t const *cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv);
-    uint32_t const *cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv);
-    int width = caca_get_canvas_width(dp->cv);
-    int height = caca_get_canvas_height(dp->cv);
-    int n;
+    int x, y, i;
 
-    for(n = height * width; n--; )
+    for(i = 0; i < caca_get_dirty_rectangle_count(dp->cv); i++)
     {
-        char ch = caca_utf32_to_cp437(*cvchars++);
-        if(n && *cvchars == CACA_MAGIC_FULLWIDTH)
+        char *screen = (char *)(intptr_t)0x000b8000;
+        uint32_t const *cvchars, *cvattrs;
+        int xmin, ymin, xmax, ymax;
+
+        caca_get_dirty_rectangle(dp->cv, i, &xmin, &ymin, &xmax, &ymax);
+
+        cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv)
+                    + xmin + ymin * dp->cv->width;
+        cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv)
+                    + xmin + ymin * dp->cv->width;
+
+        screen += ymin * dp->cv->width + xmin;
+
+        for(y = ymin; y <= ymax; y++)
         {
-            *screen++ = '[';
-            *screen++ = caca_attr_to_ansi(*cvattrs++);
-            ch = ']';
-            cvchars++;
-            n--;
+            for(x = xmin; x <= xmax; x++)
+            {
+                char ch = caca_utf32_to_cp437(*cvchars++);
+                if(x < xmax && *cvchars == CACA_MAGIC_FULLWIDTH)
+                {
+                    *screen++ = '[';
+                    *screen++ = caca_attr_to_ansi(*cvattrs++);
+                    ch = ']';
+                    cvchars++;
+                    x++;
+                }
+                *screen++ = ch;
+                *screen++ = caca_attr_to_ansi(*cvattrs++);
+            }
+
+            cvchars += dp->cv->width - (xmax - xmin) - 1;
+            cvattrs += dp->cv->width - (xmax - xmin) - 1;
+            screen += 2 * (dp->cv->width - (xmax - xmin) - 1);
         }
-        *screen++ = ch;
-        *screen++ = caca_attr_to_ansi(*cvattrs++);
     }
 }

libcaca/trunk/caca/driver/win32.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -240 +240 @@
     WriteConsoleOutput(dp->drv.p->screen, dp->drv.p->buffer, size, pos, &rect);
 #else
+    /* FIXME: would this benefit from dirty rectangles? */
     WriteConsoleOutputW(dp->drv.p->screen, dp->drv.p->buffer, size, pos, &rect);
 #endif