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

Timestamp:

Sep 27, 2008, 3:12:46 PM (11 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/frame.c (copied) (copied from libcaca/trunk/cucul/frame.c) (15 diffs)

libcaca/trunk/caca/frame.c

@@ -1 +1 @@
 /*
- *  libcucul      Canvas for ultrafast compositing of Unicode letters
+ *  libcaca       Colour ASCII-Art library
  *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
@@ -25 +25 @@
 #endif
 
-#include "cucul.h"
-#include "cucul_internals.h"
+#include "caca.h"
+#include "caca_internals.h"
 
 /** \brief Get the number of frames in a canvas.
@@ -34 +34 @@
  *  This function never fails.
  *
- *  \param cv A libcucul canvas
+ *  \param cv A libcaca canvas
  *  \return The frame count
  */
-int cucul_get_frame_count(cucul_canvas_t const *cv)
+int caca_get_frame_count(caca_canvas_t const *cv)
 {
     return cv->framecount;
@@ -46 +46 @@
  *  Set the active canvas frame. All subsequent drawing operations will
  *  be performed on that frame. The current painting context set by
- *  cucul_set_attr() is inherited.
+ *  caca_set_attr() is inherited.
  *
  *  If the frame index is outside the canvas' frame range, nothing happens.
@@ -53 +53 @@
  *  - \c EINVAL Requested frame is out of range.
  *
- *  \param cv A libcucul canvas
+ *  \param cv A libcaca canvas
  *  \param id The canvas frame to activate
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_frame(cucul_canvas_t *cv, int id)
+int caca_set_frame(caca_canvas_t *cv, int id)
 {
     if(id < 0 || id >= cv->framecount)
@@ -65 +65 @@
     }
 
-    _cucul_save_frame_info(cv);
+    _caca_save_frame_info(cv);
     cv->frame = id;
-    _cucul_load_frame_info(cv);
+    _caca_load_frame_info(cv);
 
     return 0;
@@ -75 +75 @@
  *
  *  Return the current frame's name. The returned string is valid until
- *  the frame is deleted or cucul_set_frame_name() is called to change
+ *  the frame is deleted or caca_set_frame_name() is called to change
  *  the frame name again.
  *
  *  This function never fails.
  *
- *  \param cv A libcucul canvas.
+ *  \param cv A libcaca canvas.
  *  \return The current frame's name.
  */
-char const *cucul_get_frame_name(cucul_canvas_t const *cv)
+char const *caca_get_frame_name(caca_canvas_t const *cv)
 {
     return cv->frames[cv->frame].name;
@@ -97 +97 @@
  *  - \c ENOMEM Not enough memory to allocate new frame.
  *
- *  \param cv A libcucul canvas.
+ *  \param cv A libcaca canvas.
  *  \param name The name to give to the current frame.
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_set_frame_name(cucul_canvas_t *cv, char const *name)
+int caca_set_frame_name(caca_canvas_t *cv, char const *name)
 {
     char *newname = strdup(name);
@@ -134 +134 @@
  *  - \c ENOMEM Not enough memory to allocate new frame.
  *
- *  \param cv A libcucul canvas
+ *  \param cv A libcaca canvas
  *  \param id The index where to insert the new frame
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_create_frame(cucul_canvas_t *cv, int id)
+int caca_create_frame(caca_canvas_t *cv, int id)
 {
     int size = cv->width * cv->height;
@@ -150 +150 @@
     cv->framecount++;
     cv->frames = realloc(cv->frames,
-                         sizeof(struct cucul_frame) * cv->framecount);
+                         sizeof(struct caca_frame) * cv->framecount);
 
     for(f = cv->framecount - 1; f > id; f--)
@@ -194 +194 @@
  *    last frame of the canvas.
  *
- *  \param cv A libcucul canvas
+ *  \param cv A libcaca canvas
  *  \param id The index of the frame to delete
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_free_frame(cucul_canvas_t *cv, int id)
+int caca_free_frame(caca_canvas_t *cv, int id)
 {
     int f;
@@ -223 +223 @@
     cv->framecount--;
     cv->frames = realloc(cv->frames,
-                         sizeof(struct cucul_frame) * cv->framecount);
+                         sizeof(struct caca_frame) * cv->framecount);
 
     if(cv->frame > id)
@@ -230 +230 @@
     {
         cv->frame = 0;
-        _cucul_load_frame_info(cv);
+        _caca_load_frame_info(cv);
     }
 
@@ -240 +240 @@
  */
 
-void _cucul_save_frame_info(cucul_canvas_t *cv)
+void _caca_save_frame_info(caca_canvas_t *cv)
 {
     cv->frames[cv->frame].width = cv->width;
@@ -248 +248 @@
 }
 
-void _cucul_load_frame_info(cucul_canvas_t *cv)
+void _caca_load_frame_info(caca_canvas_t *cv)
 {
     cv->width = cv->frames[cv->frame].width;