Changes in uspace/app/tetris/screen.c [09f41d3:28a5ebd] 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.
@@ -55 +54 @@
  */
 
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -73 +71 @@
 static int isset;               /* true => terminal is in game mode */
 
-static bool use_rgb;          /* true => use RGB colors */
-static bool use_color;          /* true => use indexed colors */
+static bool use_color;          /* true => use colors */
 
 static const struct shape *lastshape;
@@ -80 +77 @@
 static usec_t timeleft = 0;
 
-bool size_changed;
 console_ctrl_t *console;
 
@@ -95 +91 @@
 static void start_standout(uint32_t color)
 {
-        uint8_t bg;
-        uint8_t attr;
-
         console_flush(console);
-        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);
-        }
+        console_set_rgb_color(console, use_color ? color : 0x000000,
+            0xffffff);
 }
 
@@ -144 +126 @@
         console_cursor_visibility(console, 0);
         resume_normal();
-        scr_set();
+        scr_clear();
 }
 
@@ -160 +142 @@
 }
 
-static void get_display_color_sup(bool *rgb, bool *color)
+static bool get_display_color_sup(void)
 {
         sysarg_t ccap;
         errno_t rc = console_get_color_cap(console, &ccap);
 
-        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);
+        if (rc != EOK)
+                return false;
+
+        return ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
 }
 
@@ -194 +168 @@
         }
 
-        get_display_color_sup(&use_rgb, &use_color);
+        use_color = get_display_color_sup();
 
         if ((Rows < MINROWS) || (Cols < MINCOLS)) {
@@ -200 +174 @@
 
                 snprintf(smallscr, sizeof(smallscr),
-                    "the screen is too small (must be at least %dx%d)\n",
+                    "the screen is too small (must be at least %dx%d)",
                     MINROWS, MINCOLS);
                 stop(smallscr);
@@ -223 +197 @@
 
         fprintf(stderr, "aborting: %s", why);
-        exit(1);
+        abort();
 }
 
@@ -366 +340 @@
 {
         usec_t timeout = fallrate;
-        errno_t rc;
 
         while (timeout > 0) {
                 cons_event_t event;
 
-                rc = console_get_event_timeout(console, &event, &timeout);
-                if (rc == ETIMEOUT)
+                if (!console_get_event_timeout(console, &event, &timeout))
                         break;
-                if (rc != EOK)
-                        exit(1);
         }
 }
@@ -384 +354 @@
 int tgetchar(void)
 {
-        errno_t rc;
-
         /*
          * Reset timeleft to fallrate whenever it is not positive
@@ -408 +376 @@
                 cons_event_t event;
 
-                rc = console_get_event_timeout(console, &event, &timeleft);
-                if (rc == ETIMEOUT) {
+                if (!console_get_event_timeout(console, &event, &timeleft)) {
                         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)
@@ -432 +394 @@
 {
         char32_t c = 0;
-        errno_t rc;
 
         while (c == 0) {
                 cons_event_t event;
 
-                rc = console_get_event(console, &event);
-                if (rc == ETIMEOUT)
+                if (!console_get_event(console, &event))
                         return -1;
-                if (rc != EOK)
-                        exit(1);
 
                 if (event.type == CEV_KEY && event.ev.key.type == KEY_PRESS)