--- lbbs/src/io.c	2004/10/23 18:41:41	1.2
+++ lbbs/src/io.c	2005/05/07 12:08:28	1.12
@@ -17,21 +17,26 @@
 
 #include "io.h"
 #include "common.h"
+#include "tcplib.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 = printf("%c",c);
+  retval = fprintf (stdout, "%c", c);
 
   return retval;
 }
 
 int
-prints(const char * format, ...)
+prints (const char *format, ...)
 {
   va_list args;
   int retval;
@@ -44,42 +49,97 @@ prints(const char * format, ...)
 }
 
 int
-iflush()
+iflush ()
 {
   int retval;
-  
+
   retval = fflush (stdout);
-  
+
   return retval;
 }
 
 int
 igetch ()
 {
-  char c, tmp[256];
   static char buf[256];
-  int out = 0, loop = 1, in_esc = 0, in_ascii = 0, i = 0, j;
-  static int len =0 , pos = 0;
+  unsigned char c, tmp[256];
+  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 testfds;
+  struct timeval timeout;
+
+  //Stop on system exit
+  if (SYS_exit)
+    return KEY_NULL;
 
   if (pos >= len)
-  {
-    len = s_receive (socket_client, buf, 255, "");
-    pos = 0;
-
-    //For debug
-    //for (j = 0; j < len; j++)
-    //  log_std ("[%d]\n", buf[j]);
-  }
+    {
+      pos = 0;
+      len = 0;
+
+      FD_ZERO (&testfds);
+      FD_SET (0, &testfds);
+
+      timeout.tv_sec = 1;
+      timeout.tv_usec = 0;
+
+      result = SignalSafeSelect (FD_SETSIZE, &testfds, (fd_set *) NULL,
+		       (fd_set *) NULL, &timeout);
+
+      if (result == 0)
+	{
+	  return KEY_TIMEOUT;
+	}
+      if (result < 0)
+	{
+	  log_error ("select() error (%d) !\n", result);
+	  return KEY_NULL;
+	}
+      if (result > 0)
+	{
+	  if (FD_ISSET (0, &testfds))
+	    {
+	      len = read (0, buf, 255);
+	    }
+	}
+
+      //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)
+	{
+	  tmp[i++] = c;
+	  if (i >= 2)
+	    {
+	      out = (int) tmp[0] * 256 + tmp[1];
+	      in_control = 0;
+	      break;
+	    }
+	  continue;
+	}
 
       if (c == ESC_KEY)
 	{
@@ -136,6 +196,9 @@ igetch ()
 		case 49:
 		  out = KEY_HOME;
 		  break;
+		case 51:
+		  out = KEY_DEL;
+		  break;
 		case 52:
 		  out = KEY_END;
 		  break;
@@ -143,7 +206,7 @@ igetch ()
 		  out = KEY_PGUP;
 		  break;
 		case 54:
-		  out = KEY_PGDOWN;
+		  out = KEY_PGDN;
 		  break;
 		}
 	      break;
@@ -151,12 +214,37 @@ igetch ()
 	  continue;
 	}
 
-      out = ((int)c + 256) % 256;
+      out = ((int) c + 256) % 256;
       break;
     }
 
   //for debug
-  //log_std ("[%d]\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;
+}