Changeset 1257 for libcaca/trunk/src
- Timestamp:
- Oct 29, 2006, 9:54:51 PM (16 years ago)
- Location:
- libcaca/trunk/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/src/aafire.c
r1256 r1257 241 241 cucul_dither_bitmap(cv, 0, 0, cucul_get_canvas_width(cv), 242 242 cucul_get_canvas_height(cv), cucul_dither, bitmap); 243 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);243 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 244 244 if (sloop < 100) 245 245 cucul_putstr(cv, cucul_get_canvas_width(cv) - 30, -
libcaca/trunk/src/cacademo.c
r1256 r1257 162 162 { 163 163 fn[next](RENDER, backcv); 164 cucul_set_attr _ansi(mask, CUCUL_COLOR_LIGHTGRAY,165 CUCUL_COLOR_BLACK, 0);164 cucul_set_attr(mask, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, 165 CUCUL_BLACK)); 166 166 cucul_clear_canvas(mask); 167 cucul_set_attr_ansi(mask, CUCUL_COLOR_WHITE, 168 CUCUL_COLOR_WHITE, 0); 167 cucul_set_attr(mask, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_WHITE)); 169 168 transition(mask, tmode, 170 169 100 * (frame - next_transition) / TRANSITION_FRAMES); … … 172 171 } 173 172 174 cucul_set_attr _ansi(frontcv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);173 cucul_set_attr(frontcv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 175 174 if(frame < 100) 176 175 cucul_putstr(frontcv, cucul_get_canvas_width(frontcv) - 30, … … 695 694 696 695 if(p & 0x0f) 697 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, p >> 4, 0);696 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, p >> 4)); 698 697 else 699 cucul_set_attr _ansi(cv, CUCUL_COLOR_BLACK,700 CUCUL_COLOR_BLACK, 0);698 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, 699 CUCUL_BLACK)); 701 700 cucul_putchar(cv, x, y, gradient[p & 0x0f]); 702 701 } … … 762 761 h = cucul_get_canvas_height(cv); 763 762 764 cucul_set_attr _ansi(cv, CUCUL_COLOR_BLACK, CUCUL_COLOR_BLACK, 0);763 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_BLACK, CUCUL_BLACK)); 765 764 cucul_clear_canvas(cv); 766 765 … … 777 776 778 777 if(j < 2) 779 fg = CUCUL_ COLOR_WHITE;778 fg = CUCUL_WHITE; 780 779 else if(j < drop[i].len / 4) 781 fg = CUCUL_ COLOR_LIGHTGREEN;780 fg = CUCUL_LIGHTGREEN; 782 781 else if(j < drop[i].len * 4 / 5) 783 fg = CUCUL_ COLOR_GREEN;782 fg = CUCUL_GREEN; 784 783 else 785 fg = CUCUL_ COLOR_DARKGRAY;786 cucul_set_attr _ansi(cv, fg, CUCUL_COLOR_BLACK, 0);784 fg = CUCUL_DARKGRAY; 785 cucul_set_attr(cv, cucul_ansi_to_attr(fg, CUCUL_BLACK)); 787 786 788 787 cucul_putchar(cv, x, y - j, -
libcaca/trunk/src/cacadraw.c
r1256 r1257 152 152 static int refresh_screen(void) 153 153 { 154 cucul_set_attr _ansi(cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_DEFAULT, 0);154 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_DEFAULT, CUCUL_DEFAULT)); 155 155 cucul_clear_canvas(cv); 156 156 -
libcaca/trunk/src/cacaview.c
r1256 r1257 305 305 sprintf(buffer, " Loading `%s'... ", list[current]); 306 306 buffer[ww] = '\0'; 307 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);307 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 308 308 cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer); 309 309 caca_refresh_display(dp); … … 325 325 } 326 326 327 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK, 0);327 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLACK)); 328 328 cucul_clear_canvas(cv); 329 329 330 330 if(!items) 331 331 { 332 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);332 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 333 333 cucul_printf(cv, ww / 2 - 5, wh / 2, " No image. "); 334 334 } … … 350 350 sprintf(buffer, ERROR_STRING, list[current]); 351 351 buffer[ww] = '\0'; 352 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);352 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 353 353 cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer); 354 354 free(buffer); … … 380 380 381 381 #if 0 /* FIXME */ 382 cucul_set_attr _ansi(cv, CUCUL_COLOR_LIGHTGRAY,383 CUCUL_COLOR_BLACK, 0);382 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, 383 CUCUL_BLACK)); 384 384 switch(status) 385 385 { … … 420 420 static void print_status(void) 421 421 { 422 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);422 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 423 423 cucul_draw_line(cv, 0, 0, ww - 1, 0, " "); 424 424 cucul_draw_line(cv, 0, wh - 2, ww - 1, wh - 2, "-"); … … 430 430 cucul_printf(cv, ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom); 431 431 432 cucul_set_attr _ansi(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK, 0);432 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, CUCUL_BLACK)); 433 433 cucul_draw_line(cv, 0, wh - 1, ww - 1, wh - 1, " "); 434 434 } … … 458 458 int i; 459 459 460 cucul_set_attr _ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);460 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_WHITE, CUCUL_BLUE)); 461 461 462 462 for(i = 0; help[i]; i++) … … 519 519 { 520 520 if((((xn - x) / 5) ^ ((yn - y) / 3)) & 1) 521 cucul_set_attr _ansi(cv, CUCUL_COLOR_LIGHTGRAY,522 CUCUL_COLOR_DARKGRAY, 0);521 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_LIGHTGRAY, 522 CUCUL_DARKGRAY)); 523 523 else 524 cucul_set_attr _ansi(cv, CUCUL_COLOR_DARKGRAY,525 CUCUL_COLOR_LIGHTGRAY, 0);524 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_DARKGRAY, 525 CUCUL_LIGHTGRAY)); 526 526 cucul_putchar(cv, xn, yn, ' '); 527 527 } -
libcaca/trunk/src/img2irc.c
r1256 r1257 57 57 58 58 cucul_set_canvas_size(cv, cols, lines); 59 cucul_set_attr _ansi(cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_TRANSPARENT, 0);59 cucul_set_attr(cv, cucul_ansi_to_attr(CUCUL_DEFAULT, CUCUL_TRANSPARENT)); 60 60 cucul_clear_canvas(cv); 61 61 cucul_dither_bitmap(cv, 0, 0, cols, lines, i->dither, i->pixels);
Note: See TracChangeset
for help on using the changeset viewer.