From df3801d6831f513d07b3ce22d57a825b59fc8b11 Mon Sep 17 00:00:00 2001
From: Mark Hessling <mark@rexx.org>
Date: Thu, 1 Jan 2004 22:07:41 +0000
Subject: [PATCH] Be consistent in how to handle timeout() and halfdelay()

---
 x11/pdckbd.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/x11/pdckbd.c b/x11/pdckbd.c
index 3d9d7a23..9309bf37 100644
--- a/x11/pdckbd.c
+++ b/x11/pdckbd.c
@@ -25,7 +25,7 @@
 #include <curses.h>
 
 #ifdef PDCDEBUG
-char *rcsid_PDCkbd  = "$Id: pdckbd.c,v 1.4 2003/12/28 08:39:21 mark Exp $";
+char *rcsid_PDCkbd  = "$Id: pdckbd.c,v 1.5 2004/01/01 22:07:41 mark Exp $";
 #endif
 
 /*man-start*********************************************************************
@@ -226,28 +226,29 @@ int	PDC_rawgetch()
 #endif
 /***********************************************************************/
 {
-extern	WINDOW*	_getch_win_;
+   extern WINDOW* _getch_win_;
 
-	int	c=0;
-	int	delay;
+   int c=0;
+   int delay;
+   bool  return_immediately;
 
 #ifdef PDCDEBUG
-	if (trace_on) PDC_debug("PDC_rawgetch() - called\n");
+   if (trace_on) PDC_debug("PDC_rawgetch() - called\n");
 #endif
 
-	if (_getch_win_ == (WINDOW *)NULL)   /* @@ */
-		return( -1 );
+   if (_getch_win_ == (WINDOW *)NULL)   /* @@ */
+      return( -1 );
 
-	if (_getch_win_->_nodelay && !PDC_breakout()) /* @@ */
-		return( -1 );
+   if (SP->delaytenths || _getch_win_->_delayms || _getch_win_->_nodelay)
+      return_immediately = TRUE;
+   else
+      return_immediately = FALSE;
 
-	if ( SP->delaytenths || _getch_win_->_delayms > 0 )
-		delay = 1;
-	else
-		delay = 0;
+   if (return_immediately && !PDC_breakout())
+      return( -1 );
 
-	c = XCurses_rawgetch( delay );
-	return(c);
+   c = XCurses_rawgetch( 0 );
+   return(c);
 }
 
 /*man-start*********************************************************************