Changeset 3480 for libcaca/trunk/caca/driverTweet

Timestamp:

May 19, 2009, 10:42:12 PM (12 years ago)

Author:

Sam Hocevar

Message:

Fix dirty rectangle handling in the X11 and SLang drivers.

Location:

libcaca/trunk/caca/driver

Files:

• slang.c (modified) (2 diffs)
• x11.c (modified) (3 diffs)

libcaca/trunk/caca/driver/slang.c

@@ -221 +221 @@
 static void slang_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 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++)
         {
-            SLsmg_gotorc(y, 0);
-            for(x = xmax; x >= xmin; x--)
+            SLsmg_gotorc(y, xmin);
+            for(x = xmin; x <= xmax; x++)
             {
                 uint32_t ch = *cvchars++;
@@ -278 +282 @@
 #endif
             }
+
+            cvchars += dp->cv->width - (xmax - xmin) - 1;
+            cvattrs += dp->cv->width - (xmax - xmin) - 1;
         }
     }

libcaca/trunk/caca/driver/x11.c

@@ -143 +143 @@
             dp->drv.p->max_char = 0x7f;
 
-        font_max_char = 
+        font_max_char =
             (dp->drv.p->font_struct->max_byte1 << 8)
              | dp->drv.p->font_struct->max_char_or_byte2;
@@ -154 +154 @@
     /* Reset the default X11 error handler */
     XSetErrorHandler(old_error_handler);
-    
+
     dp->drv.p->font_width = 0;
     if(dp->drv.p->font_struct->per_char
@@ -332 +332 @@
             int yoff = (y + 1) * dp->drv.p->font_height
                                         - dp->drv.p->font_offset;
-            uint32_t const *chars = cvchars + y * width;
-            uint32_t const *attrs = cvattrs + y * width;
+            uint32_t const *chars = cvchars + xmin + y * width;
+            uint32_t const *attrs = cvattrs + xmin + y * width;
 
             for(x = xmin; x <= xmax; x++, chars++, attrs++)