Changeset 06b8383 in mainline for uspace/lib/gfxfont/private/font.h

Timestamp:

2020-08-18T11:32:59Z (4 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/private/font.h (modified) (3 diffs)

uspace/lib/gfxfont/private/font.h

@@ -43 +43 @@
 #include <types/gfx/context.h>
 #include <types/gfx/font.h>
+#include <types/gfx/typeface.h>
 
 /** Font
@@ -55 +56 @@
  */
 struct gfx_font {
-        /** Graphics context of the font */
-        gfx_context_t *gc;
+        /** Containing typeface */
+        struct gfx_typeface *typeface;
         /** Font metrics */
         gfx_font_metrics_t metrics;
@@ -67 +68 @@
 };
 
+/** Font info
+ *
+ * This is an entry in the list of fonts in typeface
+ */
+struct gfx_font_info {
+        /** Containing typeface */
+        struct gfx_typeface *typeface;
+        /** Link to @c typeface->fonts */
+        link_t lfonts;
+        /** Font properties */
+        gfx_font_props_t props;
+        /** Font or @c NULL if font is not present in memory */
+        struct gfx_font *font;
+};
+
 extern errno_t gfx_font_splice_at_glyph(gfx_font_t *, gfx_glyph_t *,
     gfx_coord_t, gfx_coord_t);