Changeset 1390Tweet

Timestamp:

Nov 14, 2006, 12:16:35 AM (14 years ago)

Author:

Sam Hocevar

Message:

• Implemented cucul_get_frame_name() and cucul_set_frame_name().
• Renamed cucul_*_canvas_frame() to cucul_*_frame() because we bloody well know that a frame belongs to a canvas.

Location:

libcaca/trunk

Files:

• cucul/canvas.c (modified) (3 diffs)
• cucul/cucul.c (modified) (4 diffs)
• cucul/cucul.h (modified) (2 diffs)
• cucul/cucul_internals.h (modified) (2 diffs)
• cucul/frame.c (modified) (7 diffs)
• cucul/legacy.c (modified) (1 diff)
• cxx/cucul++.cpp (modified) (1 diff)
• test/all.c (modified) (3 diffs)
• test/frames.c (modified) (3 diffs)

libcaca/trunk/cucul/canvas.c

@@ -473 +473 @@
     new = cucul_create_canvas(w, h);
 
-    framecount = cucul_get_canvas_frame_count(cv);
+    framecount = cucul_get_frame_count(cv);
     saved_f = cv->frame;
 
@@ -479 +479 @@
     {
         if(f)
-            cucul_create_canvas_frame(new, framecount);
-
-        cucul_set_canvas_frame(cv, f);
-        cucul_set_canvas_frame(new, f);
+            cucul_create_frame(new, framecount);
+
+        cucul_set_frame(cv, f);
+        cucul_set_frame(new, f);
         cucul_blit(new, -x, -y, cv, NULL);
 
@@ -493 +493 @@
     free(new);
 
-    cucul_set_canvas_frame(cv, saved_f);
-
-    return 0;
-}
-
+    cucul_set_frame(cv, saved_f);
+
+    return 0;
+}
+

libcaca/trunk/cucul/cucul.c

@@ -59 +59 @@
 
     cv->refcount = 0;
+    cv->autoinc = 0;
 
     cv->frame = 0;
@@ -75 +76 @@
     cv->frames[0].handlex = cv->frames[0].handley = 0;
     cv->frames[0].curattr = 0;
+    cv->frames[0].name = strdup("frame#00000000");
 
     _cucul_load_frame_info(cv);
@@ -82 +84 @@
     {
         int saved_errno = geterrno();
+        free(cv->frames[0].name);
         free(cv->frames);
         free(cv);
@@ -186 +189 @@
         free(cv->frames[f].chars);
         free(cv->frames[f].attrs);
+        free(cv->frames[f].name);
     }
 

libcaca/trunk/cucul/cucul.h

@@ -181 +181 @@
  *
  *  @{ */
-unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *);
-int cucul_set_canvas_frame(cucul_canvas_t *, unsigned int);
-int cucul_create_canvas_frame(cucul_canvas_t *, unsigned int);
-int cucul_free_canvas_frame(cucul_canvas_t *, unsigned int);
+unsigned int cucul_get_frame_count(cucul_canvas_t *);
+int cucul_set_frame(cucul_canvas_t *, unsigned int);
+char const *cucul_get_frame_name(cucul_canvas_t *);
+int cucul_set_frame_name(cucul_canvas_t *, char const *);
+int cucul_create_frame(cucul_canvas_t *, unsigned int);
+int cucul_free_frame(cucul_canvas_t *, unsigned int);
 /*  @} */
 
@@ -265 +267 @@
     int cucul_set_truecolor(cucul_canvas_t *, unsigned int,
                             unsigned int) CUCUL_DEPRECATED;
+    unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *)
+                                              CUCUL_DEPRECATED;
+    int cucul_set_canvas_frame(cucul_canvas_t *,
+                               unsigned int) CUCUL_DEPRECATED;
+    int cucul_create_canvas_frame(cucul_canvas_t *,
+                                  unsigned int) CUCUL_DEPRECATED;
+    int cucul_free_canvas_frame(cucul_canvas_t *,
+                                unsigned int) CUCUL_DEPRECATED;
     cucul_buffer_t *cucul_load_memory(void *,
                                       unsigned long int) CUCUL_DEPRECATED;

libcaca/trunk/cucul/cucul_internals.h

@@ -32 +32 @@
     int handlex, handley;
     uint32_t curattr;
+
+    /* Frame name */
+    char *name;
 };
 
@@ -41 +44 @@
 
     unsigned int refcount;
+    unsigned int autoinc;
 
     /* Shortcut to the active frame information */

libcaca/trunk/cucul/frame.c

@@ -37 +37 @@
  *  \return The frame count
  */
-unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *cv)
+unsigned int cucul_get_frame_count(cucul_canvas_t *cv)
 {
     return cv->framecount;
@@ -54 +54 @@
  *
  *  \param cv A libcucul canvas
- *  \param frame The canvas frame to activate
- *  \return 0 in case of success, -1 if an error occurred.
- */
-int cucul_set_canvas_frame(cucul_canvas_t *cv, unsigned int frame)
-{
-    if(frame >= cv->framecount)
+ *  \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, unsigned int id)
+{
+    if(id >= cv->framecount)
     {
         seterrno(EINVAL);
@@ -66 +66 @@
 
     _cucul_save_frame_info(cv);
-    cv->frame = frame;
+    cv->frame = id;
     _cucul_load_frame_info(cv);
+
+    return 0;
+}
+
+/** \brief Get the current frame's name.
+ *
+ *  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 name again.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A libcucul canvas.
+ *  \return The current frame's name.
+ */
+char const *cucul_get_frame_name(cucul_canvas_t *cv)
+{
+    return cv->frames[cv->frame].name;
+}
+
+/** \brief Set the current frame's name.
+ *
+ *  Set the current frame's name. Upon creation, a frame has a default name
+ *  of \rc "frame#xxxxxxxx" where \c xxxxxxxx is a self-incrementing
+ *  hexadecimal number.
+ *
+ *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c ENOMEM Not enough memory to allocate new frame.
+ *
+ *  \param cv A libcucul canvas.
+ *  \return 0 in case of success, -1 if an error occurred.
+ */
+int cucul_set_frame_name(cucul_canvas_t *cv, char const *name)
+{
+    char *newname = strdup(name);
+
+    if(!newname)
+    {
+        seterrno(ENOMEM);
+        return -1;
+    }
+
+    free(cv->frames[cv->frame].name);
+    cv->frames[cv->frame].name = newname;
 
     return 0;
@@ -92 +136 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_create_canvas_frame(cucul_canvas_t *cv, unsigned int id)
+int cucul_create_frame(cucul_canvas_t *cv, unsigned int id)
 {
     unsigned int size = cv->width * cv->height;
@@ -123 +167 @@
     cv->frames[id].handley = cv->frames[cv->frame].handley;
 
+    cv->frames[id].name = strdup("frame#--------");
+    sprintf(cv->frames[id].name + 6, "%.08x", cv->autoinc++);
+
     return 0;
 }
@@ -147 +194 @@
  *  \return 0 in case of success, -1 if an error occurred.
  */
-int cucul_free_canvas_frame(cucul_canvas_t *cv, unsigned int id)
+int cucul_free_frame(cucul_canvas_t *cv, unsigned int id)
 {
     unsigned int f;
@@ -165 +212 @@
     free(cv->frames[id].chars);
     free(cv->frames[id].attrs);
+    free(cv->frames[id].name);
 
     for(f = id + 1; f < cv->framecount; f++)

libcaca/trunk/cucul/legacy.c

@@ -108 +108 @@
 
 /*
+ * Functions from frame.c
+ */
+
+unsigned int cucul_get_canvas_frame_count(cucul_canvas_t *cv)
+{
+    return cucul_get_frame_count(cv);
+}
+
+int cucul_set_canvas_frame(cucul_canvas_t *cv, unsigned int id)
+{
+    return cucul_set_frame(cv, id);
+}
+
+int cucul_create_canvas_frame(cucul_canvas_t *cv, unsigned int id)
+{
+    return cucul_create_frame(cv, id);
+}
+
+int cucul_free_canvas_frame(cucul_canvas_t *cv, unsigned int id)
+{
+    return cucul_free_frame(cv, id);
+}
+
+/*
  * Functions from buffer.c
  */

libcaca/trunk/cxx/cucul++.cpp

@@ -254 +254 @@
 unsigned int Cucul::getFrameCount()
 {
-    return cucul_get_canvas_frame_count(cv);
+    return cucul_get_frame_count(cv);
 }
 int Cucul::setFrame(unsigned int f)
 {
-    return cucul_set_canvas_frame(cv, f);
+    return cucul_set_frame(cv, f);
 }
 int Cucul::createFrame(unsigned int f)
 {
-    return cucul_create_canvas_frame(cv, f);
+    return cucul_create_frame(cv, f);
 }
 int Cucul::freeFrame(unsigned int f)
 {
-    return cucul_create_canvas_frame(cv, f);
+    return cucul_create_frame(cv, f);
 }
 

libcaca/trunk/test/all.c

@@ -17 +17 @@
 #if !defined(__KERNEL__)
 #   include <stdio.h>
+#   include <string.h>
 #endif
 
@@ -22 +23 @@
 #include "caca.h"
 
-#define ITER 1000
+#define ITER 128
 
 int main(int argc, char *argv[])
 {
     cucul_canvas_t *cv;
-    unsigned int i, w, h;
+    unsigned int i, j, w, h;
 
-    /* cucul_create_canvas */
     fprintf(stderr, "testing cucul_create_canvas()\n");
     for(i = 0; i < ITER; i++)
@@ -42 +42 @@
     }
 
+    fprintf(stderr, "testing cucul_set_frame_name()\n");
+    cv = cucul_create_canvas(1, 1);
+    for(i = 0; i < ITER; i++)
+    {
+        cucul_create_frame(cv, 0);
+        for(j = 0; j < ITER; j++)
+        {
+            char buf[BUFSIZ];
+            w = cucul_rand(1, 1000);
+            memset(buf, 'x', w);
+            buf[w] = '\0';
+            cucul_set_frame_name(cv, buf);
+        }
+    }
+    cucul_free_canvas(cv);
+
     fprintf(stderr, "all tests passed\n");
     return 0;

libcaca/trunk/test/frames.c

@@ -34 +34 @@
     cv = cucul_create_canvas(0, 0);
     for(frame = 1; frame < 200; frame++)
-        cucul_create_canvas_frame(cv, frame);
+        cucul_create_frame(cv, frame);
 
     fprintf(stderr, "canvas created, size is %ix%i\n",
@@ -48 +48 @@
     for(frame = 0; frame < 16; frame++)
     {
-        cucul_set_canvas_frame(cv, frame);
+        cucul_set_frame(cv, frame);
         cucul_set_color_ansi(cv, CUCUL_WHITE, frame);
         cucul_fill_box(cv, 0, 0, 40, 15, ':');
@@ -71 +71 @@
     while(!caca_get_event(dp, CACA_EVENT_KEY_PRESS, NULL, 0))
     {
-        cucul_set_canvas_frame(cv, n % 16);
+        cucul_set_frame(cv, n % 16);
         caca_refresh_display(dp);
         n++;