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

Timestamp:

2020-08-09T18:40:28Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

06b8383

Parents:

5592c56

Message:

Finish glyph bitmap operations and tests

Setting/getting pixel, opening/saving glyph bitmap.

File:

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

uspace/lib/gfxfont/src/font.c

@@ -37 +37 @@
 #include <assert.h>
 #include <errno.h>
+#include <gfx/bitmap.h>
 #include <gfx/font.h>
 #include <gfx/glyph.h>
@@ -70 +71 @@
 {
         gfx_font_t *font;
+        gfx_bitmap_params_t params;
         errno_t rc;
 
@@ -81 +83 @@
         if (rc != EOK) {
                 assert(rc == EINVAL);
+                free(font);
+                return rc;
+        }
+
+        /* Create font bitmap */
+        gfx_bitmap_params_init(&params);
+        params.rect = font->rect;
+
+        rc = gfx_bitmap_create(font->gc, &params, NULL, &font->bitmap);
+        if (rc != EOK) {
                 free(font);
                 return rc;
@@ -190 +202 @@
 }
 
+/** Replace glyph graphic with empty space of specified width.
+ *
+ * This is used to resize a glyph in the font bitmap. This changes
+ * the bitmap widht and might also make the bitmap taller.
+ * Width and height of the glyph is also adjusted accordingly.
+ *
+ * @param font Font
+ * @param glyph Glyph to replace
+ * @param width Width of replacement space
+ * @param height Height of replacement space
+ */
+errno_t gfx_font_splice_at_glyph(gfx_font_t *font, gfx_glyph_t *glyph,
+    gfx_coord_t width, gfx_coord_t height)
+{
+        gfx_glyph_t *g;
+        gfx_bitmap_t *nbitmap;
+        gfx_bitmap_params_t params;
+        gfx_coord_t dwidth;
+        errno_t rc;
+
+        /* Change of width of glyph */
+        dwidth = width - (glyph->rect.p1.x - glyph->rect.p0.x);
+
+        /* Create new font bitmap, wider by dwidth pixels */
+        gfx_bitmap_params_init(&params);
+        params.rect = font->rect;
+        params.rect.p1.x += dwidth;
+        if (height > params.rect.p1.y)
+                params.rect.p1.y = height;
+
+        rc = gfx_bitmap_create(font->gc, &params, NULL, &nbitmap);
+        if (rc != EOK)
+                goto error;
+
+        /* Transfer glyphs before @a glyph */
+        g = gfx_font_first_glyph(font);
+        while (g != glyph) {
+                assert(g != NULL);
+
+                rc = gfx_glyph_transfer(g, 0, nbitmap, &params.rect);
+                if (rc != EOK)
+                        goto error;
+
+                g = gfx_font_next_glyph(g);
+        }
+
+        /* Skip @a glyph */
+        g = gfx_font_next_glyph(g);
+
+        /* Transfer glyphs after glyph */
+        while (g != NULL) {
+                rc = gfx_glyph_transfer(g, dwidth, nbitmap, &params.rect);
+                if (rc != EOK)
+                        goto error;
+
+                /* Update glyph coordinates */
+                g->rect.p0.x += dwidth;
+                g->rect.p1.x += dwidth;
+                g->origin.x += dwidth;
+
+                g = gfx_font_next_glyph(g);
+        }
+
+        /* Update glyph width and height */
+        glyph->rect.p1.x = glyph->rect.p0.x + width;
+        glyph->rect.p1.y = glyph->rect.p0.y + height;
+
+        /* Update font bitmap */
+        gfx_bitmap_destroy(font->bitmap);
+        font->bitmap = nbitmap;
+        font->rect = params.rect;
+
+        return EOK;
+error:
+        if (nbitmap != NULL)
+                gfx_bitmap_destroy(nbitmap);
+        return rc;
+}
+
 /** @}
  */