Changeset 1254 for libcaca/trunk/caca/driver_x11.cTweet

Timestamp:

Oct 29, 2006, 1:53:46 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Use the LSB of alpha and blue components to encode additional flags such as bold or underline. No higher level support for these yet, but at least everything is consistent.
• Created cucul_set_attr_ansi() and cucul_set_attr_argb() which are bound to replace cucul_set_color() and cucul_set_truecolor().

File:

• libcaca/trunk/caca/driver_x11.c (modified) (3 diffs)

libcaca/trunk/caca/driver_x11.c

@@ -247 +247 @@
         for(x = 0; x < dp->cv->width; x += len)
         {
-            uint32_t *attr = dp->cv->attr + x + y * dp->cv->width;
-            uint16_t bg = _cucul_argb32_to_rgb12bg(*attr);
+            uint32_t *attrs = dp->cv->attrs + x + y * dp->cv->width;
+            uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);
 
             len = 1;
             while(x + len < dp->cv->width
-                   && _cucul_argb32_to_rgb12bg(attr[len]) == bg)
+                   && _cucul_attr_to_rgb12bg(attrs[len]) == bg)
                 len++;
 
@@ -272 +272 @@
         for(x = 0; x < dp->cv->width; x++, chars++)
         {
-            uint32_t *attr = dp->cv->attr + x + y * dp->cv->width;
+            uint32_t *attrs = dp->cv->attrs + x + y * dp->cv->width;
 
             /* Skip spaces */
@@ -282 +282 @@
 
             XSetForeground(dp->drv.p->dpy, dp->drv.p->gc,
-                           dp->drv.p->colors[_cucul_argb32_to_rgb12fg(*attr)]);
+                           dp->drv.p->colors[_cucul_attr_to_rgb12fg(*attrs)]);
 
             /* Plain ASCII, no problem. */