Changeset c78a03d in mainline for uspace/lib/gfxfont/include

Timestamp:

2020-07-21T22:48:59Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5592c56

Parents:

703c743

Message:

Flesh out most of font, glyph and glyph bitmap implementation and tests

Location:

uspace/lib/gfxfont/include

Files:

• gfx/glyph.h (modified) (2 diffs)
• gfx/glyph_bmp.h (modified) (1 diff)
• types/gfx/font.h (modified) (1 diff)
• types/gfx/glyph.h (modified) (1 diff)

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

@@ -40 +40 @@
 #include <types/gfx/font.h>
 #include <types/gfx/glyph.h>
-#include <types/gfx/glyph_bmp.h>
+#include <stdbool.h>
+#include <stddef.h>
 
 extern void gfx_glyph_metrics_init(gfx_glyph_metrics_t *);
@@ -50 +51 @@
 extern errno_t gfx_glyph_set_pattern(gfx_glyph_t *, const char *);
 extern void gfx_glyph_clear_pattern(gfx_glyph_t *, const char *);
-extern errno_t gfx_glyph_open_bmp(gfx_glyph_t *, gfx_glyph_bmp_t **);
+extern bool gfx_glyph_matches(gfx_glyph_t *, const char *, size_t *);
+extern gfx_glyph_pattern_t *gfx_glyph_first_pattern(gfx_glyph_t *);
+extern gfx_glyph_pattern_t *gfx_glyph_next_pattern(gfx_glyph_pattern_t *);
+extern const char *gfx_glyph_pattern_str(gfx_glyph_pattern_t *);
 
 #endif

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

@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/coord.h>
+#include <types/gfx/glyph.h>
 #include <types/gfx/glyph_bmp.h>
 
+extern errno_t gfx_glyph_bmp_open(gfx_glyph_t *, gfx_glyph_bmp_t **);
 extern errno_t gfx_glyph_bmp_save(gfx_glyph_bmp_t *);
 extern void gfx_glyph_bmp_close(gfx_glyph_bmp_t *);

uspace/lib/gfxfont/include/types/gfx/font.h

@@ -45 +45 @@
 typedef struct {
         /** Ascent */
-        gfx_coord_t acent;
+        gfx_coord_t ascent;
         /** Descent */
         gfx_coord_t descent;

uspace/lib/gfxfont/include/types/gfx/glyph.h

@@ -42 +42 @@
 typedef struct gfx_glyph gfx_glyph_t;
 
+struct gfx_glyph_pattern;
+typedef struct gfx_glyph_pattern gfx_glyph_pattern_t;
+
 /** Glyph metrics */
 typedef struct {