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

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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.

Message:

Merge mainline changes.

File:

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

uspace/app/tetris/screen.c

@@ -53 +53 @@
 #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)
@@ -63 +65 @@
 static int isset;               /* true => terminal is in game mode */
 
-static int use_color;           /* true => use colors */
+static bool use_color;          /* true => use colors */
 
 static const struct shape *lastshape;
@@ -81 +83 @@
 {
         fflush(stdout);
-        console_set_rgb_color(fphone(stdout), 0xf0f0f0,
+        console_set_rgb_color(fphone(stdout), 0xffffff,
             use_color ? color : 0x000000);
 }
@@ -88 +90 @@
 {
         fflush(stdout);
-        console_set_rgb_color(fphone(stdout), 0, 0xf0f0f0);
+        console_set_style(fphone(stdout), STYLE_NORMAL);
 }
 
@@ -118 +120 @@
 }
 
-void moveto(int r, int c)
+void moveto(ipcarg_t r, ipcarg_t c)
 {
         fflush(stdout);
-        console_goto(fphone(stdout), c, r);
+        console_set_pos(fphone(stdout), c, r);
 }
 
@@ -131 +133 @@
 }
 
-static int get_display_color_sup(void)
-{
-        int rc;
-        int ccap;
-
-        rc = console_get_color_cap(fphone(stdout), &ccap);
+static bool get_display_color_sup(void)
+{
+        ipcarg_t ccap;
+        int rc = console_get_color_cap(fphone(stdout), &ccap);
+        
         if (rc != 0)
-                return 0;
-
+                return false;
+        
         return (ccap >= CONSOLE_CCAP_RGB);
 }
@@ -308 +309 @@
  * (We need its length in case we have to overwrite with blanks.)
  */
-void scr_msg(char *s, int set)
+void scr_msg(char *s, bool set)
 {
         int l = str_size(s);