Changeset ebb1489 in mainline for uspace/app/tetris/screen.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks 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/tetris/screen.c (modified) (7 diffs)

uspace/app/tetris/screen.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -79 +80 @@
 static usec_t timeleft = 0;
 
+bool size_changed;
 console_ctrl_t *console;
 
@@ -142 +144 @@
         console_cursor_visibility(console, 0);
         resume_normal();
-        scr_clear();
+        scr_set();
 }
 
@@ -169 +171 @@
         }
 
+        if ((ccap & CONSOLE_CAP_CURSORCTL) == 0) {
+                stop("Your screen does not support cursor control.\n");
+                return;
+        }
         *rgb = ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
         *color = ((ccap & CONSOLE_CAP_INDEXED) == CONSOLE_CAP_INDEXED);
@@ -194 +200 @@
 
                 snprintf(smallscr, sizeof(smallscr),
-                    "the screen is too small (must be at least %dx%d)",
+                    "the screen is too small (must be at least %dx%d)\n",
                     MINROWS, MINCOLS);
                 stop(smallscr);
@@ -217 +223 @@
 
         fprintf(stderr, "aborting: %s", why);
-        abort();
+        exit(1);
 }
 
@@ -410 +416 @@
                         exit(1);
 
+                if (event.type == CEV_RESIZE)
+                        size_changed = true;
+
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
                         c = event.ev.key.c;