From c63f77e3b0f4634ae996c2750a40588264c4279b Mon Sep 17 00:00:00 2001 From: Megamouse Date: Sun, 15 Mar 2020 13:53:15 +0100 Subject: [PATCH] overlays/osk: fix full width characters --- rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp | 5 +++++ rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp index 91d4cb2f93..4f162abf67 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.cpp @@ -66,6 +66,11 @@ namespace rsx { return language_class::hangul; } + case 0xFF: // Halfwidth and Fullwidth Forms + { + // Found in SCE-PS3-SR-R-JPN.TTF, so we'll use cjk_base for now + return language_class::cjk_base; + } default: { if (codepage_id >= 0xAC && codepage_id <= 0xD7) diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp index 27a0d2661f..aea2091ecd 100644 --- a/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp +++ b/rpcs3/Emu/RSX/Overlays/overlay_osk_panel.cpp @@ -164,7 +164,7 @@ namespace rsx {{{U"", U""}, {U"", U""}, {U"", U""}, {U""}}, default_bg, 1}, // Special - {{{U"あ/ア"}, {U"A/a"}, {U"全/半"}, {U""}}, special2_bg, 2, button_flags::_shift, shift_cb }, + {{{U"あ/ア"}, {U"A/a"}, {U"Ａ/ａ"}, {U""}}, special2_bg, 2, button_flags::_shift, shift_cb }, {{{U"abc"}, {U"全半"}, {U"＠％"}, {U"あア"}}, special2_bg, 2, button_flags::_layer, layer_cb}, {{{U"Space"}, {U"Space"}, {U"Space"}, {U"Space"}}, special_bg, 2, button_flags::_space, space_cb}, {{{U"Backspace"}, {U"Backspace"}, {U"Backspace"}, {U"Backspace"}}, special_bg, 2, button_flags::_default, delete_cb },