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

Timestamp:

Nov 25, 2007, 3:12:20 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Export cucul_attr_to_rgb12_bg(), cucul_attr_to_rgb12_fg() and cucul_attr_to_argb64() (previously _cucul_attr_to_rgb12bg, _cucul_attr_to_rgb12fg and _cucul_attr_to_argb4) in the official libcucul API.
• Cleanup complete: libcaca no longer depends on "cucul_internals.h".

File:

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

libcaca/trunk/caca/driver_x11.c

@@ -35 +35 @@
 
 #include "cucul.h"
-#include "cucul_internals.h"
 #include "caca.h"
 #include "caca_internals.h"
@@ -305 +304 @@
         {
             uint32_t const *attrs = cvattrs + x + y * width;
-            uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);
+            uint16_t bg = cucul_attr_to_rgb12_bg(*attrs);
 
             len = 1;
             while(x + len < width
-                   && _cucul_attr_to_rgb12bg(attrs[len]) == bg)
+                   && cucul_attr_to_rgb12_bg(attrs[len]) == bg)
                 len++;
 
@@ -333 +332 @@
         {
             XSetForeground(dp->drv.p->dpy, dp->drv.p->gc,
-                           dp->drv.p->colors[_cucul_attr_to_rgb12fg(*attrs)]);
+                           dp->drv.p->colors[cucul_attr_to_rgb12_fg(*attrs)]);
 
             x11_put_glyph(dp, x * dp->drv.p->font_width,