Changeset b433f68 in mainline for uspace/lib/gfxfont

Timestamp:

2021-02-26T16:23:36Z (5 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.

Location:

uspace/lib/gfxfont

Files:

• include/types/gfx/text.h (modified) (2 diffs)
• src/text.c (modified) (6 diffs)
• test/text.c (modified) (5 diffs)

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

@@ -38 +38 @@
 
 #include <types/gfx/coord.h>
+#include <types/gfx/color.h>
 
 /** Text horizontal alignment */
@@ -65 +66 @@
 /** Text formatting */
 typedef struct {
+        /** Text color */
+        gfx_color_t *color;
         /** Horizontal alignment */
         gfx_halign_t halign;

uspace/lib/gfxfont/src/text.c

@@ -36 +36 @@
 #include <errno.h>
 #include <gfx/bitmap.h>
+#include <gfx/color.h>
 #include <gfx/font.h>
 #include <gfx/glyph.h>
+#include <gfx/render.h>
 #include <gfx/text.h>
 #include <io/pixelmap.h>
@@ -97 +99 @@
  * @param font Font
  * @param pos Position of top-left corner of text
+ * @param color Text color
  * @param str String
  * @return EOK on success or an error code
  */
 static errno_t gfx_puttext_textmode(gfx_font_t *font, gfx_coord2_t *pos,
-    const char *str)
+    gfx_color_t *color, const char *str)
 {
         gfx_context_t *gc = font->typeface->gc;
@@ -107 +110 @@
         gfx_bitmap_t *bitmap;
         gfx_bitmap_alloc_t alloc;
+        uint16_t r, g, b;
         pixelmap_t pmap;
         gfx_coord_t x;
@@ -116 +120 @@
          * the most efficient way.
          */
+
+        gfx_color_get_rgb_i16(color, &r, &g, &b);
+
+        /*
+         * We are setting the *background* color, the foreground color
+         * will be set to its complement.
+         */
+        r = 0xff ^ (r >> 8);
+        g = 0xff ^ (g >> 8);
+        b = 0xff ^ (b >> 8);
 
         gfx_bitmap_params_init(&params);
@@ -138 +152 @@
 
         for (x = 0; x < params.rect.p1.x; x++) {
-                pixel = PIXEL(str[x], 0xff, 0xff, 0xff);
+                pixel = PIXEL(str[x], r, g, b);
                 pixelmap_put_pixel(&pmap, x, 0, pixel);
         }
@@ -206 +220 @@
         /* Text mode */
         if ((font->finfo->props.flags & gff_text_mode) != 0)
-                return gfx_puttext_textmode(font, &cpos, str);
+                return gfx_puttext_textmode(font, &cpos, fmt->color, str);
+
+        rc = gfx_set_color(font->typeface->gc, fmt->color);
+        if (rc != EOK)
+                return rc;
 
         cp = str;

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);