Changeset 811 for libcaca/trunk/test/unicode.cTweet

Timestamp:

Apr 18, 2006, 5:11:25 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Renamed caca_t into caca_display_t.
• Renamed canvas handle variables from "c" to "cv". Eh ouais mon gros.

File:

• libcaca/trunk/test/unicode.c (modified) (1 diff)

libcaca/trunk/test/unicode.c

@@ -28 +28 @@
 {
     caca_event_t ev;
-    cucul_canvas_t *c;
-    caca_t *kk;
+    cucul_canvas_t *cv;
+    caca_display_t *dp;
 
-    c = cucul_create(0, 0);
-    kk = caca_attach(c);
+    cv = cucul_create(0, 0);
+    dp = caca_attach(cv);
 
-    cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
-    cucul_putstr(c, 1, 1, "Basic Unicode support");
+    cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+    cucul_putstr(cv, 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_set_color(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+    cucul_putstr(cv, 1, 2, "This is ASCII:    | abc DEF 123 !@# |");
+    cucul_putstr(cv, 1, 3, "This is Unicode:  | äßç δεφ ☺♥♀ ╞╬╗ |");
+    cucul_putstr(cv, 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_putstr(cv, 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(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+    cucul_putstr(cv, 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(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+    cucul_putstr(cv, 31,  8, "  0%");
+    cucul_putstr(cv, 31,  9, " 25%");
+    cucul_putstr(cv, 31, 10, " 50%");
+    cucul_putstr(cv, 31, 11, " 75%");
+    cucul_putstr(cv, 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(cv, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_LIGHTGREEN);
+    cucul_putstr(cv, 1,  8, "                             ");
+    cucul_putstr(cv, 1,  9, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
+    cucul_putstr(cv, 1, 10, "▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒");
+    cucul_putstr(cv, 1, 11, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
+    cucul_putstr(cv, 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(cv, CUCUL_COLOR_LIGHTGREEN, CUCUL_COLOR_LIGHTRED);
+    cucul_putstr(cv, 36,  8, "█████████████████████████████");
+    cucul_putstr(cv, 36,  9, "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓");
+    cucul_putstr(cv, 36, 10, "▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒");
+    cucul_putstr(cv, 36, 11, "░░░░░░░░░░░░░░░░░░░░░░░░░░░░░");
+    cucul_putstr(cv, 36, 12, "                             ");
 
-    cucul_set_color(c, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
-    cucul_putstr(c, 1, 14, "Double width characters");
+    cucul_set_color(cv, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLUE);
+    cucul_putstr(cv, 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(cv, CUCUL_COLOR_LIGHTRED, CUCUL_COLOR_BLACK);
+    cucul_putstr(cv, 1, 15, "| ドラゴン ボーレ |");
+    cucul_set_color(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+    cucul_putstr(cv, 1, 16, "| ()()()() ()()() |");
+    cucul_set_color(cv, CUCUL_COLOR_YELLOW, CUCUL_COLOR_BLACK);
+    cucul_putstr(cv, 1, 17, "| ドラゴン");
+    cucul_putstr(cv, 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_set_color(cv, CUCUL_COLOR_LIGHTGRAY, CUCUL_COLOR_BLACK);
+    cucul_putstr(cv, 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: ███ ▓▓▓ ▒▒▒ ░░░ ▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟");
+    cucul_putstr(cv, 1, 20, "CP437 glyphs: ☺ ☻ ♥ ♦ ♣ ♠ • ◘ ○ ◙ ♂ ♀ ♪ ♫ ☼ ► ◄ ↕ ‼ ¶ § ▬ ↨ ↑ ↓ → ← ∟ ↔ ▲ ▼");
+    cucul_putstr(cv, 1, 21, "more CP437: α ß Γ π Σ σ µ τ Φ Θ Ω δ ∞ φ ε ∩ ≡ ± ≥ ≤ ⌠ ⌡ ÷ ≈ ° ∙ · √ ⁿ ² ■");
+    cucul_putstr(cv, 1, 22, "drawing blocks: ███ ▓▓▓ ▒▒▒ ░░░ ▀ ▄ ▌ ▐ █ ▖ ▗ ▘ ▝ ▚ ▞ ▙ ▛ ▜ ▟");
 
-    caca_display(kk);
+    caca_display(dp);
 
-    caca_get_event(kk, CACA_EVENT_KEY_PRESS, &ev, -1);
+    caca_get_event(dp, CACA_EVENT_KEY_PRESS, &ev, -1);
 
-    caca_detach(kk);
-    cucul_free(c);
+    caca_detach(dp);
+    cucul_free(cv);
 
     return 0;