From 5841fee96626716d425cd44222ce6b483c8e6ccd Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Mon, 27 Nov 2006 17:06:00 +0000
Subject: [PATCH] With recent changes, keys like Enter could show up with
 SP->key_code incorrectly set TRUE. To Do: The way keypad() is used in
 PDCurses really isn't correct. Setting it to FALSE isn't intended to ignore
 these keys, just to return them as their individual components -- ESC [ A,
 for example. But this is meaningless in PDCurses. Should the distinction be
 eliminated? Should keypad at least default to TRUE?

---
 win32/pdckbd.c | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/win32/pdckbd.c b/win32/pdckbd.c
index 573ef24a..43bf8aa2 100644
--- a/win32/pdckbd.c
+++ b/win32/pdckbd.c
@@ -13,7 +13,7 @@
 
 #include "pdcwin.h"
 
-RCSID("$Id: pdckbd.c,v 1.96 2006/11/25 17:18:27 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.97 2006/11/27 17:06:00 wmcbrine Exp $");
 
 unsigned long pdc_key_modifiers = 0L;
 
@@ -386,7 +386,7 @@ static int _get_key_count(void)
 
 static int _process_key_event(void)
 {
-	int ascii = (unsigned short)KEV.uChar.UnicodeChar;
+	int key = (unsigned short)KEV.uChar.UnicodeChar;
 	WORD vk = KEV.wVirtualKeyCode;
 	DWORD state = KEV.dwControlKeyState;
 
@@ -430,7 +430,7 @@ static int _process_key_event(void)
 		return (left_key & 0x8000) ? KEY_CONTROL_L : KEY_CONTROL_R;
 
 	case VK_MENU: /* alt */
-		if (!ascii)
+		if (!key)
 		{
 			if (!SP->return_key_modifiers)
 				return -1;
@@ -442,26 +442,25 @@ static int _process_key_event(void)
 	/* The system may emit Ascii or Unicode characters depending on
 	   whether ReadConsoleInputA or ReadConsoleInputW is used.
 
-	   Normally, if ascii != 0 then the system did the translation
+	   Normally, if key != 0 then the system did the translation
 	   successfully. But this is not true for LEFT_ALT (different to
-	   RIGHT_ALT). In case of LEFT_ALT we can get ascii != 0. So
+	   RIGHT_ALT). In case of LEFT_ALT we can get key != 0. So
 	   check for this first. */
 
-	if (ascii && ( !(state & LEFT_ALT_PRESSED) ||
+	if (key && ( !(state & LEFT_ALT_PRESSED) ||
 	    (state & RIGHT_ALT_PRESSED) ))
 	{
 		/* This code should catch all keys returning a printable
 		   character. Characters above 0x7F should be returned
 		   as positive codes. But if'ndef NUMKEYPAD we have to
-		   return extended keycodes for keypad codes. Test for
-		   it and don't return an ascii code in case. */
+		   return extended keycodes for keypad codes. */
 
 #ifndef NUMKEYPAD
 		if (kptab[vk].extended == 0)
 #endif
 		{
 			SP->key_code = FALSE;
-			return ascii;
+			return key;
 		}
 	}
 
@@ -479,15 +478,21 @@ static int _process_key_event(void)
 	}
 
 	if (state & SHIFT_PRESSED)
-		return enhanced ? ext_kptab[idx].shift : kptab[idx].shift;
+		key = enhanced ? ext_kptab[idx].shift : kptab[idx].shift;
 
-	if (state & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED))
-		return enhanced ? ext_kptab[idx].control : kptab[idx].control;
+	else if (state & (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED))
+		key = enhanced ? ext_kptab[idx].control : kptab[idx].control;
 
-	if (state & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED))
-		return enhanced ? ext_kptab[idx].alt : kptab[idx].alt;
+	else if (state & (LEFT_ALT_PRESSED|RIGHT_ALT_PRESSED))
+		key = enhanced ? ext_kptab[idx].alt : kptab[idx].alt;
 
-	return enhanced ? ext_kptab[idx].normal : kptab[idx].normal;
+	else
+		key = enhanced ? ext_kptab[idx].normal : kptab[idx].normal;
+
+	if (key < KEY_CODE_YES)
+		SP->key_code = FALSE;
+
+	return key;
 }
 
 static int _process_mouse_event(void)