Changeset 2979 for cacamoo/trunkTweet

Timestamp:

Oct 18, 2008, 11:24:58 PM (13 years ago)

Author:

Sam Hocevar

Message:

Port cacamoo to the unified libcaca 0.99.beta15 API.

Location:

cacamoo/trunk

Files:

• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/cacamoo.h (modified) (3 diffs)
• src/main.c (modified) (5 diffs)

cacamoo/trunk/configure.ac

@@ -36 +36 @@
 
 CACA="no"
-PKG_CHECK_MODULES(CUCUL, cucul,
+PKG_CHECK_MODULES(CACA, caca >= 0.99.beta15,
  [CACA="yes"],
  [AC_MSG_RESULT(no)
-  AC_MSG_ERROR([you need libcucul version 0.99 or later])])
+  AC_MSG_ERROR([you need libcaca version 0.99.beta15 or later])])
 
 # Optimizations

cacamoo/trunk/src/Makefile.am

@@ -3 +3 @@
 
 cacamoo_SOURCES = main.c cacamoo.h
-cacamoo_CFLAGS = @CUCUL_CFLAGS@
-cacamoo_LDADD = @CUCUL_LIBS@
+cacamoo_CFLAGS = @CACA_CFLAGS@
+cacamoo_LDADD = @CACA_LIBS@
 

cacamoo/trunk/src/cacamoo.h

@@ -13 +13 @@
  */
 
-#ifndef _CACASAY_H_
-#define _CACASAY_H_
+#ifndef _CACAMOO_H_
+#define _CACAMOO_H_
 
 #include <stdio.h>
@@ -24 +24 @@
 
 
-#include <cucul.h>
+#include <caca.h>
 
 static void version(void);
@@ -39 +39 @@
 #endif
 
-#endif /* _CACASAY_H_ */
+#endif /* _CACAMOO_H_ */

cacamoo/trunk/src/main.c

@@ -27 +27 @@
 
 #include "cacamoo.h"
-#include <cucul.h>
+#include <caca.h>
 
 char const *cacamoo_export = "utf8";
@@ -73 +73 @@
     char *initial = NULL;
     unsigned int no_wrap = 0;
-    cucul_buffer_t* input_buffer;
-    cucul_buffer_t* output_buffer;
-    cucul_canvas_t* canvas;
-    int buf_size;
+    caca_canvas_t* canvas;
+    size_t buf_size;
     char *buf_data;
 
@@ -251 +249 @@
     }
 
-
     /* Import our buffer as an ansi (color) one */
-    input_buffer = cucul_load_memory(buffer, buffer_size-1);
-    if(input_buffer == NULL)
-    {
-        printf("Can't load file in libcucul !\n");
+    canvas = caca_create_canvas(0, 0);
+    if(caca_import_memory(canvas, buffer, buffer_size - 1,
+                          unicode ? "utf8" : "ansi") < 0)
+    {
+        printf("Can't load file in libcaca !\n");
         return -1;
     }
-    canvas = cucul_import_canvas (input_buffer, unicode?"utf8":"ansi");
-    if(canvas == NULL)
-    {
-        printf("Can't load file in libcucul !\n");
-        return -1;
-    }
+
     /* Export given canvas to format we want */
-    output_buffer = cucul_export_canvas(canvas, "utf8");
-    if(output_buffer == NULL)
+    buf_data = caca_export_memory(canvas, "utf8", &buf_size);
+    if(buf_data == NULL)
     {
         printf("Can't export file to text !\n");
@@ -273 +266 @@
     }
 
-    buf_size = cucul_get_buffer_size(output_buffer);
-    buf_data = cucul_get_buffer_data(output_buffer);
-
-    for(i = 0; i < buf_size; i++)
-        printf("%c", buf_data[i]);
+    fwrite(buf_data, buf_size, 1, stdout);
 
     if(string)
@@ -284 +273 @@
         free(buffer);
 
-    cucul_free_buffer(input_buffer);
-    cucul_free_buffer(output_buffer);
-    cucul_free_canvas(canvas);
-
+    free(buf_data);
+    caca_free_canvas(canvas);
 
     return 0;