Changeset 2995 for neercs/trunk/src/server.cTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

Port neercs to the unified libcaca 0.99.beta15 API.

File:

• neercs/trunk/src/server.c (modified) (6 diffs)

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)