Changeset 2995Tweet

Timestamp:

Oct 18, 2008, 11:47:35 PM (15 years ago)

Author:

Sam Hocevar

Message:

Port neercs to the unified libcaca 0.99.beta15 API.

Location:

neercs/trunk

Files:

• configure.ac (modified) (1 diff)
• src/attach.c (modified) (1 diff)
• src/effects.c (modified) (13 diffs)
• src/lock.c (modified) (4 diffs)
• src/main.c (modified) (4 diffs)
• src/mygetopt.c (modified) (1 diff)
• src/neercs.h (modified) (2 diffs)
• src/recurrent.c (modified) (1 diff)
• src/screens.c (modified) (14 diffs)
• src/screensaver.c (modified) (6 diffs)
• src/server.c (modified) (6 diffs)
• src/term.c (modified) (16 diffs)
• src/wm.c (modified) (3 diffs)

neercs/trunk/configure.ac

@@ -31 +31 @@
 
 CACA="no"
-PKG_CHECK_MODULES(CACA, caca >= 0.99.beta13,
+PKG_CHECK_MODULES(CACA, caca >= 0.99.beta15,
  [CACA="yes"],
  [AC_MSG_RESULT(no)
-  AC_MSG_ERROR([you need libcaca version 0.99.beta13 or later])])
+  AC_MSG_ERROR([you need libcaca version 0.99.beta15 or later])])
 
 AC_CHECK_HEADERS(stdio.h pty.h sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h sys/wait.h linux/kdev_t.h linux/major.h security/pam_appl.h security/pam_misc.h)

neercs/trunk/src/attach.c

@@ -155 +155 @@
 
     bytes = snprintf(buf, sizeof(buf)-1, "ATTACH %10d%c%10d",
-                     cucul_get_canvas_width(screen_list->cv),
+                     caca_get_canvas_width(screen_list->cv),
                      ' ',
-                     cucul_get_canvas_height(screen_list->cv));
+                     caca_get_canvas_height(screen_list->cv));
     buf[bytes] = '\0';
     debug("Requesting attach: %s", buf);

neercs/trunk/src/effects.c

@@ -19 +19 @@
 #include <stdlib.h>
 #include <string.h>
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 #include <time.h>
@@ -30 +30 @@
 {
     char const * const *fonts;
-    cucul_dither_t *d;
-    cucul_font_t *f;
+    caca_dither_t *d;
+    caca_font_t *f;
     uint8_t *buf;
     int i;
@@ -38 +38 @@
     if(screen_list->count)
     {
-        fonts = cucul_get_font_list();
-        f = cucul_load_font(fonts[0], 0);
-
-        miniw = cucul_get_canvas_width(screen_list->screen[0]->cv)
-            * cucul_get_font_width(f);
-        minih = cucul_get_canvas_height(screen_list->screen[0]->cv)
-            * cucul_get_font_height(f);
+        fonts = caca_get_font_list();
+        f = caca_load_font(fonts[0], 0);
+
+        miniw = caca_get_canvas_width(screen_list->screen[0]->cv)
+            * caca_get_font_width(f);
+        minih = caca_get_canvas_height(screen_list->screen[0]->cv)
+            * caca_get_font_height(f);
         buf = malloc(4 * miniw * minih);
 
@@ -54 +54 @@
         if(*(uint8_t const *)&tmp == 0x12)
 #endif
-            d = cucul_create_dither(32, miniw, minih, 4 * miniw,
+            d = caca_create_dither(32, miniw, minih, 4 * miniw,
                                     0xff0000, 0xff00, 0xff, 0x0);
         else
-            d = cucul_create_dither(32, miniw, minih, 4 * miniw,
+            d = caca_create_dither(32, miniw, minih, 4 * miniw,
                                     0xff00, 0xff0000, 0xff000000, 0x0);
 
         for(i = 0; i < screen_list->count; i++)
         {
-            cucul_render_canvas(screen_list->screen[i]->cv, f, buf,
+            caca_render_canvas(screen_list->screen[i]->cv, f, buf,
                                 miniw, minih, miniw * 4);
-            cucul_dither_bitmap(screen_list->cv, 20 * i,
-                                cucul_get_canvas_height(screen_list->cv) - 6, 19, 6, d, buf);
-            cucul_set_color_ansi(screen_list->cv, CUCUL_WHITE, CUCUL_BLUE);
+            caca_dither_bitmap(screen_list->cv, 20 * i,
+                                caca_get_canvas_height(screen_list->cv) - 6, 19, 6, d, buf);
+            caca_set_color_ansi(screen_list->cv, CACA_WHITE, CACA_BLUE);
 
             if(screen_list->pty == i)
-                cucul_draw_cp437_box(screen_list->cv,20 * i,
-                                     cucul_get_canvas_height(screen_list->cv) - 6, 19, 6);
-            cucul_printf(screen_list->cv, 20 * i,
-                         cucul_get_canvas_height(screen_list->cv) - 6, "(%i)", i+1);
+                caca_draw_cp437_box(screen_list->cv,20 * i,
+                                     caca_get_canvas_height(screen_list->cv) - 6, 19, 6);
+            caca_printf(screen_list->cv, 20 * i,
+                         caca_get_canvas_height(screen_list->cv) - 6, "(%i)", i+1);
         }
 
-        cucul_free_dither(d);
-        cucul_free_font(f);
+        caca_free_dither(d);
+        caca_free_font(f);
 
         free(buf);
@@ -86 +86 @@
 void draw_status(struct screen_list *screen_list)
 {
-    int x = 0, y = cucul_get_canvas_height(screen_list->cv) - 1;
-
-
-    cucul_set_color_ansi(screen_list->cv, CUCUL_BLUE, CUCUL_BLUE);
-    cucul_fill_box(screen_list->cv,
+    int x = 0, y = caca_get_canvas_height(screen_list->cv) - 1;
+
+
+    caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
+    caca_fill_box(screen_list->cv,
                    x, y,
-                   cucul_get_canvas_width(screen_list->cv), 1, '#');
+                   caca_get_canvas_width(screen_list->cv), 1, '#');
 
 /* Hour */
@@ -101 +101 @@
         sprintf(hour, "%02d:%02d", t->tm_hour, t->tm_min);
 
-        cucul_set_color_ansi(screen_list->cv, CUCUL_LIGHTBLUE, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x, y,
+        caca_set_color_ansi(screen_list->cv, CACA_LIGHTBLUE, CACA_BLUE);
+        caca_printf(screen_list->cv, x, y,
                      "[");
 
-        cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x+1, y,
+        caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
+        caca_printf(screen_list->cv, x+1, y,
                      hour);
-        cucul_set_color_ansi(screen_list->cv, CUCUL_LIGHTBLUE, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x + strlen(hour) + 1, y,
+        caca_set_color_ansi(screen_list->cv, CACA_LIGHTBLUE, CACA_BLUE);
+        caca_printf(screen_list->cv, x + strlen(hour) + 1, y,
                      "]");
         x += 7;
@@ -120 +120 @@
         sprintf(text, "%d/%d", screen_list->pty+1, screen_list->count);
         x++;
-        cucul_set_color_ansi(screen_list->cv, CUCUL_LIGHTBLUE, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x, y, "Window:");
-        cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x+8, y, text);
+        caca_set_color_ansi(screen_list->cv, CACA_LIGHTBLUE, CACA_BLUE);
+        caca_printf(screen_list->cv, x, y, "Window:");
+        caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
+        caca_printf(screen_list->cv, x+8, y, text);
         x+= 8+strlen(text);
     }
@@ -150 +150 @@
 
         x++;
-        cucul_set_color_ansi(screen_list->cv, CUCUL_LIGHTBLUE, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x, y, "WM:");
-        cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x+4, y, text);
+        caca_set_color_ansi(screen_list->cv, CACA_LIGHTBLUE, CACA_BLUE);
+        caca_printf(screen_list->cv, x, y, "WM:");
+        caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
+        caca_printf(screen_list->cv, x+4, y, text);
         x+= 4+strlen(text);
     }
@@ -161 +161 @@
         char text[256];
         sprintf(text, "Help: ctrl-a-h");
-        x = cucul_get_canvas_width(screen_list->cv) - strlen(text);
-
-        cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_BLUE);
-        cucul_printf(screen_list->cv, x, y, text);
+        x = caca_get_canvas_width(screen_list->cv) - strlen(text);
+
+        caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
+        caca_printf(screen_list->cv, x, y, text);
     }
 
@@ -174 +174 @@
 {
     int w = 65, h = 20;
-    int x = (cucul_get_canvas_width(screen_list->cv) - w) / 2;
-    int y = (cucul_get_canvas_height(screen_list->cv) - h) / 2;
-
-
-    cucul_set_color_ansi(screen_list->cv, CUCUL_BLUE, CUCUL_BLUE);
-    cucul_fill_box(screen_list->cv,
+    int x = (caca_get_canvas_width(screen_list->cv) - w) / 2;
+    int y = (caca_get_canvas_height(screen_list->cv) - h) / 2;
+
+
+    caca_set_color_ansi(screen_list->cv, CACA_BLUE, CACA_BLUE);
+    caca_fill_box(screen_list->cv,
                    x, y,
                    w, h, '#');
-    cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_BLUE);
-    cucul_draw_cp437_box(screen_list->cv,
+    caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_BLUE);
+    caca_draw_cp437_box(screen_list->cv,
                          x, y,
                          w, h);
@@ -189 +189 @@
     x+=2;
     y++;
-    cucul_printf(screen_list->cv,
-                 (cucul_get_canvas_width(screen_list->cv) - strlen(PACKAGE_STRING)) / 2,
+    caca_printf(screen_list->cv,
+                 (caca_get_canvas_width(screen_list->cv) - strlen(PACKAGE_STRING)) / 2,
                  y-1,
                  PACKAGE_STRING);
-    cucul_printf(screen_list->cv, x, y++, "Copyright (c) 2006-2008 ");
-    cucul_printf(screen_list->cv, x, y++, "              Sam Hocevar <sam@zoy.org>");
-    cucul_printf(screen_list->cv, x, y++, "              Jean-Yves Lamoureux <jylam@lnxscene.org>");
-    cucul_printf(screen_list->cv, x, y++, "              Pascal Terjan <pterjan@linuxfr.org>");
-    cucul_printf(screen_list->cv, x, y++, "");
-    cucul_printf(screen_list->cv, x, y++, "");
-    cucul_printf(screen_list->cv, x, y++, "All shortcuts are in format 'ctrl-a-X' where X is :");
-    cucul_printf(screen_list->cv, x, y++, "n:\t Next window");
-    cucul_printf(screen_list->cv, x, y++, "p:\t Previous window");
-    cucul_printf(screen_list->cv, x, y++, "w:\t Switch window manager");
-    cucul_printf(screen_list->cv, x, y++, "c:\t Create new window");
-    cucul_printf(screen_list->cv, x, y++, "m:\t Thumbnails");
-    cucul_printf(screen_list->cv, x, y++, "d:\t Detach");
-    cucul_printf(screen_list->cv, x, y++, "k:\t Close window and kill associated process");
-    cucul_printf(screen_list->cv, x, y++, "h:\t This help");
-    cucul_printf(screen_list->cv, x, y++, "");
-    cucul_printf(screen_list->cv, x, y++, "");
-    cucul_printf(screen_list->cv, x, y++, "See http://libcaca.zoy.org/wiki/neercs for more informations");
+    caca_printf(screen_list->cv, x, y++, "Copyright (c) 2006-2008 ");
+    caca_printf(screen_list->cv, x, y++, "              Sam Hocevar <sam@zoy.org>");
+    caca_printf(screen_list->cv, x, y++, "              Jean-Yves Lamoureux <jylam@lnxscene.org>");
+    caca_printf(screen_list->cv, x, y++, "              Pascal Terjan <pterjan@linuxfr.org>");
+    caca_printf(screen_list->cv, x, y++, "");
+    caca_printf(screen_list->cv, x, y++, "");
+    caca_printf(screen_list->cv, x, y++, "All shortcuts are in format 'ctrl-a-X' where X is :");
+    caca_printf(screen_list->cv, x, y++, "n:\t Next window");
+    caca_printf(screen_list->cv, x, y++, "p:\t Previous window");
+    caca_printf(screen_list->cv, x, y++, "w:\t Switch window manager");
+    caca_printf(screen_list->cv, x, y++, "c:\t Create new window");
+    caca_printf(screen_list->cv, x, y++, "m:\t Thumbnails");
+    caca_printf(screen_list->cv, x, y++, "d:\t Detach");
+    caca_printf(screen_list->cv, x, y++, "k:\t Close window and kill associated process");
+    caca_printf(screen_list->cv, x, y++, "h:\t This help");
+    caca_printf(screen_list->cv, x, y++, "");
+    caca_printf(screen_list->cv, x, y++, "");
+    caca_printf(screen_list->cv, x, y++, "See http://libcaca.zoy.org/wiki/neercs for more informations");
 }
 
@@ -245 +245 @@
 {
     int i;
-    int w = (cucul_get_canvas_width(screen_list->cv));
-    int h = (cucul_get_canvas_height(screen_list->cv));
+    int w = (caca_get_canvas_width(screen_list->cv));
+    int h = (caca_get_canvas_height(screen_list->cv));
 
     debug("Drawing list\n");
-    cucul_set_color_ansi(screen_list->cv, CUCUL_BLACK, CUCUL_BLACK);
-    cucul_fill_box(screen_list->cv,
+    caca_set_color_ansi(screen_list->cv, CACA_BLACK, CACA_BLACK);
+    caca_fill_box(screen_list->cv,
                    0, 0,
                    w, h, '#');
-    cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_DEFAULT);
-    cucul_draw_cp437_box(screen_list->cv,
+    caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_DEFAULT);
+    caca_draw_cp437_box(screen_list->cv,
                          0, 0,
                          w, h);
 
-    cucul_printf(screen_list->cv, 2, 1, "Num \tName");
+    caca_printf(screen_list->cv, 2, 1, "Num \tName");
     for(i = 0; i < screen_list->count; i++)
     {
         char line[1024];
         if(screen_list->cur_in_list == i)
-            cucul_set_color_ansi(screen_list->cv, CUCUL_BLACK, CUCUL_WHITE);
+            caca_set_color_ansi(screen_list->cv, CACA_BLACK, CACA_WHITE);
         else
-            cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_DEFAULT);
+            caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_DEFAULT);
         sprintf(line, "%d \t%s", i+1, screen_list->screen[i]->title);
 
-        cucul_printf(screen_list->cv, 2, i+3, line);
+        caca_printf(screen_list->cv, 2, i+3, line);
     }
 }
@@ -292 +292 @@
     {
         float r = 1 - ((DELAY - (DELAY - delta)) / DELAY);
-        cucul_canvas_t *old, *new;
+        caca_canvas_t *old, *new;
         struct screen *s = screen_list->screen[screen_list->pty];
         int w = s->orig_w * r;
         int h = s->orig_h * r;
 
-        /* libcucul canvas resize function is bugged, do it by hand  */
+        /* libcaca canvas resize function is bugged, do it by hand  */
         old = s->cv;
-        new = cucul_create_canvas(w, h);
-        cucul_blit(new, 0, 0, old, NULL);
+        new = caca_create_canvas(w, h);
+        caca_blit(new, 0, 0, old, NULL);
         s->cv = new;
-        cucul_free_canvas(old);
+        caca_free_canvas(old);
         set_tty_size(s->fd, w, h);
 

neercs/trunk/src/lock.c

@@ -19 +19 @@
 #include <stdlib.h>
 #include <string.h>
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 #include <time.h>
@@ -93 +93 @@
     unsigned int i;
     char buffer[1024];
-    cucul_canvas_t *cv = screen_list->cv;
+    caca_canvas_t *cv = screen_list->cv;
 
     gethostname(buffer, sizeof(buffer)-1);
 
     int w = 65, h = 20;
-    int x = (cucul_get_canvas_width(cv) - w) / 2;
-    int y = (cucul_get_canvas_height(cv) - h) / 2;
-
-
-    cucul_set_color_ansi(cv, CUCUL_BLUE, CUCUL_BLUE);
-    cucul_fill_box(cv,
+    int x = (caca_get_canvas_width(cv) - w) / 2;
+    int y = (caca_get_canvas_height(cv) - h) / 2;
+
+
+    caca_set_color_ansi(cv, CACA_BLUE, CACA_BLUE);
+    caca_fill_box(cv,
                    x, y,
                    w, h, '#');
-    cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_BLUE);
-    cucul_draw_cp437_box(cv,
+    caca_set_color_ansi(cv, CACA_DEFAULT, CACA_BLUE);
+    caca_draw_cp437_box(cv,
                          x, y,
                          w, h);
@@ -113 +113 @@
     x+=2;
     y++;
-    cucul_printf(cv,
-                 (cucul_get_canvas_width(cv) - strlen(PACKAGE_STRING " locked")) / 2,
+    caca_printf(cv,
+                 (caca_get_canvas_width(cv) - strlen(PACKAGE_STRING " locked")) / 2,
                  y-1,
                  PACKAGE_STRING " locked");
 
-    cucul_printf(cv, x, y++, "Please type in your password for %s@%s :", getenv("USER"), buffer);
+    caca_printf(cv, x, y++, "Please type in your password for %s@%s :", getenv("USER"), buffer);
     y+=2;
 
-    x = (cucul_get_canvas_width(cv)/2) - ((strlen(screen_list->lockpass) / 2) + strlen("Password : "));
-    cucul_printf(cv, x, y, "Password : ");
+    x = (caca_get_canvas_width(cv)/2) - ((strlen(screen_list->lockpass) / 2) + strlen("Password : "));
+    caca_printf(cv, x, y, "Password : ");
     x+=strlen("Password : ");
     for(i=0; i<strlen(screen_list->lockpass); i++)
     {
-        cucul_put_str(cv, x, y, "*");
+        caca_put_str(cv, x, y, "*");
         x++;
     }
@@ -133 +133 @@
     if(strlen(screen_list->lockmsg))
     {
-        x = ((cucul_get_canvas_width(cv) - w) / 2) + (strlen(screen_list->lockmsg));
+        x = ((caca_get_canvas_width(cv) - w) / 2) + (strlen(screen_list->lockmsg));
         y+=2;
-        cucul_set_color_ansi(cv, CUCUL_RED, CUCUL_BLUE);
-        cucul_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
+        caca_set_color_ansi(cv, CACA_RED, CACA_BLUE);
+        caca_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
     }
 #endif

neercs/trunk/src/main.c

@@ -43 +43 @@
 #endif
 #include <errno.h>
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 
@@ -136 +136 @@
             {
                 /* Create main canvas and associated caca window */
-                screen_list->cv = cucul_create_canvas(0, 0);
+                screen_list->cv = caca_create_canvas(0, 0);
                 screen_list->dp = caca_create_display(screen_list->cv);
                 if(!screen_list->dp)
@@ -218 +218 @@
             else if(!strncmp("REFRESH ", buf, 8))
             {
-                cucul_import_memory(screen_list->cv, buf+8, n-8, "caca");
+                caca_import_memory(screen_list->cv, buf+8, n-8, "caca");
                 caca_refresh_display(screen_list->dp);
             }
@@ -259 +259 @@
 
         if(screen_list->cv)
-            cucul_free_canvas(screen_list->cv);
+            caca_free_canvas(screen_list->cv);
 
         for(i = 0; i < screen_list->count; i++)

neercs/trunk/src/mygetopt.c

@@ -24 +24 @@
 #include <string.h>
 
-#include "cucul_types.h"
+#include "caca_types.h"
 
 #include "mygetopt.h"

neercs/trunk/src/neercs.h

@@ -114 +114 @@
     /* Graphics stuff */
     int init;
-    cucul_canvas_t *cv;
+    caca_canvas_t *cv;
     uint32_t clearattr;
     uint8_t fg, bg;   /* ANSI-context fg/bg */
@@ -193 +193 @@
     int attach, forceattach;
 
-    cucul_canvas_t *cv;
+    caca_canvas_t *cv;
     caca_display_t *dp;
 };

neercs/trunk/src/recurrent.c

@@ -25 +25 @@
 #include <unistd.h>
 
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 

neercs/trunk/src/screens.c

@@ -25 +25 @@
 #include <unistd.h>
 
-#include <cucul.h>
 #include <caca.h>
+#include <caca.h>
 
 #include "neercs.h"
@@ -34 +34 @@
     struct screen *s = (struct screen*) malloc(sizeof(struct screen));
 
-    s->cv = cucul_create_canvas(w, h);
-    cucul_set_color_ansi(s->cv, CUCUL_BLACK, CUCUL_BLACK);
-    cucul_clear_canvas(s->cv);
+    s->cv = caca_create_canvas(w, h);
+    caca_set_color_ansi(s->cv, CACA_BLACK, CACA_BLACK);
+    caca_clear_canvas(s->cv);
     s->init = 0;
 
@@ -51 +51 @@
     if(s->fd < 0)
     {
-        cucul_free_canvas(s->cv);
+        caca_free_canvas(s->cv);
         free(s);
         return NULL;
@@ -62 +62 @@
     struct screen *s = (struct screen*) malloc(sizeof(struct screen));
 
-    s->cv = cucul_create_canvas(w, h);
-    cucul_set_color_ansi(s->cv, CUCUL_BLACK, CUCUL_BLACK);
-    cucul_clear_canvas(s->cv);
+    s->cv = caca_create_canvas(w, h);
+    caca_set_color_ansi(s->cv, CACA_BLACK, CACA_BLACK);
+    caca_clear_canvas(s->cv);
     s->init = 0;
 
@@ -85 +85 @@
     if(s->fd < 0)
     {
-        cucul_free_canvas(s->cv);
+        caca_free_canvas(s->cv);
         free(s);
         return NULL;
@@ -102 +102 @@
     s->buf = NULL;
     if(s->cv)
-        cucul_free_canvas(s->cv);
+        caca_free_canvas(s->cv);
     s->cv = NULL;
     free(s);
@@ -182 +182 @@
     debug("Current pty is %d\n", screen_list->pty);
 
-    screen_list->width  = cucul_get_canvas_width(screen_list->cv);
-    screen_list->height = cucul_get_canvas_height(screen_list->cv) - (screen_list->mini*6);
+    screen_list->width  = caca_get_canvas_width(screen_list->cv);
+    screen_list->height = caca_get_canvas_height(screen_list->cv) - (screen_list->mini*6);
 
     if(!screen_list->dont_update_coords)
         update_windows_props(screen_list);
 
-    cucul_set_color_ansi(screen_list->cv, CUCUL_DEFAULT, CUCUL_DEFAULT);
-    cucul_clear_canvas(screen_list->cv);
-    cucul_set_color_ansi(screen_list->cv, CUCUL_LIGHTRED, CUCUL_BLACK);
+    caca_set_color_ansi(screen_list->cv, CACA_DEFAULT, CACA_DEFAULT);
+    caca_clear_canvas(screen_list->cv);
+    caca_set_color_ansi(screen_list->cv, CACA_LIGHTRED, CACA_BLACK);
 
     for(i = screen_list->count - 1; i >=0; i--)
@@ -196 +196 @@
         if(i!=screen_list->pty && screen_list->screen[i]->visible)
         {
-            cucul_blit(screen_list->cv,
+            caca_blit(screen_list->cv,
                        screen_list->screen[i]->x,
                        screen_list->screen[i]->y,
                        screen_list->screen[i]->cv, NULL);
 
-            cucul_draw_cp437_box(screen_list->cv,
+            caca_draw_cp437_box(screen_list->cv,
                                  screen_list->screen[i]->x - 1,
                                  screen_list->screen[i]->y - 1,
@@ -207 +207 @@
                                  screen_list->screen[i]->h + 2);
             if(screen_list->screen[i]->title)
-                cucul_printf(screen_list->cv,
+                caca_printf(screen_list->cv,
                              screen_list->screen[i]->x,
                              screen_list->screen[i]->y - 1,
@@ -216 +216 @@
     }
 
-    cucul_blit(screen_list->cv,
+    caca_blit(screen_list->cv,
                screen_list->screen[screen_list->pty]->x,
                screen_list->screen[screen_list->pty]->y,
@@ -223 +223 @@
     if(screen_list->screen[screen_list->pty]->bell)
     {
-        cucul_set_color_ansi(screen_list->cv, CUCUL_RED, CUCUL_BLACK);
+        caca_set_color_ansi(screen_list->cv, CACA_RED, CACA_BLACK);
         screen_list->screen[screen_list->pty]->bell = 0;
         screen_list->in_bell--;
@@ -229 +229 @@
     else
     {
-        cucul_set_color_ansi(screen_list->cv, CUCUL_LIGHTGREEN, CUCUL_BLACK);
-    }
-
-    cucul_draw_cp437_box(screen_list->cv,
+        caca_set_color_ansi(screen_list->cv, CACA_LIGHTGREEN, CACA_BLACK);
+    }
+
+    caca_draw_cp437_box(screen_list->cv,
                          screen_list->screen[screen_list->pty]->x - 1,
                          screen_list->screen[screen_list->pty]->y - 1,
@@ -240 +240 @@
     if(screen_list->screen[screen_list->pty]->title)
     {
-        cucul_printf(screen_list->cv,
+        caca_printf(screen_list->cv,
                      screen_list->screen[screen_list->pty]->x,
                      screen_list->screen[screen_list->pty]->y - 1,
@@ -248 +248 @@
     }
 
-    cucul_gotoxy(screen_list->cv,
+    caca_gotoxy(screen_list->cv,
                  screen_list->screen[screen_list->pty]->x +
-                 cucul_get_cursor_x(screen_list->screen[screen_list->pty]->cv),
+                 caca_get_cursor_x(screen_list->screen[screen_list->pty]->cv),
                  screen_list->screen[screen_list->pty]->y +
-                 cucul_get_cursor_y(screen_list->screen[screen_list->pty]->cv));
+                 caca_get_cursor_y(screen_list->screen[screen_list->pty]->cv));
 
 

neercs/trunk/src/screensaver.c

@@ -25 +25 @@
 #include <unistd.h>
 
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 
@@ -84 +84 @@
 {
     int x[COUNT], y[COUNT], s[COUNT];
-    cucul_canvas_t **toaster;
+    caca_canvas_t **toaster;
 };
 
@@ -90 +90 @@
 {
     struct flying_toaster *flying_toaster;
-    int w = cucul_get_canvas_width(screen_list->cv);
-    int h = cucul_get_canvas_height(screen_list->cv);
+    int w = caca_get_canvas_width(screen_list->cv);
+    int h = caca_get_canvas_height(screen_list->cv);
     int i;
 
     flying_toaster = malloc(sizeof(struct flying_toaster));
-    flying_toaster->toaster = (cucul_canvas_t **)malloc(sizeof(cucul_canvas_t*)*3);
+    flying_toaster->toaster = (caca_canvas_t **)malloc(sizeof(caca_canvas_t*)*3);
 
 
-    flying_toaster->toaster[0] = cucul_create_canvas(0, 0);
-    flying_toaster->toaster[1] = cucul_create_canvas(0, 0);
-    flying_toaster->toaster[2] = cucul_create_canvas(0, 0);
+    flying_toaster->toaster[0] = caca_create_canvas(0, 0);
+    flying_toaster->toaster[1] = caca_create_canvas(0, 0);
+    flying_toaster->toaster[2] = caca_create_canvas(0, 0);
 
 
-    cucul_import_memory(flying_toaster->toaster[0],
+    caca_import_memory(flying_toaster->toaster[0],
                         toaster1_text,
                         strlen(toaster1_text), "ansi");
-    cucul_import_memory(flying_toaster->toaster[1],
+    caca_import_memory(flying_toaster->toaster[1],
                         toaster2_text,
                         strlen(toaster2_text), "ansi");
-    cucul_import_memory(flying_toaster->toaster[2],
+    caca_import_memory(flying_toaster->toaster[2],
                         toaster3_text,
                         strlen(toaster3_text), "ansi");
@@ -128 +128 @@
     struct flying_toaster *flying_toaster = screen_list->screensaver_data;
 
-    cucul_free_canvas(flying_toaster->toaster[0]);
-    cucul_free_canvas(flying_toaster->toaster[1]);
-    cucul_free_canvas(flying_toaster->toaster[2]);
+    caca_free_canvas(flying_toaster->toaster[0]);
+    caca_free_canvas(flying_toaster->toaster[1]);
+    caca_free_canvas(flying_toaster->toaster[2]);
     free(flying_toaster->toaster);
     free(flying_toaster);
@@ -142 +142 @@
     if(!d) return;
 
-    w = cucul_get_canvas_width(screen_list->cv);
-    h = cucul_get_canvas_height(screen_list->cv);
+    w = caca_get_canvas_width(screen_list->cv);
+    h = caca_get_canvas_height(screen_list->cv);
 
 
-    cucul_set_color_ansi(screen_list->cv, CUCUL_WHITE, CUCUL_BLACK);
-    cucul_clear_canvas(screen_list->cv);
+    caca_set_color_ansi(screen_list->cv, CACA_WHITE, CACA_BLACK);
+    caca_clear_canvas(screen_list->cv);
 
 
@@ -153 +153 @@
     for(i = 0; i < COUNT; i++)
     {
-        cucul_blit(screen_list->cv, d->x[i]/PRECISION, d->y[i]/PRECISION, d->toaster[d->s[i]/PRECISION], NULL);
+        caca_blit(screen_list->cv, d->x[i]/PRECISION, d->y[i]/PRECISION, d->toaster[d->s[i]/PRECISION], NULL);
 
         d->x[i]-=40;
         d->y[i]+=10;
 
-        if((d->x[i]/PRECISION) + cucul_get_canvas_width(d->toaster[d->s[i]/PRECISION])<=0)
+        if((d->x[i]/PRECISION) + caca_get_canvas_width(d->toaster[d->s[i]/PRECISION])<=0)
             d->x[i] = ((rand()%w)+w) * PRECISION;
         if((d->y[i]/PRECISION)>=h)

neercs/trunk/src/server.c

@@ -98 +98 @@
     void *buf;
     char *buf2;
-    buf = cucul_export_memory (screen_list->cv, "caca", &bytes);
+    buf = caca_export_memory (screen_list->cv, "caca", &bytes);
     buf2 = malloc(bytes+8);
     memcpy(buf2, "REFRESH ", 8);
@@ -145 +145 @@
 
     /* Create main canvas */
-    screen_list->cv = cucul_create_canvas(screen_list->width,
+    screen_list->cv = caca_create_canvas(screen_list->width,
                                           screen_list->height
                                           + screen_list->mini*6
@@ -206 +206 @@
             {
                 screen_list->attached = 1;
-                cucul_free_canvas(screen_list->cv);
-                screen_list->cv = cucul_create_canvas(atoi(buf+7), atoi(buf+18));
-                screen_list->width  = cucul_get_canvas_width(screen_list->cv);
-                screen_list->height = cucul_get_canvas_height(screen_list->cv) - ((screen_list->mini*6) + (screen_list->status));
+                caca_free_canvas(screen_list->cv);
+                screen_list->cv = caca_create_canvas(atoi(buf+7), atoi(buf+18));
+                screen_list->width  = caca_get_canvas_width(screen_list->cv);
+                screen_list->height = caca_get_canvas_height(screen_list->cv) - ((screen_list->mini*6) + (screen_list->status));
                 update_windows_props(screen_list);
-                cucul_clear_canvas(screen_list->cv);
+                caca_clear_canvas(screen_list->cv);
                 refresh = 1;
             }
@@ -220 +220 @@
             else if(!strncmp("RESIZE ", buf, 7))
             {
-                cucul_free_canvas(screen_list->cv);
-                screen_list->cv = cucul_create_canvas(atoi(buf+7), atoi(buf+18));
-                screen_list->width  = cucul_get_canvas_width(screen_list->cv);
-                screen_list->height = cucul_get_canvas_height(screen_list->cv) - ((screen_list->mini*6) + (screen_list->status));
+                caca_free_canvas(screen_list->cv);
+                screen_list->cv = caca_create_canvas(atoi(buf+7), atoi(buf+18));
+                screen_list->width  = caca_get_canvas_width(screen_list->cv);
+                screen_list->height = caca_get_canvas_height(screen_list->cv) - ((screen_list->mini*6) + (screen_list->status));
                 update_windows_props(screen_list);
-                cucul_clear_canvas(screen_list->cv);
+                caca_clear_canvas(screen_list->cv);
                 refresh = 1;
             }
@@ -370 +370 @@
 
     /* Clean up */
-    cucul_free_canvas(screen_list->cv);
+    caca_free_canvas(screen_list->cv);
 
     for(i = 0; i < screen_list->count; i++)
@@ -461 +461 @@
 
     /* Create main canvas and associated caca window */
-    screen_list->cv = cucul_create_canvas(0, 0);
+    screen_list->cv = caca_create_canvas(0, 0);
     screen_list->dp = caca_create_display(screen_list->cv);
     if(!screen_list->dp)

neercs/trunk/src/term.c

@@ -27 +27 @@
 #include <fcntl.h>
 
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 
@@ -96 +96 @@
     int x = 0, y = 0, save_x = 0, save_y = 0;
 
-    width = cucul_get_canvas_width(sc->cv);
-    height = cucul_get_canvas_height(sc->cv);
-    x = cucul_get_cursor_x(sc->cv);
-    y = cucul_get_cursor_y(sc->cv);
+    width = caca_get_canvas_width(sc->cv);
+    height = caca_get_canvas_height(sc->cv);
+    x = caca_get_cursor_x(sc->cv);
+    y = caca_get_cursor_y(sc->cv);
 
     if(!sc->init)
     {
-        sc->dfg = CUCUL_DEFAULT;
-        sc->dbg = CUCUL_DEFAULT;
-
-        cucul_set_color_ansi(sc->cv, sc->dfg, sc->dbg);
-        sc->clearattr = cucul_get_attr(sc->cv, -1, -1);
+        sc->dfg = CACA_DEFAULT;
+        sc->dbg = CACA_DEFAULT;
+
+        caca_set_color_ansi(sc->cv, sc->dfg, sc->dbg);
+        sc->clearattr = caca_get_attr(sc->cv, -1, -1);
 
         ansi_parse_grcm(sc, 1, &dummy);
@@ -204 +204 @@
         else if(buffer[i] == '\x1b' && buffer[i + 1] == 'c')
         {
-            sc->dfg = CUCUL_DEFAULT;
-            sc->dbg = CUCUL_DEFAULT;
-
-            cucul_set_color_ansi(sc->cv, sc->dfg, sc->dbg);
-            sc->clearattr = cucul_get_attr(sc->cv, -1, -1);
+            sc->dfg = CACA_DEFAULT;
+            sc->dbg = CACA_DEFAULT;
+
+            caca_set_color_ansi(sc->cv, sc->dfg, sc->dbg);
+            sc->clearattr = caca_get_attr(sc->cv, -1, -1);
             ansi_parse_grcm(sc, 1, &dummy);
 
@@ -408 +408 @@
                 break;
             case 'J': /* ED (0x4a) - Erase In Page */
-                savedattr = cucul_get_attr(sc->cv, -1, -1);
-                cucul_set_attr(sc->cv, sc->clearattr);
+                savedattr = caca_get_attr(sc->cv, -1, -1);
+                caca_set_attr(sc->cv, sc->clearattr);
                 if(!argc || argv[0] == 0)
                 {
-                    cucul_draw_line(sc->cv, x, y, width, y, ' ');
-                    cucul_fill_box(sc->cv, 0, y + 1, width - 1, height - 1, ' ');
+                    caca_draw_line(sc->cv, x, y, width, y, ' ');
+                    caca_fill_box(sc->cv, 0, y + 1, width - 1, height - 1, ' ');
                 }
                 else if(argv[0] == 1)
                 {
-                    cucul_fill_box(sc->cv, 0, 0, width - 1, y - 1, ' ');
-                    cucul_draw_line(sc->cv, 0, y, x, y, ' ');
+                    caca_fill_box(sc->cv, 0, 0, width - 1, y - 1, ' ');
+                    caca_draw_line(sc->cv, 0, y, x, y, ' ');
                 }
                 else if(argv[0] == 2)
                 {
                     //x = y = 0;
-                    cucul_fill_box(sc->cv, 0, 0, width, height - 1, ' ');
-                }
-                cucul_set_attr(sc->cv, savedattr);
+                    caca_fill_box(sc->cv, 0, 0, width, height - 1, ' ');
+                }
+                caca_set_attr(sc->cv, savedattr);
                 break;
             case 'K': /* EL (0x4b) - Erase In Line */
                 if(!argc || argv[0] == 0)
-                    cucul_draw_line(sc->cv, x, y, width, y, ' ');
+                    caca_draw_line(sc->cv, x, y, width, y, ' ');
                 else if(argv[0] == 1)
-                    cucul_draw_line(sc->cv, 0, y, x, y, ' ');
+                    caca_draw_line(sc->cv, 0, y, x, y, ' ');
                 else if(argv[0] == 2)
                     if((unsigned int)x < width)
-                        cucul_draw_line(sc->cv, x, y, width - 1, y, ' ');
+                        caca_draw_line(sc->cv, x, y, width - 1, y, ' ');
                 //x = width;
                 break;
@@ -442 +442 @@
                 for(j = 0; (unsigned int)(j + argv[0]) < width; j++)
                 {
-                    cucul_put_char(sc->cv, j, y,
-                                   cucul_get_char(sc->cv, j + argv[0], y));
-                    cucul_put_attr(sc->cv, j, y,
-                                   cucul_get_attr(sc->cv, j + argv[0], y));
+                    caca_put_char(sc->cv, j, y,
+                                   caca_get_char(sc->cv, j + argv[0], y));
+                    caca_put_attr(sc->cv, j, y,
+                                   caca_get_attr(sc->cv, j + argv[0], y));
                 }
 #if 0
-                savedattr = cucul_get_attr(sc->cv, -1, -1);
-                cucul_set_attr(sc->cv, sc->clearattr);
+                savedattr = caca_get_attr(sc->cv, -1, -1);
+                caca_set_attr(sc->cv, sc->clearattr);
                 for( ; (unsigned int)j < width; j++)
-                    cucul_put_char(sc->cv, j, y, ' ');
-                cucul_set_attr(sc->cv, savedattr);
+                    caca_put_char(sc->cv, j, y, ' ');
+                caca_set_attr(sc->cv, savedattr);
 #endif
             case 'X': /* ECH (0x58) - Erase Character */
                 if(argc && argv[0])
                 {
-                    savedattr = cucul_get_attr(sc->cv, -1, -1);
-                    cucul_set_attr(sc->cv, sc->clearattr);
-                    cucul_draw_line(sc->cv, x, y, x + argv[0] - 1, y, ' ');
-                    cucul_set_attr(sc->cv, savedattr);
+                    savedattr = caca_get_attr(sc->cv, -1, -1);
+                    caca_set_attr(sc->cv, sc->clearattr);
+                    caca_draw_line(sc->cv, x, y, x + argv[0] - 1, y, ' ');
+                    caca_set_attr(sc->cv, savedattr);
                 }
             case 'd': /* VPA (0x64) - Line Position Absolute */
@@ -476 +476 @@
                     for(k = 0; k < width; k++)
                     {
-                        cucul_put_char(sc->cv, k, j, cucul_get_char(sc->cv, k, j+1));
-                        cucul_put_attr(sc->cv, k, j, cucul_get_attr(sc->cv, k, j+1));
+                        caca_put_char(sc->cv, k, j, caca_get_char(sc->cv, k, j+1));
+                        caca_put_attr(sc->cv, k, j, caca_get_attr(sc->cv, k, j+1));
                     }
                 }
-                cucul_draw_line(sc->cv, 0, argv[1]-1, width, argv[1]-1, ' ');
+                caca_draw_line(sc->cv, 0, argv[1]-1, width, argv[1]-1, ' ');
                 scrolled = 1;
                 break;
@@ -560 +560 @@
 
             if(i + 6 < size)
-                ch = cucul_utf8_to_utf32((char const *)(buffer + i), &bytes);
+                ch = caca_utf8_to_utf32((char const *)(buffer + i), &bytes);
             else
             {
@@ -567 +567 @@
                 memcpy(tmp, buffer + i, size - i);
                 tmp[size - i] = '\0';
-                ch = cucul_utf8_to_utf32(tmp, &bytes);
+                ch = caca_utf8_to_utf32(tmp, &bytes);
             }
 
@@ -595 +595 @@
             sc->conv_state.ss = 0; /* no single-shift (GL) */
 
-            wch = cucul_utf32_is_fullwidth(ch) ? 2 : 1;
+            wch = caca_utf32_is_fullwidth(ch) ? 2 : 1;
             skip += bytes - 1;
         }
@@ -611 +611 @@
             int lines = (y - height) + 1;
 
-            savedattr = cucul_get_attr(sc->cv, -1, -1);
+            savedattr = caca_get_attr(sc->cv, -1, -1);
 
             for(j = 0; j + lines < height; j++)
@@ -617 +617 @@
                 for(k = 0; k < width; k++)
                 {
-                    cucul_put_char(sc->cv, k, j, cucul_get_char(sc->cv, k, j + lines));
-                    cucul_put_attr(sc->cv, k, j, cucul_get_attr(sc->cv, k, j + lines));
-                }
-            }
-            cucul_set_attr(sc->cv, sc->clearattr);
-            cucul_fill_box(sc->cv, 0, height - lines,
+                    caca_put_char(sc->cv, k, j, caca_get_char(sc->cv, k, j + lines));
+                    caca_put_attr(sc->cv, k, j, caca_get_attr(sc->cv, k, j + lines));
+                }
+            }
+            caca_set_attr(sc->cv, sc->clearattr);
+            caca_fill_box(sc->cv, 0, height - lines,
                                    width - 1, height - 1, ' ');
             y -= lines;
-            cucul_set_attr(sc->cv, savedattr);
+            caca_set_attr(sc->cv, savedattr);
         }
 
@@ -631 +631 @@
         if(wch)
         {
-            cucul_put_char(sc->cv, x, y, ch);
+            caca_put_char(sc->cv, x, y, ch);
             x += wch;
         }
     }
 
-    cucul_gotoxy(sc->cv, x, y);
+    caca_gotoxy(sc->cv, x, y);
 
     return i;
@@ -663 +663 @@
                             unsigned int argc, unsigned int const *argv)
 {
-    static uint8_t const ansi2cucul[] =
-    {
-        CUCUL_BLACK, CUCUL_RED, CUCUL_GREEN, CUCUL_BROWN,
-        CUCUL_BLUE, CUCUL_MAGENTA, CUCUL_CYAN, CUCUL_LIGHTGRAY
+    static uint8_t const ansi2caca[] =
+    {
+        CACA_BLACK, CACA_RED, CACA_GREEN, CACA_BROWN,
+        CACA_BLUE, CACA_MAGENTA, CACA_CYAN, CACA_LIGHTGRAY
     };
 
     unsigned int j;
-    uint8_t efg, ebg; /* Effective (libcucul) fg/bg */
+    uint8_t efg, ebg; /* Effective (libcaca) fg/bg */
 
     for(j = 0; j < argc; j++)
@@ -676 +676 @@
         /* Defined in ECMA-48 8.3.117: SGR - SELECT GRAPHIC RENDITION */
         if(argv[j] >= 30 && argv[j] <= 37)
-            sc->fg = ansi2cucul[argv[j] - 30];
+            sc->fg = ansi2caca[argv[j] - 30];
         else if(argv[j] >= 40 && argv[j] <= 47)
-            sc->bg = ansi2cucul[argv[j] - 40];
+            sc->bg = ansi2caca[argv[j] - 40];
         else if(argv[j] >= 90 && argv[j] <= 97)
-            sc->fg = ansi2cucul[argv[j] - 90] + 8;
+            sc->fg = ansi2caca[argv[j] - 90] + 8;
         else if(argv[j] >= 100 && argv[j] <= 107)
-            sc->bg = ansi2cucul[argv[j] - 100] + 8;
+            sc->bg = ansi2caca[argv[j] - 100] + 8;
         else switch(argv[j])
         {
@@ -773 +773 @@
     if(sc->concealed)
     {
-        efg = ebg = CUCUL_TRANSPARENT;
+        efg = ebg = CACA_TRANSPARENT;
     }
     else
@@ -784 +784 @@
             if(efg < 8)
                 efg += 8;
-            else if(efg == CUCUL_DEFAULT)
-                efg = CUCUL_WHITE;
-        }
-    }
-
-    cucul_set_color_ansi(sc->cv, efg, ebg);
+            else if(efg == CACA_DEFAULT)
+                efg = CACA_WHITE;
+        }
+    }
+
+    caca_set_color_ansi(sc->cv, efg, ebg);
 }
 

neercs/trunk/src/wm.c

@@ -15 +15 @@
 
 #include <stdio.h>
-#include <cucul.h>
+#include <caca.h>
 #include <caca.h>
 #include <stdlib.h>
@@ -24 +24 @@
 void resize_screen(struct screen *s, int w, int h)
 {
-    cucul_canvas_t *old, *new;
+    caca_canvas_t *old, *new;
 
     if(w==s->w && h==s->h) return;
@@ -32 +32 @@
     s->h = h;
 
-    /* cucul_set_canvas_boundaries() is bugged as hell,
+    /* caca_set_canvas_boundaries() is bugged as hell,
      * so let's resize it by hands */
     old = s->cv;
-    new = cucul_create_canvas(w, h);
-    cucul_blit(new, 0, 0, old, NULL);
+    new = caca_create_canvas(w, h);
+    caca_blit(new, 0, 0, old, NULL);
     s->cv = new;
-    cucul_free_canvas(old);
+    caca_free_canvas(old);
     set_tty_size(s->fd, w, h);