Changeset 2995 for neercs/trunk/src/lock.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/lock.c (modified) (4 diffs)

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