archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 22:11:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

cellKb: fix large ASCII characters for some compilers

Browse source
This commit is contained in:
Megamouse 2019-08-17 21:28:01 +02:00
parent eedf96e1f4
commit b3aff3a1c6
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/Cell/Modules/cellKb.cpp
View file

@ -156,7 +156,7 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
if (rawcode == CELL_KEYC_PERIOD) return get_ascii('.', '>'); if (rawcode == CELL_KEYC_PERIOD) return get_ascii('.', '>');
if (rawcode == CELL_KEYC_SLASH) return get_ascii('/', '?'); if (rawcode == CELL_KEYC_SLASH) return get_ascii('/', '?');
if (rawcode == CELL_KEYC_BACKSLASH_106) return get_ascii('\\', '_'); if (rawcode == CELL_KEYC_BACKSLASH_106) return get_ascii('\\', '_');
if (rawcode == CELL_KEYC_YEN_106) return get_ascii('¥', '|'); if (rawcode == CELL_KEYC_YEN_106) return get_ascii(190, '|'); // ¥
} }
else if (arrange == CELL_KB_MAPPING_101) // (US) else if (arrange == CELL_KB_MAPPING_101) // (US)
{ {
@ -187,7 +187,7 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
{ {
if (rawcode == CELL_KEYC_1) return get_ascii('1', '!'); if (rawcode == CELL_KEYC_1) return get_ascii('1', '!');
if (rawcode == CELL_KEYC_2) return get_ascii('2', '"'); if (rawcode == CELL_KEYC_2) return get_ascii('2', '"');
if (rawcode == CELL_KEYC_3) return get_ascii('3', '§'); if (rawcode == CELL_KEYC_3) return get_ascii('3', 245); // §
if (rawcode == CELL_KEYC_4) return get_ascii('4', '$'); if (rawcode == CELL_KEYC_4) return get_ascii('4', '$');
if (rawcode == CELL_KEYC_5) return get_ascii('5', '%'); if (rawcode == CELL_KEYC_5) return get_ascii('5', '%');
if (rawcode == CELL_KEYC_6) return get_ascii('6', '&'); if (rawcode == CELL_KEYC_6) return get_ascii('6', '&');
@ -197,14 +197,14 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
if (rawcode == CELL_KEYC_0) return get_ascii('0', '=', '}'); if (rawcode == CELL_KEYC_0) return get_ascii('0', '=', '}');
if (rawcode == CELL_KEYC_MINUS) return get_ascii('-', '_'); if (rawcode == CELL_KEYC_MINUS) return get_ascii('-', '_');
if (rawcode == CELL_KEYC_ACCENT_CIRCONFLEX_106) return get_ascii('^', '°'); if (rawcode == CELL_KEYC_ACCENT_CIRCONFLEX_106) return get_ascii('^', 248); // °
if (rawcode == CELL_KEYC_COMMA) return get_ascii(',', ';'); if (rawcode == CELL_KEYC_COMMA) return get_ascii(',', ';');
if (rawcode == CELL_KEYC_PERIOD) return get_ascii('.', ':'); if (rawcode == CELL_KEYC_PERIOD) return get_ascii('.', ':');
if (rawcode == CELL_KEYC_KPAD_PLUS) return get_ascii('+', '*', '~'); if (rawcode == CELL_KEYC_KPAD_PLUS) return get_ascii('+', '*', '~');
if (rawcode == CELL_KEYC_LESS) return get_ascii('<', '>', '|'); if (rawcode == CELL_KEYC_LESS) return get_ascii('<', '>', '|');
if (rawcode == CELL_KEYC_HASHTAG) return get_ascii('#', '\''); if (rawcode == CELL_KEYC_HASHTAG) return get_ascii('#', '\'');
if (rawcode == CELL_KEYC_SSHARP) return get_ascii('ß', '?', '\\'); if (rawcode == CELL_KEYC_SSHARP) return get_ascii(225, '?', '\\'); // ß
if (rawcode == CELL_KEYC_BACK_QUOTE) return get_ascii('´', '`'); if (rawcode == CELL_KEYC_BACK_QUOTE) return get_ascii(239, '`'); // ´
if (rawcode == CELL_KEYC_Q) return get_ascii('q', 'Q', '@'); if (rawcode == CELL_KEYC_Q) return get_ascii('q', 'Q', '@');
} }

4
rpcs3/basic_keyboard_handler.cpp
View file

@ -130,12 +130,12 @@ s32 basic_keyboard_handler::getUnmodifiedKey(QKeyEvent* keyEvent)
return key; return key;
} }
UINT raw_key = static_cast<UINT>(key); u32 raw_key = static_cast<u32>(key);
#ifdef _WIN32 #ifdef _WIN32
if (keyEvent->modifiers() != Qt::NoModifier && !keyEvent->text().isEmpty()) if (keyEvent->modifiers() != Qt::NoModifier && !keyEvent->text().isEmpty())
{ {
UINT mapped_key = MapVirtualKeyA((UINT)keyEvent->nativeVirtualKey(), MAPVK_VK_TO_CHAR); u32 mapped_key = (u32)MapVirtualKeyA((UINT)keyEvent->nativeVirtualKey(), MAPVK_VK_TO_CHAR);
if (raw_key != mapped_key) if (raw_key != mapped_key)
{ {

2
rpcs3/main.cpp
View file

@ -185,7 +185,7 @@ int main(int argc, char** argv)
{ {
argv.emplace_back(); argv.emplace_back();
for (u32 i = 1; i < args.length(); i++) for (int i = 1; i < args.length(); i++)
{ {
argv.emplace_back(args[i].toStdString()); argv.emplace_back(args[i].toStdString());
} }