Changeset 0c25c10 in mainline for uspace/app/tetris/screen.c

Timestamp:

2009-06-03T19:32:07Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

69e68e3

Parents:

cbff4c2

Message:

update for latest I/O changes

File:

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

uspace/app/tetris/screen.c

@@ -51 +51 @@
 #include <string.h>
 #include <unistd.h>
-#include <console.h>
-
+#include <vfs/vfs.h>
 #include <async.h>
 #include "screen.h"
 #include "tetris.h"
-#include <ipc/console.h>
+#include <io/console.h>
 
 static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */
@@ -65 +64 @@
 /*
  * putstr() is for unpadded strings (either as in termcap(5) or
- * simply literal strings); 
+ * simply literal strings);
  */
 static inline void putstr(char *s)
@@ -75 +74 @@
 static void start_standout(void)
 {
-        console_set_rgb_color(0xf0f0f0, 0);
+        console_set_rgb_color(fphone(stdout), 0xf0f0f0, 0);
 }
 
 static void resume_normal(void)
 {
-        console_set_rgb_color(0, 0xf0f0f0);
+        console_set_rgb_color(fphone(stdout), 0, 0xf0f0f0);
 }
 
 void clear_screen(void)
 {
-        console_clear();
+        console_clear(fphone(stdout));
         moveto(0, 0);
 }
@@ -97 +96 @@
 
         resume_normal();
-        console_clear();
+        console_clear(fphone(stdout));
         curscore = -1;
         memset((char *)curscreen, 0, sizeof(curscreen));
@@ -108 +107 @@
 scr_init(void)
 {
-        console_cursor_visibility(0);
+        console_cursor_visibility(fphone(stdout), 0);
         resume_normal();
         scr_clear();
@@ -115 +114 @@
 void moveto(int r, int c)
 {
-        console_goto(r, c);
+        console_goto(fphone(stdout), c, r);
 }
 
@@ -122 +121 @@
 static int get_display_size(winsize_t *ws)
 {
-        return console_get_size(&ws->ws_row, &ws->ws_col);
+        return console_get_size(fphone(stdout), &ws->ws_col, &ws->ws_row);
 }