Changeset 313ac8e in mainline

Timestamp:

2020-09-17T15:28:03Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7bef2d8

Parents:

414020d9

Message:

Make negative quadrants actually work

Location:

uspace/lib/gfxfont

Files:

• private/font.h (modified) (1 diff)
• src/font.c (modified) (5 diffs)
• src/glyph_bmp.c (modified) (6 diffs)
• test/font.c (modified) (2 diffs)
• test/glyph_bmp.c (modified) (1 diff)

uspace/lib/gfxfont/private/font.h

@@ -84 +84 @@
 
 extern errno_t gfx_font_splice_at_glyph(gfx_font_t *, gfx_glyph_t *,
-    gfx_coord_t, gfx_coord_t);
+    gfx_rect_t *);
 
 #endif

uspace/lib/gfxfont/src/font.c

@@ -271 +271 @@
  *
  * 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.
+ * the bitmap widht might also make the bitmap taller.
+ * Dimensions of the glyph are also adjusted according to @a nrect.
  *
  * @param font Font
  * @param glyph Glyph to replace
- * @param width Width of replacement space
- * @param height Height of replacement space
+ * @param nrect Replacement rectangle
  */
 errno_t gfx_font_splice_at_glyph(gfx_font_t *font, gfx_glyph_t *glyph,
-    gfx_coord_t width, gfx_coord_t height)
+    gfx_rect_t *nrect)
 {
         gfx_glyph_t *g;
@@ -286 +285 @@
         gfx_bitmap_params_t params;
         gfx_coord_t dwidth;
+        gfx_coord_t x0;
         errno_t rc;
 
         /* Change of width of glyph */
-        dwidth = width - (glyph->rect.p1.x - glyph->rect.p0.x);
+        dwidth = (nrect->p1.x - nrect->p0.x) -
+            (glyph->rect.p1.x - glyph->rect.p0.x);
 
         /* Create new font bitmap, wider by dwidth pixels */
@@ -295 +296 @@
         params.rect = font->rect;
         params.rect.p1.x += dwidth;
-        if (height > params.rect.p1.y)
-                params.rect.p1.y = height;
+        if (nrect->p1.y - nrect->p0.y > params.rect.p1.y)
+                params.rect.p1.y = nrect->p1.y - nrect->p0.y;
 
         rc = gfx_bitmap_create(font->typeface->gc, &params, NULL, &nbitmap);
         if (rc != EOK)
                 goto error;
+
+        /*
+         * In x0 we compute the left margin of @a glyph. We start with
+         * zero and then, if there are any preceding glyphs, we set it
+         * to the right margin of the last one.
+         */
+        x0 = 0;
 
         /* Transfer glyphs before @a glyph */
@@ -310 +318 @@
                 if (rc != EOK)
                         goto error;
+
+                /* Left margin of the next glyph */
+                x0 = g->rect.p1.x;
 
                 g = gfx_font_next_glyph(g);
@@ -331 +342 @@
         }
 
-        /* Update glyph width and height */
-        glyph->rect.p1.x = glyph->rect.p0.x + width;
-        glyph->rect.p1.y = glyph->rect.p0.y + height;
+        /* Place glyph rectangle inside the newly created space */
+        glyph->origin.x = x0 - nrect->p0.x;
+        glyph->origin.y = 0 - nrect->p0.y;
+        gfx_rect_translate(&glyph->origin, nrect, &glyph->rect);
 
         /* Update font bitmap */

uspace/lib/gfxfont/src/glyph_bmp.c

@@ -66 +66 @@
                 return ENOMEM;
 
-        bmp->rect.p0.x = 0;
-        bmp->rect.p0.y = 0;
-        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));
+        /* Bitmap coordinates are relative to glyph origin point */
+        gfx_rect_rtranslate(&glyph->origin, &glyph->rect, &bmp->rect);
+
+        bmp->pixels = calloc((bmp->rect.p1.x - bmp->rect.p0.x) *
+            (bmp->rect.p1.y - bmp->rect.p0.y), sizeof(int));
         if (bmp->pixels == NULL) {
                 free(bmp);
@@ -92 +91 @@
         /* 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;
+        for (y = bmp->rect.p0.y; y < bmp->rect.p1.y; y++) {
+                for (x = bmp->rect.p0.x; x < bmp->rect.p1.x; x++) {
+                        pixel = pixelmap_get_pixel(&pmap, glyph->origin.x + x,
+                            glyph->origin.y + y);
+                        bmp->pixels[(y - bmp->rect.p0.y) *
+                            (bmp->rect.p1.x - bmp->rect.p0.x) +
+                            (x - bmp->rect.p0.x)] = (pixel != 0) ? 1 : 0;
                 }
         }
@@ -126 +126 @@
          * 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);
+        rc = gfx_font_splice_at_glyph(font, glyph, &bmp->rect);
         if (rc != EOK)
                 return rc;
@@ -143 +142 @@
         /* 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] ?
+        for (y = bmp->rect.p0.y; y < bmp->rect.p1.y; y++) {
+                for (x = bmp->rect.p0.x; x < bmp->rect.p1.x; x++) {
+                        pixel = bmp->pixels[(y - bmp->rect.p0.y) *
+                            (bmp->rect.p1.x - bmp->rect.p0.x) +
+                            (x - bmp->rect.p0.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);
+                        pixelmap_put_pixel(&pmap, glyph->origin.x + x,
+                            glyph->origin.y + y, pixel);
                 }
         }
@@ -193 +194 @@
 
         pitch = bmp->rect.p1.x - bmp->rect.p0.x;
+
         return bmp->pixels[(y - bmp->rect.p0.y) * pitch +
             (x - bmp->rect.p0.x)];
@@ -214 +216 @@
         pos.x = x;
         pos.y = y;
+
         if (!gfx_pix_inside_rect(&pos, &bmp->rect)) {
                 rc = gfx_glyph_bmp_extend(bmp, &pos);

uspace/lib/gfxfont/test/font.c

@@ -332 +332 @@
         gfx_glyph_t *glyph;
         gfx_context_t *gc;
+        gfx_rect_t nrect;
         test_gc_t tgc;
         errno_t rc;
@@ -350 +351 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = gfx_font_splice_at_glyph(font, glyph, 10, 10);
+        nrect.p0.x = -5;
+        nrect.p0.y = -5;
+        nrect.p1.x = 5;
+        nrect.p1.y = 5;
+        rc = gfx_font_splice_at_glyph(font, glyph, &nrect);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

uspace/lib/gfxfont/test/glyph_bmp.c

@@ -185 +185 @@
         PCUT_ASSERT_INT_EQUALS(0, pix);
 
-        gfx_glyph_bmp_close(bmp);
+        /* ... */
+
+        rc = gfx_glyph_bmp_setpix(bmp, 1, -1, 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_glyph_bmp_save(bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_glyph_bmp_close(bmp);
+
+        /* Once again */
+
+        rc = gfx_glyph_bmp_open(glyph, &bmp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(bmp);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, 0);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 1, 1);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 1, 0);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, 1);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 1, -1);
+        PCUT_ASSERT_INT_EQUALS(1, pix);
+
+        pix = gfx_glyph_bmp_getpix(bmp, 0, -1);
+        PCUT_ASSERT_INT_EQUALS(0, pix);
+
         gfx_glyph_destroy(glyph);