Changeset 1266 for libcacaTweet

Timestamp:

Oct 31, 2006, 9:17:58 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Changed cucul_set_attr() so that only setting the style does not change the colour.

Location:

libcaca/trunk

Files:

• cucul/colour.c (modified) (8 diffs)
• cucul/export.c (modified) (2 diffs)
• test/colors.c (modified) (1 diff)
• test/export.c (modified) (1 diff)

libcaca/trunk/cucul/colour.c

@@ -38 +38 @@
  *  or created using cucul_ansi_to_attr() and cucul_argb_to_attr(), optionally
  *  ORed with style values such as CUCUL_UNDERLINE or CUCUL_BLINK.
+ *
+ *  Only changing the style does not affect the current colour value.
  *
  *  If an error occurs, -1 is returned and \b errno is set accordingly:
@@ -56 +58 @@
     }
 
+    if(attr < 0x00000010)
+        attr = (cv->curattr & 0xfffffff0) | attr;
+
     cv->curattr = attr;
 
     return 0;
-}
-
-/** \brief Set the default colour pair and text style (ANSI version).
- *
- *  Set the default ANSI colour pair and text style for drawing. String
- *  functions such as caca_printf() and graphical primitive functions such as
- *  caca_draw_line() will use these attributes.
- *
- *  Color values are those defined in cucul.h, such as CUCUL_RED
- *  or CUCUL_TRANSPARENT.
- *
- *  Style values are those defined in cucul.h, such as CUCUL_UNDERLINE
- *  or CUCUL_BLINK. The values can be ORed to set several styles at
- *  the same time.
- *
- *  If an error occurs, 0 is returned and \b errno is set accordingly:
- *  - \c EINVAL The colour values and/or the style mask are invalid.
- *
- *  \param cv A handle to the libcucul canvas.
- *  \param fg The requested foreground colour.
- *  \param bg The requested background colour.
- *  \param style The requested text styles.
- *  \return 0 in case of success, -1 if an error occurred.
- */
-unsigned long int cucul_ansi_to_attr(unsigned char fg, unsigned char bg)
-{
-    if(fg > 0x20 || bg > 0x20)
-    {
-#if defined(HAVE_ERRNO_H)
-        errno = EINVAL;
-#endif
-        return 0;
-    }
-
-    return ((unsigned long int)bg << 18) | ((unsigned long int)fg << 4);
-}
-
-/* Legacy function for old programs */
-int cucul_set_color(cucul_canvas_t *cv, unsigned char fg, unsigned char bg)
-{
-    return cucul_set_attr(cv, cucul_ansi_to_attr(fg, bg));
-}
-
-/** \brief Set the default colour pair and text style (truecolor version).
- *
- *  Set the default colour pair and text style for drawing. String
- *  functions such as caca_printf() and graphical primitive functions such as
- *  caca_draw_line() will use these attributes.
- *
- *  Colors are 16-bit ARGB values, each component being coded on 4 bits. For
- *  instance, 0xf088 is solid dark cyan (A=15 R=0 G=8 B=8), and 0x8fff is
- *  white with 50% alpha (A=8 R=15 G=15 B=15).
- *
- *  If an error occurs, 0 is returned and \b errno is set accordingly:
- *  - \c EINVAL At least one of the colour values is invalid.
- *
- *  \param cv A handle to the libcucul canvas.
- *  \param fg The requested foreground colour.
- *  \param bg The requested background colour.
- *  \param style The requested text styles.
- *  \return 0 in case of success, -1 if an error occurred.
- */
-unsigned long int cucul_argb_to_attr(unsigned int fg, unsigned int bg)
-{
-    if(fg > 0xffff || bg > 0xffff)
-    {
-#if defined(HAVE_ERRNO_H)
-        errno = EINVAL;
-#endif
-        return -1;
-    }
-
-    if(fg < 0x100)
-        fg += 0x100;
-
-    if(bg < 0x100)
-        bg += 0x100;
-
-    fg = ((fg >> 1) & 0x7ff) | ((fg >> 13) << 11);
-    bg = ((bg >> 1) & 0x7ff) | ((bg >> 13) << 11);
-
-    return ((unsigned long int)bg << 18) | ((unsigned long int)fg << 4);
-}
-
-/* Legacy function for old programs */
-int cucul_set_truecolor(cucul_canvas_t *cv, unsigned int fg, unsigned int bg)
-{
-    return cucul_set_attr(cv, cucul_argb_to_attr(fg, bg));
 }
 
@@ -182 +99 @@
 }
 
+/** \brief Set the default colour pair and text style (ANSI version).
+ *
+ *  Set the default ANSI colour pair and text style for drawing. String
+ *  functions such as caca_printf() and graphical primitive functions such as
+ *  caca_draw_line() will use these attributes.
+ *
+ *  Color values are those defined in cucul.h, such as CUCUL_RED
+ *  or CUCUL_TRANSPARENT.
+ *
+ *  Style values are those defined in cucul.h, such as CUCUL_UNDERLINE
+ *  or CUCUL_BLINK. The values can be ORed to set several styles at
+ *  the same time.
+ *
+ *  If an error occurs, 0 is returned and \b errno is set accordingly:
+ *  - \c EINVAL The colour values and/or the style mask are invalid.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \param fg The requested foreground colour.
+ *  \param bg The requested background colour.
+ *  \param style The requested text styles.
+ *  \return 0 in case of success, -1 if an error occurred.
+ */
+unsigned long int cucul_ansi_to_attr(unsigned char fg, unsigned char bg)
+{
+    if(fg > 0x20 || bg > 0x20)
+    {
+#if defined(HAVE_ERRNO_H)
+        errno = EINVAL;
+#endif
+        return 0;
+    }
+
+    fg |= 0x40;
+    bg |= 0x40;
+
+    return ((unsigned long int)bg << 18) | ((unsigned long int)fg << 4);
+}
+
+/* Legacy function for old programs */
+int cucul_set_color(cucul_canvas_t *cv, unsigned char fg, unsigned char bg)
+{
+    return cucul_set_attr(cv, cucul_ansi_to_attr(fg, bg));
+}
+
+/** \brief Set the default colour pair and text style (truecolor version).
+ *
+ *  Set the default colour pair and text style for drawing. String
+ *  functions such as caca_printf() and graphical primitive functions such as
+ *  caca_draw_line() will use these attributes.
+ *
+ *  Colors are 16-bit ARGB values, each component being coded on 4 bits. For
+ *  instance, 0xf088 is solid dark cyan (A=15 R=0 G=8 B=8), and 0x8fff is
+ *  white with 50% alpha (A=8 R=15 G=15 B=15).
+ *
+ *  If an error occurs, 0 is returned and \b errno is set accordingly:
+ *  - \c EINVAL At least one of the colour values is invalid.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \param fg The requested foreground colour.
+ *  \param bg The requested background colour.
+ *  \param style The requested text styles.
+ *  \return 0 in case of success, -1 if an error occurred.
+ */
+unsigned long int cucul_argb_to_attr(unsigned int fg, unsigned int bg)
+{
+    if(fg > 0xffff || bg > 0xffff)
+    {
+#if defined(HAVE_ERRNO_H)
+        errno = EINVAL;
+#endif
+        return -1;
+    }
+
+    if(fg < 0x100)
+        fg += 0x100;
+
+    if(bg < 0x100)
+        bg += 0x100;
+
+    fg = ((fg >> 1) & 0x7ff) | ((fg >> 13) << 11);
+    bg = ((bg >> 1) & 0x7ff) | ((bg >> 13) << 11);
+
+    return ((unsigned long int)bg << 18) | ((unsigned long int)fg << 4);
+}
+
+/* Legacy function for old programs */
+int cucul_set_truecolor(cucul_canvas_t *cv, unsigned int fg, unsigned int bg)
+{
+    return cucul_set_attr(cv, cucul_argb_to_attr(fg, bg));
+}
+
 /*
  * XXX: the following functions are local
@@ -206 +214 @@
     unsigned int i, best, dist;
 
-    if(argb14 < 0x0010)
-        return argb14;
-
-    if(argb14 == CUCUL_DEFAULT || argb14 == CUCUL_TRANSPARENT)
+    if(argb14 < 0x0050)
+        return argb14 ^ 0x40;
+
+    if(argb14 == (CUCUL_DEFAULT | 0x40) || argb14 == (CUCUL_TRANSPARENT | 0x40))
         return def;
 
@@ -267 +275 @@
     uint16_t fg = (attr >> 4) & 0x3fff;
 
-    if(fg < 0x0010)
-        return ansitab16[fg] & 0x0fff;
-
-    if(fg == CUCUL_DEFAULT)
+    if(fg < 0x0050)
+        return ansitab16[fg ^ 0x40] & 0x0fff;
+
+    if(fg == (CUCUL_DEFAULT | 0x40))
         return ansitab16[CUCUL_LIGHTGRAY] & 0x0fff;
 
-    if(fg == CUCUL_TRANSPARENT)
+    if(fg == (CUCUL_TRANSPARENT | 0x40))
         return ansitab16[CUCUL_LIGHTGRAY] & 0x0fff;
 
@@ -283 +291 @@
     uint16_t bg = attr >> 18;
 
-    if(bg < 0x0010)
-        return ansitab16[bg] & 0x0fff;
-
-    if(bg == CUCUL_DEFAULT)
+    if(bg < 0x0050)
+        return ansitab16[bg ^ 0x40] & 0x0fff;
+
+    if(bg == (CUCUL_DEFAULT | 0x40))
         return ansitab16[CUCUL_BLACK] & 0x0fff;
 
-    if(bg == CUCUL_TRANSPARENT)
+    if(bg == (CUCUL_TRANSPARENT | 0x40))
         return ansitab16[CUCUL_BLACK] & 0x0fff;
 
@@ -315 +323 @@
     uint16_t bg = attr >> 18;
 
-    if(bg < 0x0010)
-        bg = ansitab16[bg];
-    else if(bg == CUCUL_DEFAULT)
+    if(bg < 0x0050)
+        bg = ansitab16[bg ^ 0x40];
+    else if(bg == (CUCUL_DEFAULT | 0x40))
         bg = ansitab16[CUCUL_BLACK];
-    else if(bg == CUCUL_TRANSPARENT)
+    else if(bg == (CUCUL_TRANSPARENT | 0x40))
         bg = 0x0fff;
     else
@@ -329 +337 @@
     argb[3] = bg & 0xf;
 
-    if(fg < 0x0010)
-        fg = ansitab16[fg];
-    else if(fg == CUCUL_DEFAULT)
+    if(fg < 0x0050)
+        fg = ansitab16[fg ^ 0x40];
+    else if(fg == (CUCUL_DEFAULT | 0x40))
         fg = ansitab16[CUCUL_LIGHTGRAY];
-    else if(fg == CUCUL_TRANSPARENT)
+    else if(fg == (CUCUL_TRANSPARENT | 0x40))
         fg = 0x0fff;
     else

libcaca/trunk/cucul/export.c

@@ -231 +231 @@
                 continue;
 
-            fg = (((attr >> 4) & 0x3fff) == CUCUL_DEFAULT) ?
+            fg = (((attr >> 4) & 0x3fff) == (CUCUL_DEFAULT | 0x40)) ?
                      0x10 : palette[_cucul_attr_to_ansi4fg(attr)];
-            bg = (((attr >> 18) & 0x3fff) == CUCUL_TRANSPARENT) ?
+            bg = (((attr >> 18) & 0x3fff) == (CUCUL_TRANSPARENT | 0x40)) ?
                      0x10 : palette[_cucul_attr_to_ansi4bg(attr)];
 
@@ -567 +567 @@
                 continue;
 
-            if(((attr >> 4) & 0x3fff) == CUCUL_DEFAULT)
+            if(((attr >> 4) & 0x3fff) == (CUCUL_DEFAULT | 0x40))
                 fg = 0x10;
 
-            if(((attr >> 18) & 0x3fff) == CUCUL_TRANSPARENT)
+            if(((attr >> 18) & 0x3fff) == (CUCUL_TRANSPARENT | 0x40))
                 bg = 0x10;
 

libcaca/trunk/test/colors.c

@@ -53 +53 @@
     cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK));
     cucul_putstr(cv, 3, 20, "This is bold    This is blink    This is italics    This is underline");
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK) | CUCUL_BOLD);
+    cucul_set_attr(cv, CUCUL_BOLD);
     cucul_putstr(cv, 3 + 8, 20, "bold");
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK) | CUCUL_BLINK);
+    cucul_set_attr(cv, CUCUL_BLINK);
     cucul_putstr(cv, 3 + 24, 20, "blink");
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK) | CUCUL_ITALICS);
+    cucul_set_attr(cv, CUCUL_ITALICS);
     cucul_putstr(cv, 3 + 41, 20, "italics");
-    cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK) | CUCUL_UNDERLINE);
+    cucul_set_attr(cv, CUCUL_UNDERLINE);
     cucul_putstr(cv, 3 + 60, 20, "underline");
 

libcaca/trunk/test/export.c

@@ -127 +127 @@
         cucul_putstr(cv, WIDTH / 2 - 7, HEIGHT / 2 + 2, "äβç ░▒▓█▓▒░ ΔЗҒ");
 
-        cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, CUCUL_WHITE)
-                            | CUCUL_BOLD);
+        cucul_set_attr(cv, CUCUL_BOLD);
         cucul_putstr(cv, WIDTH / 2 - 16, HEIGHT / 2 + 3, "Bold");
-        cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, CUCUL_WHITE)
-                            | CUCUL_BLINK);
+        cucul_set_attr(cv, CUCUL_BLINK);
         cucul_putstr(cv, WIDTH / 2 - 9, HEIGHT / 2 + 3, "Blink");
-        cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, CUCUL_WHITE)
-                            | CUCUL_ITALICS);
+        cucul_set_attr(cv, CUCUL_ITALICS);
         cucul_putstr(cv, WIDTH / 2 - 1, HEIGHT / 2 + 3, "Italics");
-        cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, CUCUL_WHITE)
-                            | CUCUL_UNDERLINE);
+        cucul_set_attr(cv, CUCUL_UNDERLINE);
         cucul_putstr(cv, WIDTH / 2 + 8, HEIGHT / 2 + 3, "Underline");