Changeset 6a87f28 in mainline for uspace/app/gfxdemo/gfxdemo.c

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

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (4 diffs)

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;
+                }
         }