Changeset 8a9a41e in mainline for uspace/app/tetris/screen.c

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (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:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

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

uspace/app/tetris/screen.c

@@ -72 +72 @@
 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;
@@ -92 +93 @@
 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);
+        }
 }
 
@@ -143 +158 @@
 }
 
-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;
+        }
+
+        *rgb = ((ccap & CONSOLE_CAP_RGB) == CONSOLE_CAP_RGB);
+        *color = ((ccap & CONSOLE_CAP_INDEXED) == CONSOLE_CAP_INDEXED);
 }
 
@@ -169 +188 @@
         }
 
-        use_color = get_display_color_sup();
+        get_display_color_sup(&use_rgb, &use_color);
 
         if ((Rows < MINROWS) || (Cols < MINCOLS)) {