Changeset 1254 for libcaca/trunk/caca/driver_gl.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_gl.c (modified) (4 diffs)

libcaca/trunk/caca/driver_gl.c

@@ -215 +215 @@
     for(y = 0; y < dp->drv.p->height; y += dp->drv.p->font_height)
     {
-        uint32_t *attr = dp->cv->attr + line * dp->cv->width;
+        uint32_t *attrs = dp->cv->attrs + line * dp->cv->width;
 
         /* FIXME: optimise using stride */
         for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width)
         {
-            uint16_t bg = _cucul_argb32_to_rgb12bg(*attr++);
+            uint16_t bg = _cucul_attr_to_rgb12bg(*attrs++);
 
             glColor4b(((bg & 0xf00) >> 8) * 8,
@@ -245 +245 @@
     for(y = 0; y < dp->drv.p->height; y += dp->drv.p->font_height, line++)
     {
-        uint32_t *attr = dp->cv->attr + line * dp->cv->width;
+        uint32_t *attrs = dp->cv->attrs + line * dp->cv->width;
         uint32_t *chars = dp->cv->chars + line * dp->cv->width;
 
-        for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width, attr++)
+        for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width, attrs++)
         {
             uint32_t ch = *chars++;
@@ -272 +272 @@
                                         - (uint32_t)dp->drv.p->blocks[i]]);
 
-                fg = _cucul_argb32_to_rgb12fg(*attr);
+                fg = _cucul_attr_to_rgb12fg(*attrs);
                 glColor3b(((fg & 0xf00) >> 8) * 8,
                           ((fg & 0x0f0) >> 4) * 8,
@@ -292 +292 @@
             if(fullwidth)
             {
-                chars++; attr++; x += dp->drv.p->font_width;
+                chars++; attrs++; x += dp->drv.p->font_width;
             }
         }