Changeset 8a9a41e in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

9ea3a41

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (9 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);
@@ -660 +678 @@
         gfx_color_delete(color);
 
-        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(0x1f, &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);
@@ -682 +706 @@
                 goto error;
 
-        pos.x = rect.p1.x - 1;
+        pos.x = rect.p1.x;
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_right;
@@ -705 +729 @@
                 goto error;
 
-        pos.x = rect.p1.x - 1;
+        pos.x = rect.p1.x;
         pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_right;
@@ -722 +746 @@
 
         pos.x = (rect.p0.x + rect.p1.x - 1) / 2;
-        pos.y = rect.p1.y - 1;
+        pos.y = rect.p1.y;
         fmt.halign = gfx_halign_center;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom center");
@@ -728 +752 @@
                 goto error;
 
-        pos.x = rect.p1.x - 1;
-        pos.y = rect.p1.y - 1;
+        pos.x = rect.p1.x;
+        pos.y = rect.p1.y;
         fmt.halign = gfx_halign_right;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom right");
@@ -740 +764 @@
 
         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 != 0 ? i : 0x10, &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;