Changeset 2821 for libcaca/trunk/caca/caca0.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (14 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/caca/caca0.c (modified) (12 diffs)

libcaca/trunk/caca/caca0.c

@@ -28 +28 @@
 
 /* These variables are needed to emulate old non-thread safe behaviour */
-cucul_canvas_t *__caca0_cv = NULL;
+caca_canvas_t *__caca0_cv = NULL;
 caca_display_t *__caca0_dp = NULL;
-unsigned char __caca0_fg = CUCUL_LIGHTGRAY;
-unsigned char __caca0_bg = CUCUL_BLACK;
+unsigned char __caca0_fg = CACA_LIGHTGRAY;
+unsigned char __caca0_bg = CACA_BLACK;
 char __caca0_utf8[2] = " ";
 
@@ -42 +42 @@
 void __caca0_set_feature(int);
 char const *__caca0_get_feature_name(int);
-cucul_canvas_t *__caca0_load_sprite(char const *);
-cucul_dither_t *__caca0_create_bitmap(unsigned int, unsigned int,
+caca_canvas_t *__caca0_load_sprite(char const *);
+caca_dither_t *__caca0_create_bitmap(unsigned int, unsigned int,
           unsigned int, unsigned int, unsigned long int, unsigned long int,
           unsigned long int, unsigned long int);
-void __caca0_free_bitmap(cucul_dither_t *);
+void __caca0_free_bitmap(caca_dither_t *);
 extern char const *__caca0_get_color_name(unsigned char);
 
@@ -52 +52 @@
 int __caca0_init(void)
 {
-    __caca0_cv = cucul_create_canvas(0, 0);
+    __caca0_cv = caca_create_canvas(0, 0);
     if(!__caca0_cv)
         return -1;
@@ -58 +58 @@
     if(!__caca0_dp)
     {
-        cucul_free_canvas(__caca0_cv);
+        caca_free_canvas(__caca0_cv);
         __caca0_cv = NULL;
         return -1;
     }
-    __caca0_fg = CUCUL_LIGHTGRAY;
-    __caca0_bg = CUCUL_BLACK;
+    __caca0_fg = CACA_LIGHTGRAY;
+    __caca0_bg = CACA_BLACK;
     return 0;
 }
@@ -71 +71 @@
     caca_free_display(__caca0_dp);
     __caca0_dp = NULL;
-    cucul_free_canvas(__caca0_cv);
+    caca_free_canvas(__caca0_cv);
     __caca0_cv = NULL;
 }
@@ -145 +145 @@
 };
 
-static cucul_dither_t **bitmaps = NULL;
+static caca_dither_t **bitmaps = NULL;
 static unsigned int nbitmaps = 0;
 
@@ -173 +173 @@
             background = feature;
             for(i = 0; i < nbitmaps; i++)
-                cucul_set_dither_color(bitmaps[i], features[feature]);
+                caca_set_dither_color(bitmaps[i], features[feature]);
             break;
 
@@ -180 +180 @@
             antialiasing = feature;
             for(i = 0; i < nbitmaps; i++)
-                cucul_set_dither_antialias(bitmaps[i], features[feature]);
+                caca_set_dither_antialias(bitmaps[i], features[feature]);
             break;
 
@@ -187 +187 @@
             dithering = feature;
             for(i = 0; i < nbitmaps; i++)
-                cucul_set_dither_algorithm(bitmaps[i], features[feature]);
+                caca_set_dither_algorithm(bitmaps[i], features[feature]);
             break;
     }
@@ -212 +212 @@
 }
 
-cucul_canvas_t *__caca0_load_sprite(char const *file)
-{
-    cucul_canvas_t *cv;
-
-    cv = cucul_create_canvas(0, 0);;
-    if(cucul_import_file(cv, file, "") < 0)
-    {
-        cucul_free_canvas(cv);
+caca_canvas_t *__caca0_load_sprite(char const *file)
+{
+    caca_canvas_t *cv;
+
+    cv = caca_create_canvas(0, 0);;
+    if(caca_import_file(cv, file, "") < 0)
+    {
+        caca_free_canvas(cv);
         return NULL;
     }
@@ -226 +226 @@
 }
 
-cucul_dither_t *__caca0_create_bitmap(unsigned int bpp, unsigned int w,
+caca_dither_t *__caca0_create_bitmap(unsigned int bpp, unsigned int w,
                                       unsigned int h, unsigned int pitch,
                                       unsigned long int r, unsigned long int g,
                                       unsigned long int b, unsigned long int a)
 {
-    cucul_dither_t *d;
-
-    d = cucul_create_dither(bpp, w, h, pitch, r, g, b, a);
+    caca_dither_t *d;
+
+    d = caca_create_dither(bpp, w, h, pitch, r, g, b, a);
     if(!d)
         return NULL;
 
-    cucul_set_dither_color(d, features[background]);
-    cucul_set_dither_antialias(d, features[antialiasing]);
-    cucul_set_dither_algorithm(d, features[dithering]);
+    caca_set_dither_color(d, features[background]);
+    caca_set_dither_antialias(d, features[antialiasing]);
+    caca_set_dither_algorithm(d, features[dithering]);
 
     /* Store bitmap in our list */
     nbitmaps++;
-    bitmaps = realloc(bitmaps, nbitmaps * (sizeof(cucul_dither_t *)));
+    bitmaps = realloc(bitmaps, nbitmaps * (sizeof(caca_dither_t *)));
     bitmaps[nbitmaps - 1] = d;
 
@@ -249 +249 @@
 }
 
-void __caca0_free_bitmap(cucul_dither_t *d)
+void __caca0_free_bitmap(caca_dither_t *d)
 {
     unsigned int i, found = 0;
 
-    cucul_free_dither(d);
+    caca_free_dither(d);
 
     /* Remove bitmap from our list */