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

Timestamp:

2020-07-21T22:48:59Z (4 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

File:

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

uspace/lib/gfxfont/src/font.c

@@ -34 +34 @@
  */
 
+#include <adt/list.h>
 #include <assert.h>
 #include <errno.h>
 #include <gfx/font.h>
+#include <gfx/glyph.h>
 #include <mem.h>
 #include <stdlib.h>
 #include "../private/font.h"
+#include "../private/glyph.h"
 
 /** Initialize font metrics structure.
@@ -83 +86 @@
 
         font->metrics = *metrics;
+        list_initialize(&font->glyphs);
         *rfont = font;
         return EOK;
@@ -93 +97 @@
 void gfx_font_destroy(gfx_font_t *font)
 {
+        gfx_glyph_t *glyph;
+
+        glyph = gfx_font_first_glyph(font);
+        while (glyph != NULL) {
+                gfx_glyph_destroy(glyph);
+                glyph = gfx_font_first_glyph(font);
+        }
+
         free(font);
 }
@@ -125 +137 @@
 gfx_glyph_t *gfx_font_first_glyph(gfx_font_t *font)
 {
-        return NULL;
+        link_t *link;
+
+        link = list_first(&font->glyphs);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, gfx_glyph_t, lglyphs);
 }
 
@@ -135 +153 @@
 gfx_glyph_t *gfx_font_next_glyph(gfx_glyph_t *cur)
 {
-        return NULL;
+        link_t *link;
+
+        link = list_next(&cur->lglyphs, &cur->font->glyphs);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, gfx_glyph_t, lglyphs);
 }
 
@@ -149 +173 @@
     gfx_glyph_t **rglyph, size_t *rsize)
 {
-        return EOK;
+        gfx_glyph_t *glyph;
+        size_t msize;
+
+        glyph = gfx_font_first_glyph(font);
+        while (glyph != NULL) {
+                if (gfx_glyph_matches(glyph, str, &msize)) {
+                        *rglyph = glyph;
+                        *rsize = msize;
+                        return EOK;
+                }
+
+                glyph = gfx_font_next_glyph(glyph);
+        }
+
+        return ENOENT;
 }