Changeset 2821 for libcaca/trunk/examples/input.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/input.c (modified) (7 diffs)

libcaca/trunk/examples/input.c

@@ -20 +20 @@
 #endif
 
-#include "cucul.h"
 #include "caca.h"
 
@@ -35 +34 @@
 {
     textentry entries[TEXT_ENTRIES];
-    cucul_canvas_t *cv;
+    caca_canvas_t *cv;
     caca_display_t *dp;
     unsigned int i, e = 0, running = 1;
 
-    cv = cucul_create_canvas(0, 0);
+    cv = caca_create_canvas(0, 0);
     if(cv == NULL)
     {
@@ -53 +52 @@
     caca_set_cursor(dp, 1);
 
-    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
-    cucul_put_str(cv, 1, 1, "Text entries - press tab to cycle");
+    caca_set_color_ansi(cv, CACA_WHITE, CACA_BLUE);
+    caca_put_str(cv, 1, 1, "Text entries - press tab to cycle");
 
     for(i = 0; i < TEXT_ENTRIES; i++)
@@ -71 +70 @@
             unsigned int j, start, size;
 
-            cucul_set_color_ansi(cv, CUCUL_BLACK, CUCUL_LIGHTGRAY);
-            cucul_fill_box(cv, 2, 3 * i + 4, 2 + BUFFER_SIZE, 3 * i + 4, ' ');
+            caca_set_color_ansi(cv, CACA_BLACK, CACA_LIGHTGRAY);
+            caca_fill_box(cv, 2, 3 * i + 4, 2 + BUFFER_SIZE, 3 * i + 4, ' ');
 
             start = 0;
@@ -79 +78 @@
             for(j = 0; j < size; j++)
             {
-                cucul_put_char(cv, 2 + j, 3 * i + 4,
+                caca_put_char(cv, 2 + j, 3 * i + 4,
                               entries[i].buffer[start + j]);
             }
@@ -85 +84 @@
 
         /* Put the cursor on the active textentry */
-        cucul_gotoxy(cv, 2 + entries[e].cursor, 3 * e + 4);
+        caca_gotoxy(cv, 2 + entries[e].cursor, 3 * e + 4);
 
         caca_refresh_display(dp);
@@ -150 +149 @@
 
     caca_free_display(dp);
-    cucul_free_canvas(cv);
+    caca_free_canvas(cv);
 
     return 0;