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

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/src

Files:

• font.c (modified) (6 diffs)
• glyph.c (modified) (5 diffs)
• glyph_bmp.c (modified) (4 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;
 }
 

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;
 }
 

uspace/lib/gfxfont/src/glyph_bmp.c

@@ -35 +35 @@
 
 #include <errno.h>
+#include <gfx/coord.h>
 #include <gfx/glyph_bmp.h>
 #include <stdlib.h>
 #include "../private/glyph_bmp.h"
+
+static errno_t gfx_glyph_bmp_extend(gfx_glyph_bmp_t *, gfx_coord2_t *);
+
+/** 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_bmp_open(gfx_glyph_t *glyph, gfx_glyph_bmp_t **rbmp)
+{
+        gfx_glyph_bmp_t *bmp;
+
+        bmp = calloc(1, sizeof(gfx_glyph_bmp_t));
+        if (bmp == NULL)
+                return ENOMEM;
+
+        bmp->rect.p0.x = 0;
+        bmp->rect.p0.y = 0;
+        bmp->rect.p1.x = 0;
+        bmp->rect.p1.y = 0;
+        bmp->pixels = NULL;
+
+        bmp->glyph = glyph;
+        *rbmp = bmp;
+        return EOK;
+}
 
 /** Save glyph bitmap.
@@ -55 +83 @@
 void gfx_glyph_bmp_close(gfx_glyph_bmp_t *bmp)
 {
+        free(bmp->pixels);
+        free(bmp);
 }
 
@@ -66 +96 @@
 int gfx_glyph_bmp_getpix(gfx_glyph_bmp_t *bmp, gfx_coord_t x, gfx_coord_t y)
 {
-        return 0;
+        gfx_coord2_t pos;
+        size_t pitch;
+
+        pos.x = x;
+        pos.y = y;
+        if (!gfx_pix_inside_rect(&pos, &bmp->rect))
+                return 0;
+
+        pitch = bmp->rect.p1.x - bmp->rect.p0.x;
+        return bmp->pixels[(y - bmp->rect.p0.y) * pitch +
+            (x - bmp->rect.p0.x)];
 }
 
@@ -80 +120 @@
     gfx_coord_t y, int value)
 {
+        gfx_coord2_t pos;
+        size_t pitch;
+        errno_t rc;
+
+        pos.x = x;
+        pos.y = y;
+        if (!gfx_pix_inside_rect(&pos, &bmp->rect)) {
+                rc = gfx_glyph_bmp_extend(bmp, &pos);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        pitch = bmp->rect.p1.x - bmp->rect.p0.x;
+        bmp->pixels[(y - bmp->rect.p0.y) * pitch +
+            (x - bmp->rect.p0.x)] = value;
+        return EOK;
+}
+
+/** Extend glyph bitmap to cover a patricular pixel.
+ *
+ * @param bmp Glyph bitmap
+ * @param pos Pixel position
+ *
+ * @return EOK on sucesss, ENOMEM if out of memory
+ */
+static errno_t gfx_glyph_bmp_extend(gfx_glyph_bmp_t *bmp, gfx_coord2_t *pos)
+{
+        gfx_rect_t prect;
+        gfx_rect_t nrect;
+        int *npixels;
+        size_t npitch;
+        size_t opitch;
+        gfx_coord_t x, y;
+
+        /* Compute new rectangle enveloping current rectangle and new pixel */
+        prect.p0 = *pos;
+        prect.p1.x = prect.p0.x + 1;
+        prect.p1.y = prect.p0.y + 1;
+
+        gfx_rect_envelope(&bmp->rect, &prect, &nrect);
+
+        /* Allocate new pixel array */
+        npixels = calloc(sizeof(int), (nrect.p1.x - nrect.p0.x) *
+            (nrect.p1.y - nrect.p0.y));
+        if (npixels == NULL)
+                return ENOMEM;
+
+        /* Transfer pixel data */
+        opitch = bmp->rect.p1.x - bmp->rect.p0.x;
+        npitch = nrect.p1.x - nrect.p0.x;
+
+        for (y = bmp->rect.p0.y; y < bmp->rect.p1.y; y++) {
+                for (x = bmp->rect.p0.x; x < bmp->rect.p1.x; x++) {
+                        npixels[(y - nrect.p0.y) * npitch + x - nrect.p0.x] =
+                            bmp->pixels[(y - bmp->rect.p0.y) * opitch +
+                                x - bmp->rect.p0.x];
+                }
+        }
+
+        /* Switch new and old data */
+        free(bmp->pixels);
+        bmp->pixels = npixels;
+        bmp->rect = nrect;
+
         return EOK;
 }