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

Timestamp:

2020-08-18T11:32:59Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

20d0098

Parents:

d2100e2

git-author:

Jiri Svoboda <jiri@…> (2020-08-17 18:32:40)

git-committer:

Jiri Svoboda <jiri@…> (2020-08-18 11:32:59)

Message:

Introduce typeface

In other words a font family.

File:

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

uspace/lib/gfxfont/src/font.c

@@ -44 +44 @@
 #include "../private/font.h"
 #include "../private/glyph.h"
+#include "../private/typeface.h"
 
 /** Initialize font metrics structure.
@@ -57 +58 @@
 }
 
-/** Create font in graphics context.
- *
- * @param gc Graphic context
+/** Initialize font properties structure.
+ *
+ * Font properties structure must always be initialized using this function
+ * first.
+ *
+ * @param props Font properties structure
+ */
+void gfx_font_props_init(gfx_font_props_t *props)
+{
+        memset(props, 0, sizeof(gfx_font_props_t));
+}
+
+/** Get font properties.
+ *
+ * @param finfo Font info
+ * @param props Place to store font properties
+ */
+void gfx_font_get_props(gfx_font_info_t *finfo, gfx_font_props_t *props)
+{
+        *props = finfo->props;
+}
+
+/** Create font.
+ *
+ * @param tface Typeface
  * @param metrics Font metrics
  * @param rfont Place to store pointer to new font
@@ -67 +90 @@
  *         was lost
  */
-errno_t gfx_font_create(gfx_context_t *gc, gfx_font_metrics_t *metrics,
-    gfx_font_t **rfont)
-{
-        gfx_font_t *font;
+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;
         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));
-        if (font == NULL)
-                return ENOMEM;
-
-        font->gc = gc;
+        if (font == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        finfo->typeface = tface;
+        finfo->props = *props;
+        finfo->font = font;
+        font->typeface = tface;
 
         rc = gfx_font_set_metrics(font, metrics);
         if (rc != EOK) {
                 assert(rc == EINVAL);
-                free(font);
-                return rc;
+                goto error;
         }
 
@@ -91 +125 @@
         params.rect = font->rect;
 
-        rc = gfx_bitmap_create(font->gc, &params, NULL, &font->bitmap);
-        if (rc != EOK) {
-                free(font);
-                return rc;
-        }
+        rc = gfx_bitmap_create(tface->gc, &params, NULL, &font->bitmap);
+        if (rc != EOK)
+                goto error;
 
         font->metrics = *metrics;
         list_initialize(&font->glyphs);
+        list_append(&finfo->lfonts, &tface->fonts);
         *rfont = font;
         return EOK;
-}
-
-/** Destroy font.
- *
- * @param font Font
- */
-void gfx_font_destroy(gfx_font_t *font)
+error:
+        if (finfo != NULL)
+                free(finfo);
+        if (font != NULL)
+                free(font);
+        return rc;
+}
+
+/** Open font.
+ *
+ * @param finfo Font info
+ * @param rfont Place to store pointer to open font
+ * @return EOK on success or an error code
+ */
+errno_t gfx_font_open(gfx_font_info_t *finfo, gfx_font_t **rfont)
+{
+        if (finfo->font == NULL) {
+                /*
+                 * We cannot load an absent font yet.
+                 * This should not happen.
+                 */
+                assert(false);
+                return ENOTSUP;
+        }
+
+        *rfont = finfo->font;
+        return EOK;
+}
+
+/** Close font.
+ *
+ * @param font Font
+ */
+void gfx_font_close(gfx_font_t *font)
 {
         gfx_glyph_t *glyph;
@@ -232 +292 @@
                 params.rect.p1.y = height;
 
-        rc = gfx_bitmap_create(font->gc, &params, NULL, &nbitmap);
+        rc = gfx_bitmap_create(font->typeface->gc, &params, NULL, &nbitmap);
         if (rc != EOK)
                 goto error;