Changeset 678 for libcaca/trunk/testTweet

Timestamp:

Mar 23, 2006, 3:07:32 PM (15 years ago)

Author:

Sam Hocevar

Message:

• Made cucul_putchar32() an internal-only function.
• Changed the line, box, ellipsis etc. prototypes so that they use an UTF-8 string instead of a single character as their last argument.

Location:

libcaca/trunk/test

Files:

• demo.c (modified) (9 diffs)
• event.c (modified) (2 diffs)
• export.c (modified) (1 diff)
• spritedit.c (modified) (1 diff)

libcaca/trunk/test/demo.c

@@ -242 +242 @@
     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_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_draw_ellipse(qq, xo, yo, j, j / 2, "#");
 
     /* Draw the pyramid */
@@ -260 +260 @@
 
     cucul_set_color(qq, CUCUL_COLOR_GREEN, CUCUL_COLOR_BLACK);
-    cucul_fill_triangle(qq, xo, yo, xb, yb, xa, ya, '%');
+    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(qq, CUCUL_COLOR_RED, CUCUL_COLOR_BLACK);
-    cucul_fill_triangle(qq, xa, ya, xb, yb, xc, yc, '#');
+    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(qq, CUCUL_COLOR_BLUE, CUCUL_COLOR_BLACK);
-    cucul_fill_triangle(qq, xo, yo, xb, yb, xc, yc, '%');
+    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);
@@ -374 +374 @@
         cucul_draw_thin_line(qq, xa, ya, xb, yb);
     else
-        cucul_draw_line(qq, xa, ya, xb, yb, '#');
+        cucul_draw_line(qq, xa, ya, xb, yb, "#");
 }
 
@@ -395 +395 @@
 
     cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
-    cucul_fill_box(qq, xa, ya, xb, yb, '#');
+    cucul_fill_box(qq, xa, ya, xb, yb, "#");
 
     cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
@@ -401 +401 @@
         cucul_draw_thin_box(qq, xa, ya, xb, yb);
     else if(outline == 1)
-        cucul_draw_box(qq, xa, ya, xb, yb, '#');
+        cucul_draw_box(qq, xa, ya, xb, yb, "#");
 }
 
@@ -426 +426 @@
 
     cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
-    cucul_fill_ellipse(qq, x, y, a, b, '#');
+    cucul_fill_ellipse(qq, x, y, a, b, "#");
 
     cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
@@ -432 +432 @@
         cucul_draw_thin_ellipse(qq, x, y, a, b);
     else if(outline == 1)
-        cucul_draw_ellipse(qq, x, y, a, b, '#');
+        cucul_draw_ellipse(qq, x, y, a, b, "#");
 }
 
@@ -456 +456 @@
 
     cucul_set_color(qq, cucul_rand(0, 15), cucul_rand(0, 15));
-    cucul_fill_triangle(qq, xa, ya, xb, yb, xc, yc, '#');
+    cucul_fill_triangle(qq, xa, ya, xb, yb, xc, yc, "#");
 
     cucul_set_color(qq, cucul_rand(0, 15), CUCUL_COLOR_BLACK);
@@ -462 +462 @@
         cucul_draw_thin_triangle(qq, xa, ya, xb, yb, xc, yc);
     else if(outline == 1)
-        cucul_draw_triangle(qq, xa, ya, xb, yb, xc, yc, '#');
+        cucul_draw_triangle(qq, xa, ya, xb, yb, xc, yc, "#");
 }
 

libcaca/trunk/test/event.c

@@ -41 +41 @@
 
     cucul_set_color(qq, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
-    cucul_draw_line(qq, 0, 0, cucul_get_width(qq) - 1, 0, ' ');
+    cucul_draw_line(qq, 0, 0, cucul_get_width(qq) - 1, 0, " ");
 
-    cucul_draw_line(qq, 0, h, cucul_get_width(qq) - 1, h, ' ');
+    cucul_draw_line(qq, 0, h, cucul_get_width(qq) - 1, h, " ");
     cucul_putstr(qq, 0, h, "type \"quit\" to exit");
 
@@ -85 +85 @@
         /* 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_draw_line(qq, 0, 0, cucul_get_width(qq) - 1, 0, " ");
         print_event(0, 0, events[0]);
 
-        cucul_draw_line(qq, 0, h, cucul_get_width(qq) - 1, h, ' ');
+        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]);
 

libcaca/trunk/test/export.c

@@ -92 +92 @@
 
     cucul_set_color(qq, CUCUL_COLOR_BLACK, CUCUL_COLOR_WHITE);
-    cucul_fill_ellipse(qq, WIDTH / 2, HEIGHT / 2, WIDTH / 4, HEIGHT / 4, ' ');
+    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, "äβç ░▒▓█▓▒░ ΔЗҒ");

libcaca/trunk/test/spritedit.c

@@ -101 +101 @@
         yb = ya + 1 + cucul_get_sprite_height(qq, 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_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);