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

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -78 +78 @@
 static gfx_coord_t vpad;
 static console_ctrl_t *con = NULL;
+static bool textmode;
 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(gfx_coord_t w, gfx_coord_t h)
-{
-        // XXX Need a proper way to determine text mode
-        return w <= 80;
+static bool demo_is_text(void)
+{
+        return textmode;
 }
 
@@ -181 +179 @@
 
         /* XXX Crude way of detecting text mode */
-        if (w < 256) {
+        if (demo_is_text()) {
                 /* Create dummy font for text mode */
                 rc = gfx_typeface_create(gc, &tface);
@@ -270 +268 @@
 
         if (font != NULL) {
-                if (demo_is_text(w, h)) {
+                if (demo_is_text()) {
                         rc = gfx_color_new_ega(0x1e, &color);
                         if (rc != EOK)
@@ -719 +717 @@
         gfx_color_delete(color);
 
-        if (demo_is_text(w, h)) {
+        if (demo_is_text()) {
                 rc = gfx_color_new_ega(0x1f, &color);
                 if (rc != EOK)
@@ -807 +805 @@
 
         for (i = 0; i < 8; i++) {
-                if (demo_is_text(w, h)) {
+                if (demo_is_text()) {
                         rc = gfx_color_new_ega(i != 0 ? i : 0x10, &color);
                         if (rc != EOK)
@@ -884 +882 @@
                 gfx_color_delete(color);
 
-                if (demo_is_text(w, h)) {
+                if (demo_is_text()) {
                         rc = gfx_color_new_ega(0x1f, &color);
                         if (rc != EOK)
@@ -1093 +1091 @@
 
         gc = console_gc_get_ctx(cgc);
+
+        /* Currently console is always text. */
+        textmode = true;
 
         rc = demo_loop(gc, cols, rows);
@@ -1192 +1193 @@
                 task_retval(0);
 
+        textmode = ui_is_textmode(ui);
+
         args.gc = gc;
         args.dims = dims;
@@ -1252 +1255 @@
 
         task_retval(0);
+
+        /* FIXME Assuming display service is not text mode. */
+        textmode = false;
 
         rc = demo_loop(gc, 400, 300);