Changeset a4e4e29 in mainline

Timestamp:

2026-02-17T11:57:13Z (3 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

2c12135

Parents:

00d26202

git-author:

Jiri Svoboda <jiri@…> (2026-02-17 18:56:50)

git-committer:

Jiri Svoboda <jiri@…> (2026-02-17 11:57:13)

Message:

GFXDemo react to console resize in console mode.

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (8 diffs)
• lib/congfx/include/congfx/console.h (modified) (1 diff)
• lib/congfx/src/console.c (modified) (1 diff)

uspace/app/gfxdemo/gfxdemo.c

@@ -79 +79 @@
 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;
 
@@ -99 +101 @@
         usec_t usec;
         cons_event_t cevent;
+        sysarg_t cols, rows;
 
         if (ui != NULL)
@@ -113 +116 @@
                                                 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);
                                         }
                                 }
@@ -1024 +1037 @@
  *
  * @param gc Graphic context
- * @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);
+ */
+static errno_t demo_loop(gfx_context_t *gc)
+{
+        errno_t rc;
+
+        (void) demo_font_init(gc, scr_width, scr_height);
 
         while (!quit) {
-                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);
+                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);
                 if (rc != EOK)
                         goto error;
@@ -1073 +1084 @@
 static errno_t demo_console(void)
 {
-        console_gc_t *cgc = NULL;
         gfx_context_t *gc;
         sysarg_t cols, rows;
@@ -1095 +1105 @@
         textmode = true;
 
-        rc = demo_loop(gc, cols, rows);
+        scr_width = cols;
+        scr_height = rows;
+
+        rc = demo_loop(gc);
         if (rc != EOK)
                 return rc;
@@ -1112 +1125 @@
 
         ui_lock(args->ui);
-        rc = demo_loop(args->gc, args->dims.x, args->dims.y);
+        scr_width = args->dims.x;
+        scr_height = args->dims.y;
+        rc = demo_loop(args->gc);
         ui_unlock(args->ui);
         ui_quit(args->ui);
@@ -1259 +1274 @@
         textmode = false;
 
-        rc = demo_loop(gc, 400, 300);
+        scr_width = 400;
+        scr_height = 300;
+        rc = demo_loop(gc);
         if (rc != EOK)
                 return rc;

uspace/lib/congfx/include/congfx/console.h

@@ -49 +49 @@
 extern errno_t console_gc_suspend(console_gc_t *);
 extern errno_t console_gc_resume(console_gc_t *);
+extern errno_t console_gc_resize(console_gc_t *);
 extern gfx_context_t *console_gc_get_ctx(console_gc_t *);
 

uspace/lib/congfx/src/console.c

@@ -314 +314 @@
 }
 
+/** Update console GC size after console resize.
+ *
+ * @param con Console object
+ *
+ * @return EOK on success or an error code
+ */
+errno_t console_gc_resize(console_gc_t *cgc)
+{
+        sysarg_t rows;
+        sysarg_t cols;
+        charfield_t *buf = NULL;
+        errno_t rc;
+
+        console_unmap(cgc->con, cgc->buf);
+        cgc->buf = NULL;
+
+        rc = console_get_size(cgc->con, &cols, &rows);
+        if (rc != EOK)
+                goto error;
+
+        rc = console_map(cgc->con, cols, rows, &buf);
+        if (rc != EOK)
+                goto error;
+
+        cgc->rect.p0.x = 0;
+        cgc->rect.p0.y = 0;
+        cgc->rect.p1.x = cols;
+        cgc->rect.p1.y = rows;
+        cgc->clip_rect = cgc->rect;
+        cgc->buf = buf;
+        return EOK;
+error:
+        return rc;
+}
+
+
 /** Get generic graphic context from console GC.
  *