Changeset 3595Tweet

Timestamp:

07/31/09 02:01:25 (4 years ago)

Author:

sam

Message:

Make caca_printf(), caca_vprintf() and caca_put_str() return the number of
printed cells instead of always returning 0. This is handy if we want to
advance a cursor after each printf() call.

Location:

libcaca/trunk/caca

Files:

• caca_conio.c (modified) (3 diffs)
• string.c (modified) (12 diffs)

libcaca/trunk/caca/caca_conio.c

@@ -74 +74 @@
 {
     va_list args;
+    int ret;
 
     conio_init();
 
     va_start(args, format);
-    caca_vprintf(cv, caca_wherex(cv), caca_wherey(cv), format, args);
+    ret = caca_vprintf(cv, caca_wherex(cv), caca_wherey(cv), format, args);
     va_end(args);
 
+    caca_gotoxy(cv, caca_wherex(cv) + ret, caca_wherey(cv));
+
     conio_refresh();
 
-    /* FIXME: we should fix caca_vprintf so that it returns the number of
-     * characters that were printed. */
-    return 0;
+    return ret;
 }
 
@@ -113 +114 @@
     conio_init();
 
-    /* TODO: implement this function */
+    _caca_sleep(i * 1000);
 }
 
@@ -272 +273 @@
 {
     va_list args;
+    int ret;
 
     conio_init();
 
     va_start(args, format);
-    caca_vprintf(cv, caca_wherex(cv), caca_wherey(cv), format, args);
+    ret = caca_vprintf(cv, caca_wherex(cv), caca_wherey(cv), format, args);
     va_end(args);
 
+    caca_gotoxy(cv, caca_wherex(cv) + ret, caca_wherey(cv));
+
     conio_refresh();
 
-    /* FIXME: we should fix caca_vprintf so that it returns the number of
-     * characters that were printed. */
     return 0;
 }

libcaca/trunk/caca/string.c

@@ -102 +102 @@
  *  character instead of an UTF-32 character, use the caca_put_str() function.
  *
+ *  This function returns the width of the printed character. If it is a
+ *  fullwidth character, 2 is returned. Otherwise, 1 is returned.
+ *
  *  This function never fails.
  *
@@ -108 +111 @@
  *  \param y Y coordinate.
  *  \param ch The character to print.
- *  \return This function always returns 0.
+ *  \return The width of the printed character: 2 for a fullwidth character,
+ *          1 otherwise.
  */
 int caca_put_char(caca_canvas_t *cv, int x, int y, uint32_t ch)
 {
     uint32_t *curchar, *curattr, attr;
-    int fullwidth, xmin, xmax;
+    int fullwidth, xmin, xmax, ret;
+
+    if(ch == CACA_MAGIC_FULLWIDTH)
+        return 1;
+
+    fullwidth = caca_utf32_is_fullwidth(ch);
+    ret = fullwidth ? 2 : 1;
 
     if(x >= (int)cv->width || y < 0 || y >= (int)cv->height)
-        return 0;
-
-    if(ch == CACA_MAGIC_FULLWIDTH)
-        return 0;
-
-    fullwidth = caca_utf32_is_fullwidth(ch);
+        return ret;
 
     if(x == -1 && fullwidth)
@@ -130 +135 @@
     }
     else if(x < 0)
-        return 0;
+        return ret;
 
     curchar = cv->chars + x + y * cv->width;
@@ -188 +193 @@
     curattr[0] = attr;
 
-    return 0;
+    return ret;
 }
 
@@ -231 +236 @@
  *  are handled when overwriting each other or at the canvas' boundaries.
  *
+ *  This function returns the number of cells printed by the string. It is
+ *  not the number of characters printed, because fullwidth characters
+ *  account for two cells.
+ *
  *  This function never fails.
  *
@@ -237 +246 @@
  *  \param y Y coordinate.
  *  \param s The string to print.
- *  \return This function always returns 0.
+ *  \return The number of cells printed.
  */
 int caca_put_str(caca_canvas_t *cv, int x, int y, char const *s)
 {
     size_t rd;
+    int len = 0;
 
     if(y < 0 || y >= (int)cv->height || x >= (int)cv->width)
-        return 0;
-
-    while(*s && x < -1)
-    {
-        x += caca_utf32_is_fullwidth(caca_utf8_to_utf32(s, &rd)) ? 2 : 1;
+    {
+        while(*s)
+        {
+            len += caca_utf32_is_fullwidth(caca_utf8_to_utf32(s, &rd)) ? 2 : 1;
+            s += rd;
+        }
+        return len;
+    }
+
+    while(*s)
+    {
+        uint32_t ch = caca_utf8_to_utf32(s, &rd);
+
+        if(x + len >= -1 && x + len < (int)cv->width)
+            caca_put_char(cv, x + len, y, ch);
+
+        len += caca_utf32_is_fullwidth(ch) ? 2 : 1;
         s += rd;
     }
 
-    while(*s && x < (int)cv->width)
-    {
-        uint32_t ch = caca_utf8_to_utf32(s, &rd);
-        caca_put_char(cv, x, y, ch);
-        x += caca_utf32_is_fullwidth(ch) ? 2 : 1;
-        s += rd;
-    }
-
-    return 0;
+    return len;
 }
 
@@ -271 +285 @@
  *  same as for the C printf() function.
  *
+ *  This function returns the number of cells printed by the string. It is
+ *  not the number of characters printed, because fullwidth characters
+ *  account for two cells.
+ *
  *  This function never fails.
  *
@@ -278 +296 @@
  *  \param format The format string to print.
  *  \param ... Arguments to the format string.
- *  \return This function always returns 0.
+ *  \return The number of cells printed.
  */
 int caca_printf(caca_canvas_t *cv, int x, int y, char const *format, ...)
@@ -298 +316 @@
  *  same as for the C vprintf() function.
  *
+ *  This function returns the number of cells printed by the string. It is
+ *  not the number of characters printed, because fullwidth characters
+ *  account for two cells.
+ *
  *  This function never fails.
  *
@@ -305 +327 @@
  *  \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.
+ *  \return The number of cells printed.
  */
 int caca_vprintf(caca_canvas_t *cv, int x, int y, char const *format,
@@ -312 +334 @@
     char tmp[BUFSIZ];
     char *buf = tmp;
-
-    if(y < 0 || y >= (int)cv->height || x >= (int)cv->width)
-        return 0;
+    int ret;
 
     if(cv->width - x + 1 > BUFSIZ)
@@ -326 +346 @@
     buf[cv->width - x] = '\0';
 
-    caca_put_str(cv, x, y, buf);
+    ret = caca_put_str(cv, x, y, buf);
 
     if(buf != tmp)
         free(buf);
 
-    return 0;
+    return ret;
 }