Diff for /gforth/engine/io.c between versions 1.31 and 1.38

version 1.31, 2007/12/31 17:34:59 version 1.38, 2009/06/30 19:22:24
Line 1 Line 1
 /* direct key io driver  /* direct key io driver
   
   Copyright (C) 1995,1996,1997,1998,1999,2002,2003,2006,2007 Free Software Foundation, Inc.    Copyright (C) 1995,1996,1997,1998,1999,2002,2003,2006,2007,2008 Free Software Foundation, Inc.
   
   This file is part of Gforth.    This file is part of Gforth.
   
   Gforth is free software; you can redistribute it and/or    Gforth is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License    modify it under the terms of the GNU General Public License
   as published by the Free Software Foundation; either version 2    as published by the Free Software Foundation, either version 3
   of the License, or (at your option) any later version.    of the License, or (at your option) any later version.
   
   This program is distributed in the hope that it will be useful,    This program is distributed in the hope that it will be useful,
Line 15 Line 15
   GNU General Public License for more details.    GNU General Public License for more details.
   
   You should have received a copy of the GNU General Public License    You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software    along with this program; if not, see http://www.gnu.org/licenses/.
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
   The following is stolen from the readline library for bash    The following is stolen from the readline library for bash
 */  */
Line 40 Line 39
 typedef unsigned int uint32_t;  typedef unsigned int uint32_t;
 #endif  #endif
   
   #include <stdlib.h>
 #include <stdio.h>  #include <stdio.h>
 #include <signal.h>  #include <signal.h>
 #include <string.h>  #include <string.h>
Line 618  void deprep_terminal () Line 618  void deprep_terminal ()
 }  }
 #endif  /* NEW_TTY_DRIVER */  #endif  /* NEW_TTY_DRIVER */
   
 long key_avail (FILE * stream)  /* an ungetc() variant where we can know that there is a character waiting:
      gf_ungetc: like ungetc
      gf_regetc: call when reading a char, but does not get the character
      gf_ungottenc: true if there is a char waiting
   
      Implementation: just an array containing all the FILEs with ungotten chars.
      Sequential search for membership checking (there should not be many elements)
   */
   
   static FILE **ungotten_files = NULL;
   static size_t n_ungotten = 0; /* actual number */
   static size_t max_ungotten = 0; /* buffer size */
   
   int gf_ungetc(int c, FILE *stream)
   /* like ungetc, but works with the others */
   {
     if (n_ungotten>=max_ungotten) {
       max_ungotten = max_ungotten*2+1;
       ungotten_files = realloc(ungotten_files, max_ungotten*sizeof(FILE *));
     }
     ungotten_files[n_ungotten++] = stream;
     return ungetc(c, stream);
   }
   
   static long search_ungotten(FILE *stream)
   {
     long i;
     for (i=0; i<n_ungotten; i++)
       if (ungotten_files[i] == stream)
         return i;
     return -1;
   }
   
   void gf_regetc(FILE *stream)
   /* remove STREAM from ungotten_files */
   {
     long i = search_ungotten(stream);
     if (i>=0)
       ungotten_files[i] = ungotten_files[--n_ungotten];
   }
   
   int gf_ungottenc(FILE *stream)
   /* true if stream has been ungotten */
   {
     return search_ungotten(stream)>=0;
   }
   
   long key_avail (FILE *stream)
 {  {
   int tty = fileno (stream);    int tty = fileno (stream);
   fd_set selin;    fd_set selin;
   static struct timespec now = { 0 , 0 };    static struct timeval now = { 0 , 0 };
   int res;    int chars_avail;
   
     if (gf_ungottenc(stream))
       return 1;
   setvbuf(stream, NULL, _IONBF, 0);    setvbuf(stream, NULL, _IONBF, 0);
   if(!terminal_prepped && stream == stdin)    if(!terminal_prepped && stream == stdin)
     prep_terminal();      prep_terminal();
   
   FD_ZERO(&selin);    FD_ZERO(&selin);
   FD_SET(tty, &selin);    FD_SET(tty, &selin);
   return select(1, &selin, NULL, NULL, &now);    chars_avail = select(1, &selin, NULL, NULL, &now);
     if (chars_avail > 0) {
       /* getc won't block */
       int c = getc(stream);
       if (c==EOF)
         return 0;
       gf_ungetc(c, stream);
     }
     return (chars_avail == -1) ? 0 : chars_avail;
 }  }
   
 /* Get a key from the buffer of characters to be read.  /* Get a key from the buffer of characters to be read.
Line 646  Cell getkey(FILE * stream) Line 703  Cell getkey(FILE * stream)
   Cell result;    Cell result;
   unsigned char c;    unsigned char c;
   
   setvbuf(stream, NULL, _IONBF, 0);    if (!gf_ungottenc(stream))
       setvbuf(stream, NULL, _IONBF, 0);
   if(!terminal_prepped && stream == stdin)    if(!terminal_prepped && stream == stdin)
     prep_terminal();      prep_terminal();
   
   result = fread(&c, sizeof(c), 1, stream);    result = fread(&c, sizeof(c), 1, stream);
     if (result>0)
       gf_regetc(stream);
   return result==0 ? (errno == EINTR ? 12 : 4) : c;    return result==0 ? (errno == EINTR ? 12 : 4) : c;
 }  }
   

Removed from v.1.31  
changed lines
  Added in v.1.38


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