mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add HAVE_LANGEXTRA to menu_osk.c

Browse Source
This commit is contained in:
twinaphex 2017-01-29 20:01:26 +01:00
parent a9c8c81032
commit c2c2521b12
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
menu/widgets/menu_osk.c
View File

@ -53,6 +53,7 @@ static const char *lowercase_grid[] = {
"a","s","d","f","g","h","j","k","l",";","⇧", "a","s","d","f","g","h","j","k","l",";","⇧",
"z","x","c","v","b","n","m"," ",",",".","⊕"}; "z","x","c","v","b","n","m"," ",",",".","⊕"};
#ifdef HAVE_LANGEXTRA
static const char *hiragana_page1_grid[] = { static const char *hiragana_page1_grid[] = {
"あ","い","う","え","お","ら","り","る","れ","ろ","⇦", "あ","い","う","え","お","ら","り","る","れ","ろ","⇦",
"か","き","く","け","こ","が","ぎ","ぐ","げ","ご","⏎", "か","き","く","け","こ","が","ぎ","ぐ","げ","ご","⏎",
@ -76,6 +77,7 @@ static const char *katakana_page2_grid[] = {
"ハ","ヒ","フ","ヘ","ホ","パ","ピ","プ","ペ","ポ","⏎", "ハ","ヒ","フ","ヘ","ホ","パ","ピ","プ","ペ","ポ","⏎",
"マ","ミ","ム","メ","モ","ン","ッ","ャ","ュ","ョ","⇧", "マ","ミ","ム","メ","モ","ン","ッ","ャ","ュ","ョ","⇧",
"ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"}; "ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"};
#endif
void menu_event_set_osk_idx(enum osk_type idx) void menu_event_set_osk_idx(enum osk_type idx)
{ {
@ -102,11 +104,14 @@ void menu_event_osk_append(int ptr)
if (ptr < 0) if (ptr < 0)
return; return;
#ifdef HAVE_LANGEXTRA
if (string_is_equal(osk_grid[ptr],"⇦")) if (string_is_equal(osk_grid[ptr],"⇦"))
input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD); input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD);
else if (string_is_equal(osk_grid[ptr],"⏎")) else if (string_is_equal(osk_grid[ptr],"⏎"))
input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD); input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD);
else if (string_is_equal(osk_grid[ptr],"⇧")) else
#endif
if (string_is_equal(osk_grid[ptr],"⇧"))
menu_event_set_osk_idx(OSK_UPPERCASE_LATIN); menu_event_set_osk_idx(OSK_UPPERCASE_LATIN);
else if (string_is_equal(osk_grid[ptr],"⇩")) else if (string_is_equal(osk_grid[ptr],"⇩"))
menu_event_set_osk_idx(OSK_LOWERCASE_LATIN); menu_event_set_osk_idx(OSK_LOWERCASE_LATIN);
@ -123,6 +128,7 @@ void menu_event_osk_iterate(void)
{ {
switch (menu_event_get_osk_idx()) switch (menu_event_get_osk_idx())
{ {
#ifdef HAVE_LANGEXTRA
case OSK_HIRAGANA_PAGE1: case OSK_HIRAGANA_PAGE1:
memcpy(osk_grid, hiragana_page1_grid, sizeof(hiragana_page1_grid)); memcpy(osk_grid, hiragana_page1_grid, sizeof(hiragana_page1_grid));
break; break;
@ -135,6 +141,7 @@ void menu_event_osk_iterate(void)
case OSK_KATAKANA_PAGE2: case OSK_KATAKANA_PAGE2:
memcpy(osk_grid, katakana_page2_grid, sizeof(katakana_page2_grid)); memcpy(osk_grid, katakana_page2_grid, sizeof(katakana_page2_grid));
break; break;
#endif
case OSK_UPPERCASE_LATIN: case OSK_UPPERCASE_LATIN:
memcpy(osk_grid, uppercase_grid, sizeof(uppercase_grid)); memcpy(osk_grid, uppercase_grid, sizeof(uppercase_grid));
break; break;

6
menu/widgets/menu_osk.h
View File

@ -24,6 +24,10 @@
#include <retro_common_api.h> #include <retro_common_api.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#define OSK_CHARS_PER_LINE 11 #define OSK_CHARS_PER_LINE 11
RETRO_BEGIN_DECLS RETRO_BEGIN_DECLS
@ -33,10 +37,12 @@ enum osk_type
OSK_TYPE_UNKNOWN = 0U, OSK_TYPE_UNKNOWN = 0U,
OSK_LOWERCASE_LATIN, OSK_LOWERCASE_LATIN,
OSK_UPPERCASE_LATIN, OSK_UPPERCASE_LATIN,
#ifdef HAVE_LANGEXTRA
OSK_HIRAGANA_PAGE1, OSK_HIRAGANA_PAGE1,
OSK_HIRAGANA_PAGE2, OSK_HIRAGANA_PAGE2,
OSK_KATAKANA_PAGE1, OSK_KATAKANA_PAGE1,
OSK_KATAKANA_PAGE2, OSK_KATAKANA_PAGE2,
#endif
OSK_TYPE_LAST OSK_TYPE_LAST
}; };