");
- for(x = 0; x < qq->width; x += len)
+ for(x = 0; x < c->width; x += len)
{
unsigned int i;
/* Use colspan option to factor cells with same attributes
* (see below) */
len = 1;
- while(x + len < qq->width && lineattr[x + len] == lineattr[x])
+ while(x + len < c->width && lineattr[x + len] == lineattr[x])
len++;
cur += sprintf(cur, "| size = 2 + (qq->width * qq->height * 11);
+ ex->size = 2 + (c->width * c->height * 11);
ex->data = malloc(ex->size);
cur = ex->data;
- for(y = 0; y < qq->height; y++)
+ for(y = 0; y < c->height; y++)
{
- uint32_t *lineattr = qq->attr + y * qq->width;
- uint32_t *linechar = qq->chars + y * qq->width;
+ uint32_t *lineattr = c->attr + y * c->width;
+ uint32_t *linechar = c->chars + y * c->width;
uint8_t prevfg = -1;
uint8_t prevbg = -1;
- for(x = 0; x < qq->width; x++)
+ for(x = 0; x < c->width; x++)
{
uint8_t fg = palette[_cucul_argb32_to_ansi4fg(lineattr[x])];
uint8_t bg = palette[_cucul_argb32_to_ansi4bg(lineattr[x])];
- uint32_t c = linechar[x];
+ uint32_t ch = linechar[x];
if(bg == prevbg)
{
if(fg == prevfg)
; /* Same fg/bg, do nothing */
- else if(c == (uint32_t)' ')
+ else if(ch == (uint32_t)' ')
fg = prevfg; /* Hackety hack */
else
{
cur += sprintf(cur, "\x03%d", fg);
- if(c >= (uint32_t)'0' && c <= (uint32_t)'9')
+ if(ch >= (uint32_t)'0' && ch <= (uint32_t)'9')
cur += sprintf(cur, "\x02\x02");
}
}
@@ -382,10 +382,10 @@ static void export_irc(cucul_t *qq, cucul_buffer_t *ex)
else
cur += sprintf(cur, "\x03%d,%d", fg, bg);
- if(c >= (uint32_t)'0' && c <= (uint32_t)'9')
+ if(ch >= (uint32_t)'0' && ch <= (uint32_t)'9')
cur += sprintf(cur, "\x02\x02");
}
- *cur++ = c & 0x7f;
+ *cur++ = ch & 0x7f;
prevfg = fg;
prevbg = bg;
}
@@ -399,7 +399,7 @@ static void export_irc(cucul_t *qq, cucul_buffer_t *ex)
}
/* Export a PostScript document. */
-static void export_ps(cucul_t *qq, cucul_buffer_t *ex)
+static void export_ps(cucul_canvas_t *c, cucul_buffer_t *ex)
{
static char const *ps_header =
"%!\n"
@@ -430,7 +430,7 @@ static void export_ps(cucul_t *qq, cucul_buffer_t *ex)
unsigned int x, y;
/* 200 is arbitrary but should be ok */
- ex->size = strlen(ps_header) + (qq->width * qq->height * 200);
+ ex->size = strlen(ps_header) + (c->width * c->height * 200);
ex->data = malloc(ex->size);
cur = ex->data;
@@ -439,11 +439,11 @@ static void export_ps(cucul_t *qq, cucul_buffer_t *ex)
cur += sprintf(cur, "%s", ps_header);
/* Background, drawn using csquare macro defined in header */
- for(y = qq->height; y--; )
+ for(y = c->height; y--; )
{
- uint32_t *lineattr = qq->attr + y * qq->width;
+ uint32_t *lineattr = c->attr + y * c->width;
- for(x = 0; x < qq->width; x++)
+ for(x = 0; x < c->width; x++)
{
uint8_t argb[8];
_cucul_argb32_to_argb4(*lineattr++, argb);
@@ -454,20 +454,20 @@ static void export_ps(cucul_t *qq, cucul_buffer_t *ex)
}
/* Return to beginning of the line, and jump to the next one */
- cur += sprintf(cur, "-%d 1 translate\n", qq->width);
+ cur += sprintf(cur, "-%d 1 translate\n", c->width);
}
cur += sprintf(cur, "grestore\n"); /* Restore transformation matrix */
- for(y = qq->height; y--; )
+ for(y = c->height; y--; )
{
- uint32_t *lineattr = qq->attr + (qq->height - y - 1) * qq->width;
- uint32_t *linechar = qq->chars + (qq->height - y - 1) * qq->width;
+ uint32_t *lineattr = c->attr + (c->height - y - 1) * c->width;
+ uint32_t *linechar = c->chars + (c->height - y - 1) * c->width;
- for(x = 0; x < qq->width; x++)
+ for(x = 0; x < c->width; x++)
{
uint8_t argb[8];
- uint32_t c = *linechar++;
+ uint32_t ch = *linechar++;
_cucul_argb32_to_argb4(*lineattr++, argb);
@@ -478,19 +478,19 @@ static void export_ps(cucul_t *qq, cucul_buffer_t *ex)
(float)argb[6] * (1.0 / 0xf),
(float)argb[7] * (1.0 / 0xf));
- if(c < 0x00000020)
+ if(ch < 0x00000020)
cur += sprintf(cur, "(?) show\n");
- else if(c >= 0x00000080)
+ else if(ch >= 0x00000080)
cur += sprintf(cur, "(?) show\n");
- else switch((uint8_t)(c & 0x7f))
+ else switch((uint8_t)(ch & 0x7f))
{
case '\\':
case '(':
case ')':
- cur += sprintf(cur, "(\\%c) show\n", c);
+ cur += sprintf(cur, "(\\%c) show\n", ch);
break;
default:
- cur += sprintf(cur, "(%c) show\n", c);
+ cur += sprintf(cur, "(%c) show\n", ch);
break;
}
}
@@ -504,7 +504,7 @@ static void export_ps(cucul_t *qq, cucul_buffer_t *ex)
}
/* Export an SVG vector image */
-static void export_svg(cucul_t *qq, cucul_buffer_t *ex)
+static void export_svg(cucul_canvas_t *c, cucul_buffer_t *ex)
{
static char const svg_header[] =
"\n"
@@ -517,23 +517,23 @@ static void export_svg(cucul_t *qq, cucul_buffer_t *ex)
unsigned int x, y;
/* 200 is arbitrary but should be ok */
- ex->size = strlen(svg_header) + (qq->width * qq->height * 200);
+ ex->size = strlen(svg_header) + (c->width * c->height * 200);
ex->data = malloc(ex->size);
cur = ex->data;
/* Header */
- cur += sprintf(cur, svg_header, qq->width * 6, qq->height * 10,
- qq->width * 6, qq->height * 10);
+ cur += sprintf(cur, svg_header, c->width * 6, c->height * 10,
+ c->width * 6, c->height * 10);
cur += sprintf(cur, " \n");
/* Background */
- for(y = 0; y < qq->height; y++)
+ for(y = 0; y < c->height; y++)
{
- uint32_t *lineattr = qq->attr + y * qq->width;
+ uint32_t *lineattr = c->attr + y * c->width;
- for(x = 0; x < qq->width; x++)
+ for(x = 0; x < c->width; x++)
{
cur += sprintf(cur, "\n",
@@ -543,22 +543,22 @@ static void export_svg(cucul_t *qq, cucul_buffer_t *ex)
}
/* Text */
- for(y = 0; y < qq->height; y++)
+ for(y = 0; y < c->height; y++)
{
- uint32_t *lineattr = qq->attr + y * qq->width;
- uint32_t *linechar = qq->chars + y * qq->width;
+ uint32_t *lineattr = c->attr + y * c->width;
+ uint32_t *linechar = c->chars + y * c->width;
- for(x = 0; x < qq->width; x++)
+ for(x = 0; x < c->width; x++)
{
- uint32_t c = *linechar++;
+ uint32_t ch = *linechar++;
cur += sprintf(cur, "",
_cucul_argb32_to_rgb12fg(*lineattr++),
x * 6, (y * 10) + 10);
- if(c < 0x00000020)
+ if(ch < 0x00000020)
cur += sprintf(cur, "?");
- else if(c > 0x0000007f)
+ else if(ch > 0x0000007f)
{
static const uint8_t mark[7] =
{
@@ -566,27 +566,27 @@ static void export_svg(cucul_t *qq, cucul_buffer_t *ex)
};
char buf[10], *parser;
- int bytes = (c < 0x800) ? 2 : (c < 0x10000) ? 3 : 4;
+ int bytes = (ch < 0x800) ? 2 : (ch < 0x10000) ? 3 : 4;
buf[bytes] = '\0';
parser = buf + bytes;
switch(bytes)
{
- case 4: *--parser = (c | 0x80) & 0xbf; c >>= 6;
- case 3: *--parser = (c | 0x80) & 0xbf; c >>= 6;
- case 2: *--parser = (c | 0x80) & 0xbf; c >>= 6;
+ case 4: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
+ case 3: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
+ case 2: *--parser = (ch | 0x80) & 0xbf; ch >>= 6;
}
- *--parser = c | mark[bytes];
+ *--parser = ch | mark[bytes];
cur += sprintf(cur, "%s", buf);
}
- else switch((uint8_t)c)
+ else switch((uint8_t)ch)
{
case '>': cur += sprintf(cur, ">"); break;
case '<': cur += sprintf(cur, "<"); break;
case '&': cur += sprintf(cur, "&"); break;
- default: cur += sprintf(cur, "%c", c); break;
+ default: cur += sprintf(cur, "%c", ch); break;
}
cur += sprintf(cur, "\n");
}
@@ -601,7 +601,7 @@ static void export_svg(cucul_t *qq, cucul_buffer_t *ex)
}
/* Export a TGA image */
-static void export_tga(cucul_t *qq, cucul_buffer_t *ex)
+static void export_tga(cucul_canvas_t *c, cucul_buffer_t *ex)
{
char const * const * fontlist;
char * cur;
@@ -614,8 +614,8 @@ static void export_tga(cucul_t *qq, cucul_buffer_t *ex)
f = cucul_load_font(fontlist[0], 0);
- w = cucul_get_width(qq) * cucul_get_font_width(f);
- h = cucul_get_height(qq) * cucul_get_font_height(f);
+ w = cucul_get_width(c) * cucul_get_font_width(f);
+ h = cucul_get_height(c) * cucul_get_font_height(f);
ex->size = w * h * 4 + 18; /* 32 bpp + 18 bytes for the header */
ex->data = malloc(ex->size);
@@ -643,7 +643,7 @@ static void export_tga(cucul_t *qq, cucul_buffer_t *ex)
/* Color Map Data: no colormap */
/* Image Data */
- cucul_render_canvas(qq, f, cur, w, h, 4 * w);
+ cucul_render_canvas(c, f, cur, w, h, 4 * w);
/* Swap bytes. What a waste of time. */
for(i = 0; i < w * h * 4; i += 4)
diff --git a/cucul/font.c b/cucul/font.c
index 220e387..ac6434f 100644
--- a/cucul/font.c
+++ b/cucul/font.c
@@ -259,21 +259,21 @@ void cucul_free_font(cucul_font_t *f)
* This function renders the given canvas on an image buffer using a specific
* font. The pixel format is fixed (32-bit ARGB, 8 bits for each component).
*
- * The required image width can be computed using \e cucul_get_width(qq) and
+ * The required image width can be computed using \e cucul_get_width(c) and
* \e cucul_get_font_width(f). The required height can be computed using
- * \e cucul_get_height(qq) and \e cucul_get_font_height(f).
+ * \e cucul_get_height(c) and \e cucul_get_font_height(f).
*
* Glyphs that do not fit in the image buffer are currently not rendered at
* all. They may be cropped instead in future versions.
*
- * \param qq The canvas to render
+ * \param c The canvas to render
* \param f The font, as returned by \e cucul_load_font()
* \param buf The image buffer
* \param width The width (in pixels) of the image buffer
* \param height The height (in pixels) of the image buffer
* \param pitch The pitch (in bytes) of an image buffer line.
*/
-void cucul_render_canvas(cucul_t *qq, cucul_font_t *f,
+void cucul_render_canvas(cucul_canvas_t *c, cucul_font_t *f,
void *buf, unsigned int width,
unsigned int height, unsigned int pitch)
{
@@ -283,15 +283,15 @@ void cucul_render_canvas(cucul_t *qq, cucul_font_t *f,
if(f->header.bpp != 8)
glyph = malloc(f->header.width * f->header.height);
- if(width < qq->width * f->header.width)
+ if(width < c->width * f->header.width)
xmax = width / f->header.width;
else
- xmax = qq->width;
+ xmax = c->width;
- if(height < qq->height * f->header.height)
+ if(height < c->height * f->header.height)
ymax = height / f->header.height;
else
- ymax = qq->height;
+ ymax = c->height;
for(y = 0; y < ymax; y++)
{
@@ -300,8 +300,8 @@ void cucul_render_canvas(cucul_t *qq, cucul_font_t *f,
uint8_t argb[8];
unsigned int starty = y * f->header.height;
unsigned int startx = x * f->header.width;
- uint32_t ch = qq->chars[y * qq->width + x];
- uint32_t attr = qq->attr[y * qq->width + x];
+ uint32_t ch = c->chars[y * c->width + x];
+ uint32_t attr = c->attr[y * c->width + x];
unsigned int b, i, j;
struct glyph_info *g;
diff --git a/cucul/line.c b/cucul/line.c
index 511fba0..a77dc43 100644
--- a/cucul/line.c
+++ b/cucul/line.c
@@ -30,19 +30,19 @@ struct line
{
int x1, y1;
int x2, y2;
- uint32_t c;
- void (*draw) (cucul_t *, struct line*);
+ uint32_t ch;
+ void (*draw) (cucul_canvas_t *, struct line*);
};
#endif
-static void clip_line(cucul_t*, struct line*);
-static uint8_t clip_bits(cucul_t*, int, int);
-static void draw_solid_line(cucul_t*, struct line*);
-static void draw_thin_line(cucul_t*, struct line*);
+static void clip_line(cucul_canvas_t*, struct line*);
+static uint8_t clip_bits(cucul_canvas_t*, int, int);
+static void draw_solid_line(cucul_canvas_t*, struct line*);
+static void draw_thin_line(cucul_canvas_t*, struct line*);
/** \brief Draw a line on the canvas using the given character.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x1 X coordinate of the first point.
* \param y1 Y coordinate of the first point.
* \param x2 X coordinate of the second point.
@@ -50,7 +50,7 @@ static void draw_thin_line(cucul_t*, struct line*);
* \param str UTF-8 string containing the character to use to draw the line.
* \return void
*/
-void cucul_draw_line(cucul_t *qq, int x1, int y1, int x2, int y2,
+void cucul_draw_line(cucul_canvas_t *c, int x1, int y1, int x2, int y2,
char const *str)
{
struct line s;
@@ -58,9 +58,9 @@ void cucul_draw_line(cucul_t *qq, int x1, int y1, int x2, int y2,
s.y1 = y1;
s.x2 = x2;
s.y2 = y2;
- s.c = _cucul_utf8_to_utf32(str);
+ s.ch = _cucul_utf8_to_utf32(str);
s.draw = draw_solid_line;
- clip_line(qq, &s);
+ clip_line(c, &s);
}
/** \brief Draw a polyline.
@@ -70,19 +70,19 @@ void cucul_draw_line(cucul_t *qq, int x1, int y1, int x2, int y2,
* draw a polygon you need to specify the starting point at the end of the
* list as well.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x Array of X coordinates. Must have \p n + 1 elements.
* \param y Array of Y coordinates. Must have \p n + 1 elements.
* \param n Number of lines to draw.
* \param str UTF-8 string containing the character to use to draw the lines.
* \return void
*/
-void cucul_draw_polyline(cucul_t *qq, int const x[], int const y[], int n,
+void cucul_draw_polyline(cucul_canvas_t *c, int const x[], int const y[], int n,
char const *str)
{
int i;
struct line s;
- s.c = _cucul_utf8_to_utf32(str);
+ s.ch = _cucul_utf8_to_utf32(str);
s.draw = draw_solid_line;
for(i = 0; i < n; i++)
@@ -91,20 +91,20 @@ void cucul_draw_polyline(cucul_t *qq, int const x[], int const y[], int n,
s.y1 = y[i];
s.x2 = x[i+1];
s.y2 = y[i+1];
- clip_line(qq, &s);
+ clip_line(c, &s);
}
}
/** \brief Draw a thin line on the canvas, using ASCII art.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x1 X coordinate of the first point.
* \param y1 Y coordinate of the first point.
* \param x2 X coordinate of the second point.
* \param y2 Y coordinate of the second point.
* \return void
*/
-void cucul_draw_thin_line(cucul_t *qq, int x1, int y1, int x2, int y2)
+void cucul_draw_thin_line(cucul_canvas_t *c, int x1, int y1, int x2, int y2)
{
struct line s;
s.x1 = x1;
@@ -112,7 +112,7 @@ void cucul_draw_thin_line(cucul_t *qq, int x1, int y1, int x2, int y2)
s.x2 = x2;
s.y2 = y2;
s.draw = draw_thin_line;
- clip_line(qq, &s);
+ clip_line(c, &s);
}
/** \brief Draw an ASCII art thin polyline.
@@ -122,13 +122,13 @@ void cucul_draw_thin_line(cucul_t *qq, int x1, int y1, int x2, int y2)
* to draw a polygon you need to specify the starting point at the end of
* the list as well.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x Array of X coordinates. Must have \p n + 1 elements.
* \param y Array of Y coordinates. Must have \p n + 1 elements.
* \param n Number of lines to draw.
* \return void
*/
-void cucul_draw_thin_polyline(cucul_t *qq, int const x[], int const y[], int n)
+void cucul_draw_thin_polyline(cucul_canvas_t *c, int const x[], int const y[], int n)
{
int i;
struct line s;
@@ -140,7 +140,7 @@ void cucul_draw_thin_polyline(cucul_t *qq, int const x[], int const y[], int n)
s.y1 = y[i];
s.x2 = x[i+1];
s.y2 = y[i+1];
- clip_line(qq, &s);
+ clip_line(c, &s);
}
}
@@ -149,12 +149,12 @@ void cucul_draw_thin_polyline(cucul_t *qq, int const x[], int const y[], int n)
*/
/* Generic Cohen-Sutherland line clipping function. */
-static void clip_line(cucul_t *qq, struct line* s)
+static void clip_line(cucul_canvas_t *c, struct line* s)
{
uint8_t bits1, bits2;
- bits1 = clip_bits(qq, s->x1, s->y1);
- bits2 = clip_bits(qq, s->x2, s->y2);
+ bits1 = clip_bits(c, s->x1, s->y1);
+ bits2 = clip_bits(c, s->x2, s->y2);
if(bits1 & bits2)
return;
@@ -162,13 +162,13 @@ static void clip_line(cucul_t *qq, struct line* s)
if(bits1 == 0)
{
if(bits2 == 0)
- s->draw(qq, s);
+ s->draw(c, s);
else
{
int tmp;
tmp = s->x1; s->x1 = s->x2; s->x2 = tmp;
tmp = s->y1; s->y1 = s->y2; s->y2 = tmp;
- clip_line(qq, s);
+ clip_line(c, s);
}
return;
@@ -181,7 +181,7 @@ static void clip_line(cucul_t *qq, struct line* s)
}
else if(bits1 & (1<<1))
{
- int xmax = qq->width - 1;
+ int xmax = c->width - 1;
s->y1 = s->y2 - (s->x2 - xmax) * (s->y2 - s->y1) / (s->x2 - s->x1);
s->x1 = xmax;
}
@@ -192,27 +192,27 @@ static void clip_line(cucul_t *qq, struct line* s)
}
else if(bits1 & (1<<3))
{
- int ymax = qq->height - 1;
+ int ymax = c->height - 1;
s->x1 = s->x2 - (s->y2 - ymax) * (s->x2 - s->x1) / (s->y2 - s->y1);
s->y1 = ymax;
}
- clip_line(qq, s);
+ clip_line(c, s);
}
/* Helper function for clip_line(). */
-static uint8_t clip_bits(cucul_t *qq, int x, int y)
+static uint8_t clip_bits(cucul_canvas_t *c, int x, int y)
{
uint8_t b = 0;
if(x < 0)
b |= (1<<0);
- else if(x >= (int)qq->width)
+ else if(x >= (int)c->width)
b |= (1<<1);
if(y < 0)
b |= (1<<2);
- else if(y >= (int)qq->height)
+ else if(y >= (int)c->height)
b |= (1<<3);
return b;
@@ -220,7 +220,7 @@ static uint8_t clip_bits(cucul_t *qq, int x, int y)
/* Solid line drawing function, using Bresenham's mid-point line
* scan-conversion algorithm. */
-static void draw_solid_line(cucul_t *qq, struct line* s)
+static void draw_solid_line(cucul_canvas_t *c, struct line* s)
{
int x1, y1, x2, y2;
int dx, dy;
@@ -242,7 +242,7 @@ static void draw_solid_line(cucul_t *qq, struct line* s)
for(; dx>=0; dx--)
{
- _cucul_putchar32(qq, x1, y1, s->c);
+ _cucul_putchar32(c, x1, y1, s->ch);
if(delta > 0)
{
x1 += xinc;
@@ -264,7 +264,7 @@ static void draw_solid_line(cucul_t *qq, struct line* s)
for(; dy >= 0; dy--)
{
- _cucul_putchar32(qq, x1, y1, s->c);
+ _cucul_putchar32(c, x1, y1, s->ch);
if(delta > 0)
{
x1 += xinc;
@@ -282,7 +282,7 @@ static void draw_solid_line(cucul_t *qq, struct line* s)
/* Thin line drawing function, using Bresenham's mid-point line
* scan-conversion algorithm and ASCII art graphics. */
-static void draw_thin_line(cucul_t *qq, struct line* s)
+static void draw_thin_line(cucul_canvas_t *c, struct line* s)
{
uint32_t charmapx[2], charmapy[2];
int x1, y1, x2, y2;
@@ -329,7 +329,7 @@ static void draw_thin_line(cucul_t *qq, struct line* s)
{
if(delta > 0)
{
- _cucul_putchar32(qq, x1, y1, charmapy[1]);
+ _cucul_putchar32(c, x1, y1, charmapy[1]);
x1++;
y1 += yinc;
delta += dpru;
@@ -338,9 +338,9 @@ static void draw_thin_line(cucul_t *qq, struct line* s)
else
{
if(prev)
- _cucul_putchar32(qq, x1, y1, charmapy[0]);
+ _cucul_putchar32(c, x1, y1, charmapy[0]);
else
- _cucul_putchar32(qq, x1, y1, (uint32_t)'-');
+ _cucul_putchar32(c, x1, y1, (uint32_t)'-');
x1++;
delta += dpr;
prev = 0;
@@ -357,15 +357,15 @@ static void draw_thin_line(cucul_t *qq, struct line* s)
{
if(delta > 0)
{
- _cucul_putchar32(qq, x1, y1, charmapx[0]);
- _cucul_putchar32(qq, x1 + 1, y1, charmapx[1]);
+ _cucul_putchar32(c, x1, y1, charmapx[0]);
+ _cucul_putchar32(c, x1 + 1, y1, charmapx[1]);
x1++;
y1 += yinc;
delta += dpru;
}
else
{
- _cucul_putchar32(qq, x1, y1, (uint32_t)'|');
+ _cucul_putchar32(c, x1, y1, (uint32_t)'|');
y1 += yinc;
delta += dpr;
}
diff --git a/cucul/sprite.c b/cucul/sprite.c
index ae84c24..c0e34a4 100644
--- a/cucul/sprite.c
+++ b/cucul/sprite.c
@@ -246,14 +246,14 @@ int cucul_get_sprite_dy(cucul_sprite_t const *sprite, int f)
/** \brief Draw a sprite's specific frame at the given coordinates. If the
* frame does not exist, nothing is displayed.
*
- * \param qq A libcucul canvas
+ * \param c A libcucul canvas
* \param x The X coordinate.
* \param y The Y coordinate.
* \param sprite The sprite.
* \param f The frame index.
* \return void
*/
-void cucul_draw_sprite(cucul_t *qq, int x, int y, cucul_sprite_t const *sprite, int f)
+void cucul_draw_sprite(cucul_canvas_t *c, int x, int y, cucul_sprite_t const *sprite, int f)
{
int i, j;
unsigned int oldfg, oldbg;
@@ -267,8 +267,8 @@ void cucul_draw_sprite(cucul_t *qq, int x, int y, cucul_sprite_t const *sprite,
frame = &sprite->frames[f];
- oldfg = qq->fgcolor;
- oldbg = qq->bgcolor;
+ oldfg = c->fgcolor;
+ oldbg = c->bgcolor;
for(j = 0; j < frame->h; j++)
{
@@ -277,14 +277,14 @@ void cucul_draw_sprite(cucul_t *qq, int x, int y, cucul_sprite_t const *sprite,
int col = frame->color[frame->w * j + i];
if(col >= 0)
{
- cucul_set_color(qq, col, CUCUL_COLOR_BLACK);
- cucul_putchar(qq, x + i - frame->dx, y + j - frame->dy,
+ cucul_set_color(c, col, CUCUL_COLOR_BLACK);
+ cucul_putchar(c, x + i - frame->dx, y + j - frame->dy,
frame->chars[frame->w * j + i]);
}
}
}
- cucul_set_color(qq, oldfg, oldbg);
+ cucul_set_color(c, oldfg, oldbg);
}
/** \brief Free the memory associated with a sprite.
diff --git a/cucul/transform.c b/cucul/transform.c
index cb52dd5..c1d5125 100644
--- a/cucul/transform.c
+++ b/cucul/transform.c
@@ -32,14 +32,14 @@ static uint32_t rotatechar(uint32_t ch);
* This function inverts a canvas' colours (black becomes white, red
* becomes cyan, etc.) without changing the characters in it.
*
- * \param qq The canvas to invert.
+ * \param c The canvas to invert.
*/
-void cucul_invert(cucul_t *qq)
+void cucul_invert(cucul_canvas_t *c)
{
- uint32_t *attr = qq->attr;
+ uint32_t *attr = c->attr;
unsigned int i;
- for(i = qq->height * qq->width; i--; )
+ for(i = c->height * c->width; i--; )
{
*attr = *attr ^ 0x000f000f;
attr++;
@@ -51,18 +51,18 @@ void cucul_invert(cucul_t *qq)
* This function flips a canvas horizontally, choosing characters that
* look like the mirrored version wherever possible.
*
- * \param qq The canvas to flip.
+ * \param c The canvas to flip.
*/
-void cucul_flip(cucul_t *qq)
+void cucul_flip(cucul_canvas_t *c)
{
unsigned int y;
- for(y = 0; y < qq->height; y++)
+ for(y = 0; y < c->height; y++)
{
- uint32_t *cleft = qq->chars + y * qq->width;
- uint32_t *cright = cleft + qq->width - 1;
- uint32_t *aleft = qq->attr + y * qq->width;
- uint32_t *aright = aleft + qq->width - 1;
+ uint32_t *cleft = c->chars + y * c->width;
+ uint32_t *cright = cleft + c->width - 1;
+ uint32_t *aleft = c->attr + y * c->width;
+ uint32_t *aright = aleft + c->width - 1;
while(cleft < cright)
{
@@ -88,18 +88,18 @@ void cucul_flip(cucul_t *qq)
* This function flips a canvas vertically, choosing characters that
* look like the mirrored version wherever possible.
*
- * \param qq The canvas to flop.
+ * \param c The canvas to flop.
*/
-void cucul_flop(cucul_t *qq)
+void cucul_flop(cucul_canvas_t *c)
{
unsigned int x;
- for(x = 0; x < qq->width; x++)
+ for(x = 0; x < c->width; x++)
{
- uint32_t *ctop = qq->chars + x;
- uint32_t *cbottom = ctop + qq->width * (qq->height - 1);
- uint32_t *atop = qq->attr + x;
- uint32_t *abottom = atop + qq->width * (qq->height - 1);
+ uint32_t *ctop = c->chars + x;
+ uint32_t *cbottom = ctop + c->width * (c->height - 1);
+ uint32_t *atop = c->attr + x;
+ uint32_t *abottom = atop + c->width * (c->height - 1);
while(ctop < cbottom)
{
@@ -112,8 +112,8 @@ void cucul_flop(cucul_t *qq)
/* Swap characters */
ch = *cbottom; *cbottom = flopchar(*ctop); *ctop = flopchar(ch);
- ctop += qq->width; cbottom -= qq->width;
- atop += qq->width; abottom -= qq->width;
+ ctop += c->width; cbottom -= c->width;
+ atop += c->width; abottom -= c->width;
}
if(ctop == cbottom)
@@ -127,14 +127,14 @@ void cucul_flop(cucul_t *qq)
* choosing characters that look like the mirrored version wherever
* possible.
*
- * \param qq The canvas to rotate.
+ * \param c The canvas to rotate.
*/
-void cucul_rotate(cucul_t *qq)
+void cucul_rotate(cucul_canvas_t *c)
{
- uint32_t *cbegin = qq->chars;
- uint32_t *cend = cbegin + qq->width * qq->height - 1;
- uint32_t *abegin = qq->attr;
- uint32_t *aend = abegin + qq->width * qq->height - 1;
+ uint32_t *cbegin = c->chars;
+ uint32_t *cend = cbegin + c->width * c->height - 1;
+ uint32_t *abegin = c->attr;
+ uint32_t *aend = abegin + c->width * c->height - 1;
while(cbegin < cend)
{
diff --git a/cucul/triangle.c b/cucul/triangle.c
index c9af7c1..2fc6882 100644
--- a/cucul/triangle.c
+++ b/cucul/triangle.c
@@ -26,7 +26,7 @@
/** \brief Draw a triangle on the canvas using the given character.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x1 X coordinate of the first point.
* \param y1 Y coordinate of the first point.
* \param x2 X coordinate of the second point.
@@ -37,17 +37,17 @@
* to draw the triangle outline.
* \return void
*/
-void cucul_draw_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
+void cucul_draw_triangle(cucul_canvas_t *c, int x1, int y1, int x2, int y2,
int x3, int y3, char const *str)
{
- cucul_draw_line(qq, x1, y1, x2, y2, str);
- cucul_draw_line(qq, x2, y2, x3, y3, str);
- cucul_draw_line(qq, x3, y3, x1, y1, str);
+ cucul_draw_line(c, x1, y1, x2, y2, str);
+ cucul_draw_line(c, x2, y2, x3, y3, str);
+ cucul_draw_line(c, x3, y3, x1, y1, str);
}
/** \brief Draw a thin triangle on the canvas.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x1 X coordinate of the first point.
* \param y1 Y coordinate of the first point.
* \param x2 X coordinate of the second point.
@@ -56,17 +56,17 @@ void cucul_draw_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
* \param y3 Y coordinate of the third point.
* \return void
*/
-void cucul_draw_thin_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
+void cucul_draw_thin_triangle(cucul_canvas_t *c, int x1, int y1, int x2, int y2,
int x3, int y3)
{
- cucul_draw_thin_line(qq, x1, y1, x2, y2);
- cucul_draw_thin_line(qq, x2, y2, x3, y3);
- cucul_draw_thin_line(qq, x3, y3, x1, y1);
+ cucul_draw_thin_line(c, x1, y1, x2, y2);
+ cucul_draw_thin_line(c, x2, y2, x3, y3);
+ cucul_draw_thin_line(c, x3, y3, x1, y1);
}
/** \brief Fill a triangle on the canvas using the given character.
*
- * \param qq The handle to the libcucul canvas.
+ * \param c The handle to the libcucul canvas.
* \param x1 X coordinate of the first point.
* \param y1 Y coordinate of the first point.
* \param x2 X coordinate of the second point.
@@ -77,22 +77,22 @@ void cucul_draw_thin_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
* to fill the triangle.
* \return void
*/
-void cucul_fill_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
+void cucul_fill_triangle(cucul_canvas_t *c, int x1, int y1, int x2, int y2,
int x3, int y3, char const *str)
{
int x, y, xa, xb, xmax, ymax;
- uint32_t c;
+ uint32_t ch;
/* Bubble-sort y1 <= y2 <= y3 */
if(y1 > y2)
{
- cucul_fill_triangle(qq, x2, y2, x1, y1, x3, y3, str);
+ cucul_fill_triangle(c, x2, y2, x1, y1, x3, y3, str);
return;
}
if(y2 > y3)
{
- cucul_fill_triangle(qq, x1, y1, x3, y3, x2, y2, str);
+ cucul_fill_triangle(c, x1, y1, x3, y3, x2, y2, str);
return;
}
@@ -101,10 +101,10 @@ void cucul_fill_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
x2 *= 4;
x3 *= 4;
- xmax = qq->width - 1;
- ymax = qq->height - 1;
+ xmax = c->width - 1;
+ ymax = c->height - 1;
- c = _cucul_utf8_to_utf32(str);
+ ch = _cucul_utf8_to_utf32(str);
/* Rasterize our triangle */
for(y = y1 < 0 ? 0 : y1; y <= y3 && y <= ymax; y++)
@@ -136,7 +136,7 @@ void cucul_fill_triangle(cucul_t *qq, int x1, int y1, int x2, int y2,
if(xb > xmax) xb = xmax;
for(x = xa; x <= xb; x++)
- _cucul_putchar32(qq, x, y, c);
+ _cucul_putchar32(c, x, y, ch);
}
}
diff --git a/src/aafire.c b/src/aafire.c
index 4b625e4..8f00eca 100644
--- a/src/aafire.c
+++ b/src/aafire.c
@@ -39,7 +39,7 @@
#endif
#define MAXTABLE (256*5)
#ifdef LIBCACA
-static cucul_t *qq;
+static cucul_canvas_t *c;
static caca_t *kk;
static int XSIZ, YSIZ;
static cucul_dither_t *cucul_dither;
@@ -100,21 +100,21 @@ initialize (void)
#endif
#ifdef LIBCACA
- qq = cucul_create(80, 32);
- if (!qq)
+ c = cucul_create(80, 32);
+ if (!c)
{
printf ("Failed to initialize libcucul\n");
exit (1);
}
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if (!kk)
{
printf ("Failed to initialize libcaca\n");
exit (1);
}
caca_set_delay(kk, 10000);
- XSIZ = cucul_get_width(qq) * 2;
- YSIZ = cucul_get_height(qq) * 2 - 4;
+ XSIZ = cucul_get_width(c) * 2;
+ YSIZ = cucul_get_height(c) * 2 - 4;
#else
context = aa_autoinit (&aa_defparams);
if (context == NULL)
@@ -142,8 +142,8 @@ initialize (void)
#ifdef LIBCACA
cucul_dither = cucul_create_dither(8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0);
cucul_set_dither_palette(cucul_dither, r, g, b, a);
- bitmap = malloc(4 * cucul_get_width(qq) * cucul_get_height(qq) * sizeof(char));
- memset(bitmap, 0, 4 * cucul_get_width(qq) * cucul_get_height(qq));
+ bitmap = malloc(4 * cucul_get_width(c) * cucul_get_height(c) * sizeof(char));
+ memset(bitmap, 0, 4 * cucul_get_width(c) * cucul_get_height(c));
#else
aa_hidecursor (context);
#endif
@@ -153,7 +153,7 @@ uninitialize (void)
{
#ifdef LIBCACA
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
#else
aa_close (context);
#endif
@@ -235,11 +235,11 @@ drawfire (void)
firemain ();
#ifdef LIBCACA
paused:
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
cucul_dither, bitmap);
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, cucul_get_width(qq) - 30, cucul_get_height(qq) - 2,
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, cucul_get_width(c) - 30, cucul_get_height(c) - 2,
" -=[ Powered by libcaca ]=- ");
caca_display(kk);
@@ -268,7 +268,7 @@ game (void)
caca_event_t ev;
if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
{
- switch(ev.data.key.c)
+ switch(ev.data.key.ch)
{
case CACA_KEY_ESCAPE: return;
case ' ': pause = !pause;
diff --git a/src/cacaball.c b/src/cacaball.c
index 87333f0..3ad6c05 100644
--- a/src/cacaball.c
+++ b/src/cacaball.c
@@ -42,7 +42,7 @@ static unsigned char metaball[METASIZE * METASIZE];
int main(int argc, char **argv)
{
- cucul_t *qq; caca_t *kk;
+ cucul_canvas_t *c; caca_t *kk;
unsigned int r[256], g[256], b[256], a[256];
float d[METABALLS], di[METABALLS], dj[METABALLS], dk[METABALLS];
unsigned int x[METABALLS], y[METABALLS];
@@ -53,10 +53,10 @@ int main(int argc, char **argv)
double frameOffset40[360];
double frameOffset80[360];
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
@@ -95,7 +95,7 @@ int main(int argc, char **argv)
caca_event_t ev;
if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
{
- switch(ev.data.key.c)
+ switch(ev.data.key.ch)
{
case CACA_KEY_ESCAPE: goto end;
case ' ': pause = !pause;
@@ -153,11 +153,11 @@ int main(int argc, char **argv)
paused:
/* Draw our virtual buffer to screen, letting libcucul resize it */
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
cucul_dither, pixels + (METASIZE / 2) * (1 + XSIZ));
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, cucul_get_width(qq) - 30, cucul_get_height(qq) - 2,
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, cucul_get_width(c) - 30, cucul_get_height(c) - 2,
" -=[ Powered by libcaca ]=- ");
caca_display(kk);
@@ -167,7 +167,7 @@ paused:
end:
cucul_free_dither(cucul_dither);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/src/cacamoir.c b/src/cacamoir.c
index 546234d..f3ea79c 100644
--- a/src/cacamoir.c
+++ b/src/cacamoir.c
@@ -37,15 +37,15 @@ static void draw_line(int, int, char);
int main (int argc, char **argv)
{
- cucul_t *qq; caca_t *kk;
+ cucul_canvas_t *c; caca_t *kk;
unsigned int red[256], green[256], blue[256], alpha[256];
cucul_dither_t *dither;
int i, x, y, frame = 0, pause = 0;
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
@@ -71,7 +71,7 @@ int main (int argc, char **argv)
caca_event_t ev;
if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
{
- switch(ev.data.key.c)
+ switch(ev.data.key.ch)
{
case CACA_KEY_ESCAPE: goto end;
case ' ': pause = !pause;
@@ -106,11 +106,11 @@ int main (int argc, char **argv)
frame++;
paused:
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
dither, screen);
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, cucul_get_width(qq) - 30, cucul_get_height(qq) - 2,
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, cucul_get_width(c) - 30, cucul_get_height(c) - 2,
" -=[ Powered by libcaca ]=- ");
caca_display(kk);
}
@@ -118,7 +118,7 @@ paused:
end:
cucul_free_dither(dither);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/src/cacaplas.c b/src/cacaplas.c
index 2044011..fb28daf 100644
--- a/src/cacaplas.c
+++ b/src/cacaplas.c
@@ -40,23 +40,23 @@ static void do_plasma(unsigned char *,
int main (int argc, char **argv)
{
- cucul_t *qq, *qq2, *mask; caca_t *kk;
+ cucul_canvas_t *c, *c2, *mask; caca_t *kk;
unsigned int red[256], green[256], blue[256], alpha[256];
double r[3], R[6];
cucul_dither_t *dither;
int i, x, y, frame = 0, pause = 0;
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
caca_set_delay(kk, 20000);
- qq2 = cucul_create(cucul_get_width(qq), cucul_get_height(qq));
- mask = cucul_create(cucul_get_width(qq), cucul_get_height(qq));
+ c2 = cucul_create(cucul_get_width(c), cucul_get_height(c));
+ mask = cucul_create(cucul_get_width(c), cucul_get_height(c));
/* Fill various tables */
for(i = 0 ; i < 256; i++)
@@ -87,7 +87,7 @@ int main (int argc, char **argv)
caca_event_t ev;
if(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
{
- switch(ev.data.key.c)
+ switch(ev.data.key.ch)
{
case CACA_KEY_ESCAPE: goto end;
case ' ': pause = !pause;
@@ -119,18 +119,18 @@ int main (int argc, char **argv)
frame++;
paused:
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
dither, screen);
- cucul_blit(qq2, 0, 0, qq, NULL);
- cucul_invert(qq2);
+ cucul_blit(c2, 0, 0, c, NULL);
+ cucul_invert(c2);
- cucul_blit(qq, 0, 0, qq2, mask);
+ cucul_blit(c, 0, 0, c2, mask);
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, cucul_get_width(qq) - 30, cucul_get_height(qq) - 2,
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, cucul_get_width(c) - 30, cucul_get_height(c) - 2,
" -=[ Powered by libcaca ]=- ");
caca_display(kk);
}
@@ -138,7 +138,7 @@ paused:
end:
cucul_free_dither(dither);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/src/cacaplay.c b/src/cacaplay.c
index 9c6bdc0..85eb30a 100644
--- a/src/cacaplay.c
+++ b/src/cacaplay.c
@@ -27,7 +27,7 @@ int main(int argc, char **argv)
{
struct stat statbuf;
caca_event_t ev;
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
void *buffer;
int fd;
@@ -53,28 +53,28 @@ int main(int argc, char **argv)
buffer = malloc(statbuf.st_size);
read(fd, buffer, statbuf.st_size);
- qq = cucul_load(buffer, statbuf.st_size);
+ c = cucul_load(buffer, statbuf.st_size);
free(buffer);
- if(!qq)
+ if(!c)
{
fprintf(stderr, "%s: invalid caca file %s.\n", argv[0], argv[1]);
return 1;
}
- kk = caca_attach(qq);
+ kk = caca_attach(c);
caca_display(kk);
while(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1))
{
- if(ev.data.key.c == CACA_KEY_ESCAPE)
+ if(ev.data.key.ch == CACA_KEY_ESCAPE)
break;
}
/* Clean up */
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/src/cacaserver.c b/src/cacaserver.c
index c65fbc8..bed1365 100644
--- a/src/cacaserver.c
+++ b/src/cacaserver.c
@@ -104,7 +104,7 @@ struct server
char prefix[sizeof(INIT_PREFIX)];
- cucul_t *qq;
+ cucul_canvas_t *canvas;
cucul_buffer_t *buffer;
unsigned long int buflen;
void *bufdata;
@@ -184,7 +184,7 @@ int main(void)
return -1;
}
- server->qq = NULL;
+ server->canvas = NULL;
server->buffer = NULL;
/* Ignore SIGPIPE */
@@ -223,12 +223,12 @@ int main(void)
read(0, buf + 12, size - 12);
/* Free the previous canvas, if any */
- if(server->qq)
- cucul_free(server->qq);
+ if(server->canvas)
+ cucul_free(server->canvas);
- server->qq = cucul_load(buf, size);
+ server->canvas = cucul_load(buf, size);
- if(!server->qq)
+ if(!server->canvas)
continue; /* Load error */
/* Free the previous export buffer, if any */
@@ -240,7 +240,7 @@ int main(void)
/* Get ANSI representation of the image and skip the end-of buffer
* linefeed ("\r\n\0", 3 bytes) */
- server->buffer = cucul_create_export(server->qq, "ansi");
+ server->buffer = cucul_create_export(server->canvas, "ansi");
server->buflen -= 3;
for(i = 0; i < server->client_count; i++)
diff --git a/src/cacaview.c b/src/cacaview.c
index 9c96fcf..f0ff607 100644
--- a/src/cacaview.c
+++ b/src/cacaview.c
@@ -41,7 +41,7 @@
#define PAD_STEP 0.15
/* libcucul/libcaca contexts */
-cucul_t *qq; caca_t *kk;
+cucul_canvas_t *c; caca_t *kk;
/* Local functions */
static void print_status(void);
@@ -68,14 +68,14 @@ int main(int argc, char **argv)
int i;
/* Initialise libcucul */
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
{
fprintf(stderr, "%s: unable to initialise libcucul\n", argv[0]);
return 1;
}
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
{
fprintf(stderr, "%s: unable to initialise libcaca\n", argv[0]);
@@ -85,8 +85,8 @@ int main(int argc, char **argv)
/* Set the window title */
caca_set_window_title(kk, "cacaview");
- ww = cucul_get_width(qq);
- wh = cucul_get_height(qq);
+ ww = cucul_get_width(c);
+ wh = cucul_get_height(c);
/* Fill the zoom table */
zoomtab[0] = 1.0;
@@ -150,7 +150,7 @@ int main(int argc, char **argv)
reload = 1;
}
}
- else if(ev.type & CACA_EVENT_KEY_PRESS) switch(ev.data.key.c)
+ else if(ev.type & CACA_EVENT_KEY_PRESS) switch(ev.data.key.ch)
{
case 'n':
case 'N':
@@ -170,44 +170,44 @@ int main(int argc, char **argv)
break;
#if 0 /* FIXME */
case 'b':
- i = 1 + cucul_get_feature(qq, CUCUL_BACKGROUND);
+ i = 1 + cucul_get_feature(c, CUCUL_BACKGROUND);
if(i > CUCUL_BACKGROUND_MAX) i = CUCUL_BACKGROUND_MIN;
- cucul_set_feature(qq, i);
+ cucul_set_feature(c, i);
new_status = STATUS_BACKGROUND;
update = 1;
break;
case 'B':
- i = -1 + cucul_get_feature(qq, CUCUL_BACKGROUND);
+ i = -1 + cucul_get_feature(c, CUCUL_BACKGROUND);
if(i < CUCUL_BACKGROUND_MIN) i = CUCUL_BACKGROUND_MAX;
- cucul_set_feature(qq, i);
+ cucul_set_feature(c, i);
new_status = STATUS_BACKGROUND;
update = 1;
break;
case 'a':
- i = 1 + cucul_get_feature(qq, CUCUL_ANTIALIASING);
+ i = 1 + cucul_get_feature(c, CUCUL_ANTIALIASING);
if(i > CUCUL_ANTIALIASING_MAX) i = CUCUL_ANTIALIASING_MIN;
- cucul_set_feature(qq, i);
+ cucul_set_feature(c, i);
new_status = STATUS_ANTIALIASING;
update = 1;
break;
case 'A':
- i = -1 + cucul_get_feature(qq, CUCUL_ANTIALIASING);
+ i = -1 + cucul_get_feature(c, CUCUL_ANTIALIASING);
if(i < CUCUL_ANTIALIASING_MIN) i = CUCUL_ANTIALIASING_MAX;
- cucul_set_feature(qq, i);
+ cucul_set_feature(c, i);
new_status = STATUS_ANTIALIASING;
update = 1;
break;
case 'd':
- i = 1 + cucul_get_feature(qq, CUCUL_DITHERING);
+ i = 1 + cucul_get_feature(c, CUCUL_DITHERING);
if(i > CUCUL_DITHERING_MAX) i = CUCUL_DITHERING_MIN;
- cucul_set_feature(qq, i);
+ cucul_set_feature(c, i);
new_status = STATUS_DITHERING;
update = 1;
break;
case 'D':
- i = -1 + cucul_get_feature(qq, CUCUL_DITHERING);
+ i = -1 + cucul_get_feature(c, CUCUL_DITHERING);
if(i < CUCUL_DITHERING_MIN) i = CUCUL_DITHERING_MAX;
- cucul_set_feature(qq, i);
+ cucul_set_feature(c, i);
new_status = STATUS_DITHERING;
update = 1;
break;
@@ -301,11 +301,11 @@ int main(int argc, char **argv)
sprintf(buffer, " Loading `%s'... ", list[current]);
buffer[ww] = '\0';
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, (ww - strlen(buffer)) / 2, wh / 2, buffer);
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, (ww - strlen(buffer)) / 2, wh / 2, buffer);
caca_display(kk);
- ww = cucul_get_width(qq);
- wh = cucul_get_height(qq);
+ ww = cucul_get_width(c);
+ wh = cucul_get_height(c);
if(im)
unload_image(im);
@@ -321,12 +321,12 @@ int main(int argc, char **argv)
free(buffer);
}
- cucul_clear(qq);
+ cucul_clear(c);
if(!items)
{
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_printf(qq, ww / 2 - 5, wh / 2, " No image. ");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_printf(c, ww / 2 - 5, wh / 2, " No image. ");
}
else if(!im)
{
@@ -345,8 +345,8 @@ int main(int argc, char **argv)
sprintf(buffer, ERROR_STRING, list[current]);
buffer[ww] = '\0';
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, (ww - strlen(buffer)) / 2, wh / 2, buffer);
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, (ww - strlen(buffer)) / 2, wh / 2, buffer);
free(buffer);
}
else
@@ -365,7 +365,7 @@ int main(int argc, char **argv)
ww * (1.0 + xfactor) / 2,
y + height * (1.0 + yfactor) / 2);
- cucul_dither_bitmap(qq, ww * (1.0 - xfactor) * xdelta,
+ cucul_dither_bitmap(c, ww * (1.0 - xfactor) * xdelta,
y + height * (1.0 - yfactor) * ydelta,
ww * (xdelta + (1.0 - xdelta) * xfactor),
y + height * (ydelta + (1.0 - ydelta) * yfactor),
@@ -377,20 +377,20 @@ int main(int argc, char **argv)
print_status();
#if 0 /* FIXME */
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
switch(status)
{
case STATUS_ANTIALIASING:
- cucul_printf(qq, 0, wh - 1, "Antialiasing: %s",
- cucul_get_feature_name(cucul_get_feature(qq, CUCUL_ANTIALIASING)));
+ cucul_printf(c, 0, wh - 1, "Antialiasing: %s",
+ cucul_get_feature_name(cucul_get_feature(c, CUCUL_ANTIALIASING)));
break;
case STATUS_DITHERING:
- cucul_printf(qq, 0, wh - 1, "Dithering: %s",
- cucul_get_feature_name(cucul_get_feature(qq, CUCUL_DITHERING)));
+ cucul_printf(c, 0, wh - 1, "Dithering: %s",
+ cucul_get_feature_name(cucul_get_feature(c, CUCUL_DITHERING)));
break;
case STATUS_BACKGROUND:
- cucul_printf(qq, 0, wh - 1, "Background: %s",
- cucul_get_feature_name(cucul_get_feature(qq, CUCUL_BACKGROUND)));
+ cucul_printf(c, 0, wh - 1, "Background: %s",
+ cucul_get_feature_name(cucul_get_feature(c, CUCUL_BACKGROUND)));
break;
}
#endif
@@ -409,25 +409,25 @@ int main(int argc, char **argv)
if(im)
unload_image(im);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
static void print_status(void)
{
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_draw_line(qq, 0, 0, ww - 1, 0, " ");
- cucul_draw_line(qq, 0, wh - 2, ww - 1, wh - 2, "-");
- cucul_putstr(qq, 0, 0, "q:Quit np:Next/Prev +-x:Zoom gG:Gamma "
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_draw_line(c, 0, 0, ww - 1, 0, " ");
+ cucul_draw_line(c, 0, wh - 2, ww - 1, wh - 2, "-");
+ cucul_putstr(c, 0, 0, "q:Quit np:Next/Prev +-x:Zoom gG:Gamma "
"hjkl:Move d:Dither a:Antialias");
- cucul_putstr(qq, ww - strlen("?:Help"), 0, "?:Help");
- cucul_printf(qq, 3, wh - 2, "cacaview %s", VERSION);
- cucul_printf(qq, ww - 30, wh - 2, "(gamma: %#.3g)", GAMMA(g));
- cucul_printf(qq, ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom);
+ cucul_putstr(c, ww - strlen("?:Help"), 0, "?:Help");
+ cucul_printf(c, 3, wh - 2, "cacaview %s", VERSION);
+ cucul_printf(c, ww - 30, wh - 2, "(gamma: %#.3g)", GAMMA(g));
+ cucul_printf(c, ww - 14, wh - 2, "(zoom: %s%i)", zoom > 0 ? "+" : "", zoom);
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_draw_line(qq, 0, wh - 1, ww - 1, wh - 1, " ");
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_draw_line(c, 0, wh - 1, ww - 1, wh - 1, " ");
}
static void print_help(int x, int y)
@@ -454,10 +454,10 @@ static void print_help(int x, int y)
int i;
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
for(i = 0; help[i]; i++)
- cucul_putstr(qq, x, y + i, help[i]);
+ cucul_putstr(c, x, y + i, help[i]);
}
static void set_zoom(int new_zoom)
@@ -472,12 +472,12 @@ static void set_zoom(int new_zoom)
if(zoom > ZOOM_MAX) zoom = ZOOM_MAX;
if(zoom < -ZOOM_MAX) zoom = -ZOOM_MAX;
- ww = cucul_get_width(qq);
+ ww = cucul_get_width(c);
height = fullscreen ? wh : wh - 3;
xfactor = (zoom < 0) ? 1.0 / zoomtab[-zoom] : zoomtab[zoom];
yfactor = xfactor * ww / height * im->h / im->w
- * cucul_get_height(qq) / cucul_get_width(qq)
+ * cucul_get_height(c) / cucul_get_width(c)
* caca_get_window_width(kk) / caca_get_window_height(kk);
if(yfactor > xfactor)
@@ -506,17 +506,17 @@ static void draw_checkers(int x1, int y1, int x2, int y2)
{
int xn, yn;
- if(x2 + 1 > (int)cucul_get_width(qq)) x2 = cucul_get_width(qq) - 1;
- if(y2 + 1 > (int)cucul_get_height(qq)) y2 = cucul_get_height(qq) - 1;
+ if(x2 + 1 > (int)cucul_get_width(c)) x2 = cucul_get_width(c) - 1;
+ if(y2 + 1 > (int)cucul_get_height(c)) y2 = cucul_get_height(c) - 1;
for(yn = y1 > 0 ? y1 : 0; yn <= y2; yn++)
for(xn = x1 > 0 ? x1 : 0; xn <= x2; xn++)
{
if((((xn - x1) / 5) ^ ((yn - y1) / 3)) & 1)
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_DARKGRAY);
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_DARKGRAY);
else
- cucul_set_color(qq, CUCUL_COLOR_DARKGRAY, CUCUL_COLOR_LIGHTGRAY);
- cucul_putchar(qq, xn, yn, ' ');
+ cucul_set_color(c, CUCUL_COLOR_DARKGRAY, CUCUL_COLOR_LIGHTGRAY);
+ cucul_putchar(c, xn, yn, ' ');
}
}
diff --git a/src/img2irc.c b/src/img2irc.c
index b50cef8..395a8a9 100644
--- a/src/img2irc.c
+++ b/src/img2irc.c
@@ -23,7 +23,7 @@
int main(int argc, char **argv)
{
/* libcucul context */
- cucul_t *qq;
+ cucul_canvas_t *c;
cucul_buffer_t *export;
struct image *i;
int cols = 56, lines;
@@ -34,8 +34,8 @@ int main(int argc, char **argv)
return 1;
}
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
{
fprintf(stderr, "%s: unable to initialise libcucul\n", argv[0]);
return 1;
@@ -45,25 +45,25 @@ int main(int argc, char **argv)
if(!i)
{
fprintf(stderr, "%s: unable to load %s\n", argv[0], argv[1]);
- cucul_free(qq);
+ cucul_free(c);
return 1;
}
/* Assume a 6×10 font */
lines = cols * i->h * 6 / i->w / 10;
- cucul_set_size(qq, cols, lines);
- cucul_clear(qq);
- cucul_dither_bitmap(qq, 0, 0, cols - 1, lines - 1, i->dither, i->pixels);
+ cucul_set_size(c, cols, lines);
+ cucul_clear(c);
+ cucul_dither_bitmap(c, 0, 0, cols - 1, lines - 1, i->dither, i->pixels);
unload_image(i);
- export = cucul_create_export(qq, "irc");
+ export = cucul_create_export(c, "irc");
fwrite(cucul_get_buffer_data(export),
cucul_get_buffer_size(export), 1, stdout);
cucul_free_buffer(export);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/colors.c b/test/colors.c
index 6247e20..41e7868 100644
--- a/test/colors.c
+++ b/test/colors.c
@@ -22,29 +22,29 @@
int main(int argc, char **argv)
{
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
caca_event_t ev;
int i, j;
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
- cucul_clear(qq);
+ cucul_clear(c);
for(i = 0; i < 16; i++)
{
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_printf(qq, 4, i + (i >= 8 ? 4 : 3), "'%c': %i (%s)",
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_printf(c, 4, i + (i >= 8 ? 4 : 3), "'%c': %i (%s)",
'a' + i, i, cucul_get_color_name(i));
for(j = 0; j < 16; j++)
{
- cucul_set_color(qq, i, j);
- cucul_putstr(qq, (j >= 8 ? 41 : 40) + j * 2, i + (i >= 8 ? 4 : 3),
+ cucul_set_color(c, i, j);
+ cucul_putstr(c, (j >= 8 ? 41 : 40) + j * 2, i + (i >= 8 ? 4 : 3),
"# ");
}
}
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/demo.c b/test/demo.c
index 35a6a23..535e425 100644
--- a/test/demo.c
+++ b/test/demo.c
@@ -37,7 +37,7 @@ int outline = 0;
int dithering = 0;
cucul_sprite_t *sprite = NULL;
-cucul_t *qq;
+cucul_canvas_t *c;
caca_t *kk;
int main(int argc, char **argv)
@@ -45,10 +45,10 @@ int main(int argc, char **argv)
void (*demo)(void) = NULL;
int quit = 0;
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
}
else if(ev.type & CACA_EVENT_KEY_PRESS)
{
- switch(ev.data.key.c)
+ switch(ev.data.key.ch)
{
case 'q':
case 'Q':
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
case 'd':
case 'D':
dithering = (dithering + 1) % 5;
- cucul_set_feature(qq, dithering);
+ cucul_set_feature(c, dithering);
display_menu();
break;
#endif
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
}
if(demo)
- cucul_clear(qq);
+ cucul_clear(c);
}
else if(ev.type & CACA_EVENT_MOUSE_MOTION)
{
@@ -161,9 +161,9 @@ int main(int argc, char **argv)
display_menu();
if(mouse && !demo)
{
- cucul_set_color(qq, CUCUL_COLOR_RED, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, xmouse, ymouse, ".");
- cucul_putstr(qq, xmouse, ymouse + 1, "|\\");
+ cucul_set_color(c, CUCUL_COLOR_RED, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, xmouse, ymouse, ".");
+ cucul_putstr(c, xmouse, ymouse + 1, "|\\");
}
caca_display(kk);
mouse = menu = 0;
@@ -173,9 +173,9 @@ int main(int argc, char **argv)
{
demo();
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_draw_thin_box(qq, 1, 1, cucul_get_width(qq) - 2, cucul_get_height(qq) - 2);
- cucul_printf(qq, 4, 1, "[%i.%i fps]----",
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_box(c, 1, 1, cucul_get_width(c) - 2, cucul_get_height(c) - 2);
+ cucul_printf(c, 4, 1, "[%i.%i fps]----",
1000000 / caca_get_rendertime(kk),
(10000000 / caca_get_rendertime(kk)) % 10);
caca_display(kk);
@@ -185,44 +185,44 @@ int main(int argc, char **argv)
/* Clean up */
cucul_free_sprite(sprite);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
static void display_menu(void)
{
- int xo = cucul_get_width(qq) - 2;
- int yo = cucul_get_height(qq) - 2;
-
- cucul_clear(qq);
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_draw_thin_box(qq, 1, 1, xo, yo);
-
- cucul_putstr(qq, (xo - strlen("libcaca demo")) / 2, 3, "libcaca demo");
- cucul_putstr(qq, (xo - strlen("==============")) / 2, 4, "==============");
-
- cucul_putstr(qq, 4, 6, "demos:");
- cucul_putstr(qq, 4, 7, "'f': full");
- cucul_putstr(qq, 4, 8, "'1': dots");
- cucul_putstr(qq, 4, 9, "'2': lines");
- cucul_putstr(qq, 4, 10, "'3': boxes");
- cucul_putstr(qq, 4, 11, "'4': triangles");
- cucul_putstr(qq, 4, 12, "'5': ellipses");
- cucul_putstr(qq, 4, 13, "'c': colour");
- cucul_putstr(qq, 4, 14, "'r': render");
+ int xo = cucul_get_width(c) - 2;
+ int yo = cucul_get_height(c) - 2;
+
+ cucul_clear(c);
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_box(c, 1, 1, xo, yo);
+
+ cucul_putstr(c, (xo - strlen("libcaca demo")) / 2, 3, "libcaca demo");
+ cucul_putstr(c, (xo - strlen("==============")) / 2, 4, "==============");
+
+ cucul_putstr(c, 4, 6, "demos:");
+ cucul_putstr(c, 4, 7, "'f': full");
+ cucul_putstr(c, 4, 8, "'1': dots");
+ cucul_putstr(c, 4, 9, "'2': lines");
+ cucul_putstr(c, 4, 10, "'3': boxes");
+ cucul_putstr(c, 4, 11, "'4': triangles");
+ cucul_putstr(c, 4, 12, "'5': ellipses");
+ cucul_putstr(c, 4, 13, "'c': colour");
+ cucul_putstr(c, 4, 14, "'r': render");
if(sprite)
- cucul_putstr(qq, 4, 15, "'s': sprites");
+ cucul_putstr(c, 4, 15, "'s': sprites");
- cucul_putstr(qq, 4, 16, "settings:");
- cucul_printf(qq, 4, 17, "'o': outline: %s",
+ cucul_putstr(c, 4, 16, "settings:");
+ cucul_printf(c, 4, 17, "'o': outline: %s",
outline == 0 ? "none" : outline == 1 ? "solid" : "thin");
- cucul_printf(qq, 4, 18, "'b': drawing boundaries: %s",
+ cucul_printf(c, 4, 18, "'b': drawing boundaries: %s",
bounds == 0 ? "screen" : "infinite");
- //cucul_printf(qq, 4, 19, "'d': dithering (%s)",
+ //cucul_printf(c, 4, 19, "'d': dithering (%s)",
// cucul_get_feature_name(dithering));
- cucul_putstr(qq, 4, yo - 2, "'q': quit");
+ cucul_putstr(c, 4, yo - 2, "'q': quit");
caca_display(kk);
}
@@ -235,99 +235,99 @@ static void demo_all(void)
i++;
- cucul_clear(qq);
+ cucul_clear(c);
/* Draw the sun */
- cucul_set_color(qq, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
- xo = cucul_get_width(qq) / 4;
- yo = cucul_get_height(qq) / 4 + 5 * sin(0.03*i);
+ cucul_set_color(c, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+ xo = cucul_get_width(c) / 4;
+ yo = cucul_get_height(c) / 4 + 5 * sin(0.03*i);
for(j = 0; j < 16; j++)
{
xa = xo - (30 + sin(0.03*i) * 8) * sin(0.03*i + M_PI*j/8);
ya = yo + (15 + sin(0.03*i) * 4) * cos(0.03*i + M_PI*j/8);
- cucul_draw_thin_line(qq, xo, yo, xa, ya);
+ cucul_draw_thin_line(c, xo, yo, xa, ya);
}
j = 15 + sin(0.03*i) * 8;
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
- cucul_fill_ellipse(qq, xo, yo, j, j / 2, "#");
- cucul_set_color(qq, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
- cucul_draw_ellipse(qq, xo, yo, j, j / 2, "#");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
+ cucul_fill_ellipse(c, xo, yo, j, j / 2, "#");
+ cucul_set_color(c, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+ cucul_draw_ellipse(c, xo, yo, j, j / 2, "#");
/* Draw the pyramid */
- xo = cucul_get_width(qq) * 5 / 8;
+ xo = cucul_get_width(c) * 5 / 8;
yo = 2;
- xa = cucul_get_width(qq) / 8 + sin(0.03*i) * 5;
- ya = cucul_get_height(qq) / 2 + cos(0.03*i) * 5;
+ xa = cucul_get_width(c) / 8 + sin(0.03*i) * 5;
+ ya = cucul_get_height(c) / 2 + cos(0.03*i) * 5;
- xb = cucul_get_width(qq) - 10 - cos(0.02*i) * 10;
- yb = cucul_get_height(qq) * 3 / 4 - 5 + sin(0.02*i) * 5;
+ xb = cucul_get_width(c) - 10 - cos(0.02*i) * 10;
+ yb = cucul_get_height(c) * 3 / 4 - 5 + sin(0.02*i) * 5;
- xc = cucul_get_width(qq) / 4 - sin(0.02*i) * 5;
- yc = cucul_get_height(qq) * 3 / 4 + cos(0.02*i) * 5;
+ xc = cucul_get_width(c) / 4 - sin(0.02*i) * 5;
+ yc = cucul_get_height(c) * 3 / 4 + cos(0.02*i) * 5;
- cucul_set_color(qq, CUCUL_COLOR_GREEN, CUCUL_COLOR_BLACK);
- cucul_fill_triangle(qq, xo, yo, xb, yb, xa, ya, "%");
- cucul_set_color(qq, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
- cucul_draw_thin_triangle(qq, xo, yo, xb, yb, xa, ya);
+ cucul_set_color(c, CUCUL_COLOR_GREEN, CUCUL_COLOR_BLACK);
+ cucul_fill_triangle(c, xo, yo, xb, yb, xa, ya, "%");
+ cucul_set_color(c, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_triangle(c, xo, yo, xb, yb, xa, ya);
- cucul_set_color(qq, CUCUL_COLOR_RED, CUCUL_COLOR_BLACK);
- cucul_fill_triangle(qq, xa, ya, xb, yb, xc, yc, "#");
- cucul_set_color(qq, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
- cucul_draw_thin_triangle(qq, xa, ya, xb, yb, xc, yc);
+ cucul_set_color(c, CUCUL_COLOR_RED, CUCUL_COLOR_BLACK);
+ cucul_fill_triangle(c, xa, ya, xb, yb, xc, yc, "#");
+ cucul_set_color(c, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_triangle(c, xa, ya, xb, yb, xc, yc);
- cucul_set_color(qq, CUCUL_COLOR_BLUE, CUCUL_COLOR_BLACK);
- cucul_fill_triangle(qq, xo, yo, xb, yb, xc, yc, "%");
- cucul_set_color(qq, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
- cucul_draw_thin_triangle(qq, xo, yo, xb, yb, xc, yc);
+ cucul_set_color(c, CUCUL_COLOR_BLUE, CUCUL_COLOR_BLACK);
+ cucul_fill_triangle(c, xo, yo, xb, yb, xc, yc, "%");
+ cucul_set_color(c, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_triangle(c, xo, yo, xb, yb, xc, yc);
/* Draw a background triangle */
xa = 2;
ya = 2;
- xb = cucul_get_width(qq) - 3;
- yb = cucul_get_height(qq) / 2;
+ xb = cucul_get_width(c) - 3;
+ yb = cucul_get_height(c) / 2;
- xc = cucul_get_width(qq) / 3;
- yc = cucul_get_height(qq) - 3;
+ xc = cucul_get_width(c) / 3;
+ yc = cucul_get_height(c) - 3;
- cucul_set_color(qq, CUCUL_COLOR_CYAN, CUCUL_COLOR_BLACK);
- cucul_draw_thin_triangle(qq, xa, ya, xb, yb, xc, yc);
+ cucul_set_color(c, CUCUL_COLOR_CYAN, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_triangle(c, xa, ya, xb, yb, xc, yc);
- xo = cucul_get_width(qq) / 2 + cos(0.027*i) * cucul_get_width(qq) / 3;
- yo = cucul_get_height(qq) / 2 - sin(0.027*i) * cucul_get_height(qq) / 2;
+ xo = cucul_get_width(c) / 2 + cos(0.027*i) * cucul_get_width(c) / 3;
+ yo = cucul_get_height(c) / 2 - sin(0.027*i) * cucul_get_height(c) / 2;
- cucul_draw_thin_line(qq, xa, ya, xo, yo);
- cucul_draw_thin_line(qq, xb, yb, xo, yo);
- cucul_draw_thin_line(qq, xc, yc, xo, yo);
+ cucul_draw_thin_line(c, xa, ya, xo, yo);
+ cucul_draw_thin_line(c, xb, yb, xo, yo);
+ cucul_draw_thin_line(c, xc, yc, xo, yo);
/* Draw a sprite on the pyramid */
- cucul_draw_sprite(qq, xo, yo, sprite, 0);
+ cucul_draw_sprite(c, xo, yo, sprite, 0);
/* Draw a trail behind the foreground sprite */
for(j = i - 60; j < i; j++)
{
int delta = cucul_rand(-5, 5);
- cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
- cucul_putchar(qq, cucul_get_width(qq) / 2
- + cos(0.02*j) * (delta + cucul_get_width(qq) / 4),
- cucul_get_height(qq) / 2
- + sin(0.02*j) * (delta + cucul_get_height(qq) / 3),
+ cucul_set_color(c, cucul_rand(0, 15), cucul_rand(0, 15));
+ cucul_putchar(c, cucul_get_width(c) / 2
+ + cos(0.02*j) * (delta + cucul_get_width(c) / 4),
+ cucul_get_height(c) / 2
+ + sin(0.02*j) * (delta + cucul_get_height(c) / 3),
'#');
}
/* Draw foreground sprite */
- cucul_draw_sprite(qq, cucul_get_width(qq) / 2 + cos(0.02*i) * cucul_get_width(qq) / 4,
- cucul_get_height(qq) / 2 + sin(0.02*i) * cucul_get_height(qq) / 3,
+ cucul_draw_sprite(c, cucul_get_width(c) / 2 + cos(0.02*i) * cucul_get_width(c) / 4,
+ cucul_get_height(c) / 2 + sin(0.02*i) * cucul_get_height(c) / 3,
sprite, 0);
}
static void demo_dots(void)
{
- int xmax = cucul_get_width(qq) - 1;
- int ymax = cucul_get_height(qq) - 1;
+ int xmax = cucul_get_width(c) - 1;
+ int ymax = cucul_get_height(c) - 1;
int i;
static char chars[10] =
{
@@ -337,8 +337,8 @@ static void demo_dots(void)
for(i = 1000; i--;)
{
/* Putpixel */
- cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
- cucul_putchar(qq, cucul_rand(0, xmax), cucul_rand(0, ymax),
+ cucul_set_color(c, cucul_rand(0, 15), cucul_rand(0, 15));
+ cucul_putchar(c, cucul_rand(0, xmax), cucul_rand(0, ymax),
chars[cucul_rand(0, 9)]);
}
}
@@ -348,24 +348,24 @@ static void demo_color(void)
int i, j;
char buf[BUFSIZ];
- cucul_clear(qq);
+ cucul_clear(c);
for(i = 0; i < 16; i++)
{
sprintf(buf, "'%c': %i (%s)", 'a' + i, i, cucul_get_color_name(i));
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 4, i + (i >= 8 ? 4 : 3), buf);
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 4, i + (i >= 8 ? 4 : 3), buf);
for(j = 0; j < 16; j++)
{
- cucul_set_color(qq, i, j);
- cucul_putstr(qq, (j >= 8 ? 41 : 40) + j * 2, i + (i >= 8 ? 4 : 3), "# ");
+ cucul_set_color(c, i, j);
+ cucul_putstr(c, (j >= 8 ? 41 : 40) + j * 2, i + (i >= 8 ? 4 : 3), "# ");
}
}
}
static void demo_lines(void)
{
- int w = cucul_get_width(qq);
- int h = cucul_get_height(qq);
+ int w = cucul_get_width(c);
+ int h = cucul_get_height(c);
int xa, ya, xb, yb;
if(bounds)
@@ -379,17 +379,17 @@ static void demo_lines(void)
xb = cucul_rand(0, w - 1); yb = cucul_rand(0, h - 1);
}
- cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
+ cucul_set_color(c, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
if(outline > 1)
- cucul_draw_thin_line(qq, xa, ya, xb, yb);
+ cucul_draw_thin_line(c, xa, ya, xb, yb);
else
- cucul_draw_line(qq, xa, ya, xb, yb, "#");
+ cucul_draw_line(c, xa, ya, xb, yb, "#");
}
static void demo_boxes(void)
{
- int w = cucul_get_width(qq);
- int h = cucul_get_height(qq);
+ int w = cucul_get_width(c);
+ int h = cucul_get_height(c);
int xa, ya, xb, yb;
if(bounds)
@@ -403,20 +403,20 @@ static void demo_boxes(void)
xb = cucul_rand(0, w - 1); yb = cucul_rand(0, h - 1);
}
- cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
- cucul_fill_box(qq, xa, ya, xb, yb, "#");
+ cucul_set_color(c, cucul_rand(0, 15), cucul_rand(0, 15));
+ cucul_fill_box(c, xa, ya, xb, yb, "#");
- cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
+ cucul_set_color(c, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
if(outline == 2)
- cucul_draw_thin_box(qq, xa, ya, xb, yb);
+ cucul_draw_thin_box(c, xa, ya, xb, yb);
else if(outline == 1)
- cucul_draw_box(qq, xa, ya, xb, yb, "#");
+ cucul_draw_box(c, xa, ya, xb, yb, "#");
}
static void demo_ellipses(void)
{
- int w = cucul_get_width(qq);
- int h = cucul_get_height(qq);
+ int w = cucul_get_width(c);
+ int h = cucul_get_height(c);
int x, y, a, b;
if(bounds)
@@ -434,20 +434,20 @@ static void demo_ellipses(void)
} while(x - a < 0 || x + a >= w || y - b < 0 || y + b >= h);
}
- cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
- cucul_fill_ellipse(qq, x, y, a, b, "#");
+ cucul_set_color(c, cucul_rand(0, 15), cucul_rand(0, 15));
+ cucul_fill_ellipse(c, x, y, a, b, "#");
- cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
+ cucul_set_color(c, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
if(outline == 2)
- cucul_draw_thin_ellipse(qq, x, y, a, b);
+ cucul_draw_thin_ellipse(c, x, y, a, b);
else if(outline == 1)
- cucul_draw_ellipse(qq, x, y, a, b, "#");
+ cucul_draw_ellipse(c, x, y, a, b, "#");
}
static void demo_triangles(void)
{
- int w = cucul_get_width(qq);
- int h = cucul_get_height(qq);
+ int w = cucul_get_width(c);
+ int h = cucul_get_height(c);
int xa, ya, xb, yb, xc, yc;
if(bounds)
@@ -464,20 +464,20 @@ static void demo_triangles(void)
xc = cucul_rand(0, w - 1); yc = cucul_rand(0, h - 1);
}
- cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
- cucul_fill_triangle(qq, xa, ya, xb, yb, xc, yc, "#");
+ cucul_set_color(c, cucul_rand(0, 15), cucul_rand(0, 15));
+ cucul_fill_triangle(c, xa, ya, xb, yb, xc, yc, "#");
- cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
+ cucul_set_color(c, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
if(outline == 2)
- cucul_draw_thin_triangle(qq, xa, ya, xb, yb, xc, yc);
+ cucul_draw_thin_triangle(c, xa, ya, xb, yb, xc, yc);
else if(outline == 1)
- cucul_draw_triangle(qq, xa, ya, xb, yb, xc, yc, "#");
+ cucul_draw_triangle(c, xa, ya, xb, yb, xc, yc, "#");
}
static void demo_sprites(void)
{
- cucul_draw_sprite(qq, cucul_rand(0, cucul_get_width(qq) - 1),
- cucul_rand(0, cucul_get_height(qq) - 1), sprite, 0);
+ cucul_draw_sprite(c, cucul_rand(0, cucul_get_width(c) - 1),
+ cucul_rand(0, cucul_get_height(c) - 1), sprite, 0);
}
#if 0
@@ -503,7 +503,7 @@ static void demo_render(void)
cucul_set_dither_invert(dither, 1);
//dither = cucul_create_dither(16, 256, 256, 2 * 256, 0xf800, 0x07e0, 0x001f, 0x0000);
dither = cucul_create_dither(32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
- cucul_dither_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0, cucul_get_width(c) - 1, cucul_get_height(c) - 1,
dither, buffer);
cucul_free_dither(dither);
}
@@ -548,7 +548,7 @@ static void demo_render(void)
dither = cucul_create_dither(32, 256, 256, 4 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000);
cucul_set_dither_invert(dither, 1);
- cucul_dither_bitmap(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1, dither, (char *)buffer);
+ cucul_dither_bitmap(c, 0, 0, cucul_get_width(c) - 1, cucul_get_height(c) - 1, dither, (char *)buffer);
cucul_free_dither(dither);
}
diff --git a/test/dithering.c b/test/dithering.c
index 3af8828..ad32957 100644
--- a/test/dithering.c
+++ b/test/dithering.c
@@ -35,13 +35,13 @@ char density[] = " ',+:;o&%w$W@#";
int main(void)
{
caca_event_t ev;
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
int neara, dista, nearb, distb, dist;
int x, y;
- qq = cucul_create(0, 0);
- kk = caca_attach(qq);
+ c = cucul_create(0, 0);
+ kk = caca_attach(c);
for(x = 0; x < 100; x++)
for(y = 0; y < 100; y++)
@@ -116,10 +116,10 @@ int main(void)
ch = density[distb * 2 * 13 / (dista + distb)];
else
ch = density[dista * 2 * 13 / (dista + distb)];
- cucul_set_color(qq, points[nearb], points[neara]);
+ cucul_set_color(c, points[nearb], points[neara]);
- cucul_putchar(qq, x * cucul_get_width(qq) / 100,
- (100 - y) * cucul_get_height(qq) / 100, ch);
+ cucul_putchar(c, x * cucul_get_width(c) / 100,
+ (100 - y) * cucul_get_height(c) / 100, ch);
}
caca_display(kk);
@@ -127,7 +127,7 @@ int main(void)
caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/event.c b/test/event.c
index c77eff8..4b8d402 100644
--- a/test/event.c
+++ b/test/event.c
@@ -20,7 +20,7 @@
#include "cucul.h"
#include "caca.h"
-static cucul_t *qq;
+static cucul_canvas_t *c;
static caca_t *kk;
static void print_event(int, int, caca_event_t *);
@@ -30,20 +30,20 @@ int main(int argc, char **argv)
caca_event_t *events;
int i, h, quit;
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
- h = cucul_get_height(qq) - 1;
+ h = cucul_get_height(c) - 1;
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_draw_line(qq, 0, 0, cucul_get_width(qq) - 1, 0, " ");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_draw_line(c, 0, 0, cucul_get_width(c) - 1, 0, " ");
- cucul_draw_line(qq, 0, h, cucul_get_width(qq) - 1, h, " ");
- cucul_putstr(qq, 0, h, "type \"quit\" to exit");
+ cucul_draw_line(c, 0, h, cucul_get_width(c) - 1, h, " ");
+ cucul_putstr(c, 0, h, "type \"quit\" to exit");
caca_display(kk);
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
/* "quit" quits */
if(ev.type & CACA_EVENT_KEY_PRESS)
{
- int key = ev.data.key.c;
+ int key = ev.data.key.ch;
if((key == 'q' && quit == 0) || (key == 'u' && quit == 1)
|| (key == 'i' && quit == 2) || (key == 't' && quit == 3))
quit++;
@@ -81,18 +81,18 @@ int main(int argc, char **argv)
}
while(ret);
- cucul_clear(qq);
+ cucul_clear(c);
/* Print current event */
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_draw_line(qq, 0, 0, cucul_get_width(qq) - 1, 0, " ");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_draw_line(c, 0, 0, cucul_get_width(c) - 1, 0, " ");
print_event(0, 0, events);
- cucul_draw_line(qq, 0, h, cucul_get_width(qq) - 1, h, " ");
- cucul_printf(qq, 0, h, "type \"quit\" to exit: %s", quit_string[quit]);
+ cucul_draw_line(c, 0, h, cucul_get_width(c) - 1, h, " ");
+ cucul_printf(c, 0, h, "type \"quit\" to exit: %s", quit_string[quit]);
/* Print previous events */
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
for(i = 1; i < h && events[i].type; i++)
print_event(0, i, events + i);
@@ -101,7 +101,7 @@ int main(int argc, char **argv)
/* Clean up */
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
@@ -113,39 +113,39 @@ static void print_event(int x, int y, caca_event_t *ev)
switch(ev->type)
{
case CACA_EVENT_NONE:
- cucul_printf(qq, x, y, "CACA_EVENT_NONE");
+ cucul_printf(c, x, y, "CACA_EVENT_NONE");
break;
case CACA_EVENT_KEY_PRESS:
- character = ev->data.key.c;
- cucul_printf(qq, x, y, "CACA_EVENT_KEY_PRESS 0x%02x (%c)", character,
+ character = ev->data.key.ch;
+ cucul_printf(c, x, y, "CACA_EVENT_KEY_PRESS 0x%02x (%c)", character,
(character > 0x1f && character < 0x80) ? character : '?');
break;
case CACA_EVENT_KEY_RELEASE:
- character = ev->data.key.c;
- cucul_printf(qq, x, y, "CACA_EVENT_KEY_RELEASE 0x%02x (%c)", character,
+ character = ev->data.key.ch;
+ cucul_printf(c, x, y, "CACA_EVENT_KEY_RELEASE 0x%02x (%c)", character,
(character > 0x1f && character < 0x80) ? character : '?');
break;
case CACA_EVENT_MOUSE_MOTION:
- cucul_printf(qq, x, y, "CACA_EVENT_MOUSE_MOTION %u %u",
+ cucul_printf(c, x, y, "CACA_EVENT_MOUSE_MOTION %u %u",
ev->data.mouse.x, ev->data.mouse.y);
break;
case CACA_EVENT_MOUSE_PRESS:
- cucul_printf(qq, x, y, "CACA_EVENT_MOUSE_PRESS %u",
+ cucul_printf(c, x, y, "CACA_EVENT_MOUSE_PRESS %u",
ev->data.mouse.button);
break;
case CACA_EVENT_MOUSE_RELEASE:
- cucul_printf(qq, x, y, "CACA_EVENT_MOUSE_RELEASE %u",
+ cucul_printf(c, x, y, "CACA_EVENT_MOUSE_RELEASE %u",
ev->data.mouse.button);
break;
case CACA_EVENT_RESIZE:
- cucul_printf(qq, x, y, "CACA_EVENT_RESIZE %u %u",
+ cucul_printf(c, x, y, "CACA_EVENT_RESIZE %u %u",
ev->data.resize.w, ev->data.resize.h);
break;
case CACA_EVENT_QUIT:
- cucul_printf(qq, x, y, "CACA_EVENT_QUIT");
+ cucul_printf(c, x, y, "CACA_EVENT_QUIT");
break;
default:
- cucul_printf(qq, x, y, "CACA_EVENT_UNKNOWN");
+ cucul_printf(c, x, y, "CACA_EVENT_UNKNOWN");
}
}
diff --git a/test/export.c b/test/export.c
index a70d7c9..66ca3e9 100644
--- a/test/export.c
+++ b/test/export.c
@@ -34,7 +34,7 @@ uint32_t pixels[256*256];
int main(int argc, char *argv[])
{
- cucul_t *qq;
+ cucul_canvas_t *c;
cucul_dither_t *dither;
cucul_buffer_t *buffer;
char const * const * exports, * const * p;
@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
exit(-1);
}
- qq = cucul_create(WIDTH, HEIGHT);
+ c = cucul_create(WIDTH, HEIGHT);
for(y = 0; y < 256; y++)
{
@@ -80,34 +80,34 @@ int main(int argc, char *argv[])
dither = cucul_create_dither(32, 256, 256, 4 * 256,
0x00ff0000, 0x0000ff00, 0x000000ff, 0x0);
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
dither, pixels);
cucul_free_dither(dither);
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
- cucul_draw_thin_box(qq, 0, 0, WIDTH - 1, HEIGHT - 1);
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_box(c, 0, 0, WIDTH - 1, HEIGHT - 1);
- cucul_set_color(qq, CUCUL_COLOR_BLACK, CUCUL_COLOR_WHITE);
- cucul_fill_ellipse(qq, WIDTH / 2, HEIGHT / 2, WIDTH / 4, HEIGHT / 4, " ");
- cucul_putstr(qq, WIDTH / 2 - 5, HEIGHT / 2 - 2, "(\") \\o/ <&>");
- cucul_putstr(qq, WIDTH / 2 - 7, HEIGHT / 2 + 2, "äβç ░▒▓█▓▒░ ΔЗҒ");
+ cucul_set_color(c, CUCUL_COLOR_BLACK, CUCUL_COLOR_WHITE);
+ cucul_fill_ellipse(c, WIDTH / 2, HEIGHT / 2, WIDTH / 4, HEIGHT / 4, " ");
+ cucul_putstr(c, WIDTH / 2 - 5, HEIGHT / 2 - 2, "(\") \\o/ <&>");
+ cucul_putstr(c, WIDTH / 2 - 7, HEIGHT / 2 + 2, "äβç ░▒▓█▓▒░ ΔЗҒ");
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_LIGHTBLUE);
- cucul_putstr(qq, WIDTH / 2 - 7, HEIGHT / 2, " LIBCACA ");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_LIGHTBLUE);
+ cucul_putstr(c, WIDTH / 2 - 7, HEIGHT / 2, " LIBCACA ");
for(x = 0; x < 16; x++)
{
- cucul_set_truecolor(qq, 0xff00 | x, 0xf00f | (x << 4));
- cucul_putstr(qq, WIDTH / 2 - 7 + x, HEIGHT / 2 + 5, "#");
+ cucul_set_truecolor(c, 0xff00 | x, 0xf00f | (x << 4));
+ cucul_putstr(c, WIDTH / 2 - 7 + x, HEIGHT / 2 + 5, "#");
}
- buffer = cucul_create_export(qq, argv[1]);
+ buffer = cucul_create_export(c, argv[1]);
fwrite(cucul_get_buffer_data(buffer),
cucul_get_buffer_size(buffer), 1, stdout);
cucul_free_buffer(buffer);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/font.c b/test/font.c
index f0dc229..5f6bfbe 100644
--- a/test/font.c
+++ b/test/font.c
@@ -34,7 +34,7 @@ typedef unsigned int uint32_t;
int main(int argc, char *argv[])
{
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
cucul_font_t *f;
cucul_dither_t *d;
@@ -44,15 +44,15 @@ int main(int argc, char *argv[])
char const * const * fonts;
/* Create a canvas */
- qq = cucul_create(8, 2);
+ c = cucul_create(8, 2);
/* Draw stuff on our canvas */
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 0, 0, "ABcde");
- cucul_set_color(qq, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 5, 0, "\\o/");
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, 0, 1, "&$âøÿØ?!");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 0, 0, "ABcde");
+ cucul_set_color(c, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 5, 0, "\\o/");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, 0, 1, "&$âøÿØ?!");
/* Load a libcucul internal font */
fonts = cucul_get_font_list();
@@ -69,16 +69,16 @@ int main(int argc, char *argv[])
}
/* Create our bitmap buffer (32-bit ARGB) */
- w = cucul_get_width(qq) * cucul_get_font_width(f);
- h = cucul_get_height(qq) * cucul_get_font_height(f);
+ w = cucul_get_width(c) * cucul_get_font_width(f);
+ h = cucul_get_height(c) * cucul_get_font_height(f);
buf = malloc(4 * w * h);
/* Render the canvas onto our image buffer */
- cucul_render_canvas(qq, f, buf, w, h, 4 * w);
+ cucul_render_canvas(c, f, buf, w, h, 4 * w);
/* Just for fun, render the image using libcaca */
- cucul_set_size(qq, 80, 32);
- kk = caca_attach(qq);
+ cucul_set_size(c, 80, 32);
+ kk = caca_attach(c);
#if defined(HAVE_ENDIAN_H)
if(__BYTE_ORDER == __BIG_ENDIAN)
@@ -93,8 +93,8 @@ int main(int argc, char *argv[])
d = cucul_create_dither(32, w, h, 4 * w,
0x0000ff00, 0x00ff0000, 0xff000000, 0x000000ff);
- cucul_dither_bitmap(qq, 0, 0, cucul_get_width(qq) - 1,
- cucul_get_height(qq) - 1, d, buf);
+ cucul_dither_bitmap(c, 0, 0, cucul_get_width(c) - 1,
+ cucul_get_height(c) - 1, d, buf);
caca_display(kk);
caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
free(buf);
cucul_free_dither(d);
cucul_free_font(f);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/gamma.c b/test/gamma.c
index e195e26..62caff4 100644
--- a/test/gamma.c
+++ b/test/gamma.c
@@ -34,17 +34,17 @@ uint32_t buffer[256 * 4];
int main(void)
{
caca_event_t ev;
- cucul_t *qq, *gg, *mask;
+ cucul_canvas_t *c, *gg, *mask;
caca_t *kk;
cucul_dither_t *left, *right;
float gam = 1.0;
int x;
- qq = cucul_create(0, 0);
- kk = caca_attach(qq);
+ c = cucul_create(0, 0);
+ kk = caca_attach(c);
- gg = cucul_create(cucul_get_width(qq), cucul_get_height(qq));
- mask = cucul_create(cucul_get_width(qq), cucul_get_height(qq));
+ gg = cucul_create(cucul_get_width(c), cucul_get_height(c));
+ mask = cucul_create(cucul_get_width(c), cucul_get_height(c));
for(x = 0; x < 256; x++)
{
@@ -66,23 +66,23 @@ int main(void)
if(ret)
{
- if(ev.data.key.c == CACA_KEY_LEFT)
+ if(ev.data.key.ch == CACA_KEY_LEFT)
gam /= 1.03;
- else if(ev.data.key.c == CACA_KEY_RIGHT)
+ else if(ev.data.key.ch == CACA_KEY_RIGHT)
gam *= 1.03;
- else if(ev.data.key.c == CACA_KEY_DOWN)
+ else if(ev.data.key.ch == CACA_KEY_DOWN)
gam = 1.0;
- else if(ev.data.key.c == CACA_KEY_ESCAPE)
+ else if(ev.data.key.ch == CACA_KEY_ESCAPE)
break;
}
/* Resize the spare canvas, just in case the main one changed */
- cucul_set_size(gg, cucul_get_width(qq), cucul_get_height(qq));
- cucul_set_size(mask, cucul_get_width(qq), cucul_get_height(qq));
+ cucul_set_size(gg, cucul_get_width(c), cucul_get_height(c));
+ cucul_set_size(mask, cucul_get_width(c), cucul_get_height(c));
/* Draw the regular dither on the main canvas */
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
left, buffer);
/* Draw the gamma-modified dither on the spare canvas */
@@ -102,10 +102,10 @@ int main(void)
cucul_get_height(mask) / 2, "#");
/* Blit the spare canvas onto the first one */
- cucul_blit(qq, 0, 0, gg, mask);
+ cucul_blit(c, 0, 0, gg, mask);
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_printf(qq, 2, 1,
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_printf(c, 2, 1,
"gamma=%g - use arrows to change, Esc to quit", gam);
caca_display(kk);
@@ -115,7 +115,7 @@ int main(void)
cucul_free_dither(right);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/hsv.c b/test/hsv.c
index 1a6cfcf..c01b4f4 100644
--- a/test/hsv.c
+++ b/test/hsv.c
@@ -29,14 +29,14 @@ uint32_t buffer[256*256];
int main(void)
{
caca_event_t ev;
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
cucul_dither_t *dither;
int x, y;
- qq = cucul_create(0, 0);
- kk = caca_attach(qq);
+ c = cucul_create(0, 0);
+ kk = caca_attach(c);
for(y = 0; y < 256; y++)
for(x = 0; x < 256; x++)
@@ -46,8 +46,8 @@ int main(void)
dither = cucul_create_dither(32, 256, 256, 4 * 256,
0x00ff0000, 0x0000ff00, 0x000000ff, 0x0);
- cucul_dither_bitmap(qq, 0, 0,
- cucul_get_width(qq) - 1, cucul_get_height(qq) - 1,
+ cucul_dither_bitmap(c, 0, 0,
+ cucul_get_width(c) - 1, cucul_get_height(c) - 1,
dither, buffer);
cucul_free_dither(dither);
@@ -56,7 +56,7 @@ int main(void)
caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/spritedit.c b/test/spritedit.c
index dcdd509..f0bf3c7 100644
--- a/test/spritedit.c
+++ b/test/spritedit.c
@@ -22,7 +22,7 @@
int main(int argc, char **argv)
{
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
int quit = 0;
@@ -37,10 +37,10 @@ int main(int argc, char **argv)
return 1;
}
- qq = cucul_create(0, 0);
- if(!qq)
+ c = cucul_create(0, 0);
+ if(!c)
return 1;
- kk = caca_attach(qq);
+ kk = caca_attach(c);
if(!kk)
return 1;
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
if(!sprite)
{
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
fprintf(stderr, "%s: could not open `%s'.\n", argv[0], argv[1]);
return 1;
}
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
while(caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, 0))
{
- switch(ev.data.key.c)
+ switch(ev.data.key.ch)
{
case 0:
break;
@@ -100,43 +100,43 @@ int main(int argc, char **argv)
}
- cucul_clear(qq);
+ cucul_clear(c);
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_draw_thin_box(qq, 0, 0, cucul_get_width(qq) - 1, cucul_get_height(qq) - 1);
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_box(c, 0, 0, cucul_get_width(c) - 1, cucul_get_height(c) - 1);
- cucul_putstr(qq, 3, 0, "[ Sprite editor for libcaca ]");
+ cucul_putstr(c, 3, 0, "[ Sprite editor for libcaca ]");
sprintf(buf, "sprite `%s'", argv[1]);
- cucul_putstr(qq, 3, 2, buf);
+ cucul_putstr(c, 3, 2, buf);
sprintf(buf, "frame %i/%i", frame, cucul_get_sprite_frames(sprite) - 1);
- cucul_putstr(qq, 3, 3, buf);
+ cucul_putstr(c, 3, 3, buf);
/* Crosshair */
- cucul_draw_thin_line(qq, 57, 2, 57, 18);
- cucul_draw_thin_line(qq, 37, 10, 77, 10);
- cucul_putchar(qq, 57, 10, '+');
+ cucul_draw_thin_line(c, 57, 2, 57, 18);
+ cucul_draw_thin_line(c, 37, 10, 77, 10);
+ cucul_putchar(c, 57, 10, '+');
/* Boxed sprite */
xa = -1 - cucul_get_sprite_dx(sprite, frame);
ya = -1 - cucul_get_sprite_dy(sprite, frame);
xb = xa + 1 + cucul_get_sprite_width(sprite, frame);
yb = ya + 1 + cucul_get_sprite_height(sprite, frame);
- cucul_set_color(qq, CUCUL_COLOR_BLACK, CUCUL_COLOR_BLACK);
- cucul_fill_box(qq, 57 + xa, 10 + ya, 57 + xb, 10 + yb, " ");
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_draw_thin_box(qq, 57 + xa, 10 + ya, 57 + xb, 10 + yb);
- cucul_draw_sprite(qq, 57, 10, sprite, frame);
+ cucul_set_color(c, CUCUL_COLOR_BLACK, CUCUL_COLOR_BLACK);
+ cucul_fill_box(c, 57 + xa, 10 + ya, 57 + xb, 10 + yb, " ");
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_draw_thin_box(c, 57 + xa, 10 + ya, 57 + xb, 10 + yb);
+ cucul_draw_sprite(c, 57, 10, sprite, frame);
/* Free sprite */
- cucul_draw_sprite(qq, 20, 10, sprite, frame);
+ cucul_draw_sprite(c, 20, 10, sprite, frame);
caca_display(kk);
}
/* Clean up */
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/transform.c b/test/transform.c
index 533af51..0399743 100644
--- a/test/transform.c
+++ b/test/transform.c
@@ -50,12 +50,12 @@ static char const *duck[] =
int main(void)
{
caca_event_t ev;
- cucul_t *qq, *normal, *flip, *flop, *rotate;
+ cucul_canvas_t *c, *normal, *flip, *flop, *rotate;
caca_t *kk;
int i;
- qq = cucul_create(0, 0);
- kk = caca_attach(qq);
+ c = cucul_create(0, 0);
+ kk = caca_attach(c);
normal = cucul_create(70, 6);
flip = cucul_create(70, 6);
@@ -96,15 +96,15 @@ int main(void)
cucul_rotate(rotate);
/* Blit the transformed canvas onto the main canvas */
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, 0, 0, "normal");
- cucul_blit(qq, 10, 0, normal, NULL);
- cucul_putstr(qq, 0, 6, "flip");
- cucul_blit(qq, 10, 6, flip, NULL);
- cucul_putstr(qq, 0, 12, "flop");
- cucul_blit(qq, 10, 12, flop, NULL);
- cucul_putstr(qq, 0, 18, "rotate");
- cucul_blit(qq, 10, 18, rotate, NULL);
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, 0, 0, "normal");
+ cucul_blit(c, 10, 0, normal, NULL);
+ cucul_putstr(c, 0, 6, "flip");
+ cucul_blit(c, 10, 6, flip, NULL);
+ cucul_putstr(c, 0, 12, "flop");
+ cucul_blit(c, 10, 12, flop, NULL);
+ cucul_putstr(c, 0, 18, "rotate");
+ cucul_blit(c, 10, 18, rotate, NULL);
caca_display(kk);
@@ -115,7 +115,7 @@ int main(void)
cucul_free(flop);
cucul_free(flip);
cucul_free(normal);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/truecolor.c b/test/truecolor.c
index 35d90d1..46d8fd1 100644
--- a/test/truecolor.c
+++ b/test/truecolor.c
@@ -27,13 +27,13 @@ typedef unsigned int uint32_t;
int main(void)
{
caca_event_t ev;
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
int x, y;
- qq = cucul_create(32, 16);
- kk = caca_attach(qq);
+ c = cucul_create(32, 16);
+ kk = caca_attach(c);
for(y = 0; y < 16; y++)
for(x = 0; x < 16; x++)
@@ -41,19 +41,19 @@ int main(void)
uint16_t bgcolor = 0xff00 | (y << 4) | x;
uint16_t fgcolor = 0xf000 | ((15 - y) << 4) | ((15 - x) << 8);
- cucul_set_truecolor(qq, fgcolor, bgcolor);
- cucul_putstr(qq, x * 2, y, "CA");
+ cucul_set_truecolor(c, fgcolor, bgcolor);
+ cucul_putstr(c, x * 2, y, "CA");
}
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_LIGHTBLUE);
- cucul_putstr(qq, 2, 1, " truecolor libcaca ");
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_LIGHTBLUE);
+ cucul_putstr(c, 2, 1, " truecolor libcaca ");
caca_display(kk);
caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
diff --git a/test/unicode.c b/test/unicode.c
index d1e4db3..e7c672c 100644
--- a/test/unicode.c
+++ b/test/unicode.c
@@ -27,70 +27,70 @@ typedef unsigned int uint32_t;
int main(void)
{
caca_event_t ev;
- cucul_t *qq;
+ cucul_canvas_t *c;
caca_t *kk;
- qq = cucul_create(0, 0);
- kk = caca_attach(qq);
-
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, 1, 1, "Basic Unicode support");
-
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 1, 2, "This is ASCII: | abc DEF 123 !@# |");
- cucul_putstr(qq, 1, 3, "This is Unicode: | äßç δεφ ☺♥♀ ╞╬╗ |");
- cucul_putstr(qq, 1, 4, "And this is, too: | ἀβϛ ΔЗҒ ᚴᛒᛯ ♩♔✈ |");
-
- cucul_putstr(qq, 1, 5, "If the three lines do not have the same length, there is a bug somewhere.");
-
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, 1, 7, "Gradient glyphs");
-
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 31, 8, " 0%");
- cucul_putstr(qq, 31, 9, " 25%");
- cucul_putstr(qq, 31, 10, " 50%");
- cucul_putstr(qq, 31, 11, " 75%");
- cucul_putstr(qq, 31, 12, "100%");
-
- cucul_set_color(qq, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_LIGHTGREEN);
- cucul_putstr(qq, 1, 8, " ");
- cucul_putstr(qq, 1, 9, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
- cucul_putstr(qq, 1, 10, "▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒");
- cucul_putstr(qq, 1, 11, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
- cucul_putstr(qq, 1, 12, "█████████████████████████████");
-
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGREEN, CUCUL_COLOR_LIGHTRED);
- cucul_putstr(qq, 36, 8, "█████████████████████████████");
- cucul_putstr(qq, 36, 9, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
- cucul_putstr(qq, 36, 10, "▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒");
- cucul_putstr(qq, 36, 11, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
- cucul_putstr(qq, 36, 12, " ");
-
- cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
- cucul_putstr(qq, 1, 14, "Double width characters");
-
- cucul_set_color(qq, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 1, 15, "| ドラゴン ボーレ |");
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 1, 16, "| ()()()() ()()() |");
- cucul_set_color(qq, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 1, 17, "| ドラゴン");
- cucul_putstr(qq, 10, 17, "ボーレ |");
-
- cucul_set_color(qq, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
- cucul_putstr(qq, 1, 18, "If the three lines do not have the same length, there is a bug somewhere.");
-
- cucul_putstr(qq, 1, 20, "CP437 glyphs: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼");
- cucul_putstr(qq, 1, 21, "more CP437: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■");
- cucul_putstr(qq, 1, 22, "drawing blocks: ███ ▓▓▓ ▒▒▒ ░░░ ▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟");
+ c = cucul_create(0, 0);
+ kk = caca_attach(c);
+
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, 1, 1, "Basic Unicode support");
+
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 1, 2, "This is ASCII: | abc DEF 123 !@# |");
+ cucul_putstr(c, 1, 3, "This is Unicode: | äßç δεφ ☺♥♀ ╞╬╗ |");
+ cucul_putstr(c, 1, 4, "And this is, too: | ἀβϛ ΔЗҒ ᚴᛒᛯ ♩♔✈ |");
+
+ cucul_putstr(c, 1, 5, "If the three lines do not have the same length, there is a bug somewhere.");
+
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, 1, 7, "Gradient glyphs");
+
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 31, 8, " 0%");
+ cucul_putstr(c, 31, 9, " 25%");
+ cucul_putstr(c, 31, 10, " 50%");
+ cucul_putstr(c, 31, 11, " 75%");
+ cucul_putstr(c, 31, 12, "100%");
+
+ cucul_set_color(c, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_LIGHTGREEN);
+ cucul_putstr(c, 1, 8, " ");
+ cucul_putstr(c, 1, 9, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
+ cucul_putstr(c, 1, 10, "▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒");
+ cucul_putstr(c, 1, 11, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
+ cucul_putstr(c, 1, 12, "█████████████████████████████");
+
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGREEN, CUCUL_COLOR_LIGHTRED);
+ cucul_putstr(c, 36, 8, "█████████████████████████████");
+ cucul_putstr(c, 36, 9, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
+ cucul_putstr(c, 36, 10, "▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒");
+ cucul_putstr(c, 36, 11, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
+ cucul_putstr(c, 36, 12, " ");
+
+ cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+ cucul_putstr(c, 1, 14, "Double width characters");
+
+ cucul_set_color(c, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 1, 15, "| ドラゴン ボーレ |");
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 1, 16, "| ()()()() ()()() |");
+ cucul_set_color(c, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 1, 17, "| ドラゴン");
+ cucul_putstr(c, 10, 17, "ボーレ |");
+
+ cucul_set_color(c, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+ cucul_putstr(c, 1, 18, "If the three lines do not have the same length, there is a bug somewhere.");
+
+ cucul_putstr(c, 1, 20, "CP437 glyphs: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼");
+ cucul_putstr(c, 1, 21, "more CP437: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■");
+ cucul_putstr(c, 1, 22, "drawing blocks: ███ ▓▓▓ ▒▒▒ ░░░ ▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟");
caca_display(kk);
caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
caca_detach(kk);
- cucul_free(qq);
+ cucul_free(c);
return 0;
}
|