Changes in uspace/app/gfxdemo/gfxdemo.c [232bf2c:da15002] in mainline

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2020 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.
  *
@@ -227 +215 @@
 
         if (font != NULL) {
-                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;
-                }
+                rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
+                if (rc != EOK)
+                        goto error;
 
                 gfx_text_fmt_init(&fmt);
@@ -678 +660 @@
         gfx_color_delete(color);
 
-        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;
-        }
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
+        if (rc != EOK)
+                goto error;
 
         gfx_text_fmt_init(&fmt);
@@ -706 +682 @@
                 goto error;
 
-        pos.x = rect.p1.x;
+        pos.x = rect.p1.x - 1;
         pos.y = rect.p0.y;
         fmt.halign = gfx_halign_right;
@@ -729 +705 @@
                 goto error;
 
-        pos.x = rect.p1.x;
+        pos.x = rect.p1.x - 1;
         pos.y = (rect.p0.y + rect.p1.y - 1) / 2;
         fmt.halign = gfx_halign_right;
@@ -746 +722 @@
 
         pos.x = (rect.p0.x + rect.p1.x - 1) / 2;
-        pos.y = rect.p1.y;
+        pos.y = rect.p1.y - 1;
         fmt.halign = gfx_halign_center;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom center");
@@ -752 +728 @@
                 goto error;
 
-        pos.x = rect.p1.x;
-        pos.y = rect.p1.y;
+        pos.x = rect.p1.x - 1;
+        pos.y = rect.p1.y - 1;
         fmt.halign = gfx_halign_right;
         rc = gfx_puttext(font, &pos, &fmt, "Bottom right");
@@ -764 +740 @@
 
         for (i = 0; i < 8; i++) {
-                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;
-                }
+                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;
@@ -1129 +1099 @@
         errno_t rc;
         const char *display_svc = DISPLAY_DEFAULT;
-        const char *ui_display_spec = UI_DISPLAY_DEFAULT;
         int i;
 
@@ -1142 +1111 @@
                         }
 
-                        display_svc = ui_display_spec = argv[i++];
+                        display_svc = argv[i++];
                 } else {
                         printf("Invalid option '%s'.\n", argv[i]);
@@ -1159 +1128 @@
                         return 1;
         } else if (str_cmp(argv[i], "ui") == 0) {
-                rc = demo_ui(ui_display_spec);
+                rc = demo_ui(display_svc);
                 if (rc != EOK)
                         return 1;