Changeset 879 for libcacaTweet

Timestamp:

Apr 25, 2006, 6:28:00 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Got rid of _update_canvas_size().

File:

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

libcaca/trunk/cucul/import.c

@@ -197 +197 @@
 
 #define IS_ALPHA(x) (x>='A' && x<='z')
-void _update_canvas_size(cucul_canvas_t *cv, int x, int y, int *max_x, int *max_y);
 unsigned char _get_ansi_command(unsigned char const *buffer, int size);
 int _parse_tuple(unsigned int *ret, unsigned char const *buffer, int size);
@@ -210 +209 @@
     unsigned int count = 0;
     unsigned int tuple[1024]; /* Should be enough. Will it be ? */
-    int x = 0, y = 0, max_x = 80, max_y = 25;
+    int x = 0, y = 0, width = 80, height = 25;
     int save_x = 0, save_y = 0;
     unsigned int j, add = 0;
@@ -218 +217 @@
     bg = old_bg = CUCUL_COLOR_BLACK;
 
-    cv = cucul_create_canvas(max_x, max_y);
+    cv = cucul_create_canvas(width, height);
 
     for(i = 0; i < size; i++)
@@ -249 +248 @@
                     y = 0;
                 }
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
                 break;
             case 'A':
@@ -257 +255 @@
                     y -= tuple[0];
                 if(y < 0) y = 0;
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
                 break;
             case 'B':
@@ -264 +261 @@
                 else
                     y += tuple[0];
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
                 break;
             case 'C':
@@ -271 +267 @@
                 else
                     x += tuple[0];
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
                 break;
             case 'D':
@@ -279 +274 @@
                     x -= tuple[0];
                 if(x < 0) x = 0;
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
                 break;
             case 's':
@@ -288 +282 @@
                 x = save_x;
                 y = save_y;
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
                 break;
             case 'J':
@@ -295 +288 @@
                     x = 0;
                     y = 0;
-                    _update_canvas_size(cv, x, y, &max_x, &max_y);
                 }
                 break;
@@ -317 +309 @@
                 x = 0;
                 y++;
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
             }
             else if(buffer[i] == '\r')
@@ -334 +325 @@
                     cucul_putchar(cv, x, y, '?');
                 x++;
-                _update_canvas_size(cv, x, y, &max_x, &max_y);
             }
+        }
+
+        if(x >= width || y >= height)
+        {
+            if(x >= width)
+                width = x + 1;
+
+            if(y >= height)
+                height = y + 1;
+
+            cucul_set_canvas_size(cv, width, height);
         }
 
@@ -470 +471 @@
 }
 
-void _update_canvas_size(cucul_canvas_t *cv, int x, int y, int *max_x, int *max_y)
-{
-    if(x > *max_x)
-        *max_x = x;
-
-    if(y > *max_y)
-        *max_y = y;
-
-    cucul_set_canvas_size(cv, *max_x, *max_y);
-}
-