X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fwindows%2Fkeyboard.cpp;h=a598ac8450dcaf4735134d12a80876c43eb35fbe;hb=35d4d400521d30d84c20cd1434626e131cbf9304;hp=cbba914dd451fd133043e1f70f356a7f76c83b39;hpb=7312ff82ead10ae39f922f49b920d12dba28c9e8;p=libs%2Fgui.git

diff --git a/source/input/windows/keyboard.cpp b/source/input/windows/keyboard.cpp
index cbba914..a598ac8 100644
--- a/source/input/windows/keyboard.cpp
+++ b/source/input/windows/keyboard.cpp
@@ -4,7 +4,9 @@
 #include "keys.h"
 #include "keys_private.h"
 
+#ifndef MAPVK_VK_TO_VSC
 #define MAPVK_VK_TO_VSC 0
+#endif
 
 namespace Msp {
 namespace Input {
@@ -14,10 +16,14 @@ std::string Keyboard::get_button_name(unsigned btn) const
 	if(btn==KEY_NONE)
 		return "None";
 
+	unsigned vkey = key_to_sys(btn);
+	unsigned scan = MapVirtualKey(vkey&0xFF, MAPVK_VK_TO_VSC);
+	scan |= vkey&0x100;
+
 	char buf[128];
-	unsigned scan = MapVirtualKey(key_to_sys(btn), MAPVK_VK_TO_VSC);
 	if(!GetKeyNameText(scan<<16, buf, sizeof(buf)))
 		return Device::get_button_name(btn);
+
 	return buf;
 }
 
@@ -27,7 +33,17 @@ void Keyboard::input_event(const Graphics::Window::Event &event)
 	{
 	case WM_KEYDOWN:
 	case WM_KEYUP:
-		set_button_state(key_from_sys(event.wparam), event.msg==WM_KEYDOWN, true);
+		{
+			unsigned key = event.wparam | ((event.lparam>>16)&0x100);
+			if(key==VK_SHIFT)
+			{
+				if(((event.lparam>>16)&0xFF)==MapVirtualKey(VK_RSHIFT, MAPVK_VK_TO_VSC))
+					key = VK_RSHIFT;
+				else
+					key = VK_LSHIFT;
+			}
+			set_button_state(key_from_sys(key), event.msg==WM_KEYDOWN, true);
+		}
 		break;
 	case WM_CHAR:
 		signal_character.emit(event.wparam);