Changeset bc52b5b in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2021-08-15T10:02:32Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99589a9

Parents:

de0c55a

Message:

Allow the use of EGA attributes/24-bit characters alongside RGB

In a big hack (since we cannot have different pixel formats yet) we
use a pixel format that allows both 24-bit RGB (without character)
or 24-bit character with 8-bit attributes. Thus in GFX we cannot
currently have characters with any RGB color, but we can set
foreground and background individually (and it even works in EGA mode).

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -73 +73 @@
 static gfx_coord_t vpad;
 
+/** Determine if we are running in text mode.
+ *
+ * @param w Screen width
+ * @param h Screen height
+ * @return @c true iff we are running in text mode
+ */
+static bool demo_is_text(gfx_coord_t w, gfx_coord_t h)
+{
+        // XXX Need a proper way to determine text mode
+        return w <= 80;
+}
+
 /** Clear screen.
  *
@@ -215 +227 @@
 
         if (font != NULL) {
-                rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
-                if (rc != EOK)
-                        goto error;
+                if (demo_is_text(w, h)) {
+                        rc = gfx_color_new_ega(0x1e, &color);
+                        if (rc != EOK)
+                                goto error;
+                } else {
+                        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
+                        if (rc != EOK)
+                                goto error;
+                }
 
                 gfx_text_fmt_init(&fmt);
@@ -740 +758 @@
 
         for (i = 0; i < 8; i++) {
-                rc = gfx_color_new_rgb_i16((i & 4) ? 0xffff : 0,
-                    (i & 2) ? 0xffff : 0, (i & 1) ? 0xffff : 0, &color);
-                if (rc != EOK)
-                        goto error;
+                if (demo_is_text(w, h)) {
+                        rc = gfx_color_new_ega(i, &color);
+                        if (rc != EOK)
+                                goto error;
+                } else {
+                        rc = gfx_color_new_rgb_i16((i & 4) ? 0xffff : 0,
+                            (i & 2) ? 0xffff : 0, (i & 1) ? 0xffff : 0, &color);
+                        if (rc != EOK)
+                                goto error;
+                }
 
                 fmt.color = color;