Changeset 2057 for libcaca/trunk/cacaTweet

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".

Location:

libcaca/trunk/caca

Files:

• driver_cocoa.m (modified) (4 diffs)
• driver_gl.c (modified) (3 diffs)
• driver_x11.c (modified) (3 diffs)

libcaca/trunk/caca/driver_cocoa.m

@@ -271 +271 @@
                 NSColor* color = nil;
 #if USE_RGB12_FGBG
-                uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);
+                uint16_t bg = cucul_attr_to_rgb12_bg(*attrs);
                 if(bg)
                 {
@@ -289 +289 @@
 #else
                 uint8_t argb[8];
-                _cucul_attr_to_argb4(*attrs, argb);
+                cucul_attr_to_argb64(*attrs, argb);
                 color =  [NSColor colorWithCalibratedRed:((float)argb[1]) / 15.0
                                   green:((float)argb[2]) / 15.0
@@ -329 +329 @@
                     NSColor* color = nil;
 #if USE_RGB12_FGBG
-                    uint16_t fg = _cucul_attr_to_rgb12fg(*attrs);
+                    uint16_t fg = cucul_attr_to_rgb12_fg(*attrs);
 #   ifdef PRECACHE_WHOLE_COLOR_TABLE
                     color = _colorCache[fg];
@@ -344 +344 @@
 #else // USE_RGB12_FGBG
                     uint8_t argb[8];
-                    _cucul_attr_to_argb4(*attrs, argb);
+                    cucul_attr_to_argb64(*attrs, argb);
                     debug_log(@"x,y=[%d,%d] r,g,b back=[%u %u %u] front=[%u %u %u]", 
                               x, y, argb[1], argb[2], argb[3], argb[5], argb[6], argb[7]);

libcaca/trunk/caca/driver_gl.c

@@ -38 +38 @@
 
 #include "cucul.h"
-#include "cucul_internals.h"
 #include "caca.h"
 #include "caca_internals.h"
@@ -228 +227 @@
         for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width)
         {
-            uint16_t bg = _cucul_attr_to_rgb12bg(*attrs++);
+            uint16_t bg = cucul_attr_to_rgb12_bg(*attrs++);
 
             glColor4b(((bg & 0xf00) >> 8) * 8,
@@ -280 +279 @@
                                         - (uint32_t)dp->drv.p->blocks[i]]);
 
-                fg = _cucul_attr_to_rgb12fg(*attrs);
+                fg = cucul_attr_to_rgb12_fg(*attrs);
                 glColor3b(((fg & 0xf00) >> 8) * 8,
                           ((fg & 0x0f0) >> 4) * 8,

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,