Changeset 6a87f28 in mainline

Timestamp:

2021-02-25T16:48:13Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bac8acab

Parents:

26853ebc

Message:

First attempt at printing text in text-mode via GFX

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (4 diffs)
• lib/congfx/src/console.c (modified) (3 diffs)
• lib/gfxfont/include/gfx/font.h (modified) (1 diff)
• lib/gfxfont/include/types/gfx/font.h (modified) (1 diff)
• lib/gfxfont/src/font.c (modified) (2 diffs)
• lib/gfxfont/src/text.c (modified) (4 diffs)
• lib/gfxfont/test/font.c (modified) (1 diff)

uspace/app/gfxdemo/gfxdemo.c

@@ -185 +185 @@
                 for (j = 0; j < h; j++) {
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            PIXEL(255, (i % 30) < 3 ? 255 : 0,
+                            PIXEL(0, (i % 30) < 3 ? 255 : 0,
                             (j % 30) < 3 ? 255 : 0, i / 2));
                 }
@@ -221 +221 @@
                         k = i * i + j * j;
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            PIXEL(255, k, k, k));
+                            PIXEL(0, k, k, k));
                 }
         }
@@ -256 +256 @@
                         k = i * i + j * j;
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            k < w * w / 2 ? PIXEL(255, 0, 255, 0) :
+                            k < w * w / 2 ? PIXEL(0, 0, 255, 0) :
                             PIXEL(0, 255, 0, 255));
                 }
@@ -469 +469 @@
                 return EOK;
 
-        rc = gfx_typeface_open(gc, "/data/font/helena.tpf", &tface);
-        if (rc != EOK) {
-                printf("Error opening typeface\n");
-                goto error;
-        }
-
-        finfo = gfx_typeface_first_font(tface);
-        if (finfo == NULL) {
-                printf("Typeface contains no font.\n");
-                rc = ENOENT;
-                goto error;
-        }
-
-        rc = gfx_font_open(finfo, &font);
-        if (rc != EOK) {
-                printf("Error opening font.\n");
-                goto error;
+        /* XXX Crude way of detecting text mode */
+        if (w < 256) {
+                /* Create dummy font for text mode */
+                rc = gfx_typeface_create(gc, &tface);
+                if (rc != EOK) {
+                        printf("Error creating typeface\n");
+                        goto error;
+                }
+
+                rc = gfx_font_create_textmode(tface, &font);
+                if (rc != EOK) {
+                        printf("Error creating font\n");
+                        goto error;
+                }
+        } else {
+                /* Load font */
+                rc = gfx_typeface_open(gc, "/data/font/helena.tpf", &tface);
+                if (rc != EOK) {
+                        printf("Error opening typeface\n");
+                        goto error;
+                }
+
+                finfo = gfx_typeface_first_font(tface);
+                if (finfo == NULL) {
+                        printf("Typeface contains no font.\n");
+                        rc = ENOENT;
+                        goto error;
+                }
+
+                rc = gfx_font_open(finfo, &font);
+                if (rc != EOK) {
+                        printf("Error opening font.\n");
+                        goto error;
+                }
         }
 

uspace/lib/congfx/src/console.c

@@ -102 +102 @@
         cols = cgc->rect.p1.x - cgc->rect.p0.x;
 
-        ch.ch = 0;
+        ch.ch = cgc->clr >> 24;
         ch.flags = CHAR_FLAG_DIRTY;
         ch.attrs.type = CHAR_ATTR_RGB;
-        ch.attrs.val.rgb.fgcolor = cgc->clr;
+        ch.attrs.val.rgb.fgcolor = cgc->clr ^ 0xffffff;
         ch.attrs.val.rgb.bgcolor = cgc->clr;
 
@@ -320 +320 @@
                                     y - offs.y - cbm->rect.p0.y);
 
-                                ch.ch = 0;
+                                ch.ch = clr >> 24;
                                 ch.flags = CHAR_FLAG_DIRTY;
                                 ch.attrs.type = CHAR_ATTR_RGB;
-                                ch.attrs.val.rgb.fgcolor = clr;
+                                ch.attrs.val.rgb.fgcolor = clr ^ 0xffffff;
                                 ch.attrs.val.rgb.bgcolor = clr;
 
@@ -338 +338 @@
                                     y - offs.y - cbm->rect.p0.y);
 
-                                ch.ch = 0;
+                                ch.ch = clr >> 24;
                                 ch.flags = CHAR_FLAG_DIRTY;
                                 ch.attrs.type = CHAR_ATTR_RGB;
-                                ch.attrs.val.rgb.fgcolor = clr;
+                                ch.attrs.val.rgb.fgcolor = clr ^ 0xffffff;
                                 ch.attrs.val.rgb.bgcolor = clr;
 

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

@@ -50 +50 @@
 extern errno_t gfx_font_create(gfx_typeface_t *, gfx_font_props_t *,
     gfx_font_metrics_t *, gfx_font_t **);
+extern errno_t gfx_font_create_textmode(gfx_typeface_t *, gfx_font_t **);
 extern errno_t gfx_font_open(gfx_font_info_t *, gfx_font_t **);
 extern void gfx_font_close(gfx_font_t *);

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

@@ -52 +52 @@
         gff_italic = 0x2,
         /** Bold, italic */
-        gff_bold_italic = gff_bold | gff_italic
+        gff_bold_italic = gff_bold | gff_italic,
+        /** Text mode */
+        gff_text_mode = 0x4
 } gfx_font_flags_t;
 

uspace/lib/gfxfont/src/font.c

@@ -180 +180 @@
 }
 
+/** Create dummy font for printing text in text mode.
+ *
+ * @param tface Typeface
+ * @param rfont Place to store pointer to new font
+ *
+ * @return EOK on success, EINVAL if parameters are invald,
+ *         ENOMEM if insufficient resources, EIO if graphic device connection
+ *         was lost
+ */
+errno_t gfx_font_create_textmode(gfx_typeface_t *tface, gfx_font_t **rfont)
+{
+        gfx_font_props_t props;
+        gfx_font_metrics_t metrics;
+
+        gfx_font_props_init(&props);
+        props.size = 1;
+        props.flags = gff_text_mode;
+
+        gfx_font_metrics_init(&metrics);
+        metrics.ascent = 0;
+        metrics.descent = 0;
+        metrics.leading = 1;
+
+        return gfx_font_create(tface, &props, &metrics, rfont);
+}
+
 /** Open font.
  *
@@ -229 +255 @@
 void gfx_font_get_metrics(gfx_font_t *font, gfx_font_metrics_t *metrics)
 {
-        *metrics = font->metrics;
+        if (font != NULL) {
+                *metrics = font->metrics;
+        } else {
+                metrics->ascent = 0;
+                metrics->descent = 0;
+                metrics->leading = 1;
+        }
 }
 

uspace/lib/gfxfont/src/text.c

@@ -35 +35 @@
 
 #include <errno.h>
+#include <gfx/bitmap.h>
 #include <gfx/font.h>
 #include <gfx/glyph.h>
 #include <gfx/text.h>
+#include <io/pixelmap.h>
 #include <mem.h>
+#include <str.h>
+#include "../private/font.h"
+#include "../private/typeface.h"
 
 /** Initialize text formatting structure.
@@ -66 +71 @@
         gfx_coord_t width;
         errno_t rc;
+
+        if ((font->finfo->props.flags & gff_text_mode) != 0)
+                return str_width(str);
 
         width = 0;
@@ -83 +91 @@
 
         return width;
+}
+
+/** Print string using text characters in text mode.
+ *
+ * @param font Font
+ * @param pos Position of top-left corner of text
+ * @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_context_t *gc = font->typeface->gc;
+        gfx_bitmap_params_t params;
+        gfx_bitmap_t *bitmap;
+        gfx_bitmap_alloc_t alloc;
+        pixelmap_t pmap;
+        gfx_coord_t x;
+        pixel_t pixel;
+        errno_t rc;
+
+        /*
+         * NOTE: Creating and destroying bitmap each time is not probably
+         * the most efficient way.
+         */
+
+        gfx_bitmap_params_init(&params);
+        params.rect.p0.x = 0;
+        params.rect.p0.y = 0;
+        params.rect.p1.x = str_width(str);
+        params.rect.p1.y = 1;
+
+        rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_bitmap_get_alloc(bitmap, &alloc);
+        if (rc != EOK) {
+                gfx_bitmap_destroy(bitmap);
+                return rc;
+        }
+
+        pmap.width = params.rect.p1.x;
+        pmap.height = 1;
+        pmap.data = alloc.pixels;
+
+        for (x = 0; x < params.rect.p1.x; x++) {
+                pixel = PIXEL(str[x], 0xff, 0xff, 0xff);
+                pixelmap_put_pixel(&pmap, x, 0, pixel);
+        }
+
+        rc = gfx_bitmap_render(bitmap, NULL, pos);
+
+        gfx_bitmap_destroy(bitmap);
+        return rc;
 }
 
@@ -141 +204 @@
         }
 
+        /* Text mode */
+        if ((font->finfo->props.flags & gff_text_mode) != 0)
+                return gfx_puttext_textmode(font, &cpos, str);
+
         cp = str;
         while (*cp != '\0') {

uspace/lib/gfxfont/test/font.c

@@ -98 +98 @@
 }
 
+/** Test creating and destroying text-mode font */
+PCUT_TEST(create_textmode_destroy)
+{
+        gfx_typeface_t *tface;
+        gfx_font_t *font;
+        gfx_context_t *gc;
+        test_gc_t tgc;
+        errno_t rc;
+
+        rc = gfx_context_new(&test_ops, (void *)&tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_typeface_create(gc, &tface);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = gfx_font_create_textmode(tface, &font);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gfx_font_close(font);
+        gfx_typeface_destroy(tface);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
 /** Test gfx_font_get_metrics() */
 PCUT_TEST(get_metrics)