Changeset 1440 for libcaca/trunkTweet

Timestamp:

Nov 27, 2006, 3:58:59 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Got rid of that ugly cv->import member.

Location:

libcaca/trunk/cucul

Files:

• cucul.c (modified) (2 diffs)
• cucul_internals.h (modified) (1 diff)
• frame.c (modified) (2 diffs)
• import.c (modified) (9 diffs)

libcaca/trunk/cucul/cucul.c

@@ -77 +77 @@
     cv->frames[0].curattr = 0;
     cv->frames[0].name = strdup("frame#00000000");
-    cv->frames[0].import = NULL;
 
     _cucul_load_frame_info(cv);
@@ -191 +190 @@
         free(cv->frames[f].attrs);
         free(cv->frames[f].name);
-        if(cv->frames[f].import)
-            free(cv->frames[f].import);
     }
 

libcaca/trunk/cucul/cucul_internals.h

@@ -35 +35 @@
     /* Frame name */
     char *name;
-
-    /* Private information */
-    void *import;
 };
 

libcaca/trunk/cucul/frame.c

@@ -171 +171 @@
     sprintf(cv->frames[id].name + 6, "%.08x", ++cv->autoinc);
 
-    cv->frames[id].import = NULL;
-
     return 0;
 }
@@ -216 +214 @@
     free(cv->frames[id].attrs);
     free(cv->frames[id].name);
-    if(cv->frames[id].import)
-        free(cv->frames[id].import);
 
     for(f = id + 1; f < cv->framecount; f++)

libcaca/trunk/cucul/import.c

@@ -349 +349 @@
                             void const *data, unsigned int size, int utf8)
 {
-    struct import *im;
+    struct import im;
     unsigned char const *buffer = (unsigned char const*)data;
-    unsigned int i, j, init, skip, growx = 0, growy = 0, dummy = 0;
+    unsigned int i, j, skip, growx = 0, growy = 0, dummy = 0;
     unsigned int width, height;
     uint32_t savedattr;
     int x = 0, y = 0, save_x = 0, save_y = 0;
-
-    init = !!cv->frames[cv->frame].import;
-
-    if(!init)
-    {
-        cv->frames[cv->frame].import = malloc(sizeof(struct import));
-        memset(cv->frames[cv->frame].import, 0, sizeof(struct import));
-    }
-
-    im = (struct import *)cv->frames[cv->frame].import;
 
     if(utf8)
@@ -382 +372 @@
     }
 
-    if(!init)
-    {
-        if(utf8)
-        {
-            im->dfg = CUCUL_DEFAULT;
-            im->dbg = CUCUL_TRANSPARENT;
-        }
-        else
-        {
-            im->dfg = CUCUL_LIGHTGRAY;
-            im->dbg = CUCUL_BLACK;
-        }
-
-        cucul_set_color_ansi(cv, im->dfg, im->dbg);
-        im->clearattr = cucul_get_attr(cv, -1, -1);
-
-        ansi_parse_grcm(cv, im, 1, &dummy);
-    }
+    if(utf8)
+    {
+        im.dfg = CUCUL_DEFAULT;
+        im.dbg = CUCUL_TRANSPARENT;
+    }
+    else
+    {
+        im.dfg = CUCUL_LIGHTGRAY;
+        im.dbg = CUCUL_BLACK;
+    }
+
+    cucul_set_color_ansi(cv, im.dfg, im.dbg);
+    im.clearattr = cucul_get_attr(cv, -1, -1);
+
+    ansi_parse_grcm(cv, &im, 1, &dummy);
 
     for(i = 0; i < size; i += skip)
@@ -536 +523 @@
             case 'J': /* ED (0x4a) - Erase In Page */
                 savedattr = cucul_get_attr(cv, -1, -1);
-                cucul_set_attr(cv, im->clearattr);
+                cucul_set_attr(cv, im.clearattr);
                 if(!argc || argv[0] == 0)
                 {
@@ -574 +561 @@
 #if 0
                 savedattr = cucul_get_attr(cv, -1, -1);
-                cucul_set_attr(cv, im->clearattr);
+                cucul_set_attr(cv, im.clearattr);
                 for( ; (unsigned int)j < width; j++)
                     cucul_put_char(cv, j, y, ' ');
@@ -583 +570 @@
                 {
                     savedattr = cucul_get_attr(cv, -1, -1);
-                    cucul_set_attr(cv, im->clearattr);
+                    cucul_set_attr(cv, im.clearattr);
                     cucul_draw_line(cv, x, y, x + argv[0] - 1, y, ' ');
                     cucul_set_attr(cv, savedattr);
@@ -602 +589 @@
             case 'm': /* SGR (0x6d) - Select Graphic Rendition */
                 if(argc)
-                    ansi_parse_grcm(cv, im, argc, argv);
+                    ansi_parse_grcm(cv, &im, argc, argv);
                 else
-                    ansi_parse_grcm(cv, im, 1, &dummy);
+                    ansi_parse_grcm(cv, &im, 1, &dummy);
                 break;
             case 's': /* Private (save cursor position) */
@@ -695 +682 @@
             {
                 savedattr = cucul_get_attr(cv, -1, -1);
-                cucul_set_attr(cv, im->clearattr);
+                cucul_set_attr(cv, im.clearattr);
                 cucul_set_canvas_size(cv, width = x + wch, height);
                 cucul_set_attr(cv, savedattr);
@@ -710 +697 @@
         {
             savedattr = cucul_get_attr(cv, -1, -1);
-            cucul_set_attr(cv, im->clearattr);
+            cucul_set_attr(cv, im.clearattr);
             if(growy)
             {
@@ -744 +731 @@
     {
         savedattr = cucul_get_attr(cv, -1, -1);
-        cucul_set_attr(cv, im->clearattr);
+        cucul_set_attr(cv, im.clearattr);
         cucul_set_canvas_size(cv, width, height = y);
         cucul_set_attr(cv, savedattr);