Changeset 1257 for libcaca/trunk/cacaTweet

Timestamp:

Oct 29, 2006, 9:54:51 PM (14 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/caca

Files:

• caca0.c (modified) (2 diffs)
• caca0.h (modified) (2 diffs)
• driver_gl.c (modified) (1 diff)
• driver_slang.c (modified) (1 diff)

libcaca/trunk/caca/caca0.c

@@ -30 +30 @@
 cucul_canvas_t *__caca0_cv = NULL;
 caca_display_t *__caca0_dp = NULL;
-unsigned char __caca0_fg = CUCUL_COLOR_LIGHTGRAY;
-unsigned char __caca0_bg = CUCUL_COLOR_BLACK;
+unsigned char __caca0_fg = CUCUL_LIGHTGRAY;
+unsigned char __caca0_bg = CUCUL_BLACK;
 char __caca0_utf8[2] = " ";
 
@@ -61 +61 @@
         return -1;
     }
-    __caca0_fg = CUCUL_COLOR_LIGHTGRAY;
-    __caca0_bg = CUCUL_COLOR_BLACK;
+    __caca0_fg = CUCUL_LIGHTGRAY;
+    __caca0_bg = CUCUL_BLACK;
     return 0;
 }

libcaca/trunk/caca/caca0.h

@@ -51 +51 @@
 enum caca_color
 {
-    CACA_COLOR_BLACK = CUCUL_COLOR_BLACK,
-    CACA_COLOR_BLUE = CUCUL_COLOR_BLUE,
-    CACA_COLOR_GREEN = CUCUL_COLOR_GREEN,
-    CACA_COLOR_CYAN = CUCUL_COLOR_CYAN,
-    CACA_COLOR_RED = CUCUL_COLOR_RED,
-    CACA_COLOR_MAGENTA = CUCUL_COLOR_MAGENTA,
-    CACA_COLOR_BROWN = CUCUL_COLOR_BROWN,
-    CACA_COLOR_LIGHTGRAY = CUCUL_COLOR_LIGHTGRAY,
-    CACA_COLOR_DARKGRAY = CUCUL_COLOR_DARKGRAY,
-    CACA_COLOR_LIGHTBLUE = CUCUL_COLOR_LIGHTBLUE,
-    CACA_COLOR_LIGHTGREEN = CUCUL_COLOR_LIGHTGREEN,
-    CACA_COLOR_LIGHTCYAN = CUCUL_COLOR_LIGHTCYAN,
-    CACA_COLOR_LIGHTRED = CUCUL_COLOR_LIGHTRED,
-    CACA_COLOR_LIGHTMAGENTA = CUCUL_COLOR_LIGHTMAGENTA,
-    CACA_COLOR_YELLOW = CUCUL_COLOR_YELLOW,
-    CACA_COLOR_WHITE = CUCUL_COLOR_WHITE,
+    CACA_COLOR_BLACK = CUCUL_BLACK,
+    CACA_COLOR_BLUE = CUCUL_BLUE,
+    CACA_COLOR_GREEN = CUCUL_GREEN,
+    CACA_COLOR_CYAN = CUCUL_CYAN,
+    CACA_COLOR_RED = CUCUL_RED,
+    CACA_COLOR_MAGENTA = CUCUL_MAGENTA,
+    CACA_COLOR_BROWN = CUCUL_BROWN,
+    CACA_COLOR_LIGHTGRAY = CUCUL_LIGHTGRAY,
+    CACA_COLOR_DARKGRAY = CUCUL_DARKGRAY,
+    CACA_COLOR_LIGHTBLUE = CUCUL_LIGHTBLUE,
+    CACA_COLOR_LIGHTGREEN = CUCUL_LIGHTGREEN,
+    CACA_COLOR_LIGHTCYAN = CUCUL_LIGHTCYAN,
+    CACA_COLOR_LIGHTRED = CUCUL_LIGHTRED,
+    CACA_COLOR_LIGHTMAGENTA = CUCUL_LIGHTMAGENTA,
+    CACA_COLOR_YELLOW = CUCUL_YELLOW,
+    CACA_COLOR_WHITE = CUCUL_WHITE,
 };
 
@@ -132 +132 @@
 #define caca_set_color(x, y) \
     (__caca0_fg = (x), __caca0_bg = (y), \
-     cucul_set_attr_ansi(__caca0_cv, x, y, 0))
+     cucul_set_attr(__caca0_cv, cucul_ansi_to_attr(x, y)))
 #define caca_get_fg_color() __caca0_fg
 #define caca_get_bg_color() __caca0_bg

libcaca/trunk/caca/driver_gl.c

@@ -513 +513 @@
     /* Allocate a libcucul canvas and print all the glyphs on it */
     cv = cucul_create_canvas(1, b);
-    cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK, 0);
+    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLACK));
 
     for(b = 0, i = 0; dp->drv.p->blocks[i + 1]; i += 2)

libcaca/trunk/caca/driver_slang.c

@@ -223 +223 @@
             if(fgcolor == bgcolor)
             {
-                if(fgcolor == CUCUL_COLOR_BLACK)
-                    fgcolor = CUCUL_COLOR_WHITE;
-                else if(fgcolor == CUCUL_COLOR_WHITE
-                         || fgcolor <= CUCUL_COLOR_LIGHTGRAY)
-                    fgcolor = CUCUL_COLOR_BLACK;
+                if(fgcolor == CUCUL_BLACK)
+                    fgcolor = CUCUL_WHITE;
+                else if(fgcolor == CUCUL_WHITE
+                         || fgcolor <= CUCUL_LIGHTGRAY)
+                    fgcolor = CUCUL_BLACK;
                 else
-                    fgcolor = CUCUL_COLOR_WHITE;
+                    fgcolor = CUCUL_WHITE;
                 SLsmg_set_color(slang_assoc[fgcolor + 16 * bgcolor]);
                 SLsmg_write_char(' ');