Changeset 1058 for libcaca/trunkTweet

Timestamp:

Sep 18, 2006, 7:40:35 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Implemented cucul_get_font_blocks() to export the list of available glyphs.

Location:

libcaca/trunk/cucul

Files:

• cucul.h (modified) (1 diff)
• font.c (modified) (7 diffs)

libcaca/trunk/cucul/cucul.h

@@ -207 +207 @@
 unsigned int cucul_get_font_width(cucul_font_t *);
 unsigned int cucul_get_font_height(cucul_font_t *);
+unsigned long int const *cucul_get_font_blocks(cucul_font_t *);
 int cucul_render_canvas(cucul_canvas_t *, cucul_font_t *, void *,
                          unsigned int, unsigned int, unsigned int);

libcaca/trunk/cucul/font.c

@@ -69 +69 @@
 
     struct block_info *block_list;
+    unsigned int *user_block_list;
     struct glyph_info *glyph_list;
     uint8_t *font_data;
@@ -189 +190 @@
     }
 
+    f->user_block_list = malloc((f->header.blocks + 1)
+                                  * 2 * sizeof(unsigned long int));
+    if(!f->user_block_list)
+    {
+        free(f->block_list);
+        free(f);
+#if defined(HAVE_ERRNO_H)
+        errno = ENOMEM;
+#endif
+        return NULL;
+    }
+
     memcpy(f->block_list,
            f->private + 8 + sizeof(struct font_header),
@@ -202 +215 @@
             || f->block_list[i].index >= f->header.glyphs)
         {
+            free(f->user_block_list);
             free(f->block_list);
             free(f);
@@ -209 +223 @@
             return NULL;
         }
-    }
+
+        f->user_block_list[i * 2] = f->block_list[i].start;
+        f->user_block_list[i * 2 + 1] = f->block_list[i].stop;
+    }
+
+    f->user_block_list[i * 2] = 0;
+    f->user_block_list[i * 2] = 0;
 
     f->glyph_list = malloc(f->header.glyphs * sizeof(struct glyph_info));
     if(!f->glyph_list)
     {
+        free(f->user_block_list);
         free(f->block_list);
         free(f);
@@ -238 +259 @@
         {
             free(f->glyph_list);
+            free(f->user_block_list);
             free(f->block_list);
             free(f);
@@ -301 +323 @@
 }
 
+/** \brief Get a font's list of supported glyphs.
+ *
+ *  This function returns the list of Unicode blocks supported by the
+ *  given font. The list is a zero-terminated list of indices. Here is
+ *  an example:
+ *
+ *  \code
+ *  {
+ *       0x0,  0x80,   // Basic latin: A, B, C, a, b, c
+ *      0x80, 0x100,   // Latin-1 supplement: "A, 'e, ^u
+ *     0x530, 0x590,   // Armenian
+ *       0x0,   0x0,   // END
+ *  };
+ *  \endcode
+ *
+ *  This function never fails.
+ *
+ *  \param f The font, as returned by cucul_load_font()
+ *  \return The list of Unicode blocks supported by the font.
+ */
+unsigned long int const *cucul_get_font_blocks(cucul_font_t *f)
+{
+    return (unsigned long int const *)f->user_block_list;
+}
+
 /** \brief Free a font structure.
  *
@@ -316 +363 @@
 {
     free(f->glyph_list);
+    free(f->user_block_list);
     free(f->block_list);
     free(f);