[BACK]Return to io.c CVS log [TXT] [DIR] Up to [gforth] / gforth / engine

Diff for /gforth/engine/io.c between versions 1.13 and 1.21

version 1.13, 2000/09/23 15:47:08 version 1.21, 2006/04/09 07:44:13
Line 1 Line 1
 /* direct key io driver  /* direct key io driver
   
   Copyright (C) 1995,1996,1997,1998,1999 Free Software Foundation, Inc.    Copyright (C) 1995,1996,1997,1998,1999,2002,2003 Free Software Foundation, Inc.
   
   This file is part of Gforth.    This file is part of Gforth.
   
Line 26 Line 26
 */  */
   
 #include "config.h"  #include "config.h"
   #include "forth.h"
 #include <sys/time.h>  #include <sys/time.h>
 #include <sys/types.h>  #include <sys/types.h>
 #include <unistd.h>  #include <unistd.h>
Line 51  typedef unsigned int uint32_t; Line 52  typedef unsigned int uint32_t;
 #include <sys/filio.h>  #include <sys/filio.h>
 #endif  #endif
 #include <setjmp.h>  #include <setjmp.h>
 #include "forth.h"  
 #include "io.h"  #include "io.h"
   
 #ifndef MSDOS  #ifndef MSDOS
Line 447  void deprep_terminal () Line 447  void deprep_terminal ()
 #define VTIME VEOL  #define VTIME VEOL
 #endif  #endif
   
   #include <locale.h>
   
 void prep_terminal ()  void prep_terminal ()
 {  {
   int tty = fileno (stdin);    int tty = fileno (stdin);
Line 472  void prep_terminal () Line 474  void prep_terminal ()
     return;      /* added by MdG */      return;      /* added by MdG */
   }      /* added by MdG */    }      /* added by MdG */
         
     setlocale(LC_ALL, "");
   
   /* Try to keep this function from being INTerrupted.  We can do it    /* Try to keep this function from being INTerrupted.  We can do it
      on POSIX and systems with BSD-like signal handling. */       on POSIX and systems with BSD-like signal handling. */
 #if defined (HAVE_POSIX_SIGNALS)  #if defined (HAVE_POSIX_SIGNALS)
Line 613  void deprep_terminal () Line 617  void deprep_terminal ()
 }  }
 #endif  /* NEW_TTY_DRIVER */  #endif  /* NEW_TTY_DRIVER */
   
 /* If a character is available to be read, then read it  
    and stuff it into IBUFFER.  Otherwise, just return. */  
   
 long pending = -1L;  
   
 long key_avail (FILE * stream)  long key_avail (FILE * stream)
 {  {
   int tty = fileno (stream);    int tty = fileno (stream);
   int chars_avail = pending;    fd_set selin;
   int result;    static int now[2] = { 0 , 0 };
     int res;
   if(!terminal_prepped)  prep_terminal();  
   
 #ifndef _WIN32    if(!terminal_prepped && stream == stdin)
   if(isatty (tty)) {      prep_terminal();
     result = ioctl (tty, FIONREAD, &chars_avail);  
   }  
 #else  
   {  
     fd_set selin;  
     static int now[2] = { 0 , 0 };  
     int res;  
       
     FD_ZERO(&selin);  
     FD_SET(tty, &selin);  
     chars_avail=select(1, &selin, NULL, NULL, now);  
   }  
 #endif  
     
   if(chars_avail == -1L) {  
     unsigned char inchar;  
       
     fcntl(tty, F_SETFL, O_NDELAY);  
     result = read(tty, &inchar, sizeof(char));  
     if(result == sizeof(char)) {  
       chars_avail = 1;  
       pending = (long)inchar;  
     } else {  
       chars_avail = 0;  
     }  
     fcntl(tty, F_SETFL, 0);  
   }  
   
   return chars_avail;    FD_ZERO(&selin);
     FD_SET(tty, &selin);
     return select(1, &selin, NULL, NULL, now);
 }  }
   
 /* Get a key from the buffer of characters to be read.  /* Get a key from the buffer of characters to be read.
Line 674  Cell getkey(FILE * stream) Line 647  Cell getkey(FILE * stream)
   if(!terminal_prepped)    if(!terminal_prepped)
     prep_terminal();      prep_terminal();
   
   while (pending < 0)    while (1)
     {      {
       result = read (fileno (stream), &c, sizeof (char));        result = read (fileno (stream), &c, sizeof (char));
   
Line 692  Cell getkey(FILE * stream) Line 665  Cell getkey(FILE * stream)
       if (errno != EINTR)        if (errno != EINTR)
         return (EOF);          return (EOF);
     }      }
   
   /* otherwise there is a character pending;  
      return it and delete pending char */  
   result = (Cell) pending;  
   pending = -1L;  
   
   return result;  
 }  }
   
 #ifdef TEST  #ifdef TEST
Removed from v.1.13  
changed lines
  Added in v.1.21

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>