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

Timestamp:

2009-06-09T11:10:31Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f3afd24

Parents:

080ad7f

Message:

slightly cleanup the horrible mess of tetris
introduce colors

File:

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

uspace/app/tetris/screen.c

@@ -37 +37 @@
 
 /** @addtogroup tetris
- * @{ 
+ * @{
  */
 /** @file
@@ -57 +57 @@
 #include <io/console.h>
 
-static cell curscreen[B_SIZE];  /* 1 => standout (or otherwise marked) */
+#define STOP  (B_COLS - 3)
+
+static cell curscreen[B_SIZE];  /* non-zero => standout (or otherwise marked) */
 static int curscore;
-static int isset;               /* true => terminal is in game mode */
+static int isset;               /* true => terminal is in game mode */
+
+static const struct shape *lastshape;
 
 
@@ -72 +76 @@
 }
 
-static void start_standout(void)
-{
-        console_set_rgb_color(fphone(stdout), 0xf0f0f0, 0);
+static void start_standout(uint32_t color)
+{
+        console_set_rgb_color(fphone(stdout), 0xf0f0f0, color);
 }
 
@@ -91 +95 @@
  * Clear the screen, forgetting the current contents in the process.
  */
-void
-scr_clear(void)
-{
-
+void scr_clear(void)
+{
         resume_normal();
         console_clear(fphone(stdout));
         curscore = -1;
-        memset((char *)curscreen, 0, sizeof(curscreen));
+        memset(curscreen, 0, sizeof(curscreen));
 }
 
@@ -104 +106 @@
  * Set up screen
  */
-void
-scr_init(void)
+void scr_init(void)
 {
         console_cursor_visibility(fphone(stdout), 0);
@@ -127 +128 @@
  * Set up screen mode.
  */
-void
-scr_set(void)
+void scr_set(void)
 {
         winsize_t ws;
-
-        Rows = 0, Cols = 0;
+        
+        Rows = 0;
+        Cols = 0;
+        
         if (get_display_size(&ws) == 0) {
                 Rows = ws.ws_row;
                 Cols = ws.ws_col;
         }
-        if (Rows < MINROWS || Cols < MINCOLS) {
+        
+        if ((Rows < MINROWS) || (Cols < MINCOLS)) {
                 char smallscr[55];
-
+                
                 snprintf(smallscr, sizeof(smallscr),
                     "the screen is too small (must be at least %dx%d)",
@@ -146 +149 @@
         }
         isset = 1;
-
+        
         scr_clear();
 }
@@ -153 +156 @@
  * End screen mode.
  */
-void
-scr_end(void)
-{
-}
-
-void
-stop(char *why)
-{
-
+void scr_end(void)
+{
+        console_cursor_visibility(fphone(stdout), 1);
+}
+
+void stop(char *why)
+{
         if (isset)
                 scr_end();
+        
         errx(1, "aborting: %s", why);
 }
 
-
 /*
  * Update the screen.
  */
-void
-scr_update(void)
-{
-        cell *bp, *sp;
-        cell so, cur_so = 0;
-        int i, ccol, j;
-        static const struct shape *lastshape;
-
-        /* always leave cursor after last displayed point */
+void scr_update(void)
+{
+        cell *bp;
+        cell *sp;
+        cell so;
+        cell cur_so = 0;
+        int i;
+        int j;
+        int ccol;
+        
+        /* Always leave cursor after last displayed point */
         curscreen[D_LAST * B_COLS - 1] = -1;
-
+        
         if (score != curscore) {
                 moveto(0, 0);
@@ -187 +190 @@
                 curscore = score;
         }
-
-        /* draw preview of next pattern */
-        if (showpreview && (nextshape != lastshape)) {
+        
+        /* Draw preview of next pattern */
+        if ((showpreview) && (nextshape != lastshape)) {
                 int i;
-                static int r=5, c=2;
+                static int r = 5, c = 2;
                 int tr, tc, t;
-
+                
                 lastshape = nextshape;
-
-                /* clean */
+                
+                /* Clean */
                 resume_normal();
-                moveto(r-1, c-1); putstr("          ");
-                moveto(r,   c-1); putstr("          ");
-                moveto(r+1, c-1); putstr("          ");
-                moveto(r+2, c-1); putstr("          ");
-
-                moveto(r-3, c-2);
+                moveto(r - 1, c - 1);
+                putstr("          ");
+                moveto(r, c - 1);
+                putstr("          ");
+                moveto(r + 1, c - 1);
+                putstr("          ");
+                moveto(r + 2, c - 1);
+                putstr("          ");
+                
+                moveto(r - 3, c - 2);
                 putstr("Next shape:");
-
-                /* draw */
-                start_standout();
+                
+                /* Draw */
+                start_standout(nextshape->color);
                 moveto(r, 2 * c);
                 putstr("  ");
@@ -213 +220 @@
                         t = c + r * B_COLS;
                         t += nextshape->off[i];
-
+                        
                         tr = t / B_COLS;
                         tc = t % B_COLS;
-
+                        
                         moveto(tr, 2*tc);
                         putstr("  ");
@@ -222 +229 @@
                 resume_normal();
         }
-
+        
         bp = &board[D_FIRST * B_COLS];
         sp = &curscreen[D_FIRST * B_COLS];
@@ -230 +237 @@
                         if (*sp == (so = *bp))
                                 continue;
+                        
                         *sp = so;
                         if (i != ccol) {
@@ -238 +246 @@
                                 moveto(RTOD(j), CTOD(i));
                         }
+                        
                         if (so != cur_so) {
                                 if (so)
-                                        start_standout();
+                                        start_standout(so);
                                 else
                                         resume_normal();
@@ -246 +255 @@
                         }
                         putstr("  ");
-
+                        
                         ccol = i + 1;
                         /*
@@ -256 +265 @@
                          * the next cell is a different color.
                          */
-#define STOP (B_COLS - 3)
-                        if (i > STOP || sp[1] != bp[1] || so != bp[1])
+                        
+                        if ((i > STOP) || (sp[1] != bp[1]) || (so != bp[1]))
                                 continue;
+                        
                         if (sp[2] != bp[2])
                                 sp[1] = -1;
-                        else if (i < STOP && so == bp[2] && sp[3] != bp[3]) {
+                        else if ((i < STOP) && (so == bp[2]) && (sp[3] != bp[3])) {
                                 sp[2] = -1;
                                 sp[1] = -1;
@@ -267 +277 @@
                 }
         }
+        
         if (cur_so)
                 resume_normal();
-        fflush(stdout);
-}
-
-/*
- * Write a message (set!=0), or clear the same message (set==0).
+        
+        fflush(stdout);
+}
+
+/*
+ * Write a message (set != 0), or clear the same message (set == 0).
  * (We need its length in case we have to overwrite with blanks.)
  */
-void
-scr_msg(char *s, int set)
-{
-        
+void scr_msg(char *s, int set)
+{
         int l = str_size(s);
         
         moveto(Rows - 2, ((Cols - l) >> 1) - 1);
+        
         if (set)
                 putstr(s);
@@ -292 +303 @@
 /** @}
  */
-