Changeset 1333 for libcacaTweet

Timestamp:

Nov 11, 2006, 10:10:17 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Replace _cucul_attr_to_ansi8() with a now documented cucul_attr_to_ansi() function.

Location:

libcaca/trunk

Files:

• caca/driver_conio.c (modified) (2 diffs)
• caca/driver_ncurses.c (modified) (1 diff)
• caca/driver_slang.c (modified) (1 diff)
• caca/driver_vga.c (modified) (2 diffs)
• cucul/attr.c (modified) (2 diffs)
• cucul/cucul.h (modified) (1 diff)
• cucul/cucul_internals.h (modified) (1 diff)

libcaca/trunk/caca/driver_conio.c

@@ -108 +108 @@
         {
             *screen++ = '[';
-            *screen++ = _cucul_attr_to_ansi8(*attrs++);
+            *screen++ = cucul_attr_to_ansi(*attrs++);
             ch = ']';
             chars++;
@@ -114 +114 @@
         }
         *screen++ = ch;
-        *screen++ = _cucul_attr_to_ansi8(*attrs++);
+        *screen++ = cucul_attr_to_ansi(*attrs++);
     }
 #   if defined(SCREENUPDATE_IN_PC_H)

libcaca/trunk/caca/driver_ncurses.c

@@ -204 +204 @@
         for(x = dp->cv->width; x--; )
         {
-            attrset(dp->drv.p->attr[_cucul_attr_to_ansi8(*attrs++)]);
+            attrset(dp->drv.p->attr[cucul_attr_to_ansi(*attrs++)]);
             ncurses_write_utf32(*chars++);
         }

libcaca/trunk/caca/driver_slang.c

@@ -243 +243 @@
 #endif
             {
-                SLsmg_set_color(slang_assoc[_cucul_attr_to_ansi8(*attrs++)]);
+                SLsmg_set_color(slang_assoc[cucul_attr_to_ansi(*attrs++)]);
                 slang_write_utf32(ch);
             }
 #else
-            SLsmg_set_color(_cucul_attr_to_ansi8(*attrs++));
+            SLsmg_set_color(cucul_attr_to_ansi(*attrs++));
             slang_write_utf32(ch);
 #endif

libcaca/trunk/caca/driver_vga.c

@@ -126 +126 @@
         {
             *screen++ = '[';
-            *screen++ = _cucul_attr_to_ansi8(*attrs++);
+            *screen++ = cucul_attr_to_ansi(*attrs++);
             ch = ']';
             chars++;
@@ -132 +132 @@
         }
         *screen++ = ch;
-        *screen++ = _cucul_attr_to_ansi8(*attrs++);
+        *screen++ = cucul_attr_to_ansi(*attrs++);
     }
 }

libcaca/trunk/cucul/attr.c

@@ -235 +235 @@
 }
 
+/** \brief Get DOS ANSI information from attribute.
+ *
+ *  Get the ANSI colour pair for a given attribute. The returned value is
+ *  an 8-bit value whose higher 4 bits are the background colour and lower
+ *  4 bits are the foreground colour.
+ *
+ *  If the attribute has ARGB colours, the nearest colour is used. Special
+ *  attributes such as \e CUCUL_DEFAULT and \e CUCUL_TRANSPARENT are not
+ *  handled and are both replaced with \e CUCUL_LIGHTGRAY for the foreground
+ *  colour and \e CUCUL_BLACK for the background colour.
+ *
+ *  This function never fails. If the attribute value is outside the expected
+ *  32-bit range, higher order bits are simply ignored.
+ *
+ *  \param attr The requested attribute value.
+ *  \return The corresponding DOS ANSI value.
+ */
+unsigned char cucul_attr_to_ansi(unsigned long int attr)
+{
+    uint8_t fg = nearest_ansi((attr >> 4) & 0x3fff);
+    uint8_t bg = nearest_ansi(attr >> 18);
+
+    return (fg < 0x10 ? fg : CUCUL_LIGHTGRAY)
+            | ((bg < 0x10 ? bg : CUCUL_BLACK) << 4);
+}
+
 /** \brief Get ANSI foreground information from attribute.
  *
@@ -335 +361 @@
 
     return best;
-}
-
-uint8_t _cucul_attr_to_ansi8(uint32_t attr)
-{
-    uint8_t fg = nearest_ansi((attr >> 4) & 0x3fff);
-    uint8_t bg = nearest_ansi(attr >> 18);
-
-    if(fg == CUCUL_DEFAULT || fg == CUCUL_TRANSPARENT)
-        fg = CUCUL_LIGHTGRAY;
-
-    if(bg == CUCUL_DEFAULT || bg == CUCUL_TRANSPARENT)
-        bg = CUCUL_BLACK;
-
-    return fg | (bg << 4);
 }
 

libcaca/trunk/cucul/cucul.h

@@ -122 +122 @@
  *
  *  @{ */
+unsigned char cucul_attr_to_ansi(unsigned long int);
 unsigned char cucul_attr_to_ansi_fg(unsigned long int);
 unsigned char cucul_attr_to_ansi_bg(unsigned long int);

libcaca/trunk/cucul/cucul_internals.h

@@ -58 +58 @@
 
 /* Colour functions */
-uint8_t _cucul_attr_to_ansi8(uint32_t);
-uint8_t _cucul_attr_to_ansi4fg(uint32_t);
-uint8_t _cucul_attr_to_ansi4bg(uint32_t);
-uint16_t _cucul_attr_to_rgb12fg(uint32_t);
-uint16_t _cucul_attr_to_rgb12bg(uint32_t);
-uint32_t _cucul_attr_to_rgb24fg(uint32_t);
-uint32_t _cucul_attr_to_rgb24bg(uint32_t);
-void _cucul_attr_to_argb4(uint32_t, uint8_t[8]);
+extern uint16_t _cucul_attr_to_rgb12fg(uint32_t);
+extern uint16_t _cucul_attr_to_rgb12bg(uint32_t);
+extern uint32_t _cucul_attr_to_rgb24fg(uint32_t);
+extern uint32_t _cucul_attr_to_rgb24bg(uint32_t);
+extern void _cucul_attr_to_argb4(uint32_t, uint8_t[8]);
 
 #endif /* __CUCUL_INTERNALS_H__ */