Changeset 1365 for libcaca/trunk/tools/makefont.cTweet

Timestamp:

Nov 12, 2006, 6:30:08 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Add maxwidth and maxheight members to the font format.

File:

• libcaca/trunk/tools/makefont.c (modified) (6 diffs)

libcaca/trunk/tools/makefont.c

@@ -91 +91 @@
 
     FT_Bitmap img;
-    int width, height, blocks, glyphs, fullwidth;
+    int stdwidth, fullwidth, height, blocks, glyphs, fullglyphs;
     unsigned int n, b, i, index;
-    unsigned int glyph_size, control_size, data_size, current_offset;
+    unsigned int stdsize, fullsize, control_size, data_size, current_offset;
     uint8_t *glyph_data;
     struct glyph *gtab;
@@ -149 +149 @@
     pango_layout_set_markup(l, "@", -1);
     pango_layout_get_extents(l, NULL, &r);
-    width = PANGO_PIXELS(r.width);
+    stdwidth = PANGO_PIXELS(r.width);
+    fullwidth = stdwidth * 2;
     height = PANGO_PIXELS(r.height);
-    glyph_size = ((width * height) + (8 / bpp) - 1) / (8 / bpp);
+    stdsize = ((stdwidth * height) + (8 / bpp) - 1) / (8 / bpp);
+    fullsize = ((fullwidth * height) + (8 / bpp) - 1) / (8 / bpp);
 
     /* Compute blocks and glyphs count */
     blocks = 0;
     glyphs = 0;
-    fullwidth = 0;
+    fullglyphs = 0;
     for(b = 0; blocklist[b + 1]; b += 2)
     {
@@ -163 +165 @@
         for(i = blocklist[b]; i < blocklist[b + 1]; i++)
             if(cucul_utf32_is_fullwidth(i))
-                fullwidth++;
-    }
-
-    control_size = 24 + 12 * blocks + 8 * glyphs;
-    data_size = glyph_size * (glyphs + fullwidth);
+                fullglyphs++;
+    }
+
+    control_size = 28 + 12 * blocks + 8 * glyphs;
+    data_size = stdsize * (glyphs - fullglyphs) + fullsize * fullglyphs;
 
     gtab = malloc(glyphs * sizeof(struct glyph));
@@ -174 +176 @@
     /* Let's go! */
     printf("/* libcucul font file\n");
-    printf(" * \"%s\": %i dpi, %i bpp, %ix%i glyphs\n",
-           font, dpi, bpp, width, height);
+    printf(" * \"%s\": %i dpi, %i bpp, %ix%i/%ix%i glyphs\n",
+           font, dpi, bpp, stdwidth, height, fullwidth, height);
     printf(" * Automatically generated by tools/makefont.c:\n");
     printf(" *   tools/makefont %s \"%s\" %i %i\n", prefix, font, dpi, bpp);
@@ -205 +207 @@
     printf_u32("\"%s\" /* glyphs */\n", glyphs);
     printf_u16("\"%s\" /* bpp */\n", bpp);
-    printf_u16("\"%s\" /* width */\n", width);
-    printf_u16("\"%s\" /* height */\n", height);
+    printf_u16("\"%s\" /* std width */\n", stdwidth);
+    printf_u16("\"%s\" /* std height */\n", height);
+    printf_u16("\"%s\" /* max width */\n", fullwidth);
+    printf_u16("\"%s\" /* max height */\n", height);
     printf_u16("\"%s\" /* flags */\n", 1);
     printf("\n");
@@ -227 +231 @@
         for(i = blocklist[b]; i < blocklist[b + 1]; i++)
         {
-            int x, y, bytes, current_width = width;
-            unsigned int k, current_size = glyph_size;
+            int x, y, bytes, current_width = stdwidth;
+            unsigned int k, current_size = stdsize;
 
             if(cucul_utf32_is_fullwidth(i))
             {
-                current_width *= 2;
-                current_size *= 2;
+                current_width = fullwidth;
+                current_size = fullsize;
             }
             gtab[n].unicode = i;