Changeset 3586Tweet

Timestamp:

07/27/09 01:26:08 (4 years ago)

Author:

sam

Message:

Implement caca_vprintf() to allow third-party variadic functions to call us.

Location:

libcaca/trunk/caca

Files:

• caca.h (modified) (2 diffs)
• string.c (modified) (3 diffs)

libcaca/trunk/caca/caca.h

@@ -26 +26 @@
 
 #include <caca_types.h>
+
+#if !defined(__KERNEL__)
+#   include <stdarg.h>
+#endif
 
 #undef __extern
@@ -228 +232 @@
 __extern int caca_put_str(caca_canvas_t *, int, int, char const *);
 __extern int caca_printf(caca_canvas_t *, int, int, char const *, ...);
+__extern int caca_vprintf(caca_canvas_t *, int, int, char const *, va_list);
 __extern int caca_clear_canvas(caca_canvas_t *);
 __extern int caca_set_canvas_handle(caca_canvas_t *, int, int);

libcaca/trunk/caca/string.c

@@ -282 +282 @@
 int caca_printf(caca_canvas_t *cv, int x, int y, char const *format, ...)
 {
+    va_list args;
+    int ret;
+    va_start(args, format);
+    ret = caca_vprintf(cv, x, y, format, args);
+    va_end(args);
+    return ret;
+}
+
+/** \brief Print a formated string (va_list version).
+ *
+ *  Format a string at the given coordinates, using the default foreground
+ *  and background values. The coordinates may be outside the canvas
+ *  boundaries (eg. a negative Y coordinate) and the string will be cropped
+ *  accordingly if it is too long. The syntax of the format string is the
+ *  same as for the C vprintf() function.
+ *
+ *  This function never fails.
+ *
+ *  \param cv A handle to the libcaca canvas.
+ *  \param x X coordinate.
+ *  \param y Y coordinate.
+ *  \param format The format string to print.
+ *  \param ap A va_list containting the arguments to the format string.
+ *  \return This function always returns 0.
+ */
+int caca_vprintf(caca_canvas_t *cv, int x, int y, char const *format,
+                 va_list args)
+{
     char tmp[BUFSIZ];
     char *buf = tmp;
-    va_list args;
 
     if(y < 0 || y >= (int)cv->height || x >= (int)cv->width)
@@ -292 +319 @@
         buf = malloc(cv->width - x + 1);
 
-    va_start(args, format);
 #if defined(HAVE_VSNPRINTF)
     vsnprintf(buf, cv->width - x + 1, format, args);
@@ -299 +325 @@
 #endif
     buf[cv->width - x] = '\0';
-    va_end(args);
 
     caca_put_str(cv, x, y, buf);