Make PSPOskConstants.cpp not binary anymore

.gitattributes

@@ -11,4 +11,4 @@
 *.xml            text
 
 # To avoid mucking up the utf-8 characters.
-Core/Dialog/PSPOskDialog.cpp binary
+Core/Dialog/PSPOskConstants.cpp binary

Core/Core.vcxproj

@@ -564,6 +564,7 @@
     <ClCompile Include="Debugger\WebSocket\SteppingBroadcaster.cpp" />
     <ClCompile Include="Debugger\WebSocket\SteppingSubscriber.cpp" />
     <ClCompile Include="Debugger\WebSocket\WebSocketUtils.cpp" />
+    <ClCompile Include="Dialog\PSPOskConstants.cpp" />
     <ClCompile Include="FileSystems\BlobFileSystem.cpp" />
     <ClCompile Include="FrameTiming.cpp" />
     <ClCompile Include="HLE\AtracCtx.cpp" />
@@ -1174,6 +1175,7 @@
     <ClInclude Include="Debugger\WebSocket\GameBroadcaster.h" />
     <ClInclude Include="Debugger\WebSocket\LogBroadcaster.h" />
     <ClInclude Include="Debugger\WebSocket\SteppingBroadcaster.h" />
+    <ClInclude Include="Dialog\PSPOskConstants.h" />
     <ClInclude Include="FileSystems\BlobFileSystem.h" />
     <ClInclude Include="FrameTiming.h" />
     <ClInclude Include="HLE\AtracCtx.h" />

Core/Core.vcxproj.filters

@@ -1315,6 +1315,9 @@
     <ClCompile Include="HLE\AtracCtx2.cpp">
       <Filter>HLE\Libraries</Filter>
     </ClCompile>
+    <ClCompile Include="Dialog\PSPOskConstants.cpp">
+      <Filter>Dialog</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ELF\ElfReader.h">
@@ -2109,6 +2112,9 @@
     <ClInclude Include="HLE\AtracCtx2.h">
       <Filter>HLE\Libraries</Filter>
     </ClInclude>
+    <ClInclude Include="Dialog\PSPOskConstants.h">
+      <Filter>Dialog</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\LICENSE.TXT" />

Core/Dialog/PSPOskConstants.cpp

@@ -0,0 +1,118 @@
+// Copyright (c) 2012- PPSSPP Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0 or later versions.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official git repository and contact information can be found at
+// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
+
+#include <cstdint>
+
+#include "Core/Dialog/PSPOskConstants.h"
+
+// Japanese (Kana) diacritics
+const wchar_t diacritics[2][103] =
+{
+	{L"かがきぎくぐけげこごさざしじすずせぜそぞただちぢつづてでとどはばぱばひびぴびふぶぷぶへべぺべほぼぽぼウヴカガキギクグケゲコゴサザシジスズセゼソゾタダチヂツヅテデトドハバパバヒビピビフブプブヘベペベホボポボ"},
+	{L"はぱばぱひぴびぴふぷぶぷへぺべぺほぽぼぽハパバパヒピビピフプブプヘペベペホポボポ"}
+};
+
+// Korean (Hangul) consonant
+const wchar_t kor_cons[20] = L"ㄱㄲㄴㄷㄸㄹㅁㅂㅃㅅㅆㅇㅈㅉㅊㅋㅌㅍㅎ";
+
+// Korean (Hangul) vowels, Some vowels are not used, they will be spaces
+const wchar_t kor_vowel[22] = L"ㅏㅐㅑㅒㅓㅔㅕㅖㅗ   ㅛㅜ   ㅠㅡ ㅣ";
+
+// Korean (Hangul) vowel Combination key
+const uint8_t kor_vowelCom[21] = {0,8,9,1,8,10,20,8,11,4,13,14,5,13,15,20,13,16,20,18,19};
+
+// Korean (Hangul) last consonant(diacritics)
+const wchar_t kor_lcons[28] = L"ㄱㄲㄳㄴㄵㄶㄷㄹㄺㄻㄼㄽㄾㄿㅀㅁㅂㅄㅅㅆㅇㅈㅊㅋㅌㅍㅎ";
+
+// Korean (Hangul) last consonant Combination key
+const uint8_t kor_lconsCom[33] = {18,0,2,21,3,4,26,3,5,0,7,8,15,7,9,16,7,10,18,7,11,24,7,12,25,7,13,26,7,14,18,16,17};
+
+// Korean (Hangul) last consonant Separation key
+const uint8_t kor_lconsSpr[33] = {2,1,9,4,4,12,5,4,18,8,8,0,9,8,6,10,8,7,11,8,9,12,8,16,13,8,17,14,8,18,17,17,9};
+
+const char16_t oskKeys[OSK_KEYBOARD_COUNT][6][14] =
+{
+	{
+		// Latin Lowercase
+		{u"1234567890-+"},
+		{u"qwertyuiop[]"},
+		{u"asdfghjkl;@~"},
+		{u"zxcvbnm,./?\\"},
+	},
+	{
+		// Latin Uppercase
+		{u"!@#$%^&*()_+"},
+		{u"QWERTYUIOP{}"},
+		{u"ASDFGHJKL:\"`"},
+		{u"ZXCVBNM<>/?|"},
+	},
+	{
+		// Hiragana
+		{u"あかさたなはまやらわぁゃっ"},
+		{u"いきしちにひみ　り　ぃ　　"},
+		{u"うくすつぬふむゆるをぅゅ゛"},
+		{u"えけせてねへめ　れ　ぇ　゜"},
+		{u"おこそとのほもよろんぉょー"},
+		{u"・。、「」『』〜     "},
+	},
+	{
+		// Katakana
+		{u"アカサタナハマヤラワァャッ"},
+		{u"イキシチニヒミ　リ　ィ　　"},
+		{u"ウクスツヌフムユルヲゥュ゛"},
+		{u"エケセテネヘメ　レ　ェ　゜"},
+		{u"オコソトノホモヨロンォョー"},
+		{u"・。、「」『』〜     "},
+	},
+	{
+		// Korean(Hangul)
+		{u"1234567890-+"},
+		{u"ㅃㅉㄸㄲㅆ!@#$%^&"},
+		{u"ㅂㅈㄷㄱㅅㅛㅕㅑㅐㅔ[]"},
+		{u"ㅁㄴㅇㄹㅎㅗㅓㅏㅣ;@~"},
+		{u"ㅋㅌㅊㅍㅠㅜㅡ<>/?|"},
+	},
+	{
+		// Russian Lowercase
+		{u"1234567890-+"},
+		{u"йцукенгшщзхъ"},
+		{u"фывапролджэё"},
+		{u"ячсмитьбю/?|"},
+	},
+	{
+		// Russian Uppercase
+		{u"!@#$%^&*()_+"},
+		{u"ЙЦУКЕНГШЩЗХЪ"},
+		{u"ФЫВАПРОЛДЖЭЁ"},
+		{u"ЯЧСМИТЬБЮ/?|"},
+	},
+	{
+		// Latin Full-width Lowercase
+		{ u"１２３４５６７８９０－＋" },
+		{ u"ｑｗｅｒｔｙｕｉｏｐ［］" },
+		{ u"ａｓｄｆｇｈｊｋｌ；＠～" },
+		{ u"ｚｘｃｖｂｎｍ，．／？￥￥" },
+	},
+	{
+		// Latin Full-width Uppercase
+		{ u"！＠＃＄％＾＆＊（）＿＋" },
+		{ u"ＱＷＥＲＴＹＵＩＯＰ｛｝" },
+		{ u"ＡＳＤＦＧＨＪＫＬ：￥”‘" },
+		{ u"ＺＸＣＶＢＮＭ＜＞／？｜" },
+	},
+};
+

Core/Dialog/PSPOskConstants.h

@@ -0,0 +1,16 @@
+#pragma once
+
+// Internal enum, not from PSP.
+enum OskKeyboardDisplay {
+	OSK_KEYBOARD_LATIN_LOWERCASE,
+	OSK_KEYBOARD_LATIN_UPPERCASE,
+	OSK_KEYBOARD_HIRAGANA,
+	OSK_KEYBOARD_KATAKANA,
+	OSK_KEYBOARD_KOREAN,
+	OSK_KEYBOARD_RUSSIAN_LOWERCASE,
+	OSK_KEYBOARD_RUSSIAN_UPPERCASE,
+	OSK_KEYBOARD_LATIN_FW_LOWERCASE,
+	OSK_KEYBOARD_LATIN_FW_UPPERCASE,
+	// TODO: Something to do native?
+	OSK_KEYBOARD_COUNT
+};

Core/Dialog/PSPOskDialog.h

@@ -23,7 +23,7 @@
 #include "Core/Dialog/PSPDialog.h"
 #include "Core/MemMap.h"
 #include "Common/CommonTypes.h"
-
+#include "Core/Dialog/PSPOskConstants.h"
 
 /**
 * Enumeration for input language
@@ -150,22 +150,6 @@ struct SceUtilityOskParams
 	s32_le unk_60;
 };
 
-// Internal enum, not from PSP.
-enum OskKeyboardDisplay
-{
-	OSK_KEYBOARD_LATIN_LOWERCASE,
-	OSK_KEYBOARD_LATIN_UPPERCASE,
-	OSK_KEYBOARD_HIRAGANA,
-	OSK_KEYBOARD_KATAKANA,
-	OSK_KEYBOARD_KOREAN,
-	OSK_KEYBOARD_RUSSIAN_LOWERCASE,
-	OSK_KEYBOARD_RUSSIAN_UPPERCASE,
-	OSK_KEYBOARD_LATIN_FW_LOWERCASE,
-	OSK_KEYBOARD_LATIN_FW_UPPERCASE,
-	// TODO: Something to do native?
-	OSK_KEYBOARD_COUNT
-};
-
 // Internal enum, not from PSP.
 enum OskKeyboardLanguage
 {