Changeset 724 for libcaca/trunk/caca
- Timestamp:
- Apr 6, 2006, 3:41:56 PM (15 years ago)
- Location:
- libcaca/trunk/caca
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/driver_conio.c
r689 r724 99 99 { 100 100 char *screen = kk->drv.p->screen; 101 uint 8_t *attr = kk->qq->attr;101 uint32_t *attr = kk->qq->attr; 102 102 uint32_t *chars = kk->qq->chars; 103 103 int n; … … 106 106 { 107 107 *screen++ = _cucul_utf32_to_cp437(*chars++); 108 *screen++ = *attr++;108 *screen++ = _cucul_rgba32_to_ansi8(*attr++); 109 109 } 110 110 # if defined(SCREENUPDATE_IN_PC_H) -
libcaca/trunk/caca/driver_gl.c
r700 r724 246 246 for(y = 0; y < kk->drv.p->height; y += kk->drv.p->font_height) 247 247 { 248 uint 8_t *attr = kk->qq->attr + line * kk->qq->width;248 uint32_t *attr = kk->qq->attr + line * kk->qq->width; 249 249 250 250 for(x = 0; x < kk->drv.p->width; x += kk->drv.p->font_width) 251 251 { 252 252 glDisable(GL_TEXTURE_2D); 253 glColor4bv(gl_bgpal[ attr[0] >> 4]);253 glColor4bv(gl_bgpal[_cucul_rgba32_to_ansi4bg(*attr++)]); 254 254 glBegin(GL_QUADS); 255 255 glVertex2f(x, y); … … 259 259 glVertex2f(x, y + kk->drv.p->font_height); 260 260 glEnd(); 261 262 attr++;263 261 } 264 262 … … 274 272 for(y = 0; y < kk->drv.p->height; y += kk->drv.p->font_height) 275 273 { 276 uint 8_t *attr = kk->qq->attr + line * kk->qq->width;274 uint32_t *attr = kk->qq->attr + line * kk->qq->width; 277 275 uint32_t *chars = kk->qq->chars + line * kk->qq->width; 278 276 … … 284 282 { 285 283 glBindTexture(GL_TEXTURE_2D, kk->drv.p->id[c - 32]); 286 glColor4bv(gl_bgpal[ attr[0] & 0xf]);284 glColor4bv(gl_bgpal[_cucul_rgba32_to_ansi4fg(*attr)]); 287 285 glBegin(GL_QUADS); 288 286 glTexCoord2f(0, kk->drv.p->sh); -
libcaca/trunk/caca/driver_ncurses.c
r689 r724 191 191 { 192 192 int x, y; 193 uint 8_t *attr = kk->qq->attr;193 uint32_t *attr = kk->qq->attr; 194 194 uint32_t *chars = kk->qq->chars; 195 195 for(y = 0; y < (int)kk->qq->height; y++) … … 198 198 for(x = kk->qq->width; x--; ) 199 199 { 200 attrset(kk->drv.p->attr[ *attr++]);200 attrset(kk->drv.p->attr[_cucul_rgba32_to_ansi8(*attr++)]); 201 201 ncurses_write_utf32(*chars++); 202 202 } -
libcaca/trunk/caca/driver_raw.c
r702 r724 56 56 static void raw_display(caca_t *kk) 57 57 { 58 uint 8_t *attr = kk->qq->attr;58 uint32_t *attr = kk->qq->attr; 59 59 uint32_t *chars = kk->qq->chars; 60 60 uint32_t w, h; … … 71 71 { 72 72 uint32_t c = *chars++; 73 uint 8_t a = *attr++;73 uint32_t a = *attr++; 74 74 75 fprintf(stdout, "%c%c%c%c%c", (c >> 24), (c >> 16) & 0xff, 76 (c >> 8) & 0xff, c & 0xff, a); 75 fprintf(stdout, "%c%c%c%c%c%c%c%c", 76 (c >> 24), (c >> 16) & 0xff, (c >> 8) & 0xff, c & 0xff, 77 (a >> 24), (a >> 16) & 0xff, (a >> 8) & 0xff, a & 0xff); 77 78 } 78 79 -
libcaca/trunk/caca/driver_slang.c
r689 r724 203 203 { 204 204 int x, y; 205 uint 8_t *attr = kk->qq->attr;205 uint32_t *attr = kk->qq->attr; 206 206 uint32_t *chars = kk->qq->chars; 207 207 for(y = 0; y < (int)kk->qq->height; y++) … … 213 213 214 214 #if defined(OPTIMISE_SLANG_PALETTE) 215 uint8_t fgcolor = *attr & 0xf;216 uint8_t bgcolor = *attr >> 4;215 uint8_t fgcolor = _cucul_rgba32_to_ansi4fg(*attr); 216 uint8_t bgcolor = _cucul_rgba32_to_ansi4bg(*attr); 217 217 218 218 /* If foreground == background, just don't use this colour … … 220 220 if(fgcolor != bgcolor) 221 221 { 222 SLsmg_set_color(slang_assoc[ *attr++]);222 SLsmg_set_color(slang_assoc[_cucul_rgba32_to_ansi8(*attr++)]); 223 223 slang_write_utf32(c); 224 224 } … … 237 237 } 238 238 #else 239 SLsmg_set_color( *attr++);239 SLsmg_set_color(_cucul_rgba32_to_ansi8(*attr++)); 240 240 slang_write_utf32(c); 241 241 #endif -
libcaca/trunk/caca/driver_vga.c
r689 r724 117 117 { 118 118 char *screen = (char *)(intptr_t)0x000b8000; 119 uint 8_t *attr = kk->qq->attr;119 uint32_t *attr = kk->qq->attr; 120 120 uint32_t *chars = kk->qq->chars; 121 121 int n; … … 124 124 { 125 125 *screen++ = _cucul_utf32_to_cp437(*chars++); 126 *screen++ = *attr++;126 *screen++ = _cucul_rgba32_to_ansi8(*attr++); 127 127 } 128 128 } -
libcaca/trunk/caca/driver_win32.c
r689 r724 211 211 212 212 kk->drv.p->buffer[i].Attributes = 213 win32_fg_palette[ kk->qq->attr[i] & 0xf]214 | win32_bg_palette[ kk->qq->attr[i] >> 4];213 win32_fg_palette[_cucul_rgba32_to_ansi4fg(kk->qq->attr[i])] 214 | win32_bg_palette[_cucul_rgba32_to_ansi4bg(kk->qq->attr[i])]; 215 215 } 216 216 -
libcaca/trunk/caca/driver_x11.c
r689 r724 260 260 for(x = 0; x < kk->qq->width; x += len) 261 261 { 262 uint8_t *attr = kk->qq->attr + x + y * kk->qq->width; 262 uint32_t *attr = kk->qq->attr + x + y * kk->qq->width; 263 uint8_t bg = _cucul_rgba32_to_ansi4bg(*attr); 263 264 264 265 len = 1; 265 266 while(x + len < kk->qq->width 266 && (attr[len] >> 4) == (attr[0] >> 4))267 && _cucul_rgba32_to_ansi4bg(attr[len]) == bg) 267 268 len++; 268 269 269 270 XSetForeground(kk->drv.p->dpy, kk->drv.p->gc, 270 kk->drv.p->colors[ attr[0] >> 4]);271 kk->drv.p->colors[_cucul_rgba32_to_ansi4bg(*attr)]); 271 272 XFillRectangle(kk->drv.p->dpy, kk->drv.p->pixmap, kk->drv.p->gc, 272 273 x * kk->drv.p->font_width, y * kk->drv.p->font_height, … … 284 285 for(x = 0; x < kk->qq->width; x++, chars++) 285 286 { 286 uint 8_t *attr = kk->qq->attr + x + y * kk->qq->width;287 uint32_t *attr = kk->qq->attr + x + y * kk->qq->width; 287 288 288 289 /* Skip spaces */ … … 291 292 292 293 XSetForeground(kk->drv.p->dpy, kk->drv.p->gc, 293 kk->drv.p->colors[ *attr & 0xf]);294 kk->drv.p->colors[_cucul_rgba32_to_ansi4fg(*attr)]); 294 295 295 296 /* Plain ASCII, no problem. */
Note: See TracChangeset
for help on using the changeset viewer.