Changeset d53af3c8 in mainline

Timestamp:

2020-09-18T23:00:44Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0ee3157

Parents:

7bef2d8

Message:

Save typeface to (RIFF) TPF file using newly introduced libriff

Originally I planned introducing libriff for better RIFF WAVE support.
It could be used for this purpose in the future (as well as for WebP
and other RIFF-based formats).

Location:

uspace

Files:

• app/fontedit/fontedit.c (modified) (1 diff)
• lib/gfxfont/include/gfx/typeface.h (modified) (1 diff)
• lib/gfxfont/meson.build (modified) (1 diff)
• lib/gfxfont/private/font.h (modified) (2 diffs)
• lib/gfxfont/private/glyph.h (modified) (2 diffs)
• lib/gfxfont/private/tpf_file.h (added)
• lib/gfxfont/src/font.c (modified) (2 diffs)
• lib/gfxfont/src/glyph.c (modified) (2 diffs)
• lib/gfxfont/src/typeface.c (modified) (2 diffs)
• lib/meson.build (modified) (1 diff)
• lib/riff/include/riff/chunk.h (added)
• lib/riff/include/riff/rwave.h (added)
• lib/riff/include/types/riff/chunk.h (added)
• lib/riff/include/types/riff/rwave.h (added)
• lib/riff/meson.build (added)
• lib/riff/src/chunk.c (added)
• lib/riff/src/rwave.c (added)

uspace/app/fontedit/fontedit.c

@@ -142 +142 @@
 static void font_edit_ctrl_key(font_edit_t *fedit, kbd_event_t *event)
 {
+        errno_t rc;
+
         switch (event->key) {
         case KC_S:
                 printf("Save!\n");
                 (void) gfx_glyph_bmp_save(fedit->gbmp);
+                rc = gfx_typeface_save(fedit->typeface, "/test.tpf");
+                if (rc != EOK)
+                        printf("Error saving typeface.\n");
                 font_edit_paint(fedit);
                 break;

uspace/lib/gfxfont/include/gfx/typeface.h

@@ -48 +48 @@
 extern gfx_font_info_t *gfx_typeface_first_font(gfx_typeface_t *);
 extern gfx_font_info_t *gfx_typeface_next_font(gfx_font_info_t *);
+extern errno_t gfx_typeface_save(gfx_typeface_t *, const char *);
 
 #endif

uspace/lib/gfxfont/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'gfx' ]
+deps = [ 'gfx', 'riff' ]
 src = files(
         'src/font.c',

uspace/lib/gfxfont/private/font.h

@@ -44 +44 @@
 #include <types/gfx/font.h>
 #include <types/gfx/typeface.h>
+#include <riff/chunk.h>
 
 /** Font
@@ -85 +86 @@
 extern errno_t gfx_font_splice_at_glyph(gfx_font_t *, gfx_glyph_t *,
     gfx_rect_t *);
+extern errno_t gfx_font_save(gfx_font_info_t *, riffw_t *);
 
 #endif

uspace/lib/gfxfont/private/glyph.h

@@ -41 +41 @@
 #include <gfx/coord.h>
 #include <types/gfx/glyph.h>
+#include <riff/chunk.h>
 
 /** Glyph
@@ -76 +77 @@
 extern errno_t gfx_glyph_transfer(gfx_glyph_t *, gfx_coord_t, gfx_bitmap_t *,
     gfx_rect_t *);
+extern errno_t gfx_glyph_save(gfx_glyph_t *, riffw_t *);
 
 #endif

uspace/lib/gfxfont/src/font.c

@@ -44 +44 @@
 #include "../private/font.h"
 #include "../private/glyph.h"
+#include "../private/tpf_file.h"
 #include "../private/typeface.h"
 
@@ -359 +360 @@
 }
 
+/** Save font properties to RIFF TPF file.
+ *
+ * @param props Font properties
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_font_props_save(gfx_font_props_t *props, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t propsck;
+
+        rc = riff_wchunk_start(riffw, CKID_fprp, &propsck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) props, sizeof(*props));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &propsck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save font metrics to RIFF TPF file.
+ *
+ * @param metrics Font metrics
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_font_metrics_save(gfx_font_metrics_t *metrics,
+    riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t mtrck;
+
+        rc = riff_wchunk_start(riffw, CKID_fmtr, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) metrics, sizeof(*metrics));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save font bitmap to RIFF TPF file.
+ *
+ * @param font Font
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_font_bitmap_save(gfx_font_t *font, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t bmpck;
+        gfx_bitmap_alloc_t alloc;
+
+        rc = gfx_bitmap_get_alloc(font->bitmap, &alloc);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_start(riffw, CKID_fbmp, &bmpck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_write_uint32(riffw, font->rect.p1.x);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_write_uint32(riffw, font->rect.p1.y);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_write_uint32(riffw, 8 * sizeof(uint32_t));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) alloc.pixels,
+            font->rect.p1.x * font->rect.p1.y * sizeof(uint32_t));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &bmpck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save font into RIFF TPF file.
+ *
+ * @param finfo Font info
+ * @param riffw RIFF writer
+ */
+errno_t gfx_font_save(gfx_font_info_t *finfo, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t fontck;
+        gfx_glyph_t *glyph;
+
+        rc = riff_wchunk_start(riffw, CKID_LIST, &fontck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_write_uint32(riffw, LTYPE_font);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_font_props_save(&finfo->props, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_font_metrics_save(&finfo->font->metrics, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_font_bitmap_save(finfo->font, riffw);
+        if (rc != EOK)
+                return rc;
+
+        glyph = gfx_font_first_glyph(finfo->font);
+        while (glyph != NULL) {
+                rc = gfx_glyph_save(glyph, riffw);
+                if (rc != EOK)
+                        return rc;
+
+                glyph = gfx_font_next_glyph(glyph);
+        }
+
+        rc = riff_wchunk_end(riffw, &fontck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/gfxfont/src/glyph.c

@@ -44 +44 @@
 #include "../private/font.h"
 #include "../private/glyph.h"
+#include "../private/tpf_file.h"
 
 /** Initialize glyph metrics structure.
@@ -314 +315 @@
 }
 
+/** Save glyph metrics to RIFF TPF file.
+ *
+ * @param metrics Glyph metrics
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_glyph_metrics_save(gfx_glyph_metrics_t *metrics,
+    riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t mtrck;
+
+        rc = riff_wchunk_start(riffw, CKID_gmtr, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) metrics, sizeof(*metrics));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save glyph patterns to RIFF TPF file.
+ *
+ * @param glyph Glyph
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_glyph_patterns_save(gfx_glyph_t *glyph, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t patck;
+        gfx_glyph_pattern_t *pat;
+        const char *str;
+
+        rc = riff_wchunk_start(riffw, CKID_gpat, &patck);
+        if (rc != EOK)
+                return rc;
+
+        pat = gfx_glyph_first_pattern(glyph);
+        while (pat != NULL) {
+                str = gfx_glyph_pattern_str(pat);
+
+                rc = riff_wchunk_write(riffw, (void *) str, 1 + str_size(str));
+                if (rc != EOK)
+                        return rc;
+
+                pat = gfx_glyph_next_pattern(pat);
+        }
+
+        rc = riff_wchunk_end(riffw, &patck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save glyph rectangle/origin to RIFF TPF file.
+ *
+ * @param glyph Glyph
+ * @param riffw RIFF writer
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_glyph_rectangle_origin_save(gfx_glyph_t *glyph,
+    riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t rorck;
+
+        rc = riff_wchunk_start(riffw, CKID_gror, &rorck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) &glyph->rect,
+            sizeof(glyph->rect));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_write(riffw, (void *) &glyph->origin,
+            sizeof(glyph->origin));
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &rorck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Save glyph into RIFF TPF file.
+ *
+ * @param glyph Glyph
+ * @param riffw RIFF writer
+ */
+errno_t gfx_glyph_save(gfx_glyph_t *glyph, riffw_t *riffw)
+{
+        errno_t rc;
+        riff_wchunk_t glyphck;
+
+        rc = riff_wchunk_start(riffw, CKID_LIST, &glyphck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_write_uint32(riffw, LTYPE_glph);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_glyph_metrics_save(&glyph->metrics, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_glyph_patterns_save(glyph, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_glyph_rectangle_origin_save(glyph, riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_end(riffw, &glyphck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/gfxfont/src/typeface.c

@@ -41 +41 @@
 #include <gfx/typeface.h>
 #include <mem.h>
+#include <riff/chunk.h>
 #include <stdlib.h>
 #include "../private/font.h"
 #include "../private/glyph.h"
+#include "../private/tpf_file.h"
 #include "../private/typeface.h"
 
@@ -111 +113 @@
 }
 
+/** Save typeface into a TPF file.
+ *
+ * @param tface Typeface
+ * @param fname Destination file name
+ * @return EOK on success or an error code
+ */
+errno_t gfx_typeface_save(gfx_typeface_t *tface, const char *fname)
+{
+        riffw_t *riffw = NULL;
+        errno_t rc;
+        gfx_font_info_t *finfo;
+        riff_wchunk_t riffck;
+
+        rc = riff_wopen(fname, &riffw);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_wchunk_start(riffw, CKID_RIFF, &riffck);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_write_uint32(riffw, FORM_TPFC);
+        if (rc != EOK)
+                goto error;
+
+        finfo = gfx_typeface_first_font(tface);
+        while (finfo != NULL) {
+                /* Save font */
+                rc = gfx_font_save(finfo, riffw);
+                if (rc != EOK)
+                        goto error;
+
+                finfo = gfx_typeface_next_font(finfo);
+        }
+
+        rc = riff_wchunk_end(riffw, &riffck);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_wclose(riffw);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+error:
+        if (riffw != NULL)
+                riff_wclose(riffw);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/meson.build

@@ -68 +68 @@
         'pcut',
         'posix',
+        'riff',
         'scsi',
         'sif',