Changes in uspace/app/tetris/screen.c [96b02eb9:50cfa6c] in mainline

File:

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

uspace/app/tetris/screen.c

@@ -49 +49 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <str.h>
+#include <string.h>
 #include <unistd.h>
 #include <vfs/vfs.h>
 #include <async.h>
-#include <bool.h>
-#include <io/console.h>
-#include <io/style.h>
 #include "screen.h"
 #include "tetris.h"
+#include <io/console.h>
 
 #define STOP  (B_COLS - 3)
@@ -65 +63 @@
 static int isset;               /* true => terminal is in game mode */
 
-static bool use_color;          /* true => use colors */
+static int use_color;           /* true => use colors */
 
 static const struct shape *lastshape;
@@ -74 +72 @@
  * simply literal strings);
  */
-static inline void putstr(const char *s)
+static inline void putstr(char *s)
 {
         while (*s)
@@ -83 +81 @@
 {
         fflush(stdout);
-        console_set_rgb_color(fphone(stdout), 0xffffff,
+        console_set_rgb_color(fphone(stdout), 0xf0f0f0,
             use_color ? color : 0x000000);
 }
@@ -90 +88 @@
 {
         fflush(stdout);
-        console_set_style(fphone(stdout), STYLE_NORMAL);
+        console_set_rgb_color(fphone(stdout), 0, 0xf0f0f0);
 }
 
@@ -120 +118 @@
 }
 
-void moveto(sysarg_t r, sysarg_t c)
+void moveto(int r, int c)
 {
         fflush(stdout);
-        console_set_pos(fphone(stdout), c, r);
+        console_goto(fphone(stdout), c, r);
 }
 
@@ -133 +131 @@
 }
 
-static bool get_display_color_sup(void)
-{
-        sysarg_t ccap;
-        int rc = console_get_color_cap(fphone(stdout), &ccap);
-        
+static int get_display_color_sup(void)
+{
+        int rc;
+        int ccap;
+
+        rc = console_get_color_cap(fphone(stdout), &ccap);
         if (rc != 0)
-                return false;
-        
+                return 0;
+
         return (ccap >= CONSOLE_CCAP_RGB);
 }
@@ -182 +181 @@
 }
 
-void stop(const char *why)
+void stop(char *why)
 {
         if (isset)
@@ -309 +308 @@
  * (We need its length in case we have to overwrite with blanks.)
  */
-void scr_msg(char *s, bool set)
+void scr_msg(char *s, int set)
 {
         int l = str_size(s);