Changeset 1254 for libcaca/trunk/caca
- Timestamp:
- Oct 29, 2006, 1:53:46 AM (14 years ago)
- Location:
- libcaca/trunk/caca
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/caca0.h
r1015 r1254 131 131 132 132 #define caca_set_color(x, y) \ 133 (__caca0_fg = (x), __caca0_bg = (y), cucul_set_color(__caca0_cv, x, y)) 133 (__caca0_fg = (x), __caca0_bg = (y), \ 134 cucul_set_attr_ansi(__caca0_cv, x, y, 0)) 134 135 #define caca_get_fg_color() __caca0_fg 135 136 #define caca_get_bg_color() __caca0_bg -
libcaca/trunk/caca/driver_conio.c
r1218 r1254 98 98 { 99 99 char *screen = dp->drv.p->screen; 100 uint32_t *attr = dp->cv->attr;100 uint32_t *attrs = dp->cv->attrs; 101 101 uint32_t *chars = dp->cv->chars; 102 102 unsigned int n; … … 108 108 { 109 109 *screen++ = '['; 110 *screen++ = _cucul_a rgb32_to_ansi8(*attr++);110 *screen++ = _cucul_attr_to_ansi8(*attrs++); 111 111 ch = ']'; 112 112 chars++; … … 114 114 } 115 115 *screen++ = ch; 116 *screen++ = _cucul_a rgb32_to_ansi8(*attr++);116 *screen++ = _cucul_attr_to_ansi8(*attrs++); 117 117 } 118 118 # if defined(SCREENUPDATE_IN_PC_H) -
libcaca/trunk/caca/driver_gl.c
r1233 r1254 215 215 for(y = 0; y < dp->drv.p->height; y += dp->drv.p->font_height) 216 216 { 217 uint32_t *attr = dp->cv->attr+ line * dp->cv->width;217 uint32_t *attrs = dp->cv->attrs + line * dp->cv->width; 218 218 219 219 /* FIXME: optimise using stride */ 220 220 for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width) 221 221 { 222 uint16_t bg = _cucul_a rgb32_to_rgb12bg(*attr++);222 uint16_t bg = _cucul_attr_to_rgb12bg(*attrs++); 223 223 224 224 glColor4b(((bg & 0xf00) >> 8) * 8, … … 245 245 for(y = 0; y < dp->drv.p->height; y += dp->drv.p->font_height, line++) 246 246 { 247 uint32_t *attr = dp->cv->attr+ line * dp->cv->width;247 uint32_t *attrs = dp->cv->attrs + line * dp->cv->width; 248 248 uint32_t *chars = dp->cv->chars + line * dp->cv->width; 249 249 250 for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width, attr ++)250 for(x = 0; x < dp->drv.p->width; x += dp->drv.p->font_width, attrs++) 251 251 { 252 252 uint32_t ch = *chars++; … … 272 272 - (uint32_t)dp->drv.p->blocks[i]]); 273 273 274 fg = _cucul_a rgb32_to_rgb12fg(*attr);274 fg = _cucul_attr_to_rgb12fg(*attrs); 275 275 glColor3b(((fg & 0xf00) >> 8) * 8, 276 276 ((fg & 0x0f0) >> 4) * 8, … … 292 292 if(fullwidth) 293 293 { 294 chars++; attr ++; x += dp->drv.p->font_width;294 chars++; attrs++; x += dp->drv.p->font_width; 295 295 } 296 296 } -
libcaca/trunk/caca/driver_ncurses.c
r1218 r1254 197 197 { 198 198 int x, y; 199 uint32_t *attr = dp->cv->attr;199 uint32_t *attrs = dp->cv->attrs; 200 200 uint32_t *chars = dp->cv->chars; 201 201 for(y = 0; y < (int)dp->cv->height; y++) … … 204 204 for(x = dp->cv->width; x--; ) 205 205 { 206 attrset(dp->drv.p->attr[_cucul_a rgb32_to_ansi8(*attr++)]);206 attrset(dp->drv.p->attr[_cucul_attr_to_ansi8(*attrs++)]); 207 207 ncurses_write_utf32(*chars++); 208 208 } -
libcaca/trunk/caca/driver_slang.c
r1218 r1254 202 202 { 203 203 int x, y; 204 uint32_t *attr = dp->cv->attr;204 uint32_t *attrs = dp->cv->attrs; 205 205 uint32_t *chars = dp->cv->chars; 206 206 for(y = 0; y < (int)dp->cv->height; y++) … … 218 218 * bright backgrounds, it's just fucked up. */ 219 219 #if 0 220 uint8_t fgcolor = _cucul_a rgb32_to_ansi4fg(*attr);221 uint8_t bgcolor = _cucul_a rgb32_to_ansi4bg(*attr);220 uint8_t fgcolor = _cucul_attr_to_ansi4fg(*attrs); 221 uint8_t bgcolor = _cucul_attr_to_ansi4bg(*attrs); 222 222 223 223 if(fgcolor == bgcolor) … … 232 232 SLsmg_set_color(slang_assoc[fgcolor + 16 * bgcolor]); 233 233 SLsmg_write_char(' '); 234 attr ++;234 attrs++; 235 235 } 236 236 else 237 237 #endif 238 238 { 239 SLsmg_set_color(slang_assoc[_cucul_a rgb32_to_ansi8(*attr++)]);239 SLsmg_set_color(slang_assoc[_cucul_attr_to_ansi8(*attrs++)]); 240 240 slang_write_utf32(ch); 241 241 } 242 242 #else 243 SLsmg_set_color(_cucul_a rgb32_to_ansi8(*attr++));243 SLsmg_set_color(_cucul_attr_to_ansi8(*attrs++)); 244 244 slang_write_utf32(ch); 245 245 #endif -
libcaca/trunk/caca/driver_vga.c
r1218 r1254 116 116 { 117 117 char *screen = (char *)(intptr_t)0x000b8000; 118 uint32_t *attr = dp->cv->attr;118 uint32_t *attrs = dp->cv->attrs; 119 119 uint32_t *chars = dp->cv->chars; 120 120 int n; … … 126 126 { 127 127 *screen++ = '['; 128 *screen++ = _cucul_a rgb32_to_ansi8(*attr++);128 *screen++ = _cucul_attr_to_ansi8(*attrs++); 129 129 ch = ']'; 130 130 chars++; … … 132 132 } 133 133 *screen++ = ch; 134 *screen++ = _cucul_a rgb32_to_ansi8(*attr++);134 *screen++ = _cucul_attr_to_ansi8(*attrs++); 135 135 } 136 136 } -
libcaca/trunk/caca/driver_win32.c
r1233 r1254 191 191 SMALL_RECT rect; 192 192 CHAR_INFO *buffer = dp->drv.p->buffer; 193 uint32_t *attr = dp->cv->attr;193 uint32_t *attrs = dp->cv->attrs; 194 194 uint32_t *chars = dp->cv->chars; 195 195 unsigned int n; … … 215 215 216 216 buffer->Attributes = 217 win32_fg_palette[_cucul_a rgb32_to_ansi4fg(*attr)]218 | win32_bg_palette[_cucul_a rgb32_to_ansi4bg(*attr)];219 attr ++;217 win32_fg_palette[_cucul_attr_to_ansi4fg(*attrs)] 218 | win32_bg_palette[_cucul_attr_to_ansi4bg(*attrs)]; 219 attrs++; 220 220 buffer++; 221 221 } -
libcaca/trunk/caca/driver_x11.c
r1233 r1254 247 247 for(x = 0; x < dp->cv->width; x += len) 248 248 { 249 uint32_t *attr = dp->cv->attr+ x + y * dp->cv->width;250 uint16_t bg = _cucul_a rgb32_to_rgb12bg(*attr);249 uint32_t *attrs = dp->cv->attrs + x + y * dp->cv->width; 250 uint16_t bg = _cucul_attr_to_rgb12bg(*attrs); 251 251 252 252 len = 1; 253 253 while(x + len < dp->cv->width 254 && _cucul_a rgb32_to_rgb12bg(attr[len]) == bg)254 && _cucul_attr_to_rgb12bg(attrs[len]) == bg) 255 255 len++; 256 256 … … 272 272 for(x = 0; x < dp->cv->width; x++, chars++) 273 273 { 274 uint32_t *attr = dp->cv->attr+ x + y * dp->cv->width;274 uint32_t *attrs = dp->cv->attrs + x + y * dp->cv->width; 275 275 276 276 /* Skip spaces */ … … 282 282 283 283 XSetForeground(dp->drv.p->dpy, dp->drv.p->gc, 284 dp->drv.p->colors[_cucul_a rgb32_to_rgb12fg(*attr)]);284 dp->drv.p->colors[_cucul_attr_to_rgb12fg(*attrs)]); 285 285 286 286 /* Plain ASCII, no problem. */
Note: See TracChangeset
for help on using the changeset viewer.