Changeset 1342 for libcacaTweet

Timestamp:

Nov 11, 2006, 3:24:35 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Add cursor and handle support to canvases. Unused yet.

Location:

libcaca/trunk

Files:

• TODO (modified) (1 diff)
• cucul/canvas.c (modified) (2 diffs)
• cucul/cucul.c (modified) (2 diffs)
• cucul/cucul.h (modified) (2 diffs)
• cucul/cucul_internals.h (modified) (1 diff)
• cucul/export.c (modified) (4 diffs)
• cucul/frame.c (modified) (2 diffs)
• cucul/import.c (modified) (4 diffs)

libcaca/trunk/TODO

@@ -7 +7 @@
   - allow to change the canvas size in a per-frame basis.
   - export attribute parsing functions such as attr_to_ansi4fg etc.
-  - add cursor support in the canvas, so that we can load ANSI files
-    in stream mode.
 
   \subsection indep API-independent stuff

libcaca/trunk/cucul/canvas.c

@@ -42 +42 @@
 #include "cucul_internals.h"
 
+/** \brief Set cursor position.
+ *
+ *  Put the cursor at the given coordinates. Functions making use of the
+ *  cursor will use the new values. Setting the cursor position outside the
+ *  canvas is legal but the cursor will not be shown.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \param x X cursor coordinate.
+ *  \param y Y cursor coordinate.
+ *  \return This function always returns 0.
+ */
+int cucul_gotoxy(cucul_canvas_t *cv, int x, int y)
+{
+    cv->frames[cv->frame].x = x;
+    cv->frames[cv->frame].y = y;
+
+    return 0;
+}
+
+/** \brief Get X cursor position.
+ *
+ *  Retrieve the X coordinate of the cursor's position.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \return The cursor's X coordinate.
+ */
+int cucul_get_cursor_x(cucul_canvas_t *cv)
+{
+    return cv->frames[cv->frame].x;
+}
+
+/** \brief Get Y cursor position.
+ *
+ *  Retrieve the Y coordinate of the cursor's position.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \return The cursor's Y coordinate.
+ */
+int cucul_get_cursor_y(cucul_canvas_t *cv)
+{
+    return cv->frames[cv->frame].y;
+}
+
 /** \brief Print an ASCII or Unicode character.
  *
@@ -263 +312 @@
 
     return 0;
+}
+
+/** \brief Set cursor handle.
+ *
+ *  Set the canvas' handle. Blitting functions will use the handle value
+ *  to put the canvas at the proper coordinates.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \param x X handle coordinate.
+ *  \param y Y handle coordinate.
+ *  \return This function always returns 0.
+ */
+int cucul_set_canvas_handle(cucul_canvas_t *cv, int x, int y)
+{
+    cv->frames[cv->frame].handlex = x;
+    cv->frames[cv->frame].handley = y;
+
+    return 0;
+}
+
+/** \brief Get X handle position.
+ *
+ *  Retrieve the X coordinate of the canvas' handle.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \return The canvas' handle's X coordinate.
+ */
+int cucul_get_canvas_handle_x(cucul_canvas_t *cv)
+{
+    return cv->frames[cv->frame].handlex;
+}
+
+/** \brief Get Y handle position.
+ *
+ *  Retrieve the Y coordinate of the canvas' handle.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcucul canvas.
+ *  \return The canvas' handle's Y coordinate.
+ */
+int cucul_get_canvas_handle_y(cucul_canvas_t *cv)
+{
+    return cv->frames[cv->frame].handley;
 }
 

libcaca/trunk/cucul/cucul.c

@@ -44 +44 @@
  *  should be called at the end of the program to free all allocated resources.
  *
+ *  Both the cursor and the canvas' handle are initialised at the top-left
+ *  corner.
+ *
  *  If an error occurs, NULL is returned and \b errno is set accordingly:
  *  - \c ENOMEM Not enough memory for the requested canvas size.
@@ -79 +82 @@
     cv->frames[0].chars = NULL;
     cv->frames[0].attrs = NULL;
+    cv->frames[0].x = cv->frames[0].y = 0;
+    cv->frames[0].handlex = cv->frames[0].handley = 0;
     cv->frames[0].curattr = cv->curattr;
 

libcaca/trunk/cucul/cucul.h

@@ -90 +90 @@
  *  @{ */
 #define CUCUL_MAGIC_FULLWIDTH 0x000ffffe /**< Used to indicate that the previous character was a fullwidth glyph. */
+int cucul_gotoxy(cucul_canvas_t *, int, int);
+int cucul_get_cursor_x(cucul_canvas_t *);
+int cucul_get_cursor_y(cucul_canvas_t *);
 unsigned long int cucul_get_attr(cucul_canvas_t *, int, int);
 int cucul_set_attr(cucul_canvas_t *, unsigned long int);
@@ -100 +103 @@
 int cucul_printf(cucul_canvas_t *, int, int, char const *, ...);
 int cucul_clear_canvas(cucul_canvas_t *);
+int cucul_set_canvas_handle(cucul_canvas_t *, int, int);
+int cucul_get_canvas_handle_x(cucul_canvas_t *);
+int cucul_get_canvas_handle_y(cucul_canvas_t *);
 int cucul_blit(cucul_canvas_t *, int, int, cucul_canvas_t const *,
                cucul_canvas_t const *);

libcaca/trunk/cucul/cucul_internals.h

@@ -29 +29 @@
 
     /* Painting context */
+    int x, y;
+    int handlex, handley;
     uint32_t curattr;
 };

libcaca/trunk/cucul/export.c

@@ -172 +172 @@
      *  - 24 bytes for the frame info
      * 8 bytes for each character cell */
-    *bytes = 44 + 8 * cv->width * cv->height;
+    *bytes = 52 + 8 * cv->width * cv->height;
     cur = data = malloc(*bytes);
 
@@ -179 +179 @@
 
     /* canvas_header */
-    cur += sprintu32(cur, 16 + 24);
+    cur += sprintu32(cur, 16 + 32 * 1);
     cur += sprintu32(cur, cv->width * cv->height * 8);
     cur += sprintu16(cur, 0x0001);
@@ -190 +190 @@
     cur += sprintu32(cur, 0);
     cur += sprintu32(cur, cv->curattr);
-    cur += sprintu32(cur, 0);
-    cur += sprintu32(cur, 0);
+    cur += sprintu32(cur, cv->frames[0].x);
+    cur += sprintu32(cur, cv->frames[0].y);
+    cur += sprintu32(cur, cv->frames[0].handlex);
+    cur += sprintu32(cur, cv->frames[0].handley);
 
     /* canvas_data */
@@ -237 +239 @@
  *                               // not specify a duration
  *       uint32_t attr;          // Graphics context attribute
+ *       int32_t cursor_x;       // Cursor X coordinate
+ *       int32_t cursor_y;       // Cursor Y coordinate
  *       int32_t handle_x;       // Handle X coordinate
  *       int32_t handle_y;       // Handle Y coordinate

libcaca/trunk/cucul/frame.c

@@ -115 +115 @@
         cv->frames[f] = cv->frames[f - 1];
 
+    if(cv->frame >= id)
+        cv->frame++;
+
     cv->frames[id].width = cv->width;
     cv->frames[id].height = cv->height;
@@ -123 +126 @@
     cv->frames[id].curattr = cv->curattr;
 
-    if(cv->frame >= id)
-        cv->frame++;
+    cv->frames[id].x = cv->frames[cv->frame].x;
+    cv->frames[id].y = cv->frames[cv->frame].y;
+    cv->frames[id].handlex = cv->frames[cv->frame].handlex;
+    cv->frames[id].handley = cv->frames[cv->frame].handley;
 
     return 0;

libcaca/trunk/cucul/import.c

@@ -248 +248 @@
         return 0;
 
-    if(control_size < 16 + frames * 24)
+    if(control_size < 16 + frames * 32)
         goto invalid_caca;
 
@@ -255 +255 @@
         unsigned int width, height, duration;
         uint32_t attr;
-        int x, y;
+        int x, y, handlex, handley;
 
         width = sscanu32(buf + 4 + 16 + f * 24);
@@ -263 +263 @@
         x = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 16);
         y = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 20);
+        handlex = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 24);
+        handley = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 28);
 
         expected_size += width * height * 8;
@@ -284 +286 @@
 
     cv->curattr = sscanu32(buf + 4 + 16 + 12);
+    cv->frames[0].x = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 16);
+    cv->frames[0].y = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 20);
+    cv->frames[0].handlex = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 24);
+    cv->frames[0].handley = (int32_t)sscanu32(buf + 4 + 16 + f * 24 + 28);
 
     return 4 + control_size + data_size;