--- lbbs/src/io.c	2005/03/02 16:33:49	1.4
+++ lbbs/src/io.c	2005/03/22 08:19:11	1.9
@@ -19,19 +19,23 @@
 #include "common.h"
 #include <stdio.h>
 #include <stdarg.h>
+#include <time.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/ioctl.h>
 
 int
-outc(char c)
+outc (char c)
 {
   int retval;
 
-  retval = fprintf(stdout, "%c", c);
+  retval = fprintf (stdout, "%c", c);
 
   return retval;
 }
 
 int
-prints(const char * format, ...)
+prints (const char *format, ...)
 {
   va_list args;
   int retval;
@@ -44,12 +48,12 @@ prints(const char * format, ...)
 }
 
 int
-iflush()
+iflush ()
 {
   int retval;
-  
+
   retval = fflush (stdout);
-  
+
   return retval;
 }
 
@@ -58,50 +62,79 @@ igetch ()
 {
   static char buf[256];
   unsigned char c, tmp[256];
-  int out = 0, loop = 1, in_esc = 0, in_ascii = 0, in_control = 0, i = 0, j;
-  static int len = 0 , pos = 0;
+  int out = KEY_NULL, loop = 1, in_esc = 0, in_ascii = 0, in_control = 0, i =
+    0, j, result;
+  static int len = 0, pos = 0;
+  fd_set inputs, testfds;
+  struct timeval timeout;
 
   if (pos >= len)
-  {
-    len = s_receive (socket_client, buf, 255, "");
-    pos = 0;
-
-    //For debug
-    for (j = 0; j < len; j++)
-      log_std ("<--[%u]\n", (buf[j] + 256) % 256);
-  }
+    {
+      pos = 0;
+      len = 0;
+
+      FD_ZERO (&inputs);
+      FD_SET (0, &inputs);
+
+      testfds = inputs;
+      timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
+
+      result = select (FD_SETSIZE, &testfds, (fd_set *) NULL,
+		       (fd_set *) NULL, &timeout);
+
+      switch (result)
+	{
+	case 0:
+	  out = KEY_TIMEOUT;
+	  break;
+	case -1:
+	  log_error ("select() error!\n");
+	  break;
+	default:
+	  if (FD_ISSET (0, &testfds))
+	    {
+	      len = read (0, buf, 255);
+	    }
+	  break;
+	}
+
+      //For debug
+      //for (j = 0; j < len; j++)
+      //  log_std ("<--[%u]\n", (buf[j] + 256) % 256);
+    }
 
   while (pos < len)
     {
       c = buf[pos++];
 
       if (c == '\0')
-      {
-      	out = c;
-        break;
-      }
+	{
+	  out = c;
+	  break;
+	}
 
       if (c == KEY_CONTROL)
-        {
-          if (in_control == 0)
-            {
-              in_control = 1;
-              i = 0;
-              continue;
-            }
-        }
-      
+	{
+	  if (in_control == 0)
+	    {
+	      in_control = 1;
+	      i = 0;
+	      continue;
+	    }
+	}
+
       if (in_control)
-      {
-      	tmp[i++] = c;
-      	if (i >= 2)
-      	{
-      	  out = (int)tmp[0] * 256 + tmp[1];
-      	  in_control = 0;
-      	  break;
-      	}
-      	continue;
-      }
+	{
+	  tmp[i++] = c;
+	  if (i >= 2)
+	    {
+	      out = (int) tmp[0] * 256 + tmp[1];
+	      in_control = 0;
+	      break;
+	    }
+	  continue;
+	}
 
       if (c == ESC_KEY)
 	{
@@ -168,7 +201,7 @@ igetch ()
 		  out = KEY_PGUP;
 		  break;
 		case 54:
-		  out = KEY_PGDOWN;
+		  out = KEY_PGDN;
 		  break;
 		}
 	      break;
@@ -176,12 +209,35 @@ igetch ()
 	  continue;
 	}
 
-      out = ((int)c + 256) % 256;
+      out = ((int) c + 256) % 256;
       break;
     }
 
   //for debug
-  log_std ("-->[%u]\n", out);
+  //log_std ("-->[%u]\n", out);
 
   return out;
 }
+
+int
+igetch_t (long int sec)
+{
+  int ch;
+  time_t t_begin = time(0);
+  
+  do {
+    ch = igetch ();
+  } while ((ch == KEY_TIMEOUT) && (time(0) - t_begin < sec));
+
+  return ch;
+}
+
+int
+ikbhit ()
+{
+  int len;
+
+  ioctl (0, FIONREAD, &len);
+
+  return len;
+}