Ignore:
Timestamp:
Oct 29, 2006, 9:35:46 AM (13 years ago)
Author:
Sam Hocevar
Message:
  • Remove cucul_set_color() from the exported API and replaced all calls with cucul_set_attr_ansi(). Old application will still compile (but issue a warning) and run, though.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/src/cacaview.c

    r1255 r1256  
    305305            sprintf(buffer, " Loading `%s'... ", list[current]);
    306306            buffer[ww] = '\0';
    307             cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
     307            cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
    308308            cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer);
    309309            caca_refresh_display(dp);
     
    325325        }
    326326
    327         cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
     327        cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK, 0);
    328328        cucul_clear_canvas(cv);
    329329
    330330        if(!items)
    331331        {
    332             cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
     332            cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
    333333            cucul_printf(cv, ww / 2 - 5, wh / 2, " No image. ");
    334334        }
     
    350350            sprintf(buffer, ERROR_STRING, list[current]);
    351351            buffer[ww] = '\0';
    352             cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
     352            cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
    353353            cucul_putstr(cv, (ww - strlen(buffer)) / 2, wh / 2, buffer);
    354354            free(buffer);
     
    380380
    381381#if 0 /* FIXME */
    382             cucul_set_color(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
     382            cucul_set_attr_ansi(cv, CUCUL_COLOR_LIGHTGRAY,
     383                                    CUCUL_COLOR_BLACK, 0);
    383384            switch(status)
    384385            {
     
    419420static void print_status(void)
    420421{
    421     cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
     422    cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
    422423    cucul_draw_line(cv, 0, 0, ww - 1, 0, " ");
    423424    cucul_draw_line(cv, 0, wh - 2, ww - 1, wh - 2, "-");
     
    429430    cucul_printf(cv, ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom);
    430431
    431     cucul_set_color(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
     432    cucul_set_attr_ansi(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK, 0);
    432433    cucul_draw_line(cv, 0, wh - 1, ww - 1, wh - 1, " ");
    433434}
     
    457458    int i;
    458459
    459     cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
     460    cucul_set_attr_ansi(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE, 0);
    460461
    461462    for(i = 0; help[i]; i++)
     
    518519    {
    519520        if((((xn - x) / 5) ^ ((yn - y) / 3)) & 1)
    520             cucul_set_color(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_DARKGRAY);
     521            cucul_set_attr_ansi(cv, CUCUL_COLOR_LIGHTGRAY,
     522                                    CUCUL_COLOR_DARKGRAY, 0);
    521523        else
    522             cucul_set_color(cv, CUCUL_COLOR_DARKGRAY, CUCUL_COLOR_LIGHTGRAY);
     524            cucul_set_attr_ansi(cv, CUCUL_COLOR_DARKGRAY,
     525                                    CUCUL_COLOR_LIGHTGRAY, 0);
    523526        cucul_putchar(cv, xn, yn, ' ');
    524527    }
Note: See TracChangeset for help on using the changeset viewer.