Changeset 5052046 in mainline

Timestamp:

2006-05-31T16:37:57Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

1c20e22

Parents:

c0e674a

Message:

Modified tetris input to be helenos-friendly.

File:

• tetris/input.c (modified) (7 diffs)

tetris/input.c

@@ -51 +51 @@
 
 #include <async.h>
+#include "../console/console.h"
 
 /* return true iff the given timeval is positive */
@@ -65 +66 @@
         }
 
+/* We will use a hack here - if lastchar is non-zero, it is
+ * the last character read. We will somehow simulate the select
+ * semantics.
+ */
 static aid_t getchar_inprog = 0;
+static char lastchar = '\0';
 
 /*
@@ -76 +82 @@
  *
  * Return 0 => no input, 1 => can read() from stdin
+ *
  */
 int
@@ -81 +88 @@
 {
         struct timeval starttv, endtv, *s;
-        fd_set fds;
+        static ipc_call_t charcall;
+        int rc;
 
 #define NILTZ ((struct timezone *)0)
@@ -97 +105 @@
                 s = NULL;
 again:
-        FD_ZERO(&fds);
-        FD_SET(STDIN_FILENO, &fds);
-        switch (select(STDIN_FILENO + 1, &fds, (fd_set *)0, (fd_set *)0, s)) {
-
-        case -1:
-                if (tvp == 0)
-                        return (-1);
-                if (errno == EINTR)
-                        goto again;
-                stop("select failed, help");
-                /* NOTREACHED */
-
-        case 0: /* timed out */
-                tvp->tv_sec = 0;
-                tvp->tv_usec = 0;
-                return (0);
+        if (!lastchar) {
+                if (!getchar_inprog)
+                        getchar_inprog = async_send_2(1,CONSOLE_GETCHAR,0,0,&charcall);
+                if (async_wait_timeout(getchar_inprog, &rc, s->tv_usec) == ETIMEOUT) {
+                        tvp->tv_sec = 0;
+                        tvp->tv_usec = 0;
+                        return (0);
+                }
+                getchar_inprog = 0;
+                if (rc) {
+                        stop("end of file, help");
+                }
+                lastchar = IPC_GET_ARG1(charcall);
         }
         if (tvp) {
@@ -136 +141 @@
         tv.tv_usec = fallrate;
         while (TV_POS(&tv))
-                if (rwait(&tv) && read(STDIN_FILENO, &c, 1) != 1)
+                if (rwait(&tv)) {
+                        lastchar = '\0';
+                } else
                         break;
 }
@@ -165 +172 @@
         if (!rwait(&timeleft))
                 return (-1);
-        if (read(STDIN_FILENO, &c, 1) != 1)
-                stop("end of file, help");
+        c = lastchar;
+        lastchar = '\0';
         return ((int)(unsigned char)c);
 }