Changeset b433f68 in mainline for uspace/lib/gfxfont/test/text.c

Timestamp:

2021-02-26T16:23:36Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

77ffa01

Parents:

fe40b67

Message:

Puttext needs to know the color of the text being printed

So far we were using the GC's current drawing color. But unless there
was a way to read it, we could not render text-mode text in the correct
color.

File:

• uspace/lib/gfxfont/test/text.c (modified) (5 diffs)

uspace/lib/gfxfont/test/text.c

@@ -27 +27 @@
  */
 
+#include <gfx/color.h>
 #include <gfx/context.h>
 #include <gfx/font.h>
@@ -110 +111 @@
         gfx_font_t *font;
         gfx_context_t *gc;
+        gfx_color_t *color;
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
@@ -118 +120 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &color);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
         rc = gfx_typeface_create(gc, &tface);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
@@ -127 +132 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.color = color;
         pos.x = 0;
         pos.y = 0;
@@ -135 +141 @@
         gfx_font_close(font);
         gfx_typeface_destroy(tface);
+        gfx_color_delete(color);
 
         rc = gfx_context_delete(gc);