Changes in uspace/app/gfxdemo/gfxdemo.c [d0dfbba:0a411bbf] in mainline

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #include <display.h>
 #include <fibril.h>
-#include <fibril_synch.h>
 #include <gfx/bitmap.h>
 #include <gfx/color.h>
@@ -62 +61 @@
 };
 
-static void uiwnd_resize_event(ui_window_t *, void *);
 static void uiwnd_close_event(ui_window_t *, void *);
 static void uiwnd_kbd_event(ui_window_t *, void *, kbd_event_t *);
 
 static ui_window_cb_t ui_window_cb = {
-        .resize = uiwnd_resize_event,
         .close = uiwnd_close_event,
         .kbd = uiwnd_kbd_event
@@ -81 +78 @@
 static gfx_coord_t vpad;
 static console_ctrl_t *con = NULL;
-static bool textmode;
-static console_gc_t *cgc = NULL;
-static unsigned scr_width, scr_height;
 static ui_t *ui;
 
 /** 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(void)
-{
-        return textmode;
+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;
 }
 
@@ -104 +101 @@
         usec_t usec;
         cons_event_t cevent;
-        sysarg_t cols, rows;
 
         if (ui != NULL)
@@ -119 +115 @@
                                                 demo_kbd_event(&cevent.ev.key);
                                                 fibril_mutex_lock(&quit_lock);
-                                        } else if (cevent.type == CEV_RESIZE) {
-                                                rc = console_get_size(con,
-                                                    &cols, &rows);
-                                                if (rc == EOK) {
-                                                        scr_width = cols;
-                                                        scr_height = rows;
-                                                }
-                                                rc = console_gc_resize(cgc);
-                                                if (rc != EOK)
-                                                        exit(1);
                                         }
                                 }
@@ -195 +181 @@
 
         /* XXX Crude way of detecting text mode */
-        if (demo_is_text()) {
+        if (w < 256) {
                 /* Create dummy font for text mode */
                 rc = gfx_typeface_create(gc, &tface);
@@ -284 +270 @@
 
         if (font != NULL) {
-                if (demo_is_text()) {
+                if (demo_is_text(w, h)) {
                         rc = gfx_color_new_ega(0x1e, &color);
                         if (rc != EOK)
@@ -733 +719 @@
         gfx_color_delete(color);
 
-        if (demo_is_text()) {
+        if (demo_is_text(w, h)) {
                 rc = gfx_color_new_ega(0x1f, &color);
                 if (rc != EOK)
@@ -821 +807 @@
 
         for (i = 0; i < 8; i++) {
-                if (demo_is_text()) {
+                if (demo_is_text(w, h)) {
                         rc = gfx_color_new_ega(i != 0 ? i : 0x10, &color);
                         if (rc != EOK)
@@ -898 +884 @@
                 gfx_color_delete(color);
 
-                if (demo_is_text()) {
+                if (demo_is_text(w, h)) {
                         rc = gfx_color_new_ega(0x1f, &color);
                         if (rc != EOK)
@@ -1040 +1026 @@
  *
  * @param gc Graphic context
- */
-static errno_t demo_loop(gfx_context_t *gc)
-{
-        errno_t rc;
-
-        (void) demo_font_init(gc, scr_width, scr_height);
+ * @param w Width
+ * @param h Height
+ */
+static errno_t demo_loop(gfx_context_t *gc, gfx_coord_t w, gfx_coord_t h)
+{
+        errno_t rc;
+
+        (void) demo_font_init(gc, w, h);
 
         while (!quit) {
-                rc = demo_rects(gc, scr_width, scr_height);
-                if (rc != EOK)
-                        goto error;
-
-                rc = demo_bitmap(gc, scr_width, scr_height);
-                if (rc != EOK)
-                        goto error;
-
-                rc = demo_bitmap2(gc, scr_width, scr_height);
-                if (rc != EOK)
-                        goto error;
-
-                rc = demo_bitmap_kc(gc, scr_width, scr_height);
-                if (rc != EOK)
-                        goto error;
-
-                rc = demo_text(gc, scr_width, scr_height);
-                if (rc != EOK)
-                        goto error;
-
-                rc = demo_text_abbr(gc, scr_width, scr_height);
-                if (rc != EOK)
-                        goto error;
-
-                rc = demo_clip(gc, scr_width, scr_height);
+                rc = demo_rects(gc, w, h);
+                if (rc != EOK)
+                        goto error;
+
+                rc = demo_bitmap(gc, w, h);
+                if (rc != EOK)
+                        goto error;
+
+                rc = demo_bitmap2(gc, w, h);
+                if (rc != EOK)
+                        goto error;
+
+                rc = demo_bitmap_kc(gc, w, h);
+                if (rc != EOK)
+                        goto error;
+
+                rc = demo_text(gc, w, h);
+                if (rc != EOK)
+                        goto error;
+
+                rc = demo_text_abbr(gc, w, h);
+                if (rc != EOK)
+                        goto error;
+
+                rc = demo_clip(gc, w, h);
                 if (rc != EOK)
                         goto error;
@@ -1087 +1075 @@
 static errno_t demo_console(void)
 {
+        console_gc_t *cgc = NULL;
         gfx_context_t *gc;
         sysarg_t cols, rows;
@@ -1105 +1094 @@
         gc = console_gc_get_ctx(cgc);
 
-        /* Currently console is always text. */
-        textmode = true;
-
-        scr_width = cols;
-        scr_height = rows;
-
-        rc = demo_loop(gc);
+        rc = demo_loop(gc, cols, rows);
         if (rc != EOK)
                 return rc;
@@ -1128 +1111 @@
 
         ui_lock(args->ui);
-        scr_width = args->dims.x;
-        scr_height = args->dims.y;
-        rc = demo_loop(args->gc);
+        rc = demo_loop(args->gc, args->dims.x, args->dims.y);
         ui_unlock(args->ui);
         ui_quit(args->ui);
@@ -1172 +1153 @@
 
         /* Do not decorate the window in fullscreen mode */
-        if (ui_is_fullscreen(ui)) {
+        if (ui_is_fullscreen(ui))
                 params.style &= ~ui_wds_decorated;
-                params.placement = ui_wnd_place_full_screen;
-        }
 
         /*
@@ -1213 +1192 @@
                 task_retval(0);
 
-        textmode = ui_is_textmode(ui);
-
         args.gc = gc;
         args.dims = dims;
@@ -1276 +1253 @@
         task_retval(0);
 
-        /* FIXME Assuming display service is not text mode. */
-        textmode = false;
-
-        scr_width = 400;
-        scr_height = 300;
-        rc = demo_loop(gc);
+        rc = demo_loop(gc, 400, 300);
         if (rc != EOK)
                 return rc;
@@ -1333 +1305 @@
         (void)arg;
         demo_kbd_event(event);
-}
-
-static void uiwnd_resize_event(ui_window_t *window, void *arg)
-{
-        gfx_rect_t rect;
-        gfx_coord2_t dims;
-
-        ui_window_get_app_rect(window, &rect);
-        gfx_rect_dims(&rect, &dims);
-        scr_width = dims.x;
-        scr_height = dims.y;
 }
 
@@ -1388 +1349 @@
         }
 
-        if (i >= argc || str_cmp(argv[i], "ui") == 0) {
-                rc = demo_ui(ui_display_spec);
+        if (i >= argc || str_cmp(argv[i], "display") == 0) {
+                rc = demo_display(display_svc);
                 if (rc != EOK)
                         return 1;
@@ -1396 +1357 @@
                 if (rc != EOK)
                         return 1;
-        } else if (str_cmp(argv[i], "display") == 0) {
-                rc = demo_display(display_svc);
+        } else if (str_cmp(argv[i], "ui") == 0) {
+                rc = demo_ui(ui_display_spec);
                 if (rc != EOK)
                         return 1;