From 42ea6306f68b6c62678c0478fd41791d5ee5232d Mon Sep 17 00:00:00 2001
From: crs <cschoeneman@gmail.com>
Date: Sun, 27 Apr 2003 18:05:32 +0000
Subject: [PATCH] Fixes to previous checkpoint.  Non-ascii keys seem to work
 correctly. Still not supporting key composition on X11.

---
 lib/platform/CMSWindowsSecondaryScreen.cpp | 1 -
 lib/platform/CMSWindowsSecondaryScreen.h   | 1 +
 lib/server/Makefile.am                     | 1 +
 lib/server/server.dsp                      | 8 ++++++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/platform/CMSWindowsSecondaryScreen.cpp b/lib/platform/CMSWindowsSecondaryScreen.cpp
index 25db82f3..e7bd4e48 100644
--- a/lib/platform/CMSWindowsSecondaryScreen.cpp
+++ b/lib/platform/CMSWindowsSecondaryScreen.cpp
@@ -120,7 +120,6 @@ CMSWindowsSecondaryScreen::keyRepeat(KeyID key,
 
 	// if we've seen this button (and we should have) then make sure
 	// we release the same key we pressed when we saw it.
-	ServerKeyMap::iterator index = m_serverKeyMap.find(button);
 	if (index != m_serverKeyMap.end() && virtualKey != index->second) {
 		// replace key up with previous keycode but leave key down
 		// alone so it uses the new keycode and store that keycode
diff --git a/lib/platform/CMSWindowsSecondaryScreen.h b/lib/platform/CMSWindowsSecondaryScreen.h
index e60327a4..3bb9140b 100644
--- a/lib/platform/CMSWindowsSecondaryScreen.h
+++ b/lib/platform/CMSWindowsSecondaryScreen.h
@@ -25,6 +25,7 @@
 #include "IMSWindowsScreenEventHandler.h"
 #include "CMutex.h"
 #include "CString.h"
+#include "stdmap.h"
 #include "stdvector.h"
 
 class CMSWindowsScreen;
diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am
index ba6b8415..a414bc90 100644
--- a/lib/server/Makefile.am
+++ b/lib/server/Makefile.am
@@ -34,6 +34,7 @@ libserver_a_SOURCES = 				\
 	CServer.cpp						\
 	CClientProxy.h					\
 	CClientProxy1_0.h				\
+	CClientProxy1_1.h				\
 	CConfig.h						\
 	CHTTPServer.h					\
 	CPrimaryClient.h				\
diff --git a/lib/server/server.dsp b/lib/server/server.dsp
index 29ee4b0a..986fedf8 100644
--- a/lib/server/server.dsp
+++ b/lib/server/server.dsp
@@ -95,6 +95,10 @@ SOURCE=.\CClientProxy1_0.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\CClientProxy1_1.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\CConfig.cpp
 # End Source File
 # Begin Source File
@@ -123,6 +127,10 @@ SOURCE=.\CClientProxy1_0.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\CClientProxy1_1.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\CConfig.h
 # End Source File
 # Begin Source File