Changeset a57c70c in mainline

Timestamp:

2020-09-11T13:38:00Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

414020d9

Parents:

e2776ff

git-author:

Jiri Svoboda <jiri@…> (2020-09-10 17:37:41)

git-committer:

Jiri Svoboda <jiri@…> (2020-09-11 13:38:00)

Message:

Save glyph with S key and get a preview

Location:

uspace

Files:

• app/fontedit/fontedit.c (modified) (6 diffs)
• app/fontedit/fontedit.h (modified) (1 diff)
• lib/gfxfont/include/gfx/font.h (modified) (1 diff)
• lib/gfxfont/include/gfx/glyph.h (modified) (1 diff)
• lib/gfxfont/src/font.c (modified) (1 diff)
• lib/gfxfont/src/glyph.c (modified) (1 diff)

uspace/app/fontedit/fontedit.c

@@ -120 +120 @@
 }
 
+/** Handle font editor keyboard event.
+ *
+ * @param widget Canvas widget
+ * @param data Position event
+ */
+static void font_edit_kbd_event(widget_t *widget, void *data)
+{
+        kbd_event_t *event = (kbd_event_t *) data;
+        font_edit_t *fedit;
+
+        fedit = (font_edit_t *) widget_get_data(widget);
+
+        if (event->type == KEY_PRESS) {
+                if (event->key == KC_S) {
+                        printf("Save!\n");
+                        (void) gfx_glyph_bmp_save(fedit->gbmp);
+                        font_edit_paint(fedit);
+                }
+        }
+}
+
 /** Convert glyph pixel coordinates to displayed rectangle.
  *
@@ -139 +160 @@
         drect->p1.x = glyph_orig_x + (x + 1) * glyph_scale;
         drect->p1.y = glyph_orig_y + (y + 1) * glyph_scale;
+}
+
+/** Paint font preview.
+ *
+ * @param fedit Font editor
+ */
+static errno_t font_edit_paint_preview(font_edit_t *fedit)
+{
+        gfx_glyph_metrics_t gmetrics;
+        size_t stradv;
+        const char *cp;
+        gfx_glyph_t *glyph;
+        gfx_coord2_t pos;
+        errno_t rc;
+
+        cp = "ABCD";
+        pos.x = 20;
+        pos.y = 20;
+
+        while (*cp != '\0') {
+                rc = gfx_font_search_glyph(fedit->font, cp, &glyph, &stradv);
+                if (rc != EOK) {
+                        ++cp;
+                        continue;
+                }
+
+                gfx_glyph_get_metrics(glyph, &gmetrics);
+
+                rc = gfx_glyph_render(glyph, &pos);
+                if (rc != EOK)
+                        return rc;
+
+                cp += stradv;
+                pos.x += gmetrics.advance;
+        }
+
+        return EOK;
 }
 
@@ -224 +282 @@
 
         rc = font_edit_paint_gbmp(fedit);
+        if (rc != EOK)
+                return rc;
+
+        rc = font_edit_paint_preview(fedit);
         if (rc != EOK)
                 return rc;
@@ -334 +396 @@
         }
 
+        rc = gfx_glyph_set_pattern(glyph, "A");
+        if (rc != EOK) {
+                printf("Error setting glyph pattern.\n");
+                goto error;
+        }
+
         rc = gfx_glyph_bmp_open(glyph, &bmp);
         if (rc != EOK) {
@@ -342 +410 @@
         sig_connect(&canvas->position_event, &canvas->widget,
             font_edit_pos_event);
+        sig_connect(&canvas->keyboard_event, &canvas->widget,
+            font_edit_kbd_event);
 
         fedit->cgc = cgc;
@@ -348 +418 @@
         fedit->height = vh;
         fedit->typeface = tface;
+        fedit->font = font;
         fedit->glyph = glyph;
         fedit->gbmp = bmp;

uspace/app/fontedit/fontedit.h

@@ -54 +54 @@
         /** Typeface */
         gfx_typeface_t *typeface;
+        /** Font */
+        gfx_font_t *font;
         /** Glyph */
         gfx_glyph_t *glyph;

uspace/lib/gfxfont/include/gfx/font.h

@@ -56 +56 @@
 extern gfx_glyph_t *gfx_font_first_glyph(gfx_font_t *);
 extern gfx_glyph_t *gfx_font_next_glyph(gfx_glyph_t *);
-extern int gfx_font_search_glyph(gfx_font_t *, const char *, gfx_glyph_t **,
+extern errno_t gfx_font_search_glyph(gfx_font_t *, const char *, gfx_glyph_t **,
     size_t *);
 

uspace/lib/gfxfont/include/gfx/glyph.h

@@ -55 +55 @@
 extern gfx_glyph_pattern_t *gfx_glyph_next_pattern(gfx_glyph_pattern_t *);
 extern const char *gfx_glyph_pattern_str(gfx_glyph_pattern_t *);
+extern errno_t gfx_glyph_render(gfx_glyph_t *, gfx_coord2_t *);
 
 #endif

uspace/lib/gfxfont/src/font.c

@@ -248 +248 @@
  * @return EOK on success, ENOENT if no matching glyph was found
  */
-int gfx_font_search_glyph(gfx_font_t *font, const char *str,
+errno_t gfx_font_search_glyph(gfx_font_t *font, const char *str,
     gfx_glyph_t **rglyph, size_t *rsize)
 {

uspace/lib/gfxfont/src/glyph.c

@@ -254 +254 @@
 }
 
+/** Render glyph to GC.
+ *
+ * @param glyph Glyph
+ * @param pos Position to render to (where glyph origin is placed)
+ */
+errno_t gfx_glyph_render(gfx_glyph_t *glyph, gfx_coord2_t *pos)
+{
+        gfx_coord2_t offs;
+
+        gfx_coord2_subtract(pos, &glyph->origin, &offs);
+
+        return gfx_bitmap_render(glyph->font->bitmap, &glyph->rect, &offs);
+}
+
 /** Transfer glyph to new font bitmap.
  *