Changeset ea459d4 in mainline for uspace/lib/gfxfont/src/font.c

Timestamp:

2020-09-24T14:25:21Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

120031a5

Parents:

aaf962e6

git-author:

Jiri Svoboda <jiri@…> (2020-09-22 17:25:10)

git-committer:

Jiri Svoboda <jiri@…> (2020-09-24 14:25:21)

Message:

Reading typeface from TPF file

File:

• uspace/lib/gfxfont/src/font.c (modified) (11 diffs)

uspace/lib/gfxfont/src/font.c

@@ -81 +81 @@
 }
 
-/** Create font.
+/** Create font with existing font info structure.
  *
  * @param tface Typeface
+ * @param finfo Font info
  * @param metrics Font metrics
  * @param rfont Place to store pointer to new font
@@ -91 +92 @@
  *         was lost
  */
-errno_t gfx_font_create(gfx_typeface_t *tface, gfx_font_props_t *props,
-    gfx_font_metrics_t *metrics, gfx_font_t **rfont)
-{
-        gfx_font_info_t *finfo = NULL;
+static errno_t gfx_font_create_with_info(gfx_typeface_t *tface,
+    gfx_font_info_t *finfo, gfx_font_metrics_t *metrics, gfx_font_t **rfont)
+{
         gfx_font_t *font = NULL;
         gfx_bitmap_params_t params;
         errno_t rc;
-
-        finfo = calloc(1, sizeof(gfx_font_info_t));
-        if (finfo == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
 
         font = calloc(1, sizeof(gfx_font_t));
@@ -110 +104 @@
                 goto error;
         }
-
-        finfo->typeface = tface;
-        finfo->props = *props;
-        finfo->font = font;
-
         font->typeface = tface;
+        font->finfo = finfo;
 
         font->rect.p0.x = 0;
@@ -138 +128 @@
         font->metrics = *metrics;
         list_initialize(&font->glyphs);
+        *rfont = font;
+        return EOK;
+error:
+        if (font != NULL)
+                free(font);
+        return rc;
+}
+
+/** Create font.
+ *
+ * @param tface Typeface
+ * @param props Font properties
+ * @param metrics Font metrics
+ * @param rfont Place to store pointer to new font
+ *
+ * @return EOK on success, EINVAL if parameters are invald,
+ *         ENOMEM if insufficient resources, EIO if graphic device connection
+ *         was lost
+ */
+errno_t gfx_font_create(gfx_typeface_t *tface, gfx_font_props_t *props,
+    gfx_font_metrics_t *metrics, gfx_font_t **rfont)
+{
+        gfx_font_info_t *finfo = NULL;
+        gfx_font_t *font = NULL;
+        errno_t rc;
+
+        finfo = calloc(1, sizeof(gfx_font_info_t));
+        if (finfo == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        finfo->typeface = tface;
+        finfo->props = *props;
+
+        rc = gfx_font_create_with_info(tface, finfo, metrics, &font);
+        if (rc != EOK)
+                goto error;
+
+        finfo->font = font;
         list_append(&finfo->lfonts, &tface->fonts);
         *rfont = font;
@@ -144 +174 @@
         if (finfo != NULL)
                 free(finfo);
-        if (font != NULL)
-                free(font);
         return rc;
 }
@@ -157 +185 @@
 errno_t gfx_font_open(gfx_font_info_t *finfo, gfx_font_t **rfont)
 {
+        errno_t rc;
+
         if (finfo->font == NULL) {
-                /*
-                 * We cannot load an absent font yet.
-                 * This should not happen.
-                 */
-                assert(false);
-                return ENOTSUP;
+                /* Load absent font from TPF file */
+                rc = gfx_font_load(finfo);
+                if (rc != EOK)
+                        return rc;
+
+                assert(finfo->font != NULL);
+                finfo->font->finfo = finfo;
         }
 
@@ -184 +215 @@
         }
 
+        font->finfo->font = NULL;
         free(font);
 }
@@ -360 +392 @@
 }
 
+/** Load font properties from RIFF TPF file.
+ *
+ * @param parent Parent chunk
+ * @param props Font properties
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_font_props_load(riff_rchunk_t *parent,
+    gfx_font_props_t *props)
+{
+        errno_t rc;
+        riff_rchunk_t propsck;
+        size_t nread;
+
+        rc = riff_rchunk_match(parent, CKID_fprp, &propsck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_read(&propsck, (void *) props, sizeof(*props), &nread);
+        if (rc != EOK || nread != sizeof(*props))
+                return EIO;
+
+        rc = riff_rchunk_end(&propsck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** Save font properties to RIFF TPF file.
  *
@@ -386 +446 @@
 }
 
+/** Load font metrics from RIFF TPF file.
+ *
+ * @param parent Parent chunk
+ * @param metrics Font metrics
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_font_metrics_load(riff_rchunk_t *parent,
+    gfx_font_metrics_t *metrics)
+{
+        errno_t rc;
+        riff_rchunk_t mtrck;
+        size_t nread;
+
+        rc = riff_rchunk_match(parent, CKID_fmtr, &mtrck);
+        if (rc != EOK)
+                return rc;
+
+        rc = riff_read(&mtrck, (void *) metrics, sizeof(*metrics), &nread);
+        if (rc != EOK || nread != sizeof(*metrics))
+                return EIO;
+
+        rc = riff_rchunk_end(&mtrck);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
 /** Save font metrics to RIFF TPF file.
  *
@@ -413 +501 @@
 }
 
+/** Load font bitmap from RIFF TPF file.
+ *
+ * @param parent Parent chunk
+ * @param font Font
+ * @return EOK on success or an error code
+ */
+static errno_t gfx_font_bitmap_load(riff_rchunk_t *parent, gfx_font_t *font)
+{
+        errno_t rc;
+        riff_rchunk_t bmpck;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_alloc_t alloc;
+        gfx_bitmap_t *bitmap = NULL;
+        uint32_t width;
+        uint32_t height;
+        uint32_t depth;
+        size_t nread;
+
+        rc = riff_rchunk_match(parent, CKID_fbmp, &bmpck);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_read_uint32(&bmpck, &width);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_read_uint32(&bmpck, &height);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_read_uint32(&bmpck, &depth);
+        if (rc != EOK)
+                goto error;
+
+        if (depth != 8 * sizeof(uint32_t)) {
+                rc = ENOTSUP;
+                goto error;
+        }
+
+        gfx_bitmap_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = width;
+        params.rect.p1.y = height;
+
+        rc = gfx_bitmap_create(font->typeface->gc, &params, NULL, &bitmap);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_bitmap_get_alloc(bitmap, &alloc);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_read(&bmpck, (void *) alloc.pixels,
+            width * height * sizeof(uint32_t), &nread);
+        if (rc != EOK)
+                goto error;
+
+        if (nread != width * height * sizeof(uint32_t)) {
+                rc = EIO;
+                goto error;
+        }
+
+        rc = riff_rchunk_end(&bmpck);
+        if (rc != EOK)
+                goto error;
+
+        gfx_bitmap_destroy(font->bitmap);
+        font->bitmap = bitmap;
+        font->rect = params.rect;
+        return EOK;
+error:
+        if (bitmap != NULL)
+                gfx_bitmap_destroy(bitmap);
+        return rc;
+}
+
 /** Save font bitmap to RIFF TPF file.
  *
@@ -457 +622 @@
 }
 
+/** Load font info from RIFF TPF file.
+ *
+ * @param tface Containing typeface
+ * @param parent Parent chunk
+ * @return EOK on success or an error code
+ */
+errno_t gfx_font_info_load(gfx_typeface_t *tface, riff_rchunk_t *parent)
+{
+        errno_t rc;
+        riff_rchunk_t fontck;
+        gfx_font_props_t props;
+        gfx_font_info_t *finfo = NULL;
+        gfx_font_t *font = NULL;
+
+        rc = riff_rchunk_list_match(parent, LTYPE_font, &fontck);
+        if (rc != EOK)
+                goto error;
+
+        finfo = calloc(1, sizeof(gfx_font_info_t));
+        if (finfo == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        finfo->fontck = fontck;
+
+        rc = gfx_font_props_load(&fontck, &props);
+        if (rc != EOK)
+                goto error;
+
+        rc = riff_rchunk_end(&fontck);
+        if (rc != EOK)
+                goto error;
+
+        finfo->typeface = tface;
+        list_append(&finfo->lfonts, &tface->fonts);
+        finfo->props = props;
+        finfo->font = NULL;
+
+        return EOK;
+error:
+        if (finfo != NULL)
+                free(finfo);
+        if (font != NULL)
+                gfx_font_close(font);
+        return rc;
+}
+
+/** Load font from RIFF TPF file.
+ *
+ * @param finfo Font information
+ * @return EOK on success or an error code
+ */
+errno_t gfx_font_load(gfx_font_info_t *finfo)
+{
+        errno_t rc;
+        gfx_font_metrics_t metrics;
+        gfx_font_t *font = NULL;
+
+        /* Seek to beginning of chunk (just after list type) */
+        rc = riff_rchunk_seek(&finfo->fontck, sizeof(uint32_t), SEEK_SET);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_font_props_load(&finfo->fontck, &finfo->props);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_font_metrics_load(&finfo->fontck, &metrics);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_font_create_with_info(finfo->typeface, finfo, &metrics, &font);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_font_bitmap_load(&finfo->fontck, font);
+        if (rc != EOK)
+                goto error;
+
+        while (true) {
+                rc = gfx_glyph_load(font, &finfo->fontck);
+                if (rc == ENOENT)
+                        break;
+                if (rc != EOK)
+                        goto error;
+        }
+
+        finfo->font = font;
+        return EOK;
+error:
+        if (font != NULL)
+                gfx_font_close(font);
+        return rc;
+}
+
 /** Save font into RIFF TPF file.
  *
  * @param finfo Font info
  * @param riffw RIFF writer
+ * @return EOK on success or an error code
  */
 errno_t gfx_font_save(gfx_font_info_t *finfo, riffw_t *riffw)