Changeset 946 for libcaca/trunk/cucul/import.cTweet

Timestamp:

May 9, 2006, 3:57:47 AM (16 years ago)

Author:

Sam Hocevar

Message:

• If the ANSI file we import does not use the 80 columns, we don't expand the canvas to 80 columns.

File:

• libcaca/trunk/cucul/import.c (modified) (4 diffs)

libcaca/trunk/cucul/import.c

@@ -244 +244 @@
     cucul_canvas_t *cv;
     unsigned int i, j, skip, dummy = 0;
-    unsigned int width = 80, height = 25;
+    unsigned int width = 1, height = 1;
     int x = 0, y = 0, save_x = 0, save_y = 0;
 
@@ -263 +263 @@
 
         /* Wrap long lines */
-        if((unsigned int)x >= width)
+        if((unsigned int)x >= 80)
         {
             x = 0;
@@ -380 +380 @@
                 break;
             case 'K': /* EL - Erase In Line */
-                for(j = x; j < width; j++)
+                if(width < 80)
+                    cucul_set_canvas_size(cv, width = 80, height);
+                for(j = x; j < 80; j++)
                     _cucul_putchar32(cv, j, y, (uint32_t)' ');
-                x = width;
+                x = 80;
                 break;
             case 'm': /* SGR - Select Graphic Rendition */
@@ -397 +399 @@
         /* We're going to paste a character. First make sure the canvas
          * is big enough. */
+        if((unsigned int)x >= width)
+            cucul_set_canvas_size(cv, width = x + 1, height);
+
         if((unsigned int)y >= height)
-        {
-            height = y + 1;
-            cucul_set_canvas_size(cv, width, height);
-        }
+            cucul_set_canvas_size(cv, width, height = y + 1);
 
         /* Now paste our character */