Changeset 9f1362d4 in mainline for uspace/app/tetris

Timestamp:

2010-04-19T19:58:18Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

369a5f8

Parents:

caad59a

Message:

console output improvements

• define new generic styles (STYLE_INVERTED for inverted print and STYLE_SELECTION for selections), use them primarily instead of specifying colors or RGBs
• use console_set_style(fphone(stdout), STYLE_NORMAL) as the correct mean for reseting console settings (instead of specifying conrete hardcoded colors)
• rename console_goto() to console_set_pos() (consistency with console_get_pos())
• use semantically correct unsigned types for console sizes and cursor positions (instead of signed types)
• use unsigned types for sizes and positions in libclui
• top: nicer screen redrawing (do not use console_clear() which causes flickering, but repaint the screen properly — not entirely finished yet)
• initialize mouse pointer coordinates (so the mouse cursor does not behave erratic after boot, unfortunatelly this does not solve ticket #223)

Location:

uspace/app/tetris

Files:

• screen.c (modified) (7 diffs)
• screen.h (modified) (2 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);

uspace/app/tetris/screen.h

@@ -48 +48 @@
 
 #include <sys/types.h>
+#include <ipc/ipc.h>
 #include <async.h>
+#include <bool.h>
 
 typedef struct {
-        int ws_row;
-        int ws_col;
+        ipcarg_t ws_row;
+        ipcarg_t ws_col;
 } winsize_t;
 
 extern winsize_t winsize;
 
-extern void moveto(int r, int c);
+extern void moveto(ipcarg_t r, ipcarg_t c);
 extern void clear_screen(void);
 
@@ -65 +67 @@
 extern void scr_end(void);
 extern void scr_init(void);
-extern void scr_msg(char *, int);
+extern void scr_msg(char *, bool);
 extern void scr_set(void);
 extern void scr_update(void);