Changeset 2821 for libcaca/trunk/caca/caca.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/caca.c (modified) (11 diffs)

libcaca/trunk/caca/caca.c

@@ -32 +32 @@
 #endif
 
-#include "cucul.h"
 #include "caca.h"
 #include "caca_internals.h"
@@ -49 +48 @@
 #endif
 
-/** \brief Attach a caca graphical context to a cucul canvas.
+/** \brief Attach a caca graphical context to a caca canvas.
  *
  *  Create a graphical context using device-dependent features (ncurses for
  *  terminals, an X11 window, a DOS command window...) that attaches to a
- *  libcucul canvas. Everything that gets drawn in the libcucul canvas can
+ *  libcaca canvas. Everything that gets drawn in the libcaca canvas can
  *  then be displayed by the libcaca driver.
  *
- *  If no cucul canvas is provided, a new one is created. Its handle can be
+ *  If no caca canvas is provided, a new one is created. Its handle can be
  *  retrieved using caca_get_canvas() and it is automatically destroyed when
  *  caca_free_display() is called.
@@ -66 +65 @@
  *  - \c ENODEV Graphical device could not be initialised.
  *
- *  \param cv The cucul canvas or NULL to create a canvas automatically.
+ *  \param cv The caca canvas or NULL to create a canvas automatically.
  *  \return The caca graphical context or NULL if an error occurred.
  */
-caca_display_t * caca_create_display(cucul_canvas_t *cv)
+caca_display_t * caca_create_display(caca_canvas_t *cv)
 {
     return caca_create_display_with_driver(cv, NULL);
 }
 
-/** \brief Attach a specific caca graphical context to a cucul canvas.
+/** \brief Attach a specific caca graphical context to a caca canvas.
  *
  *  Create a graphical context using device-dependent features (ncurses for
  *  terminals, an X11 window, a DOS command window...) that attaches to a
- *  libcucul canvas. Everything that gets drawn in the libcucul canvas can
+ *  libcaca canvas. Everything that gets drawn in the libcaca canvas can
  *  then be displayed by the libcaca driver.
  *
- *  If no cucul canvas is provided, a new one is created. Its handle can be
+ *  If no caca canvas is provided, a new one is created. Its handle can be
  *  retrieved using caca_get_canvas() and it is automatically destroyed when
  *  caca_free_display() is called.
@@ -94 +93 @@
  *  - \c ENODEV Graphical device could not be initialised.
  *
- *  \param cv The cucul canvas or NULL to create a canvas automatically.
+ *  \param cv The caca canvas or NULL to create a canvas automatically.
  *  \param driver A string describing the desired output driver or NULL to
  *                choose the best driver automatically.
  *  \return The caca graphical context or NULL if an error occurred.
  */
-caca_display_t * caca_create_display_with_driver(cucul_canvas_t *cv,
+caca_display_t * caca_create_display_with_driver(caca_canvas_t *cv,
                                                  char const *driver)
 {
@@ -112 +111 @@
     if((dp->autorelease = (cv == NULL)))
     {
-        cv = cucul_create_canvas(0, 0);
+        cv = caca_create_canvas(0, 0);
     }
 
     dp->cv = cv;
 
-    if(cucul_manage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp))
+    if(caca_manage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp))
     {
         if(dp->autorelease)
-            cucul_free_canvas(dp->cv);
+            caca_free_canvas(dp->cv);
         free(dp);
         seterrno(EBUSY);
@@ -128 +127 @@
     if(caca_install_driver(dp, driver))
     {
-        cucul_unmanage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp);
+        caca_unmanage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp);
         if(dp->autorelease)
-            cucul_free_canvas(dp->cv);
+            caca_free_canvas(dp->cv);
         free(dp);
         seterrno(ENODEV);
@@ -224 +223 @@
 }
 
-/** \brief Detach a caca graphical context from a cucul backend context.
- *
- *  Detach a graphical context from its cucul backend and destroy it. The
- *  libcucul canvas continues to exist and other graphical contexts can be
+/** \brief Detach a caca graphical context from a caca backend context.
+ *
+ *  Detach a graphical context from its caca backend and destroy it. The
+ *  libcaca canvas continues to exist and other graphical contexts can be
  *  attached to it afterwards.
  *
- *  If the cucul canvas was automatically created by caca_create_display(),
+ *  If the caca canvas was automatically created by caca_create_display(),
  *  it is automatically destroyed and any handle to it becomes invalid.
  *
@@ -241 +240 @@
 {
     caca_uninstall_driver(dp);
-    cucul_unmanage_canvas(dp->cv, (int (*)(void *))caca_can_resize, (void *)dp);
+    caca_unmanage_canvas(dp->cv, (int (*)(void *))caca_can_resize, (void *)dp);
     if(dp->autorelease)
-        cucul_free_canvas(dp->cv);
+        caca_free_canvas(dp->cv);
     free(dp);
 
@@ -251 +250 @@
 /** \brief Get the canvas attached to a caca graphical context.
  *
- *  Return a handle on the \e cucul_canvas_t object that was either attached
+ *  Return a handle on the \e caca_canvas_t object that was either attached
  *  or created by caca_create_display().
  *
@@ -257 +256 @@
  *
  *  \param dp The libcaca graphical context.
- *  \return The libcucul canvas.
- */
-cucul_canvas_t * caca_get_canvas(caca_display_t *dp)
+ *  \return The libcaca canvas.
+ */
+caca_canvas_t * caca_get_canvas(caca_display_t *dp)
 {
     return dp->cv;
@@ -331 +330 @@
 
     /* Mouse position */
-    dp->mouse.x = cucul_get_canvas_width(dp->cv) / 2;
-    dp->mouse.y = cucul_get_canvas_height(dp->cv) / 2;
+    dp->mouse.x = caca_get_canvas_width(dp->cv) / 2;
+    dp->mouse.y = caca_get_canvas_height(dp->cv) / 2;
 
     /* Resize events */