Changeset 1330


Ignore:
Timestamp:
Nov 11, 2006, 9:11:26 AM (14 years ago)
Author:
Sam Hocevar
Message:
  • Switch back to UTF-32 arguments for drawing primitives, now that we properly export cucul_utf8_to_utf32(). Evil API breakage, but no one uses these functions anyway.
Location:
libcaca/trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/caca0.h

    r1269 r1330  
    4747extern unsigned char __caca0_fg;
    4848extern unsigned char __caca0_bg;
    49 extern char __caca0_utf8[];
    5049
    5150/* These enums and macros changed names or values */
     
    142141
    143142#define caca_draw_line(x, y, z, t, c) \
    144     (__caca0_utf8[0] = c, \
    145      cucul_draw_line(__caca0_cv, x, y, z, t, __caca0_utf8))
     143    cucul_draw_line(__caca0_cv, x, y, z, t, c)
    146144#define caca_draw_polyline(x, y, z, c) \
    147     (__caca0_utf8[0] = c, \
    148      cucul_draw_polyline(__caca0_cv, x, y, z, __caca0_utf8))
     145    cucul_draw_polyline(__caca0_cv, x, y, z, c)
    149146#define caca_draw_thin_line(x, y, z, t) \
    150147    cucul_draw_thin_line(__caca0_cv, x, y, z, t)
     
    152149    cucul_draw_thin_polyline(__caca0_cv, x, y, z)
    153150#define caca_draw_circle(x, y, z, c) \
    154     (__caca0_utf8[0] = c, cucul_draw_circle(__caca0_cv, x, y, z, __caca0_utf8))
     151    cucul_draw_circle(__caca0_cv, x, y, z, c)
    155152#define caca_draw_ellipse(x, y, z, t, c) \
    156     (__caca0_utf8[0] = c, \
    157      cucul_draw_ellipse(__caca0_cv, x, y, z, t, __caca0_utf8))
     153    cucul_draw_ellipse(__caca0_cv, x, y, z, t, c)
    158154#define caca_draw_thin_ellipse(x, y, z, t) \
    159155    cucul_draw_thin_ellipse(__caca0_cv, x, y, z, t)
    160156#define caca_fill_ellipse(x, y, z, t, c) \
    161     (__caca0_utf8[0] = c, \
    162      cucul_fill_ellipse(__caca0_cv, x, y, z, t, __caca0_utf8))
     157    cucul_fill_ellipse(__caca0_cv, x, y, z, t, c)
    163158#define caca_draw_box(x, y, z, t, c) \
    164     (__caca0_utf8[0] = c, cucul_draw_box(__caca0_cv, x, y, z, t, __caca0_utf8))
     159    cucul_draw_box(__caca0_cv, x, y, z, t, c)
    165160#define caca_draw_thin_box(x, y, z, t) \
    166161    cucul_draw_thin_box(__caca0_cv, x, y, z, t)
    167162#define caca_fill_box(x, y, z, t, c) \
    168     (__caca0_utf8[0] = c, cucul_fill_box(__caca0_cv, x, y, z, t, __caca0_utf8))
     163    cucul_fill_box(__caca0_cv, x, y, z, t, c)
    169164#define caca_draw_triangle(x, y, z, t, u, v, c) \
    170     (__caca0_utf8[0] = c, \
    171      cucul_draw_triangle(__caca0_cv, x, y, z, t, u, v, __caca0_utf8))
     165    cucul_draw_triangle(__caca0_cv, x, y, z, t, u, v, c)
    172166#define caca_draw_thin_triangle(x, y, z, t, u, v) \
    173167    cucul_draw_thin_triangle(__caca0_cv, x, y, z, t, u, v)
    174168#define caca_fill_triangle(x, y, z, t, u, v, c) \
    175     (__caca0_utf8[0] = c, \
    176      cucul_fill_triangle(__caca0_cv, x, y, z, t, u, v, __caca0_utf8))
     169    cucul_fill_triangle(__caca0_cv, x, y, z, t, u, v, c)
    177170
    178171#define caca_rand(a, b) cucul_rand(a, (b)+1)
  • libcaca/trunk/cucul/box.c

    r1329 r1330  
    3535 *  \param x2 X coordinate of the lower-right corner of the box.
    3636 *  \param y2 Y coordinate of the lower-right corner of the box.
    37  *  \param str UTF-8 string containing the character to use to draw the box.
     37 *  \param ch UTF-32 character to be used to draw the box.
    3838 *  \return This function always returns 0.
    3939 */
    4040int cucul_draw_box(cucul_canvas_t *cv, int x1, int y1, int x2, int y2,
    41                    char const *str)
    42 {
    43     cucul_draw_line(cv, x1, y1, x1, y2, str);
    44     cucul_draw_line(cv, x1, y2, x2, y2, str);
    45     cucul_draw_line(cv, x2, y2, x2, y1, str);
    46     cucul_draw_line(cv, x2, y1, x1, y1, str);
     41                   unsigned long int ch)
     42{
     43    cucul_draw_line(cv, x1, y1, x1, y2, ch);
     44    cucul_draw_line(cv, x1, y2, x2, y2, ch);
     45    cucul_draw_line(cv, x2, y2, x2, y1, ch);
     46    cucul_draw_line(cv, x2, y1, x1, y1, ch);
    4747
    4848    return 0;
     
    176176 *  \param x2 X coordinate of the lower-right corner of the box.
    177177 *  \param y2 Y coordinate of the lower-right corner of the box.
    178  *  \param str UTF-8 string containing the character to fill the box with.
     178 *  \param ch UTF-32 character to be used to draw the box.
    179179 *  \return This function always returns 0.
    180180 */
    181181int cucul_fill_box(cucul_canvas_t *cv, int x1, int y1, int x2, int y2,
    182                    char const *str)
     182                   unsigned long int ch)
    183183{
    184184    int x, y, xmax, ymax;
    185     uint32_t ch;
    186185
    187186    if(x1 > x2)
     
    208207    if(y2 > ymax) y2 = ymax;
    209208
    210     ch = cucul_utf8_to_utf32(str, NULL);
    211 
    212209    for(y = y1; y <= y2; y++)
    213210        for(x = x1; x <= x2; x++)
  • libcaca/trunk/cucul/conic.c

    r982 r1330  
    3737 *  \param y Center Y coordinate.
    3838 *  \param r Circle radius.
    39  *  \param str UTF-8 string representing the character that should be used
    40  *         to draw the circle outline.
    41  *  \return This function always returns 0.
    42  */
    43 int cucul_draw_circle(cucul_canvas_t *cv, int x, int y, int r, char const *str)
     39 *  \param ch UTF-32 character to be used to draw the circle outline.
     40 *  \return This function always returns 0.
     41 */
     42int cucul_draw_circle(cucul_canvas_t *cv, int x, int y, int r,
     43                      unsigned long int ch)
    4444{
    4545    int test, dx, dy;
    46     uint32_t ch = cucul_utf8_to_utf32(str, NULL);
    4746
    4847    /* Optimized Bresenham. Kick ass. */
     
    6766 *  \param a Ellipse X radius.
    6867 *  \param b Ellipse Y radius.
    69  *  \param str UTF-8 string representing the character that should be used
    70  *         to fill the ellipse.
     68 *  \param ch UTF-32 character to be used to fill the ellipse.
    7169 *  \return This function always returns 0.
    7270 */
    7371int cucul_fill_ellipse(cucul_canvas_t *cv, int xo, int yo, int a, int b,
    74                        char const *str)
     72                       unsigned long int ch)
    7573{
    7674    int d2;
     
    8886        {
    8987            d1 += b*b*(2*x*1) + a*a*(-2*y+2);
    90             cucul_draw_line(cv, xo - x, yo - y, xo + x, yo - y, str);
    91             cucul_draw_line(cv, xo - x, yo + y, xo + x, yo + y, str);
     88            cucul_draw_line(cv, xo - x, yo - y, xo + x, yo - y, ch);
     89            cucul_draw_line(cv, xo - x, yo + y, xo + x, yo + y, ch);
    9290            y--;
    9391        }
     
    9593    }
    9694
    97     cucul_draw_line(cv, xo - x, yo - y, xo + x, yo - y, str);
    98     cucul_draw_line(cv, xo - x, yo + y, xo + x, yo + y, str);
     95    cucul_draw_line(cv, xo - x, yo - y, xo + x, yo - y, ch);
     96    cucul_draw_line(cv, xo - x, yo + y, xo + x, yo + y, ch);
    9997
    10098    d2 = b*b*(x+0.5)*(x+0.5) + a*a*(y-1)*(y-1) - a*a*b*b;
     
    112110
    113111        y--;
    114         cucul_draw_line(cv, xo - x, yo - y, xo + x, yo - y, str);
    115         cucul_draw_line(cv, xo - x, yo + y, xo + x, yo + y, str);
     112        cucul_draw_line(cv, xo - x, yo - y, xo + x, yo - y, ch);
     113        cucul_draw_line(cv, xo - x, yo + y, xo + x, yo + y, ch);
    116114    }
    117115
     
    128126 *  \param a Ellipse X radius.
    129127 *  \param b Ellipse Y radius.
    130  *  \param str UTF-8 string representing the character that should be used
    131  *         to draw the ellipse outline.
     128 *  \param ch UTF-32 character to be used to draw the ellipse outline.
    132129 *  \return This function always returns 0.
    133130 */
    134131int cucul_draw_ellipse(cucul_canvas_t *cv, int xo, int yo, int a, int b,
    135                        char const *str)
     132                       unsigned long int ch)
    136133{
    137134    int d2;
     
    139136    int y = b;
    140137    int d1 = b*b - (a*a*b) + (a*a/4);
    141     uint32_t ch = cucul_utf8_to_utf32(str, NULL);
    142138
    143139    ellipsepoints(cv, xo, yo, x, y, ch);
  • libcaca/trunk/cucul/cucul.h

    r1329 r1330  
    135135 *
    136136 *  @{ */
    137 int cucul_draw_line(cucul_canvas_t *, int, int, int, int, char const *);
    138 int cucul_draw_polyline(cucul_canvas_t *, int const x[], int const y[], int, char const *);
     137int cucul_draw_line(cucul_canvas_t *, int, int, int, int, unsigned long int);
     138int cucul_draw_polyline(cucul_canvas_t *, int const x[], int const y[], int,
     139                        unsigned long int);
    139140int cucul_draw_thin_line(cucul_canvas_t *, int, int, int, int);
    140 int cucul_draw_thin_polyline(cucul_canvas_t *, int const x[], int const y[], int);
    141 
    142 int cucul_draw_circle(cucul_canvas_t *, int, int, int, char const *);
    143 int cucul_draw_ellipse(cucul_canvas_t *, int, int, int, int, char const *);
     141int cucul_draw_thin_polyline(cucul_canvas_t *, int const x[], int const y[],
     142                             int);
     143
     144int cucul_draw_circle(cucul_canvas_t *, int, int, int, unsigned long int);
     145int cucul_draw_ellipse(cucul_canvas_t *, int, int, int, int, unsigned long int);
    144146int cucul_draw_thin_ellipse(cucul_canvas_t *, int, int, int, int);
    145 int cucul_fill_ellipse(cucul_canvas_t *, int, int, int, int, char const *);
    146 
    147 int cucul_draw_box(cucul_canvas_t *, int, int, int, int, char const *);
     147int cucul_fill_ellipse(cucul_canvas_t *, int, int, int, int, unsigned long int);
     148
     149int cucul_draw_box(cucul_canvas_t *, int, int, int, int, unsigned long int);
    148150int cucul_draw_thin_box(cucul_canvas_t *, int, int, int, int);
    149151int cucul_draw_cp437_box(cucul_canvas_t *, int, int, int, int);
    150 int cucul_fill_box(cucul_canvas_t *, int, int, int, int, char const *);
    151 
    152 int cucul_draw_triangle(cucul_canvas_t *, int, int, int, int, int, int, char const *);
     152int cucul_fill_box(cucul_canvas_t *, int, int, int, int, unsigned long int);
     153
     154int cucul_draw_triangle(cucul_canvas_t *, int, int, int, int, int, int,
     155                        unsigned long int);
    153156int cucul_draw_thin_triangle(cucul_canvas_t *, int, int, int, int, int, int);
    154 int cucul_fill_triangle(cucul_canvas_t *, int, int, int, int, int, int, char const *);
     157int cucul_fill_triangle(cucul_canvas_t *, int, int, int, int, int, int,
     158                        unsigned long int);
    155159/*  @} */
    156160
  • libcaca/trunk/cucul/line.c

    r982 r1330  
    5151 *  \param x2 X coordinate of the second point.
    5252 *  \param y2 Y coordinate of the second point.
    53  *  \param str UTF-8 string containing the character to use to draw the line.
     53 *  \param ch UTF-32 character to be used to draw the line.
    5454 *  \return This function always returns 0.
    5555 */
    5656int cucul_draw_line(cucul_canvas_t *cv, int x1, int y1, int x2, int y2,
    57                     char const *str)
     57                    unsigned long int ch)
    5858{
    5959    struct line s;
     
    6262    s.x2 = x2;
    6363    s.y2 = y2;
    64     s.ch = cucul_utf8_to_utf32(str, NULL);
     64    s.ch = ch;
    6565    s.draw = draw_solid_line;
    6666    clip_line(cv, &s);
     
    8282 *  \param y Array of Y coordinates. Must have \p n + 1 elements.
    8383 *  \param n Number of lines to draw.
    84  *  \param str UTF-8 string containing the character to use to draw the lines.
     84 *  \param ch UTF-32 character to be used to draw the lines.
    8585 *  \return This function always returns 0.
    8686 */
    8787int cucul_draw_polyline(cucul_canvas_t *cv, int const x[], int const y[],
    88                         int n, char const *str)
     88                        int n, unsigned long int ch)
    8989{
    9090    int i;
    9191    struct line s;
    92     s.ch = cucul_utf8_to_utf32(str, NULL);
     92    s.ch = ch;
    9393    s.draw = draw_solid_line;
    9494
  • libcaca/trunk/cucul/triangle.c

    r1174 r1330  
    3737 *  \param x3 X coordinate of the third point.
    3838 *  \param y3 Y coordinate of the third point.
    39  *  \param str UTF-8 string representing the character that should be used
    40  *         to draw the triangle outline.
     39 *  \param ch UTF-32 character to be used to draw the triangle outline.
    4140 *  \return This function always returns 0.
    4241 */
    4342int cucul_draw_triangle(cucul_canvas_t *cv, int x1, int y1, int x2, int y2,
    44                         int x3, int y3, char const *str)
     43                        int x3, int y3, unsigned long int ch)
    4544{
    46     cucul_draw_line(cv, x1, y1, x2, y2, str);
    47     cucul_draw_line(cv, x2, y2, x3, y3, str);
    48     cucul_draw_line(cv, x3, y3, x1, y1, str);
     45    cucul_draw_line(cv, x1, y1, x2, y2, ch);
     46    cucul_draw_line(cv, x2, y2, x3, y3, ch);
     47    cucul_draw_line(cv, x3, y3, x1, y1, ch);
    4948
    5049    return 0;
     
    8584 *  \param x3 X coordinate of the third point.
    8685 *  \param y3 Y coordinate of the third point.
    87  *  \param str UTF-8 string representing the character that should be used
    88  *         to fill the triangle.
     86 *  \param ch UTF-32 character to be used to fill the triangle.
    8987 *  \return This function always returns 0.
    9088 */
    9189int cucul_fill_triangle(cucul_canvas_t *cv, int x1, int y1, int x2, int y2,
    92                         int x3, int y3, char const *str)
     90                        int x3, int y3, unsigned long int ch)
    9391{
    9492    int x, y, xmin, xmax, ymin, ymax;
    9593    long int xx1, xx2, xa, xb, sl21, sl31, sl32;
    96     uint32_t ch;
    9794
    9895    /* Bubble-sort y1 <= y2 <= y3 */
    9996    if(y1 > y2)
    100         return cucul_fill_triangle(cv, x2, y2, x1, y1, x3, y3, str);
     97        return cucul_fill_triangle(cv, x2, y2, x1, y1, x3, y3, ch);
    10198
    10299    if(y2 > y3)
    103         return cucul_fill_triangle(cv, x1, y1, x3, y3, x2, y2, str);
    104 
    105     ch = cucul_utf8_to_utf32(str, NULL);
     100        return cucul_fill_triangle(cv, x1, y1, x3, y3, x2, y2, ch);
    106101
    107102    /* Compute slopes and promote precision */
  • libcaca/trunk/src/cacademo.c

    r1267 r1330  
    235235        star_rot[(a)*2] * mulx + w2, star_rot[(a)*2+1] * muly + h2, \
    236236        star_rot[(b)*2] * mulx + w2, star_rot[(b)*2+1] * muly + h2, \
    237         star_rot[(c)*2] * mulx + w2, star_rot[(c)*2+1] * muly + h2, "#")
     237        star_rot[(c)*2] * mulx + w2, star_rot[(c)*2+1] * muly + h2, '#')
    238238            DO_TRI(0, 1, 9);
    239239            DO_TRI(1, 2, 3);
     
    247247
    248248        case TRANSITION_CIRCLE:
    249             cucul_fill_ellipse(mask, w2, h2, mulx, muly, "#");
     249            cucul_fill_ellipse(mask, w2, h2, mulx, muly, '#');
    250250            break;
    251251
  • libcaca/trunk/src/cacaview.c

    r1267 r1330  
    420420{
    421421    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
    422     cucul_draw_line(cv, 0, 0, ww - 1, 0, " ");
    423     cucul_draw_line(cv, 0, wh - 2, ww - 1, wh - 2, "-");
     422    cucul_draw_line(cv, 0, 0, ww - 1, 0, ' ');
     423    cucul_draw_line(cv, 0, wh - 2, ww - 1, wh - 2, '-');
    424424    cucul_putstr(cv, 0, 0, "q:Quit  np:Next/Prev  +-x:Zoom  gG:Gamma  "
    425425                           "hjkl:Move  d:Dither  a:Antialias");
     
    430430
    431431    cucul_set_color_ansi(cv, CUCUL_LIGHTGRAY, CUCUL_BLACK);
    432     cucul_draw_line(cv, 0, wh - 1, ww - 1, wh - 1, " ");
     432    cucul_draw_line(cv, 0, wh - 1, ww - 1, wh - 1, ' ');
    433433}
    434434
  • libcaca/trunk/test/demo.c

    r1269 r1330  
    264264    j = 15 + sin(0.03*i) * 8;
    265265    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLACK);
    266     cucul_fill_ellipse(cv, xo, yo, j, j / 2, "#");
     266    cucul_fill_ellipse(cv, xo, yo, j, j / 2, '#');
    267267    cucul_set_color_ansi(cv, CUCUL_YELLOW, CUCUL_BLACK);
    268     cucul_draw_ellipse(cv, xo, yo, j, j / 2, "#");
     268    cucul_draw_ellipse(cv, xo, yo, j, j / 2, '#');
    269269
    270270    /* Draw the pyramid */
     
    282282
    283283    cucul_set_color_ansi(cv, CUCUL_GREEN, CUCUL_BLACK);
    284     cucul_fill_triangle(cv, xo, yo, xb, yb, xa, ya, "%");
     284    cucul_fill_triangle(cv, xo, yo, xb, yb, xa, ya, '%');
    285285    cucul_set_color_ansi(cv, CUCUL_YELLOW, CUCUL_BLACK);
    286286    cucul_draw_thin_triangle(cv, xo, yo, xb, yb, xa, ya);
    287287
    288288    cucul_set_color_ansi(cv, CUCUL_RED, CUCUL_BLACK);
    289     cucul_fill_triangle(cv, xa, ya, xb, yb, xc, yc, "#");
     289    cucul_fill_triangle(cv, xa, ya, xb, yb, xc, yc, '#');
    290290    cucul_set_color_ansi(cv, CUCUL_YELLOW, CUCUL_BLACK);
    291291    cucul_draw_thin_triangle(cv, xa, ya, xb, yb, xc, yc);
    292292
    293293    cucul_set_color_ansi(cv, CUCUL_BLUE, CUCUL_BLACK);
    294     cucul_fill_triangle(cv, xo, yo, xb, yb, xc, yc, "%");
     294    cucul_fill_triangle(cv, xo, yo, xb, yb, xc, yc, '%');
    295295    cucul_set_color_ansi(cv, CUCUL_YELLOW, CUCUL_BLACK);
    296296    cucul_draw_thin_triangle(cv, xo, yo, xb, yb, xc, yc);
     
    381381        cucul_draw_thin_line(cv, xa, ya, xb, yb);
    382382    else
    383         cucul_draw_line(cv, xa, ya, xb, yb, "#");
     383        cucul_draw_line(cv, xa, ya, xb, yb, '#');
    384384}
    385385
     
    402402
    403403    cucul_set_color_ansi(cv, cucul_rand(0, 16), cucul_rand(0, 16));
    404     cucul_fill_box(cv, xa, ya, xb, yb, "#");
     404    cucul_fill_box(cv, xa, ya, xb, yb, '#');
    405405
    406406    cucul_set_color_ansi(cv, cucul_rand(0, 16), CUCUL_BLACK);
     
    408408        cucul_draw_thin_box(cv, xa, ya, xb, yb);
    409409    else if(outline == 1)
    410         cucul_draw_box(cv, xa, ya, xb, yb, "#");
     410        cucul_draw_box(cv, xa, ya, xb, yb, '#');
    411411}
    412412
     
    433433
    434434    cucul_set_color_ansi(cv, cucul_rand(0, 16), cucul_rand(0, 16));
    435     cucul_fill_ellipse(cv, x, y, a, b, "#");
     435    cucul_fill_ellipse(cv, x, y, a, b, '#');
    436436
    437437    cucul_set_color_ansi(cv, cucul_rand(0, 16), CUCUL_BLACK);
     
    439439        cucul_draw_thin_ellipse(cv, x, y, a, b);
    440440    else if(outline == 1)
    441         cucul_draw_ellipse(cv, x, y, a, b, "#");
     441        cucul_draw_ellipse(cv, x, y, a, b, '#');
    442442}
    443443
     
    463463
    464464    cucul_set_color_ansi(cv, cucul_rand(0, 16), cucul_rand(0, 16));
    465     cucul_fill_triangle(cv, xa, ya, xb, yb, xc, yc, "#");
     465    cucul_fill_triangle(cv, xa, ya, xb, yb, xc, yc, '#');
    466466
    467467    cucul_set_color_ansi(cv, cucul_rand(0, 16), CUCUL_BLACK);
     
    469469        cucul_draw_thin_triangle(cv, xa, ya, xb, yb, xc, yc);
    470470    else if(outline == 1)
    471         cucul_draw_triangle(cv, xa, ya, xb, yb, xc, yc, "#");
     471        cucul_draw_triangle(cv, xa, ya, xb, yb, xc, yc, '#');
    472472}
    473473#if 0
  • libcaca/trunk/test/event.c

    r1267 r1330  
    4343
    4444    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
    45     cucul_draw_line(cv, 0, 0, cucul_get_canvas_width(cv) - 1, 0, " ");
     45    cucul_draw_line(cv, 0, 0, cucul_get_canvas_width(cv) - 1, 0, ' ');
    4646
    47     cucul_draw_line(cv, 0, h, cucul_get_canvas_width(cv) - 1, h, " ");
     47    cucul_draw_line(cv, 0, h, cucul_get_canvas_width(cv) - 1, h, ' ');
    4848    cucul_putstr(cv, 0, h, "type \"quit\" to exit");
    4949
     
    8989        /* Print current event */
    9090        cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
    91         cucul_draw_line(cv, 0, 0, cucul_get_canvas_width(cv) - 1, 0, " ");
     91        cucul_draw_line(cv, 0, 0, cucul_get_canvas_width(cv) - 1, 0, ' ');
    9292        print_event(0, 0, events);
    9393
    94         cucul_draw_line(cv, 0, h, cucul_get_canvas_width(cv) - 1, h, " ");
     94        cucul_draw_line(cv, 0, h, cucul_get_canvas_width(cv) - 1, h, ' ');
    9595        cucul_printf(cv, 0, h, "type \"quit\" to exit: %s", quit_string[quit]);
    9696
  • libcaca/trunk/test/export.c

    r1308 r1330  
    114114        cucul_set_color_ansi(cv, CUCUL_BLACK, CUCUL_WHITE);
    115115        cucul_fill_ellipse(cv, WIDTH / 2, HEIGHT / 2,
    116                                WIDTH / 4, HEIGHT / 4, " ");
     116                               WIDTH / 4, HEIGHT / 4, ' ');
    117117        cucul_putstr(cv, WIDTH / 2 - 5, HEIGHT / 2 - 5, "(\") \\o/ <&>");
    118118        cucul_putstr(cv, WIDTH / 2 - 8, HEIGHT / 2 - 3, "[<><><><> <>--<>]");
  • libcaca/trunk/test/frames.c

    r1267 r1330  
    5050        cucul_set_canvas_frame(cv, frame);
    5151        cucul_set_color_ansi(cv, CUCUL_WHITE, frame);
    52         cucul_fill_box(cv, 0, 0, 40, 15, ":");
     52        cucul_fill_box(cv, 0, 0, 40, 15, ':');
    5353        cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
    5454        cucul_putstr(cv, frame * 5 / 2, frame, "カカ");
  • libcaca/trunk/test/gamma.c

    r1267 r1330  
    9595                                   * 0.5 * cucul_get_canvas_height(mask),
    9696                                 cucul_get_canvas_width(mask) / 2,
    97                                  cucul_get_canvas_height(mask) / 2, "#");
     97                                 cucul_get_canvas_height(mask) / 2, '#');
    9898
    9999        /* Blit the spare canvas onto the first one */
  • libcaca/trunk/test/input.c

    r1267 r1330  
    6363
    6464            cucul_set_color_ansi(cv, CUCUL_BLACK, CUCUL_LIGHTGRAY);
    65             cucul_fill_box(cv, 2, 3 * i + 4, 2 + BUFFER_SIZE, 3 * i + 4, " ");
     65            cucul_fill_box(cv, 2, 3 * i + 4, 2 + BUFFER_SIZE, 3 * i + 4, ' ');
    6666
    6767            start = 0;
Note: See TracChangeset for help on using the changeset viewer.