Changeset 4583015 in mainline for uspace/lib/gfxfont/include

Timestamp:

2022-03-07T16:10:44Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ca2680d

Parents:

5c27e77

Message:

Add font to gfx_text_fmt_t

This is quite logical and saves us one argument that we need to pass to
all text formatting functions.

Location:

uspace/lib/gfxfont/include

Files:

• gfx/text.h (modified) (1 diff)
• types/gfx/text.h (modified) (1 diff)

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

@@ -45 +45 @@
 extern void gfx_text_fmt_init(gfx_text_fmt_t *);
 extern gfx_coord_t gfx_text_width(gfx_font_t *, const char *);
-extern errno_t gfx_puttext(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
-    const char *);
-extern void gfx_text_start_pos(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
-    const char *, gfx_coord2_t *);
-extern size_t gfx_text_find_pos(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
-    const char *, gfx_coord2_t *);
-extern void gfx_text_cont(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
-    const char *, gfx_coord2_t *, gfx_text_fmt_t *);
-extern void gfx_text_rect(gfx_font_t *, gfx_coord2_t *, gfx_text_fmt_t *,
-    const char *, gfx_rect_t *);
+extern errno_t gfx_puttext(gfx_coord2_t *, gfx_text_fmt_t *, const char *);
+extern void gfx_text_start_pos(gfx_coord2_t *, gfx_text_fmt_t *, const char *,
+    gfx_coord2_t *);
+extern size_t gfx_text_find_pos(gfx_coord2_t *, gfx_text_fmt_t *, const char *,
+    gfx_coord2_t *);
+extern void gfx_text_cont(gfx_coord2_t *, gfx_text_fmt_t *, const char *,
+    gfx_coord2_t *, gfx_text_fmt_t *);
+extern void gfx_text_rect(gfx_coord2_t *, gfx_text_fmt_t *, const char *,
+    gfx_rect_t *);
 
 #endif

uspace/lib/gfxfont/include/types/gfx/text.h

@@ -67 +67 @@
 /** Text formatting */
 typedef struct {
+        /** Text font */
+        struct gfx_font *font;
         /** Text color */
         gfx_color_t *color;