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

Timestamp:

2020-09-30T20:26:24Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c9748a4

Parents:

38a4b6d

Message:

Need to set rectangle/origin for new glyph

Otherwise, having unsaved glyphs would lead to corruption once another
glyph is created, edited and saved.

Location:

uspace/lib/gfxfont/src

Files:

• font.c (modified) (1 diff)
• glyph.c (modified) (3 diffs)

uspace/lib/gfxfont/src/font.c

@@ -274 +274 @@
 }
 
+/** Get last glyph in font.
+ *
+ * @param font Font
+ * @return Last glyph or @c NULL if there are none
+ */
+gfx_glyph_t *gfx_font_last_glyph(gfx_font_t *font)
+{
+        link_t *link;
+
+        link = list_last(&font->glyphs);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, gfx_glyph_t, lglyphs);
+}
+
+/** Get previous glyph in font.
+ *
+ * @param cur Current glyph
+ * @return Previous glyph in font or @c NULL if @a cur was the last one
+ */
+gfx_glyph_t *gfx_font_prev_glyph(gfx_glyph_t *cur)
+{
+        link_t *link;
+
+        link = list_prev(&cur->lglyphs, &cur->font->glyphs);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, gfx_glyph_t, lglyphs);
+}
+
 /** Search for glyph that should be set for the beginning of a string.
  *

uspace/lib/gfxfont/src/glyph.c

@@ -38 +38 @@
 #include <errno.h>
 #include <gfx/bitmap.h>
+#include <gfx/font.h>
 #include <gfx/glyph.h>
 #include <io/pixelmap.h>
@@ -73 +74 @@
 {
         gfx_glyph_t *glyph;
+        gfx_glyph_t *last;
         errno_t rc;
 
@@ -88 +90 @@
         }
 
+        last = gfx_font_last_glyph(font);
+
         glyph->metrics = *metrics;
         list_append(&glyph->lglyphs, &glyph->font->glyphs);
         list_initialize(&glyph->patterns);
+
+        if (last != NULL)
+                glyph->rect.p0.x = last->rect.p1.x;
+        else
+                glyph->rect.p0.x = 0;
+
+        glyph->rect.p0.y = 0;
+        glyph->rect.p1.x = glyph->rect.p0.x;
+        glyph->rect.p1.y = glyph->rect.p1.y;
+
+        glyph->origin.x = glyph->rect.p0.x;
+        glyph->origin.y = glyph->rect.p0.y;
+
         *rglyph = glyph;
         return EOK;