Changeset 1332 for libcaca/trunkTweet

Timestamp:

Nov 11, 2006, 9:44:14 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Get rid of _cucul_attr_to_ansi4[fb]g() and replace all calls with the now official cucul_attr_to_ansi_[fb]g().

Location:

libcaca/trunk

Files:

• caca/driver_slang.c (modified) (1 diff)
• caca/driver_win32.c (modified) (2 diffs)
• cucul/attr.c (modified) (1 diff)
• cucul/export.c (modified) (3 diffs)

libcaca/trunk/caca/driver_slang.c

@@ -218 +218 @@
              * bright backgrounds, it's just fucked up. */
 #if 0
-            uint8_t fgcolor = _cucul_attr_to_ansi4fg(*attrs);
-            uint8_t bgcolor = _cucul_attr_to_ansi4bg(*attrs);
+            uint8_t fgcolor = cucul_attr_to_ansi_fg(*attrs);
+            uint8_t bgcolor = cucul_attr_to_ansi_bg(*attrs);
+
+            if(fgcolor >= 0x10)
+                fgcolor = CUCUL_LIGHTGRAY;
+
+            if(bgcolor >= 0x10)
+                bgcolor = CUCUL_BLACK; /* FIXME: handle transparency */
 
             if(fgcolor == bgcolor)

libcaca/trunk/caca/driver_win32.c

@@ -199 +199 @@
     {
         uint32_t ch = *chars++;
+        uint8_t fg = cucul_attr_to_ansi_fg(*attrs);
+        uint8_t bg = cucul_attr_to_ansi_bg(*attrs);
 
 #if 0
@@ -214 +216 @@
 #endif
 
-        buffer->Attributes =
-                win32_fg_palette[_cucul_attr_to_ansi4fg(*attrs)]
-                 | win32_bg_palette[_cucul_attr_to_ansi4bg(*attrs)];
+        buffer->Attributes = win32_fg_palette[fg < 0x10 ? fg : CUCUL_LIGHTGRAY]
+                              | win32_bg_palette[bg < 0x10 ? bg : CUCUL_BLACK];
         attrs++;
         buffer++;

libcaca/trunk/cucul/attr.c

@@ -351 +351 @@
 }
 
-uint8_t _cucul_attr_to_ansi4fg(uint32_t attr)
-{
-    uint8_t c = nearest_ansi((attr >> 4) & 0x3fff);
-
-    if(c == CUCUL_DEFAULT || c == CUCUL_TRANSPARENT)
-        return CUCUL_LIGHTGRAY;
-
-    return c;
-}
-
-uint8_t _cucul_attr_to_ansi4bg(uint32_t attr)
-{
-    uint8_t c = nearest_ansi(attr >> 18);
-
-    if(c == CUCUL_DEFAULT || c == CUCUL_TRANSPARENT)
-        return CUCUL_BLACK;
-
-    return c;
-}
-
 uint16_t _cucul_attr_to_rgb12fg(uint32_t attr)
 {

libcaca/trunk/cucul/export.c

@@ -289 +289 @@
             uint32_t attr = lineattr[x];
             uint32_t ch = linechar[x];
-            uint8_t fg, bg;
+            uint8_t ansifg, ansibg, fg, bg;
 
             if(ch == CUCUL_MAGIC_FULLWIDTH)
                 continue;
 
-            fg = (((attr >> 4) & 0x3fff) == (CUCUL_DEFAULT | 0x40)) ?
-                     0x10 : palette[_cucul_attr_to_ansi4fg(attr)];
-            bg = (((attr >> 18) & 0x3fff) == (CUCUL_TRANSPARENT | 0x40)) ?
-                     0x10 : palette[_cucul_attr_to_ansi4bg(attr)];
+            ansifg = cucul_attr_to_ansi_fg(attr);
+            ansibg = cucul_attr_to_ansi_bg(attr);
+
+            fg = ansifg < 0x10 ? palette[ansifg] : 0x10;
+            bg = ansibg < 0x10 ? palette[ansibg] : 0x10;
 
             /* TODO: the [0 could be omitted in some cases */
@@ -364 +365 @@
         for(x = 0; x < cv->width; x++)
         {
-            uint8_t fg = palette[_cucul_attr_to_ansi4fg(lineattr[x])];
-            uint8_t bg = palette[_cucul_attr_to_ansi4bg(lineattr[x])];
+            uint8_t ansifg = cucul_attr_to_ansi_fg(lineattr[x]);
+            uint8_t ansibg = cucul_attr_to_ansi_bg(lineattr[x]);
+            uint8_t fg = ansifg < 0x10 ? palette[ansifg] : CUCUL_LIGHTGRAY;
+            uint8_t bg = ansibg < 0x10 ? palette[ansibg] : CUCUL_BLACK;
             uint32_t ch = linechar[x];
 
@@ -615 +618 @@
         {
             uint32_t attr = lineattr[x];
-            uint8_t fg = palette[_cucul_attr_to_ansi4fg(attr)];
-            uint8_t bg = palette[_cucul_attr_to_ansi4bg(attr)];
             uint32_t ch = linechar[x];
+            uint8_t ansifg, ansibg, fg, bg;
 
             if(ch == CUCUL_MAGIC_FULLWIDTH)
                 continue;
 
-            if(((attr >> 4) & 0x3fff) == (CUCUL_DEFAULT | 0x40))
-                fg = 0x10;
-
-            if(((attr >> 18) & 0x3fff) == (CUCUL_TRANSPARENT | 0x40))
-                bg = 0x10;
+            ansifg = cucul_attr_to_ansi_fg(attr);
+            ansibg = cucul_attr_to_ansi_bg(attr);
+
+            fg = ansifg < 0x10 ? palette[ansifg] : 0x10;
+            bg = ansibg < 0x10 ? palette[ansibg] : 0x10;
 
             /* TODO: optimise series of same fg / same bg