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

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

File:

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

uspace/lib/gfxfont/src/glyph.c

@@ -39 +39 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <str.h>
+#include "../private/font.h"
 #include "../private/glyph.h"
 
@@ -83 +85 @@
 
         glyph->metrics = *metrics;
+        list_append(&glyph->lglyphs, &glyph->font->glyphs);
+        list_initialize(&glyph->patterns);
         *rglyph = glyph;
         return EOK;
@@ -93 +97 @@
 void gfx_glyph_destroy(gfx_glyph_t *glyph)
 {
+        list_remove(&glyph->lglyphs);
         free(glyph);
 }
@@ -130 +135 @@
 errno_t gfx_glyph_set_pattern(gfx_glyph_t *glyph, const char *pattern)
 {
+        gfx_glyph_pattern_t *pat;
+
+        pat = gfx_glyph_first_pattern(glyph);
+        while (pat != NULL) {
+                if (str_cmp(pat->text, pattern) == 0) {
+                        /* Already set */
+                        return EOK;
+                }
+
+                pat = gfx_glyph_next_pattern(pat);
+        }
+
+        pat = calloc(1, sizeof(gfx_glyph_pattern_t));
+        if (pat == NULL)
+                return ENOMEM;
+
+        pat->glyph = glyph;
+        pat->text = str_dup(pattern);
+        if (pat->text == NULL) {
+                free(pat);
+                return ENOMEM;
+        }
+
+        list_append(&pat->lpatterns, &glyph->patterns);
         return EOK;
 }
@@ -142 +171 @@
 void gfx_glyph_clear_pattern(gfx_glyph_t *glyph, const char *pattern)
 {
-}
-
-/** Open glyph bitmap for editing.
- *
- * @param glyph Glyph
- * @param rbmp Place to store glyph bitmap
- * @return EOK on success, ENOMEM if out of memory
- */
-errno_t gfx_glyph_open_bmp(gfx_glyph_t *glyph, gfx_glyph_bmp_t **rbmp)
-{
-        return EOK;
+        gfx_glyph_pattern_t *pat;
+
+        pat = gfx_glyph_first_pattern(glyph);
+        while (pat != NULL) {
+                if (str_cmp(pat->text, pattern) == 0) {
+                        list_remove(&pat->lpatterns);
+                        free(pat->text);
+                        free(pat);
+                        return;
+                }
+
+                pat = gfx_glyph_next_pattern(pat);
+        }
+}
+
+/** Determine if glyph maches the beginning of a string.
+ *
+ * @param glyph Glyph
+ * @param str String
+ * @param rsize Place to store number of bytes in the matching pattern
+ * @return @c true iff glyph matches the beginning of the string
+ */
+bool gfx_glyph_matches(gfx_glyph_t *glyph, const char *str, size_t *rsize)
+{
+        gfx_glyph_pattern_t *pat;
+
+        pat = gfx_glyph_first_pattern(glyph);
+        while (pat != NULL) {
+                if (str_test_prefix(str, pat->text)) {
+                        *rsize = str_size(pat->text);
+                        return true;
+                }
+
+                pat = gfx_glyph_next_pattern(pat);
+        }
+
+        return false;
+}
+
+/** Get first glyph pattern.
+ *
+ * @param glyph Glyph
+ * @return First pattern or @c NULL if there are none
+ */
+gfx_glyph_pattern_t *gfx_glyph_first_pattern(gfx_glyph_t *glyph)
+{
+        link_t *link;
+
+        link = list_first(&glyph->patterns);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, gfx_glyph_pattern_t, lpatterns);
+}
+
+/** Get next glyph pattern.
+ *
+ * @param cur Current pattern
+ * @return Next pattern or @c NULL if there are none
+ */
+gfx_glyph_pattern_t *gfx_glyph_next_pattern(gfx_glyph_pattern_t *cur)
+{
+        link_t *link;
+
+        link = list_next(&cur->lpatterns, &cur->glyph->patterns);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, gfx_glyph_pattern_t, lpatterns);
+}
+
+/** Return pattern string.
+ *
+ * @param pattern Pattern
+ * @return Pattern string (owned by @a pattern)
+ */
+const char *gfx_glyph_pattern_str(gfx_glyph_pattern_t *pattern)
+{
+        return pattern->text;
 }