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

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.

Location:

uspace/lib/gfxfont/src

Files:

• font.c (modified) (4 diffs)
• glyph.c (modified) (2 diffs)
• glyph_bmp.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;
+}
+
 /** @}
  */

uspace/lib/gfxfont/src/glyph.c

@@ -36 +36 @@
 #include <assert.h>
 #include <errno.h>
+#include <gfx/bitmap.h>
 #include <gfx/glyph.h>
+#include <io/pixelmap.h>
 #include <mem.h>
 #include <stdlib.h>
@@ -252 +254 @@
 }
 
+/** Transfer glyph to new font bitmap.
+ *
+ * @param glyph Glyph
+ * @param offs Offset in new font bitmap
+ * @param dest New font bitmap
+ * @param drect Bounding rectangle for @a dest
+ *
+ * @return EOK on success or an error code
+ */
+errno_t gfx_glyph_transfer(gfx_glyph_t *glyph, gfx_coord_t offs,
+    gfx_bitmap_t *dest, gfx_rect_t *drect)
+{
+        pixelmap_t smap;
+        pixelmap_t dmap;
+        gfx_bitmap_alloc_t salloc;
+        gfx_bitmap_alloc_t dalloc;
+        gfx_coord_t x, y;
+        pixel_t pixel;
+        errno_t rc;
+
+        rc = gfx_bitmap_get_alloc(glyph->font->bitmap, &salloc);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_bitmap_get_alloc(dest, &dalloc);
+        if (rc != EOK)
+                return rc;
+
+        smap.width = glyph->font->rect.p1.x;
+        smap.height = glyph->font->rect.p1.y;
+        smap.data = salloc.pixels;
+
+        dmap.width = drect->p1.x;
+        dmap.height = drect->p1.y;
+        dmap.data = dalloc.pixels;
+
+        for (y = drect->p0.y; y < drect->p1.y; y++) {
+                for (x = drect->p0.x; x < drect->p1.x; x++) {
+                        pixel = pixelmap_get_pixel(&smap, x, y);
+                        pixelmap_put_pixel(&dmap, x + offs, y, pixel);
+                }
+        }
+
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/gfxfont/src/glyph_bmp.c

@@ -35 +35 @@
 
 #include <errno.h>
+#include <gfx/bitmap.h>
 #include <gfx/coord.h>
+#include <gfx/font.h>
 #include <gfx/glyph_bmp.h>
+#include <io/pixelmap.h>
 #include <stdlib.h>
+#include "../private/font.h"
+#include "../private/glyph.h"
 #include "../private/glyph_bmp.h"
 
@@ -50 +55 @@
 errno_t gfx_glyph_bmp_open(gfx_glyph_t *glyph, gfx_glyph_bmp_t **rbmp)
 {
+        gfx_font_t *font = glyph->font;
         gfx_glyph_bmp_t *bmp;
+        pixelmap_t pmap;
+        gfx_bitmap_alloc_t alloc;
+        gfx_coord_t x, y;
+        pixel_t pixel;
+        errno_t rc;
 
         bmp = calloc(1, sizeof(gfx_glyph_bmp_t));
@@ -58 +69 @@
         bmp->rect.p0.x = 0;
         bmp->rect.p0.y = 0;
-        bmp->rect.p1.x = 0;
-        bmp->rect.p1.y = 0;
-        bmp->pixels = NULL;
+        bmp->rect.p1.x = glyph->rect.p1.x - glyph->rect.p0.x;
+        bmp->rect.p1.y = glyph->rect.p1.y - glyph->rect.p0.y;
+
+        bmp->pixels = calloc(bmp->rect.p1.x * bmp->rect.p1.y, sizeof(int));
+        if (bmp->pixels == NULL) {
+                free(bmp);
+                return ENOMEM;
+        }
+
+        rc = gfx_bitmap_get_alloc(font->bitmap, &alloc);
+        if (rc != EOK) {
+                free(bmp->pixels);
+                free(bmp);
+                return rc;
+        }
+
+        assert(font->rect.p0.x == 0);
+        assert(font->rect.p0.y == 0);
+        pmap.width = font->rect.p1.x;
+        pmap.height = font->rect.p1.y;
+        pmap.data = alloc.pixels;
+
+        /* Copy pixels from font bitmap */
+
+        for (y = 0; y < bmp->rect.p1.y; y++) {
+                for (x = 0; x < bmp->rect.p1.x; x++) {
+                        pixel = pixelmap_get_pixel(&pmap, glyph->rect.p0.x + x,
+                            glyph->rect.p0.y + y);
+                        bmp->pixels[y * bmp->rect.p1.x + x] =
+                            (pixel != 0) ? 1 : 0;
+                }
+        }
 
         bmp->glyph = glyph;
@@ -74 +114 @@
 errno_t gfx_glyph_bmp_save(gfx_glyph_bmp_t *bmp)
 {
+        gfx_glyph_t *glyph = bmp->glyph;
+        gfx_font_t *font = glyph->font;
+        gfx_coord_t x, y;
+        pixel_t pixel;
+        pixelmap_t pmap;
+        gfx_bitmap_alloc_t alloc;
+        errno_t rc;
+
+        /*
+         * Replace glyph with empty space in the font bitmap, the width
+         * of the empty equal to new glyph bitmap width. The glyph width
+         * is adjusted.
+         */
+        rc = gfx_font_splice_at_glyph(font, glyph,
+            bmp->rect.p1.x - bmp->rect.p0.x, bmp->rect.p1.y - bmp->rect.p0.y);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_bitmap_get_alloc(font->bitmap, &alloc);
+        if (rc != EOK)
+                return rc;
+
+        assert(font->rect.p0.x == 0);
+        assert(font->rect.p0.y == 0);
+        pmap.width = font->rect.p1.x;
+        pmap.height = font->rect.p1.y;
+        pmap.data = alloc.pixels;
+
+        /* Copy pixels to font bitmap */
+
+        for (y = 0; y < bmp->rect.p1.y; y++) {
+                for (x = 0; x < bmp->rect.p1.x; x++) {
+                        pixel = bmp->pixels[y * bmp->rect.p1.x + x] ?
+                            PIXEL(255, 255, 255, 255) : PIXEL(0, 0, 0, 0);
+                        pixelmap_put_pixel(&pmap, glyph->rect.p0.x + x,
+                            glyph->rect.p0.y + y, pixel);
+                }
+        }
+
         return EOK;
 }