Changeset 1338 for libcaca/trunk/cucul/sprite.cTweet

Timestamp:

Nov 11, 2006, 1:57:03 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Prepare the way for per-frame width/height information.

File:

• libcaca/trunk/cucul/sprite.c (modified) (5 diffs)

libcaca/trunk/cucul/sprite.c

@@ -31 +31 @@
 #include "cucul_internals.h"
 
+static void save_frame_info(cucul_canvas_t *);
+static void load_frame_info(cucul_canvas_t *);
+
 /** \brief Get the number of frames in a canvas.
  *
@@ -70 +73 @@
     }
 
+    save_frame_info(cv);
     cv->frame = frame;
-
-    cv->chars = cv->allchars[cv->frame];
-    cv->attrs = cv->allattrs[cv->frame];
+    load_frame_info(cv);
 
     return 0;
@@ -85 +87 @@
  *  The frame index indicates where the frame should be inserted. Valid
  *  values range from 0 to the current canvas frame count. If the frame
- *  index is greater the or equals the current canvas frame count, the new
+ *  index is greater than or equals the current canvas frame count, the new
  *  frame is appended at the end of the canvas.
  *
@@ -107 +109 @@
 
     cv->framecount++;
-    cv->allchars = realloc(cv->allchars, sizeof(uint32_t *) * cv->framecount);
-    cv->allattrs = realloc(cv->allattrs, sizeof(uint32_t *) * cv->framecount);
+    cv->frames = realloc(cv->frames,
+                         sizeof(struct cucul_frame) * cv->framecount);
 
     for(f = cv->framecount - 1; f > frame; f--)
-    {
-        cv->allchars[f] = cv->allchars[f - 1];
-        cv->allattrs[f] = cv->allattrs[f - 1];
-    }
-
-    cv->allchars[frame] = malloc(size);
-    memcpy(cv->allchars[frame], cv->chars, size);
-    cv->allattrs[frame] = malloc(size);
-    memcpy(cv->allattrs[frame], cv->attrs, size);
+        cv->frames[f] = cv->frames[f - 1];
+
+    cv->frames[frame].width = cv->width;
+    cv->frames[frame].height = cv->height;
+    cv->frames[frame].chars = malloc(size);
+    memcpy(cv->frames[frame].chars, cv->chars, size);
+    cv->frames[frame].attrs = malloc(size);
+    memcpy(cv->frames[frame].attrs, cv->attrs, size);
+    cv->frames[frame].curattr = cv->curattr;
 
     if(cv->frame >= frame)
         cv->frame++;
-
-    cv->chars = cv->allchars[cv->frame];
-    cv->attrs = cv->allattrs[cv->frame];
 
     return 0;
@@ -171 +170 @@
     }
 
-    free(cv->allchars[frame]);
-    free(cv->allattrs[frame]);
+    free(cv->frames[frame].chars);
+    free(cv->frames[frame].attrs);
 
     for(f = frame + 1; f < cv->framecount; f++)
-    {
-        cv->allchars[f - 1] = cv->allchars[f];
-        cv->allattrs[f - 1] = cv->allattrs[f];
-    }
+        cv->frames[f - 1] = cv->frames[f];
 
     cv->framecount--;
-    cv->allchars = realloc(cv->allchars, sizeof(uint32_t *) * cv->framecount);
-    cv->allattrs = realloc(cv->allattrs, sizeof(uint32_t *) * cv->framecount);
+    cv->frames = realloc(cv->frames,
+                         sizeof(struct cucul_frame) * cv->framecount);
 
     if(cv->frame > frame)
         cv->frame--;
     else if(cv->frame == frame)
+    {
         cv->frame = 0;
-
-    cv->chars = cv->allchars[cv->frame];
-    cv->attrs = cv->allattrs[cv->frame];
+        load_frame_info(cv);
+    }
 
     return 0;
 }
 
+/*
+ * XXX: the following functions are local.
+ */
+
+static void save_frame_info(cucul_canvas_t *cv)
+{
+    cv->frames[cv->frame].width = cv->width;
+    cv->frames[cv->frame].height = cv->height;
+
+    cv->frames[cv->frame].curattr = cv->curattr;
+}
+
+static void load_frame_info(cucul_canvas_t *cv)
+{
+    cv->width = cv->frames[cv->frame].width;
+    cv->height = cv->frames[cv->frame].height;
+
+    cv->chars = cv->frames[cv->frame].chars;
+    cv->attrs = cv->frames[cv->frame].attrs;
+
+    cv->curattr = cv->frames[cv->frame].curattr;
+}
+