From 874176c19ab88ddccd3153e7c29699dc92996241 Mon Sep 17 00:00:00 2001
From: omigamedev <omarator@gmail.com>
Date: Mon, 24 Apr 2017 11:55:12 +0100
Subject: [PATCH] add kemaps to win

---
 engine.vcxproj         |   5 ++
 engine.vcxproj.filters |  15 ++++
 engine/keymap.h        | 199 +++++++++++++++++++++++++++++++++++++++++
 engine/main.cpp        |   4 +-
 4 files changed, 221 insertions(+), 2 deletions(-)

diff --git a/engine.vcxproj b/engine.vcxproj
index 2381738..e2dca01 100644
--- a/engine.vcxproj
+++ b/engine.vcxproj
@@ -150,11 +150,13 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="engine\action.cpp" />
     <ClCompile Include="engine\app.cpp" />
     <ClCompile Include="engine\asset.cpp" />
     <ClCompile Include="engine\bezier.cpp" />
     <ClCompile Include="engine\brush.cpp" />
     <ClCompile Include="engine\canvas.cpp" />
+    <ClCompile Include="engine\event.cpp" />
     <ClCompile Include="engine\font.cpp" />
     <ClCompile Include="engine\image.cpp" />
     <ClCompile Include="engine\layout.cpp" />
@@ -191,13 +193,16 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="engine\action.h" />
     <ClInclude Include="engine\app.h" />
     <ClInclude Include="engine\asset.h" />
     <ClInclude Include="engine\bezier.h" />
     <ClInclude Include="engine\brush.h" />
     <ClInclude Include="engine\canvas.h" />
+    <ClInclude Include="engine\event.h" />
     <ClInclude Include="engine\font.h" />
     <ClInclude Include="engine\image.h" />
+    <ClInclude Include="engine\keymap.h" />
     <ClInclude Include="engine\layout.h" />
     <ClInclude Include="engine\log.h" />
     <ClInclude Include="engine\pch.h" />
diff --git a/engine.vcxproj.filters b/engine.vcxproj.filters
index dbfab69..02e11e9 100644
--- a/engine.vcxproj.filters
+++ b/engine.vcxproj.filters
@@ -72,6 +72,12 @@
     <ClCompile Include="engine\log.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="engine\action.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="engine\event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="engine\app.h">
@@ -119,5 +125,14 @@
     <ClInclude Include="engine\log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="engine\action.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="engine\keymap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/engine/keymap.h b/engine/keymap.h
index 457dfe8..4b18265 100644
--- a/engine/keymap.h
+++ b/engine/keymap.h
@@ -122,6 +122,7 @@ kKey convert_key(int key)
 #define CASE(K,V) case K: return V;
     switch(key)
     {
+#ifdef __APPLE__
     CASE(kVK_ANSI_A, kKey::Unknown);
     CASE(kVK_ANSI_S, kKey::Unknown);
     CASE(kVK_ANSI_D, kKey::Unknown);
@@ -234,6 +235,204 @@ kKey convert_key(int key)
     CASE(kVK_RightArrow, kKey::Unknown);
     CASE(kVK_DownArrow, kKey::Unknown);
     CASE(kVK_UpArrow, kKey::Unknown);
+#elif defined(_WIN32)
+    CASE(VK_LBUTTON, kKey::Unknown);
+    CASE(VK_RBUTTON, kKey::Unknown);
+    CASE(VK_CANCEL, kKey::Unknown);
+    CASE(VK_MBUTTON, kKey::Unknown);
+    CASE(VK_XBUTTON1, kKey::Unknown);
+    CASE(VK_XBUTTON2, kKey::Unknown);
+    CASE(VK_BACK, kKey::Unknown);
+    CASE(VK_TAB, kKey::Unknown);
+    CASE(VK_CLEAR, kKey::Unknown);
+    CASE(VK_RETURN, kKey::Unknown);
+    CASE(VK_SHIFT, kKey::Unknown);
+    CASE(VK_CONTROL, kKey::Unknown);
+    CASE(VK_MENU, kKey::Unknown);
+    CASE(VK_PAUSE, kKey::Unknown);
+    CASE(VK_CAPITAL, kKey::Unknown);
+    CASE(VK_KANA, kKey::Unknown);
+    //CASE(VK_HANGEUL, kKey::Unknown); // same as VK_KANA
+    //CASE(VK_HANGUL, kKey::Unknown);  // same as VK_KANA
+    CASE(VK_JUNJA, kKey::Unknown);
+    CASE(VK_FINAL, kKey::Unknown);
+    CASE(VK_HANJA, kKey::Unknown);
+    //CASE(VK_KANJI, kKey::Unknown); // same as VK_HANJA
+    CASE(VK_ESCAPE, kKey::Unknown);
+    CASE(VK_CONVERT, kKey::Unknown);
+    CASE(VK_NONCONVERT, kKey::Unknown);
+    CASE(VK_ACCEPT, kKey::Unknown);
+    CASE(VK_MODECHANGE, kKey::Unknown);
+    CASE(VK_SPACE, kKey::Unknown);
+    CASE(VK_PRIOR, kKey::Unknown);
+    CASE(VK_NEXT, kKey::Unknown);
+    CASE(VK_END, kKey::Unknown);
+    CASE(VK_HOME, kKey::Unknown);
+    CASE(VK_LEFT, kKey::Unknown);
+    CASE(VK_UP, kKey::Unknown);
+    CASE(VK_RIGHT, kKey::Unknown);
+    CASE(VK_DOWN, kKey::Unknown);
+    CASE(VK_SELECT, kKey::Unknown);
+    CASE(VK_PRINT, kKey::Unknown);
+    CASE(VK_EXECUTE, kKey::Unknown);
+    CASE(VK_SNAPSHOT, kKey::Unknown);
+    CASE(VK_INSERT, kKey::Unknown);
+    CASE(VK_DELETE, kKey::Unknown);
+    CASE(VK_HELP, kKey::Unknown);
+    CASE('0', kKey::Unknown);
+    CASE('1', kKey::Unknown);
+    CASE('2', kKey::Unknown);
+    CASE('3', kKey::Unknown);
+    CASE('4', kKey::Unknown);
+    CASE('5', kKey::Unknown);
+    CASE('6', kKey::Unknown);
+    CASE('7', kKey::Unknown);
+    CASE('8', kKey::Unknown);
+    CASE('9', kKey::Unknown);
+    CASE('A', kKey::Unknown);
+    CASE('B', kKey::Unknown);
+    CASE('C', kKey::Unknown);
+    CASE('D', kKey::Unknown);
+    CASE('E', kKey::KeyE);
+    CASE('F', kKey::Unknown);
+    CASE('G', kKey::Unknown);
+    CASE('H', kKey::Unknown);
+    CASE('I', kKey::Unknown);
+    CASE('J', kKey::Unknown);
+    CASE('K', kKey::Unknown);
+    CASE('L', kKey::Unknown);
+    CASE('M', kKey::Unknown);
+    CASE('N', kKey::Unknown);
+    CASE('O', kKey::Unknown);
+    CASE('P', kKey::Unknown);
+    CASE('Q', kKey::Unknown);
+    CASE('R', kKey::Unknown);
+    CASE('S', kKey::Unknown);
+    CASE('T', kKey::Unknown);
+    CASE('U', kKey::Unknown);
+    CASE('V', kKey::Unknown);
+    CASE('W', kKey::Unknown);
+    CASE('X', kKey::Unknown);
+    CASE('Y', kKey::Unknown);
+    CASE('Z', kKey::Unknown);
+    CASE(VK_LWIN, kKey::Unknown);
+    CASE(VK_RWIN, kKey::Unknown);
+    CASE(VK_APPS, kKey::Unknown);
+    CASE(VK_SLEEP, kKey::Unknown);
+    CASE(VK_NUMPAD0, kKey::Unknown);
+    CASE(VK_NUMPAD1, kKey::Unknown);
+    CASE(VK_NUMPAD2, kKey::Unknown);
+    CASE(VK_NUMPAD3, kKey::Unknown);
+    CASE(VK_NUMPAD4, kKey::Unknown);
+    CASE(VK_NUMPAD5, kKey::Unknown);
+    CASE(VK_NUMPAD6, kKey::Unknown);
+    CASE(VK_NUMPAD7, kKey::Unknown);
+    CASE(VK_NUMPAD8, kKey::Unknown);
+    CASE(VK_NUMPAD9, kKey::Unknown);
+    CASE(VK_MULTIPLY, kKey::Unknown);
+    CASE(VK_ADD, kKey::Unknown);
+    CASE(VK_SEPARATOR, kKey::Unknown);
+    CASE(VK_SUBTRACT, kKey::Unknown);
+    CASE(VK_DECIMAL, kKey::Unknown);
+    CASE(VK_DIVIDE, kKey::Unknown);
+    CASE(VK_F1, kKey::Unknown);
+    CASE(VK_F2, kKey::Unknown);
+    CASE(VK_F3, kKey::Unknown);
+    CASE(VK_F4, kKey::Unknown);
+    CASE(VK_F5, kKey::Unknown);
+    CASE(VK_F6, kKey::Unknown);
+    CASE(VK_F7, kKey::Unknown);
+    CASE(VK_F8, kKey::Unknown);
+    CASE(VK_F9, kKey::Unknown);
+    CASE(VK_F10, kKey::Unknown);
+    CASE(VK_F11, kKey::Unknown);
+    CASE(VK_F12, kKey::Unknown);
+    CASE(VK_F13, kKey::Unknown);
+    CASE(VK_F14, kKey::Unknown);
+    CASE(VK_F15, kKey::Unknown);
+    CASE(VK_F16, kKey::Unknown);
+    CASE(VK_F17, kKey::Unknown);
+    CASE(VK_F18, kKey::Unknown);
+    CASE(VK_F19, kKey::Unknown);
+    CASE(VK_F20, kKey::Unknown);
+    CASE(VK_F21, kKey::Unknown);
+    CASE(VK_F22, kKey::Unknown);
+    CASE(VK_F23, kKey::Unknown);
+    CASE(VK_F24, kKey::Unknown);
+    CASE(VK_NUMLOCK, kKey::Unknown);
+    CASE(VK_SCROLL, kKey::Unknown);
+    //CASE(VK_OEM_NEC_EQUAL, kKey::Unknown); // same as VK_OEM_FJ_JISHO
+    CASE(VK_OEM_FJ_JISHO, kKey::Unknown);
+    CASE(VK_OEM_FJ_MASSHOU, kKey::Unknown);
+    CASE(VK_OEM_FJ_TOUROKU, kKey::Unknown);
+    CASE(VK_OEM_FJ_LOYA, kKey::Unknown);
+    CASE(VK_OEM_FJ_ROYA, kKey::Unknown);
+    CASE(VK_LSHIFT, kKey::Unknown);
+    CASE(VK_RSHIFT, kKey::Unknown);
+    CASE(VK_LCONTROL, kKey::Unknown);
+    CASE(VK_RCONTROL, kKey::Unknown);
+    CASE(VK_LMENU, kKey::Unknown);
+    CASE(VK_RMENU, kKey::Unknown);
+    CASE(VK_BROWSER_BACK, kKey::Unknown);
+    CASE(VK_BROWSER_FORWARD, kKey::Unknown);
+    CASE(VK_BROWSER_REFRESH, kKey::Unknown);
+    CASE(VK_BROWSER_STOP, kKey::Unknown);
+    CASE(VK_BROWSER_SEARCH, kKey::Unknown);
+    CASE(VK_BROWSER_FAVORITES, kKey::Unknown);
+    CASE(VK_BROWSER_HOME, kKey::Unknown);
+    CASE(VK_VOLUME_MUTE, kKey::Unknown);
+    CASE(VK_VOLUME_DOWN, kKey::Unknown);
+    CASE(VK_VOLUME_UP, kKey::Unknown);
+    CASE(VK_MEDIA_NEXT_TRACK, kKey::Unknown);
+    CASE(VK_MEDIA_PREV_TRACK, kKey::Unknown);
+    CASE(VK_MEDIA_STOP, kKey::Unknown);
+    CASE(VK_MEDIA_PLAY_PAUSE, kKey::Unknown);
+    CASE(VK_LAUNCH_MAIL, kKey::Unknown);
+    CASE(VK_LAUNCH_MEDIA_SELECT, kKey::Unknown);
+    CASE(VK_LAUNCH_APP1, kKey::Unknown);
+    CASE(VK_LAUNCH_APP2, kKey::Unknown);
+    CASE(VK_OEM_1, kKey::Unknown);
+    CASE(VK_OEM_PLUS, kKey::Unknown);
+    CASE(VK_OEM_COMMA, kKey::Unknown);
+    CASE(VK_OEM_MINUS, kKey::Unknown);
+    CASE(VK_OEM_PERIOD, kKey::Unknown);
+    CASE(VK_OEM_2, kKey::Unknown);
+    CASE(VK_OEM_3, kKey::Unknown);
+    CASE(VK_OEM_4, kKey::Unknown);
+    CASE(VK_OEM_5, kKey::Unknown);
+    CASE(VK_OEM_6, kKey::Unknown);
+    CASE(VK_OEM_7, kKey::Unknown);
+    CASE(VK_OEM_8, kKey::Unknown);
+    CASE(VK_OEM_AX, kKey::Unknown);
+    CASE(VK_OEM_102, kKey::Unknown);
+    CASE(VK_ICO_HELP, kKey::Unknown);
+    CASE(VK_ICO_00, kKey::Unknown);
+    CASE(VK_PROCESSKEY, kKey::Unknown);
+    CASE(VK_ICO_CLEAR, kKey::Unknown);
+    CASE(VK_PACKET, kKey::Unknown);
+    CASE(VK_OEM_RESET, kKey::Unknown);
+    CASE(VK_OEM_JUMP, kKey::Unknown);
+    CASE(VK_OEM_PA1, kKey::Unknown);
+    CASE(VK_OEM_PA2, kKey::Unknown);
+    CASE(VK_OEM_PA3, kKey::Unknown);
+    CASE(VK_OEM_WSCTRL, kKey::Unknown);
+    CASE(VK_OEM_CUSEL, kKey::Unknown);
+    CASE(VK_OEM_ATTN, kKey::Unknown);
+    CASE(VK_OEM_FINISH, kKey::Unknown);
+    CASE(VK_OEM_COPY, kKey::Unknown);
+    CASE(VK_OEM_AUTO, kKey::Unknown);
+    CASE(VK_OEM_ENLW, kKey::Unknown);
+    CASE(VK_OEM_BACKTAB, kKey::Unknown);
+    CASE(VK_ATTN, kKey::Unknown);
+    CASE(VK_CRSEL, kKey::Unknown);
+    CASE(VK_EXSEL, kKey::Unknown);
+    CASE(VK_EREOF, kKey::Unknown);
+    CASE(VK_PLAY, kKey::Unknown);
+    CASE(VK_ZOOM, kKey::Unknown);
+    CASE(VK_NONAME, kKey::Unknown);
+    CASE(VK_PA1, kKey::Unknown);
+    CASE(VK_OEM_CLEAR, kKey::Unknown);
+#endif
     default: 
         return kKey::Unknown;
     }
diff --git a/engine/main.cpp b/engine/main.cpp
index 1c8d8c9..6d989a3 100644
--- a/engine/main.cpp
+++ b/engine/main.cpp
@@ -635,11 +635,11 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
         break;
     case WM_KEYDOWN:
         keys[wp] = true;
-        App::I.key_down((int)wp);
+        App::I.key_down(convert_key((int)wp));
         break;
     case WM_KEYUP:
         keys[wp] = false;
-        App::I.key_up((int)wp);
+        App::I.key_up(convert_key((int)wp));
         break;
     case WM_CHAR:
         App::I.key_char((int)wp);