Changeset 1256 for libcaca/trunk/src/cacaview.cTweet

Timestamp:

Oct 29, 2006, 9:35:46 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Remove cucul_set_color() from the exported API and replaced all calls with cucul_set_attr_ansi(). Old application will still compile (but issue a warning) and run, though.

File:

• libcaca/trunk/src/cacaview.c (modified) (8 diffs)

libcaca/trunk/src/cacaview.c

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