diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2023-06-09 11:11:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-09 12:11:53 +0200 |
| commit | 2bf4555591d246ba315505d5b70fcaee43c1fa11 (patch) | |
| tree | 775750688a82d767ab53fe1a42ad036441157dcf /src/Ryujinx.HLE/HOS/Applets | |
| parent | 86de288142188341a98fab6d132152077b391fbd (diff) | |
Swkbd Applet Fixes (#5236)
* Swkbd Applet Fixes
* Forgot a full stop
* Update src/Ryujinx.Ava/UI/Applet/SwkbdAppletDialog.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update src/Ryujinx/Ui/Applet/SwkbdAppletDialog.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
---------
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Diffstat (limited to 'src/Ryujinx.HLE/HOS/Applets')
| -rw-r--r-- | src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs | 17 | ||||
| -rw-r--r-- | src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/KeyboardMode.cs | 18 |
2 files changed, 30 insertions, 5 deletions
diff --git a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs new file mode 100644 index 00000000..36e6ff51 --- /dev/null +++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/CJKCharacterValidation.cs @@ -0,0 +1,17 @@ +using System.Text.RegularExpressions; + +namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard +{ + public static partial class CJKCharacterValidation + { + public static bool IsCJK(char value) + { + Regex regex = CJKRegex(); + + return regex.IsMatch(value.ToString()); + } + + [GeneratedRegex("\\p{IsHangulJamo}|\\p{IsCJKRadicalsSupplement}|\\p{IsCJKSymbolsandPunctuation}|\\p{IsEnclosedCJKLettersandMonths}|\\p{IsCJKCompatibility}|\\p{IsCJKUnifiedIdeographsExtensionA}|\\p{IsCJKUnifiedIdeographs}|\\p{IsHangulSyllables}|\\p{IsCJKCompatibilityForms}")] + private static partial Regex CJKRegex(); + } +}
\ No newline at end of file diff --git a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/KeyboardMode.cs b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/KeyboardMode.cs index 01b3c963..e2862211 100644 --- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/KeyboardMode.cs +++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/KeyboardMode.cs @@ -6,22 +6,30 @@ public enum KeyboardMode : uint { /// <summary> - /// A full alpha-numeric keyboard. + /// All UTF-16 characters allowed. /// </summary> Default = 0, /// <summary> - /// Number pad. + /// Only numbers allowed. /// </summary> NumbersOnly = 1, /// <summary> - /// ASCII characters keyboard. + /// Only ASCII characters allowed. /// </summary> ASCII = 2, - FullLatin = 3, - Alphabet = 4, + /// <summary> + /// Synonymous with default. + /// </summary> + FullLatin = 3, + + /// <summary> + /// All UTF-16 characters except CJK characters allowed. + /// </summary> + Alphabet = 4, + SimplifiedChinese = 5, TraditionalChinese = 6, Korean = 7, |