Changeset 1257 for libcaca/trunk/srcTweet

Timestamp:

Oct 29, 2006, 9:54:51 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Get rid of cucul_set_attr_ansi() and cucul_set_attr_argb and merge the functionality into cucul_set_attr().
• Add cucul_ansi_to_attr() and cucul_argb_to_attr().
• Rename CUCUL_COLOR_* to CUCUL_*.

Location:

libcaca/trunk/src

Files:

• aafire.c (modified) (1 diff)
• cacademo.c (modified) (5 diffs)
• cacadraw.c (modified) (1 diff)
• cacaview.c (modified) (8 diffs)
• img2irc.c (modified) (1 diff)

libcaca/trunk/src/aafire.c

@@ -241 +241 @@
   cucul_dither_bitmap(cv, 0, 0, cucul_get_canvas_width(cv),
                       cucul_get_canvas_height(cv), cucul_dither, bitmap);
-  cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+  cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
   if (sloop < 100)
     cucul_putstr(cv, cucul_get_canvas_width(cv) - 30,

libcaca/trunk/src/cacademo.c

@@ -162 +162 @@
         {
             fn[next](RENDER, backcv);
-            cucul_set_attr_ansi(mask, CUCUL_COLOR_LIGHTGRAY,
-                                      CUCUL_COLOR_BLACK, 0);
+            cucul_set_attr(mask, cucul_ansi_to_attr(CUCUL_LIGHTGRAY,
+                                                    CUCUL_BLACK));
             cucul_clear_canvas(mask);
-            cucul_set_attr_ansi(mask, CUCUL_COLOR_WHITE,
-                                      CUCUL_COLOR_WHITE, 0);
+            cucul_set_attr(mask, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_WHITE));
             transition(mask, tmode,
                        100 * (frame - next_transition) / TRANSITION_FRAMES);
@@ -172 +171 @@
         }
 
-        cucul_set_attr_ansi(frontcv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+        cucul_set_attr(frontcv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
         if(frame < 100)
             cucul_putstr(frontcv, cucul_get_canvas_width(frontcv) - 30,
@@ -695 +694 @@
 
                 if(p & 0x0f)
-                    cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, p >> 4, 0);
+                    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, p >> 4));
                 else
-                    cucul_set_attr_ansi(cv, CUCUL_COLOR_BLACK,
-                                            CUCUL_COLOR_BLACK, 0);
+                    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK,
+                                                          CUCUL_BLACK));
                 cucul_putchar(cv, x, y, gradient[p & 0x0f]);
             }
@@ -762 +761 @@
         h = cucul_get_canvas_height(cv);
 
-        cucul_set_attr_ansi(cv, CUCUL_COLOR_BLACK, CUCUL_COLOR_BLACK, 0);
+        cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, CUCUL_BLACK));
         cucul_clear_canvas(cv);
 
@@ -777 +776 @@
 
                 if(j < 2)
-                    fg = CUCUL_COLOR_WHITE;
+                    fg = CUCUL_WHITE;
                 else if(j < drop[i].len / 4)
-                    fg = CUCUL_COLOR_LIGHTGREEN;
+                    fg = CUCUL_LIGHTGREEN;
                 else if(j < drop[i].len * 4 / 5)
-                    fg = CUCUL_COLOR_GREEN;
+                    fg = CUCUL_GREEN;
                 else
-                    fg = CUCUL_COLOR_DARKGRAY;
-                cucul_set_attr_ansi(cv, fg, CUCUL_COLOR_BLACK, 0);
+                    fg = CUCUL_DARKGRAY;
+                cucul_set_attr(cv, cucul_ansi_to_attr(fg, CUCUL_BLACK));
 
                 cucul_putchar(cv, x, y - j,

libcaca/trunk/src/cacadraw.c

@@ -152 +152 @@
 static int refresh_screen(void)
 {
-    cucul_set_attr_ansi(cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_DEFAULT, 0);
+    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_DEFAULT, CUCUL_DEFAULT));
     cucul_clear_canvas(cv);
 

libcaca/trunk/src/cacaview.c

@@ -305 +305 @@
             sprintf(buffer, " Loading `%s'... ", list[current]);
             buffer[ww] = '\0';
-            cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+            cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
             cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer);
             caca_refresh_display(dp);
@@ -325 +325 @@
         }
 
-        cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK, 0);
+        cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLACK));
         cucul_clear_canvas(cv);
 
         if(!items)
         {
-            cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+            cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
             cucul_printf(cv, ww / 2 - 5, wh / 2, " No image. ");
         }
@@ -350 +350 @@
             sprintf(buffer, ERROR_STRING, list[current]);
             buffer[ww] = '\0';
-            cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+            cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
             cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer);
             free(buffer);
@@ -380 +380 @@
 
 #if 0 /* FIXME */
-            cucul_set_attr_ansi(cv, CUCUL_COLOR_LIGHTGRAY,
-                                    CUCUL_COLOR_BLACK, 0);
+            cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY,
+                                                  CUCUL_BLACK));
             switch(status)
             {
@@ -420 +420 @@
 static void print_status(void)
 {
-    cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
     cucul_draw_line(cv, 0, 0, ww - 1, 0, " ");
     cucul_draw_line(cv, 0, wh - 2, ww - 1, wh - 2, "-");
@@ -430 +430 @@
     cucul_printf(cv, ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom);
 
-    cucul_set_attr_ansi(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK, 0);
+    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK));
     cucul_draw_line(cv, 0, wh - 1, ww - 1, wh - 1, " ");
 }
@@ -458 +458 @@
     int i;
 
-    cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
+    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE));
 
     for(i = 0; help[i]; i++)
@@ -519 +519 @@
     {
         if((((xn - x) / 5) ^ ((yn - y) / 3)) & 1)
-            cucul_set_attr_ansi(cv, CUCUL_COLOR_LIGHTGRAY,
-                                    CUCUL_COLOR_DARKGRAY, 0);
+            cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY,
+                                                  CUCUL_DARKGRAY));
         else
-            cucul_set_attr_ansi(cv, CUCUL_COLOR_DARKGRAY,
-                                    CUCUL_COLOR_LIGHTGRAY, 0);
+            cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_DARKGRAY,
+                                                  CUCUL_LIGHTGRAY));
         cucul_putchar(cv, xn, yn, ' ');
     }

libcaca/trunk/src/img2irc.c

@@ -57 +57 @@
 
     cucul_set_canvas_size(cv, cols, lines);
-    cucul_set_attr_ansi(cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_TRANSPARENT, 0);
+    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_DEFAULT, CUCUL_TRANSPARENT));
     cucul_clear_canvas(cv);
     cucul_dither_bitmap(cv, 0, 0, cols, lines, i->dither, i->pixels);