 @@ -1,14 +1,14 @@
-/*   $NetBSD: get_wch.c,v 1.7 2009/11/01 22:11:27 dsl Exp $ */
+/*   $NetBSD: get_wch.c,v 1.8 2009/11/04 21:51:11 dsl Exp $ */
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
  * All rights reserved.
+ *
  * This code is derived from code donated to the NetBSD Foundation
  * by Ruibiao Qiu <ruibiao@arl.wustl.edu,ruibiao@gmail.com>.
+ *
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -26,27 +26,27 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.7 2009/11/01 22:11:27 dsl Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.8 2009/11/04 21:51:11 dsl Exp $");
 #endif						  /* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include "curses.h"
 #include "curses_private.h"
 #include "keymap.h"
 #ifdef HAVE_WCHAR
 static short   wstate;		  /* state of the wcinkey function */
 #endif /* HAVE_WCHAR */
 @@ -89,27 +89,27 @@ inkey(wchar_t *wc, int to, int delay)
 	FILE		*infd = _cursesi_screen->infd;
 	int		 *start = &_cursesi_screen->cbuf_head,
 				*working = &_cursesi_screen->cbuf_cur,
 				*end = &_cursesi_screen->cbuf_tail;
 	char		*inbuf = &_cursesi_screen->cbuf[ 0 ];
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "inkey (%p, %d, %d)\n", wc, to, delay);
 #endif
 	for (;;) { /* loop until we get a complete key sequence */
 		if (wstate == INKEY_NORM) {
 			if (delay && __timeout(delay) == ERR)
 				return ERR;
-			c = getchar();
+			c = fgetc(infd);
 			if (c == WEOF) {
 				clearerr(infd);
 				return ERR;
+			}
 			if (delay && (__notimeout() == ERR))
 				return ERR;
 			k = (wchar_t) c;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "inkey (wstate normal) got '%s'\n", unctrl(k));
 #endif
 @@ -137,27 +137,27 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
+			}
 		} else if (wstate == INKEY_ASSEMBLING) {
 			/* assembling a key sequence */
 			if (delay) {
 				if (__timeout(to ? (ESCDELAY / 100) : delay)
 						== ERR)
 					return ERR;
 			} else {
 				if (to && (__timeout(ESCDELAY / 100) == ERR))
 					return ERR;
+			}
-			c = getchar();
+			c = fgetc(infd);
 			if (ferror(infd)) {
 				clearerr(infd);
 				return ERR;
+			}
 			if ((to || delay) && (__notimeout() == ERR))
 				return ERR;
 			k = (wchar_t) c;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "inkey (wstate assembling) got '%s'\n", unctrl(k));
 #endif /* DEBUG */
 @@ -187,27 +187,27 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
+			}
 		} else if (wstate == INKEY_WCASSEMBLING) {
 			/* assembling a wide char sequence */
 			if (delay) {
 				if (__timeout(to ? (ESCDELAY / 100) : delay)
 						== ERR)
 					return ERR;
 			} else {
 				if (to && (__timeout(ESCDELAY / 100) == ERR))
 					return ERR;
+			}
-			c = getchar();
+			c = fgetc(infd);
 			if (ferror(infd)) {
 				clearerr(infd);
 				return ERR;
+			}
 			if ((to || delay) && (__notimeout() == ERR))
 				return ERR;
 			k = (wchar_t) c;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "inkey (wstate wcassembling) got '%s'\n",
 				unctrl(k));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getch.c,v 1.53 2009/11/01 22:11:27 dsl Exp $	*/
+/*	$NetBSD: getch.c,v 1.54 2009/11/04 21:51:11 dsl Exp $	*/
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)getch.c	8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: getch.c,v 1.53 2009/11/01 22:11:27 dsl Exp $");
+__RCSID("$NetBSD: getch.c,v 1.54 2009/11/04 21:51:11 dsl Exp $");
 #endif
 #endif					/* not lint */
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include "curses.h"
 #include "curses_private.h"
 #include "keymap.h"
 short	state;		/* state of the inkey function */
 @@ -547,27 +547,27 @@ inkey(int to, int delay)
 	keymap_t	*current = _cursesi_screen->base_keymap;
 	FILE            *infd = _cursesi_screen->infd;
 	k = 0;		/* XXX gcc -Wuninitialized */
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT, "inkey (%d, %d)\n", to, delay);
 #endif
 	for (;;) {		/* loop until we get a complete key sequence */
 reread:
 		if (state == INKEY_NORM) {
 			if (delay && __timeout(delay) == ERR)
 				return ERR;
-			c = getchar();
+			c = fgetc(infd);
 			if (c == EOF) {
 				clearerr(infd);
 				return ERR;
+			}
 			if (delay && (__notimeout() == ERR))
 				return ERR;
 			k = (wchar_t) c;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "inkey (state normal) got '%s'\n", unctrl(k));
 #endif
 @@ -589,27 +589,27 @@ reread:
 				state = INKEY_ASSEMBLING;
+			}
 		} else if (state == INKEY_ASSEMBLING) {
 			/* assembling a key sequence */
 			if (delay) {
 				if (__timeout(to ? (ESCDELAY / 100) : delay)
 				    == ERR)
 					return ERR;
 			} else {
 				if (to && (__timeout(ESCDELAY / 100) == ERR))
 					return ERR;
+			}
-			c = getchar();
+			c = fgetc(infd);
 			if (ferror(infd)) {
 				clearerr(infd);
 				return ERR;
+			}
 			if ((to || delay) && (__notimeout() == ERR))
 					return ERR;
 #ifdef DEBUG
 			__CTRACE(__CTRACE_INPUT,
 			    "inkey (state assembling) got '%s'\n", unctrl(k));
 #endif
 			if (feof(infd) || c == -1) {	/* inter-char timeout,
 @@ -859,27 +859,27 @@ wgetch(WINDOW *win)
 			if (__delay() == ERR)
 				return ERR;
 			break;
 		case 0:
 			if (__nodelay() == ERR)
 				return ERR;
 			break;
 		default:
 			if (__timeout(win->delay) == ERR)
 				return ERR;
 			break;
+		}
-		c = getchar();
+		c = fgetc(infd);
 		if (feof(infd)) {
 			clearerr(infd);
 			__restore_termios();
 			return ERR;	/* we have timed out */
+		}
 		if (ferror(infd)) {
 			clearerr(infd);
 			inp = ERR;
 		} else {
 			inp = c;
+		}
+	}