Changeset 2821 for libcaca/trunk/examples/event.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (13 years ago)

Author:

Sam Hocevar

Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:

• libcaca/trunk/examples/event.c (modified) (6 diffs)

libcaca/trunk/examples/event.c

@@ -21 +21 @@
 #endif
 
-#include "cucul.h"
 #include "caca.h"
 
-static cucul_canvas_t *cv;
+static caca_canvas_t *cv;
 static caca_display_t *dp;
 
@@ -34 +33 @@
     int i, h, quit;
 
-    cv = cucul_create_canvas(80, 24);
+    cv = caca_create_canvas(80, 24);
     if(cv == NULL)
     {
@@ -48 +47 @@
     }
 
-    h = cucul_get_canvas_height(cv) - 1;
+    h = caca_get_canvas_height(cv) - 1;
 
-    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
-    cucul_draw_line(cv, 0, 0, cucul_get_canvas_width(cv) - 1, 0, ' ');
+    caca_set_color_ansi(cv, CACA_WHITE, CACA_BLUE);
+    caca_draw_line(cv, 0, 0, caca_get_canvas_width(cv) - 1, 0, ' ');
 
-    cucul_draw_line(cv, 0, h, cucul_get_canvas_width(cv) - 1, h, ' ');
-    cucul_put_str(cv, 0, h, "type \"quit\" to exit");
+    caca_draw_line(cv, 0, h, caca_get_canvas_width(cv) - 1, h, ' ');
+    caca_put_str(cv, 0, h, "type \"quit\" to exit");
 
     caca_refresh_display(dp);
@@ -92 +91 @@
         while(ret);
 
-        cucul_set_color_ansi(cv, CUCUL_LIGHTGRAY, CUCUL_BLACK);
-        cucul_clear_canvas(cv);
+        caca_set_color_ansi(cv, CACA_LIGHTGRAY, CACA_BLACK);
+        caca_clear_canvas(cv);
 
         /* Print current event */
-        cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
-        cucul_draw_line(cv, 0, 0, cucul_get_canvas_width(cv) - 1, 0, ' ');
+        caca_set_color_ansi(cv, CACA_WHITE, CACA_BLUE);
+        caca_draw_line(cv, 0, 0, caca_get_canvas_width(cv) - 1, 0, ' ');
         print_event(0, 0, events);
 
-        cucul_draw_line(cv, 0, h, cucul_get_canvas_width(cv) - 1, h, ' ');
-        cucul_printf(cv, 0, h, "type \"quit\" to exit: %s", quit_string[quit]);
+        caca_draw_line(cv, 0, h, caca_get_canvas_width(cv) - 1, h, ' ');
+        caca_printf(cv, 0, h, "type \"quit\" to exit: %s", quit_string[quit]);
 
         /* Print previous events */
-        cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLACK);
+        caca_set_color_ansi(cv, CACA_WHITE, CACA_BLACK);
         for(i = 1; i < h && caca_get_event_type(&events[i]); i++)
             print_event(0, i, events + i);
@@ -114 +113 @@
     free(events);
     caca_free_display(dp);
-    cucul_free_canvas(cv);
+    caca_free_canvas(cv);
 
     return 0;
@@ -126 +125 @@
     {
     case CACA_EVENT_NONE:
-        cucul_printf(cv, x, y, "CACA_EVENT_NONE");
+        caca_printf(cv, x, y, "CACA_EVENT_NONE");
         break;
     case CACA_EVENT_KEY_PRESS:
         character = caca_get_event_key_ch(ev);
-        cucul_printf(cv, x, y, "CACA_EVENT_KEY_PRESS 0x%02x (%c)", character,
+        caca_printf(cv, x, y, "CACA_EVENT_KEY_PRESS 0x%02x (%c)", character,
                      (character > 0x1f && character < 0x80) ? character : '?');
         break;
     case CACA_EVENT_KEY_RELEASE:
         character = caca_get_event_key_ch(ev);
-        cucul_printf(cv, x, y, "CACA_EVENT_KEY_RELEASE 0x%02x (%c)", character,
+        caca_printf(cv, x, y, "CACA_EVENT_KEY_RELEASE 0x%02x (%c)", character,
                      (character > 0x1f && character < 0x80) ? character : '?');
         break;
     case CACA_EVENT_MOUSE_MOTION:
-        cucul_printf(cv, x, y, "CACA_EVENT_MOUSE_MOTION %u %u",
+        caca_printf(cv, x, y, "CACA_EVENT_MOUSE_MOTION %u %u",
                      caca_get_event_mouse_x(ev), caca_get_event_mouse_y(ev));
         break;
     case CACA_EVENT_MOUSE_PRESS:
-        cucul_printf(cv, x, y, "CACA_EVENT_MOUSE_PRESS %u",
+        caca_printf(cv, x, y, "CACA_EVENT_MOUSE_PRESS %u",
                      caca_get_event_mouse_button(ev));
         break;
     case CACA_EVENT_MOUSE_RELEASE:
-        cucul_printf(cv, x, y, "CACA_EVENT_MOUSE_RELEASE %u",
+        caca_printf(cv, x, y, "CACA_EVENT_MOUSE_RELEASE %u",
                      caca_get_event_mouse_button(ev));
         break;
     case CACA_EVENT_RESIZE:
-        cucul_printf(cv, x, y, "CACA_EVENT_RESIZE %u %u",
+        caca_printf(cv, x, y, "CACA_EVENT_RESIZE %u %u",
                      caca_get_event_resize_width(ev),
                      caca_get_event_resize_height(ev));
         break;
     case CACA_EVENT_QUIT:
-        cucul_printf(cv, x, y, "CACA_EVENT_QUIT");
+        caca_printf(cv, x, y, "CACA_EVENT_QUIT");
         break;
     default:
-        cucul_printf(cv, x, y, "CACA_EVENT_UNKNOWN");
+        caca_printf(cv, x, y, "CACA_EVENT_UNKNOWN");
     }
 }