From 95b9789564899d09034a8baf515d52012763cabc Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Wed, 15 Nov 2006 01:09:31 +0000
Subject: [PATCH] Slightly more efficient.

---
 os2/pdckbd.c  | 16 +++++++++-------
 os2/pdcscrn.c | 12 ++----------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/os2/pdckbd.c b/os2/pdckbd.c
index e8d8d75c..d3ea39d7 100644
--- a/os2/pdckbd.c
+++ b/os2/pdckbd.c
@@ -32,7 +32,7 @@ static HMOU mouse_handle = 0;
 static MOUSE_STATUS old_mouse_status;
 #endif
 
-RCSID("$Id: pdckbd.c,v 1.53 2006/11/14 18:11:47 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.54 2006/11/15 01:09:31 wmcbrine Exp $");
 
 /************************************************************************
  *   Table for key code translation of function keys in keypad mode	*
@@ -588,25 +588,27 @@ void PDC_flushinp(void)
 int PDC_mouse_set(void)
 {
 #ifndef EMXVIDEO
-	if (SP->_trap_mbe && !mouse_handle)
+
+	unsigned long mbe = SP->_trap_mbe;
+
+	if (mbe && !mouse_handle)
 	{
 		memset(&old_mouse_status, 0, sizeof(MOUSE_STATUS));
 		MouOpen(NULL, &mouse_handle);
 		if (mouse_handle)
 			MouDrawPtr(mouse_handle);
 	}
-	else if (!SP->_trap_mbe && mouse_handle)
+	else if (!mbe && mouse_handle)
 	{
 		MouClose(mouse_handle);
 		mouse_handle = 0;
 	}
 
-	if (SP->_trap_mbe)
+	if (mbe)
 	{
-		USHORT mask;
-		unsigned long mbe = SP->_trap_mbe;
+		USHORT mask =
 
-		mask =  ((mbe & (BUTTON1_PRESSED | BUTTON1_CLICKED | 
+			((mbe & (BUTTON1_PRESSED | BUTTON1_CLICKED | 
 			BUTTON1_MOVED)) ? 6 : 0) |
 
 			((mbe & (BUTTON3_PRESSED | BUTTON3_CLICKED | 
diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c
index 742c2445..842e3c0b 100644
--- a/os2/pdcscrn.c
+++ b/os2/pdcscrn.c
@@ -13,7 +13,7 @@
 
 #include "pdcos2.h"
 
-RCSID("$Id: pdcscrn.c,v 1.59 2006/11/11 16:36:08 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.60 2006/11/15 01:09:31 wmcbrine Exp $");
 
 int pdc_font;			/* default font size	*/
 
@@ -84,17 +84,9 @@ static void _set_font(int size)
 
 void PDC_scr_close(void)
 {
-	char *ptr;
-
 	PDC_LOG(("PDC_scr_close() - called\n"));
 
-#ifdef EMXVIDEO
-	ptr = getenv("PDC_RESTORE_SCREEN");
-#else
-	if (DosScanEnv("PDC_RESTORE_SCREEN", (PSZ *)&ptr))
-		ptr = NULL;
-#endif
-	if (ptr && saved_screen)
+	if (saved_screen && getenv("PDC_RESTORE_SCREEN"))
 	{
 #ifdef EMXVIDEO
 		v_putline(saved_screen, 0, 0, saved_lines * saved_cols);