Changeset 2057 for libcaca/trunk/caca
- Timestamp:
- Nov 25, 2007, 3:12:20 PM (13 years ago)
- Location:
- libcaca/trunk/caca
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/driver_cocoa.m
r2056 r2057 271 271 NSColor* color = nil; 272 272 #if USE_RGB12_FGBG 273 uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);273 uint16_t bg = cucul_attr_to_rgb12_bg(*attrs); 274 274 if(bg) 275 275 { … … 289 289 #else 290 290 uint8_t argb[8]; 291 _cucul_attr_to_argb4(*attrs, argb);291 cucul_attr_to_argb64(*attrs, argb); 292 292 color = [NSColor colorWithCalibratedRed:((float)argb[1]) / 15.0 293 293 green:((float)argb[2]) / 15.0 … … 329 329 NSColor* color = nil; 330 330 #if USE_RGB12_FGBG 331 uint16_t fg = _cucul_attr_to_rgb12fg(*attrs);331 uint16_t fg = cucul_attr_to_rgb12_fg(*attrs); 332 332 # ifdef PRECACHE_WHOLE_COLOR_TABLE 333 333 color = _colorCache[fg]; … … 344 344 #else // USE_RGB12_FGBG 345 345 uint8_t argb[8]; 346 _cucul_attr_to_argb4(*attrs, argb);346 cucul_attr_to_argb64(*attrs, argb); 347 347 debug_log(@"x,y=[%d,%d] r,g,b back=[%u %u %u] front=[%u %u %u]", 348 348 x, y, argb[1], argb[2], argb[3], argb[5], argb[6], argb[7]); -
libcaca/trunk/caca/driver_gl.c
r2056 r2057 38 38 39 39 #include "cucul.h" 40 #include "cucul_internals.h"41 40 #include "caca.h" 42 41 #include "caca_internals.h" … … 228 227 for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width) 229 228 { 230 uint16_t bg = _cucul_attr_to_rgb12bg(*attrs++);229 uint16_t bg = cucul_attr_to_rgb12_bg(*attrs++); 231 230 232 231 glColor4b(((bg & 0xf00) >> 8) * 8, … … 280 279 - (uint32_t)dp->drv.p->blocks[i]]); 281 280 282 fg = _cucul_attr_to_rgb12fg(*attrs);281 fg = cucul_attr_to_rgb12_fg(*attrs); 283 282 glColor3b(((fg & 0xf00) >> 8) * 8, 284 283 ((fg & 0x0f0) >> 4) * 8, -
libcaca/trunk/caca/driver_x11.c
r2056 r2057 35 35 36 36 #include "cucul.h" 37 #include "cucul_internals.h"38 37 #include "caca.h" 39 38 #include "caca_internals.h" … … 305 304 { 306 305 uint32_t const *attrs = cvattrs + x + y * width; 307 uint16_t bg = _cucul_attr_to_rgb12bg(*attrs);306 uint16_t bg = cucul_attr_to_rgb12_bg(*attrs); 308 307 309 308 len = 1; 310 309 while(x + len < width 311 && _cucul_attr_to_rgb12bg(attrs[len]) == bg)310 && cucul_attr_to_rgb12_bg(attrs[len]) == bg) 312 311 len++; 313 312 … … 333 332 { 334 333 XSetForeground(dp->drv.p->dpy, dp->drv.p->gc, 335 dp->drv.p->colors[ _cucul_attr_to_rgb12fg(*attrs)]);334 dp->drv.p->colors[cucul_attr_to_rgb12_fg(*attrs)]); 336 335 337 336 x11_put_glyph(dp, x * dp->drv.p->font_width,
Note: See TracChangeset
for help on using the changeset viewer.