Changeset 8fa65af0 in mainline for uspace/app/fontedit/fontedit.c

Timestamp:

2020-10-06T08:59:57Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

74f59b7

Parents:

25f2983b

git-author:

Jiri Svoboda <jiri@…> (2020-10-05 18:59:36)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-06 08:59:57)

Message:

Add text rendering routine and demo

File:

• uspace/app/fontedit/fontedit.c (modified) (2 diffs)

uspace/app/fontedit/fontedit.c

@@ -41 +41 @@
 #include <gfx/glyph.h>
 #include <gfx/render.h>
+#include <gfx/text.h>
 #include <gfx/typeface.h>
 #include <stdbool.h>
@@ -422 +423 @@
     gfx_coord_t x, gfx_coord_t y, const char *str)
 {
-        gfx_glyph_metrics_t gmetrics;
-        size_t stradv;
-        const char *cp;
+        gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
-        gfx_glyph_t *glyph;
-        errno_t rc;
+
+        gfx_text_fmt_init(&fmt);
 
         pos.x = x;
         pos.y = y;
-        cp = str;
-
-        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;
+
+        return gfx_puttext(fedit->font, &pos, &fmt, str);
 }