Changes in uspace/app/tetris/screen.c [28a5ebd:09f41d3] in mainline

File:

• uspace/app/tetris/screen.c (modified) (14 diffs)

uspace/app/tetris/screen.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -54 +55 @@
  */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -71 +73 @@
 static int isset;               /* true => terminal is in game mode */
 
-static bool use_color;          /* true => use colors */
+static bool use_rgb;          /* true => use RGB colors */
+static bool use_color;          /* true => use indexed colors */
 
 static const struct shape *lastshape;
@@ -77 +80 @@
 static usec_t timeleft = 0;
 
+bool size_changed;
 console_ctrl_t *console;
 
@@ -91 +95 @@
 static void start_standout(uint32_t color)
 {
+        uint8_t bg;
+        uint8_t attr;
+
         console_flush(console);
-        console_set_rgb_color(console, use_color ? color : 0x000000,
-            0xffffff);
+        if (use_rgb) {
+                console_set_rgb_color(console, color, 0xffffff);
+        } else if (use_color) {
+                bg = 0x00;
+                attr = 0;
+                if ((color & 0xff0000) != 0)
+                        bg |= 0x4;
+                if ((color & 0x00ff00) != 0)
+                        bg |= 0x2;
+                if ((color & 0x0000ff) != 0)
+                        bg |= 0x1;
+                console_set_color(console, bg, 0x00, attr);
+        }
 }
 
@@ -126 +144 @@
         console_cursor_visibility(console, 0);
         resume_normal();
-        scr_clear();
+        scr_set();
 }
 
@@ -142 +160 @@
 }
 
-static bool get_display_color_sup(void)
+static void get_display_color_sup(bool *rgb, bool *color)
 {
         sysarg_t ccap;
         errno_t rc = console_get_color_cap(console, &ccap);
 
-        if (rc != EOK)
-                return false;
-
-        return ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
+        if (rc != EOK) {
+                *rgb = false;
+                *color = false;
+                return;
+        }
+
+        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);
 }
 
@@ -168 +194 @@
         }
 
-        use_color = get_display_color_sup();
+        get_display_color_sup(&use_rgb, &use_color);
 
         if ((Rows < MINROWS) || (Cols < MINCOLS)) {
@@ -174 +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);
@@ -197 +223 @@
 
         fprintf(stderr, "aborting: %s", why);
-        abort();
+        exit(1);
 }
 
@@ -340 +366 @@
 {
         usec_t timeout = fallrate;
+        errno_t rc;
 
         while (timeout > 0) {
                 cons_event_t event;
 
-                if (!console_get_event_timeout(console, &event, &timeout))
+                rc = console_get_event_timeout(console, &event, &timeout);
+                if (rc == ETIMEOUT)
                         break;
+                if (rc != EOK)
+                        exit(1);
         }
 }
@@ -354 +384 @@
 int tgetchar(void)
 {
+        errno_t rc;
+
         /*
          * Reset timeleft to fallrate whenever it is not positive
@@ -376 +408 @@
                 cons_event_t event;
 
-                if (!console_get_event_timeout(console, &event, &timeleft)) {
+                rc = console_get_event_timeout(console, &event, &timeleft);
+                if (rc == ETIMEOUT) {
                         timeleft = 0;
                         return -1;
                 }
+                if (rc != EOK)
+                        exit(1);
+
+                if (event.type == CEV_RESIZE)
+                        size_changed = true;
 
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)
@@ -394 +432 @@
 {
         char32_t c = 0;
+        errno_t rc;
 
         while (c == 0) {
                 cons_event_t event;
 
-                if (!console_get_event(console, &event))
+                rc = console_get_event(console, &event);
+                if (rc == ETIMEOUT)
                         return -1;
+                if (rc != EOK)
+                        exit(1);
 
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)