Changeset 1267 for libcaca/trunk/test/unicode.cTweet

Timestamp:

Oct 31, 2006, 2:29:48 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Got rid of cucul_ansi_to_attr() and cucul_argb_to_attr() and restored cucul_set_color() and cucul_set_truecolor() under the new names cucul_set_color_ansi() and cucul_set_color_argb().
• Renamed cucul_get_color_name() into cucul_ansi_to_str().

File:

• libcaca/trunk/test/unicode.c (modified) (6 diffs)

libcaca/trunk/test/unicode.c

@@ -25 +25 @@
 #include "caca.h"
 
-#define ATTR_WHITE_ON_BLUE cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)
-#define ATTR_DEFAULT cucul_ansi_to_attr(CUCUL_DEFAULT, CUCUL_TRANSPARENT)
-
 int main(int argc, char *argv[])
 {
@@ -36 +33 @@
     dp = caca_create_display(cv);
 
-    cucul_set_attr(cv, ATTR_WHITE_ON_BLUE);
+    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
     cucul_putstr(cv, 1, 1, "Basic Unicode support");
 
-    cucul_set_attr(cv, ATTR_DEFAULT);
+    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
     cucul_putstr(cv, 1, 2, "This is ASCII:    | abc DEF 123 !@# |");
     cucul_putstr(cv, 1, 3, "This is Unicode:  | äßç δεφ ☺♥♀ ╞╬╗ |");
@@ -46 +43 @@
     cucul_putstr(cv, 1, 5, "If the three lines do not have the same length, there is a bug somewhere.");
 
-    cucul_set_attr(cv, ATTR_WHITE_ON_BLUE);
+    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
     cucul_putstr(cv, 1, 7, "Gradient glyphs");
 
-    cucul_set_attr(cv, ATTR_DEFAULT);
+    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
     cucul_putstr(cv, 31,  8, "  0%");
     cucul_putstr(cv, 31,  9, " 25%");
@@ -56 +53 @@
     cucul_putstr(cv, 31, 12, "100%");
 
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTRED, CUCUL_LIGHTGREEN));
+    cucul_set_color_ansi(cv, CUCUL_LIGHTRED, CUCUL_LIGHTGREEN);
     cucul_putstr(cv, 1,  8, "                             ");
     cucul_putstr(cv, 1,  9, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
@@ -63 +60 @@
     cucul_putstr(cv, 1, 12, "█████████████████████████████");
 
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGREEN, CUCUL_LIGHTRED));
+    cucul_set_color_ansi(cv, CUCUL_LIGHTGREEN, CUCUL_LIGHTRED);
     cucul_putstr(cv, 36,  8, "█████████████████████████████");
     cucul_putstr(cv, 36,  9, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
@@ -70 +67 @@
     cucul_putstr(cv, 36, 12, "                             ");
 
-    cucul_set_attr(cv, ATTR_WHITE_ON_BLUE);
+    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
     cucul_putstr(cv, 1, 14, "Double width characters");
 
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTRED, CUCUL_TRANSPARENT));
+    cucul_set_color_ansi(cv, CUCUL_LIGHTRED, CUCUL_TRANSPARENT);
     cucul_putstr(cv, 1, 15, "| ドラゴン ボーレ |");
-    cucul_set_attr(cv, ATTR_DEFAULT);
+    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
     cucul_putstr(cv, 1, 16, "| ()()()() ()()() |");
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_YELLOW, CUCUL_TRANSPARENT));
+    cucul_set_color_ansi(cv, CUCUL_YELLOW, CUCUL_TRANSPARENT);
     cucul_putstr(cv, 1, 17, "| ドラゴン");
     cucul_putstr(cv, 12, 17, "ボーレ |");
 
-    cucul_set_attr(cv, ATTR_DEFAULT);
+    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
     cucul_putstr(cv, 1, 18, "If the three lines do not have the same length, there is a bug somewhere.");