Changeset 2061Tweet

Timestamp:

11/25/07 18:13:08 (5 years ago)

Author:

sam

Message:

• Allow caca_create_display()'s argument to be NULL. It will automatically create a canvas when so.
• Add caca_get_canvas() to retrieve the cucul canvas.

Location:

libcaca/trunk/caca

Files:

• caca.c (modified) (7 diffs)
• caca.h (modified) (1 diff)
• caca_internals.h (modified) (1 diff)

libcaca/trunk/caca/caca.c

@@ -55 +55 @@
  *  then be displayed by the libcaca driver.
  *
+ *  If no cucul 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.
+ *
  *  If an error occurs, NULL is returned and \b errno is set accordingly:
  *  - \c ENOMEM Not enough memory.
@@ -72 +76 @@
     }
 
+    if((dp->autorelease = (cv == NULL)))
+    {
+        cv = cucul_create_canvas(0, 0);
+    }
+
+    dp->cv = cv;
+
     if(cucul_manage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp))
     {
+        if(dp->autorelease)
+            cucul_free_canvas(dp->cv);
         free(dp);
         seterrno(EBUSY);
@@ -79 +92 @@
     }
 
-    dp->cv = cv;
 #if defined(USE_PLUGINS)
     dp->plugin = NULL;
@@ -91 +103 @@
 #endif
         cucul_unmanage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp);
+        if(dp->autorelease)
+            cucul_free_canvas(dp->cv);
         free(dp);
         seterrno(ENODEV);
@@ -103 +117 @@
 #endif
         cucul_unmanage_canvas(cv, (int (*)(void *))caca_can_resize, (void *)dp);
+        if(dp->autorelease)
+            cucul_free_canvas(dp->cv);
         free(dp);
         seterrno(ENODEV);
@@ -145 +161 @@
  *  attached to it afterwards.
  *
+ *  If the cucul canvas was automatically created by caca_create_display(),
+ *  it is automatically destroyed and any handle to it becomes invalid.
+ *
  *  This function never fails.
  *
@@ -158 +177 @@
 #endif
     cucul_unmanage_canvas(dp->cv, (int (*)(void *))caca_can_resize, (void *)dp);
+    if(dp->autorelease)
+        cucul_free_canvas(dp->cv);
     free(dp);
 
     return 0;
+}
+
+/** \brief Get the canvas attached to a caca graphical context.
+ *
+ *  Return a handle on the \e cucul_canvas_t object that was either attached
+ *  or created by caca_create_display().
+ *
+ *  This function never fails.
+ *
+ *  \param dp The libcaca graphical context.
+ *  \return The libcucul canvas.
+ */
+cucul_canvas_t * caca_get_canvas(caca_display_t *dp)
+{
+    return dp->cv;
 }
 

libcaca/trunk/caca/caca.h

@@ -155 +155 @@
 __extern caca_display_t * caca_create_display(cucul_canvas_t *);
 __extern int caca_free_display(caca_display_t *);
+__extern cucul_canvas_t * caca_get_canvas(caca_display_t *);
 __extern int caca_refresh_display(caca_display_t *);
 __extern int caca_set_display_time(caca_display_t *, unsigned int);

libcaca/trunk/caca/caca_internals.h

@@ -109 +109 @@
     /* A link to our cucul canvas */
     cucul_canvas_t *cv;
+    int autorelease;
 
 #if defined(USE_PLUGINS)