Changeset a57c70c in mainline for uspace/lib

Timestamp:

2020-09-11T13:38:00Z (5 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/lib/gfxfont

Files:

• include/gfx/font.h (modified) (1 diff)
• include/gfx/glyph.h (modified) (1 diff)
• src/font.c (modified) (1 diff)
• src/glyph.c (modified) (1 diff)

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.
  *