Changeset ebe70f1 in mainline for uspace/app/tetris/input.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/input.c (modified) (8 diffs)

uspace/app/tetris/input.c

@@ -37 +37 @@
 
 /** @addtogroup tetris
- * @{ 
+ * @{
  */
 /** @file
@@ -93 +93 @@
  *
  */
-int
-rwait(struct timeval *tvp)
+int rwait(struct timeval *tvp)
 {
         struct timeval starttv, endtv, *s;
         static ipc_call_t charcall;
         ipcarg_t rc;
-
+        
         /*
          * Someday, select() will do this for us.
@@ -111 +110 @@
         } else
                 s = NULL;
-
+        
         if (!lastchar) {
 again:
@@ -118 +117 @@
                             CONSOLE_GET_EVENT, &charcall);
                 }
+                
                 if (!s)
                         async_wait_for(getchar_inprog, &rc);
@@ -125 +125 @@
                         return (0);
                 }
+                
                 getchar_inprog = 0;
-                if (rc) {
+                if (rc)
                         stop("end of file, help");
-                }
+                
                 if (IPC_GET_ARG1(charcall) == KEY_RELEASE)
                         goto again;
-
+                
                 lastchar = IPC_GET_ARG4(charcall);
         }
+        
         if (tvp) {
                 /* since there is input, we may not have timed out */
                 (void) gettimeofday(&endtv, NULL);
                 TV_SUB(&endtv, &starttv);
-                TV_SUB(tvp, &endtv);    /* adjust *tvp by elapsed time */
+                TV_SUB(tvp, &endtv);  /* adjust *tvp by elapsed time */
         }
-        return (1);
+        
+        return 1;
 }
 
@@ -147 +150 @@
  * Eat any input that might be available.
  */
-void
-tsleep(void)
+void tsleep(void)
 {
         struct timeval tv;
-
+        
         tv.tv_sec = 0;
         tv.tv_usec = fallrate;
@@ -164 +166 @@
  * getchar with timeout.
  */
-int
-tgetchar(void)
+int tgetchar(void)
 {
         static struct timeval timeleft;
         char c;
-
+        
         /*
          * Reset timeleft to fallrate whenever it is not positive.
@@ -180 +181 @@
          */
         if (!TV_POS(&timeleft)) {
-                faster();       /* go faster */
+                faster();  /* go faster */
                 timeleft.tv_sec = 0;
                 timeleft.tv_usec = fallrate;
         }
+        
         if (!rwait(&timeleft))
-                return (-1);
+                return -1;
+        
         c = lastchar;
         lastchar = '\0';
-        return ((int)(unsigned char)c);
+        return ((int) (unsigned char) c);
 }
 
 /** @}
  */
-