From ef974086aa9080973717ed754c0e4193b1d11ab7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 12 Jan 2017 11:31:24 +0100 Subject: [PATCH] Split up menu OSK code to separate file - menu/widgets/menu_osk.c --- Makefile.common | 1 + griffin/griffin.c | 1 + menu/drivers/materialui.c | 1 + menu/drivers/xmb.c | 1 + menu/menu_driver.c | 2 +- menu/menu_event.c | 170 +++++++------------------------------- menu/menu_event.h | 13 +-- menu/menu_input.c | 1 + menu/widgets/menu_osk.c | 151 +++++++++++++++++++++++++++++++++ menu/widgets/menu_osk.h | 59 +++++++++++++ runloop.c | 8 +- 11 files changed, 252 insertions(+), 156 deletions(-) create mode 100644 menu/widgets/menu_osk.c create mode 100644 menu/widgets/menu_osk.h diff --git a/Makefile.common b/Makefile.common index 88347354f8..e3e3d219ae 100644 --- a/Makefile.common +++ b/Makefile.common @@ -527,6 +527,7 @@ ifeq ($(HAVE_MENU_COMMON), 1) menu/widgets/menu_input_bind_dialog.o \ menu/widgets/menu_entry.o \ menu/widgets/menu_list.o \ + menu/widgets/menu_osk.o \ menu/menu_cbs.o \ menu/cbs/menu_cbs_ok.o \ menu/cbs/menu_cbs_cancel.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 983c566383..041d9b92c9 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -945,6 +945,7 @@ MENU #include "../menu/widgets/menu_input_dialog.c" #include "../menu/widgets/menu_input_bind_dialog.c" #include "../menu/widgets/menu_list.c" +#include "../menu/widgets/menu_osk.c" #include "../menu/cbs/menu_cbs_ok.c" #include "../menu/cbs/menu_cbs_cancel.c" #include "../menu/cbs/menu_cbs_select.c" diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 64bb5319d6..87d7b63f37 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -48,6 +48,7 @@ #include "../menu_event.h" #include "../widgets/menu_input_dialog.h" +#include "../widgets/menu_osk.h" #include "../../core_info.h" #include "../../core.h" diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index febabf08b4..2a436e6fbd 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -49,6 +49,7 @@ #include "../widgets/menu_entry.h" #include "../widgets/menu_list.h" #include "../widgets/menu_input_dialog.h" +#include "../widgets/menu_osk.h" #include "../menu_event.h" diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 6dd6a2812c..bbc6d4d29d 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -228,7 +228,7 @@ static void menu_input_key_event(bool down, unsigned keycode, RARCH_LOG("down: %d, keycode: %d, mod: %d, character: %d\n", down, keycode, mod, character); #endif - menu_event_keyboard_set(down, (enum retro_key)keycode); + menu_event_kb_set(down, (enum retro_key)keycode); } static void menu_driver_toggle(bool on) diff --git a/menu/menu_event.c b/menu/menu_event.c index 0f4d6dc450..f2e021a70f 100644 --- a/menu/menu_event.c +++ b/menu/menu_event.c @@ -24,11 +24,11 @@ #include "../config.h" #endif -#include #include #include "widgets/menu_entry.h" #include "widgets/menu_input_dialog.h" +#include "widgets/menu_osk.h" #include "menu_event.h" @@ -42,104 +42,8 @@ #include "../configuration.h" #include "../runloop.h" -#if defined(_MSC_VER) && !defined(_XBOX) -/* https://support.microsoft.com/en-us/kb/980263 */ -#pragma execution_character_set("utf-8") -#endif - -#define OSK_CHARS_PER_LINE 11 - static unsigned char menu_keyboard_key_state[RETROK_LAST]; -enum osk_type -{ - OSK_TYPE_UNKNOWN = 0U, - OSK_LOWERCASE_LATIN, - OSK_UPPERCASE_LATIN, - OSK_HIRAGANA_PAGE1, - OSK_HIRAGANA_PAGE2, - OSK_KATAKANA_PAGE1, - OSK_KATAKANA_PAGE2, - OSK_TYPE_LAST -}; - -static int osk_ptr = 0; -static enum osk_type osk_idx = OSK_LOWERCASE_LATIN; -static const char *osk_grid[45]; - -static const char *uppercase_grid[] = { - "!","@","#","$","%","^","&","*","(",")","⇦", - "Q","W","E","R","T","Y","U","I","O","P","⏎", - "A","S","D","F","G","H","J","K","L",":","⇩", - "Z","X","C","V","B","N","M"," ","<",">","⊕"}; - -static const char *lowercase_grid[] = { - "1","2","3","4","5","6","7","8","9","0","⇦", - "q","w","e","r","t","y","u","i","o","p","⏎", - "a","s","d","f","g","h","j","k","l",";","⇧", - "z","x","c","v","b","n","m"," ",",",".","⊕"}; - -static const char *hiragana_page1_grid[] = { - "あ","い","う","え","お","ら","り","る","れ","ろ","⇦", - "か","き","く","け","こ","が","ぎ","ぐ","げ","ご","⏎", - "さ","し","す","せ","そ","ざ","じ","ず","ぜ","ぞ","⇧", - "た","ち","つ","て","と","だ","ぢ","づ","で","ど","⊕"}; - -static const char *hiragana_page2_grid[] = { - "な","に","ぬ","ね","の","ば","び","ぶ","べ","ぼ","⇦", - "は","ひ","ふ","へ","ほ","ぱ","ぴ","ぷ","ぺ","ぽ","⏎", - "ま","み","む","め","も","ん","っ","ゃ","ゅ","ょ","⇧", - "や","ゆ","よ","わ","を","ぁ","ぃ","ぅ","ぇ","ぉ","⊕"}; - -static const char *katakana_page1_grid[] = { - "ア","イ","ウ","エ","オ","ラ","リ","ル","レ","ロ","⇦", - "カ","キ","ク","ケ","コ","ガ","ギ","グ","ゲ","ゴ","⏎", - "サ","シ","ス","セ","ソ","ザ","ジ","ズ","ゼ","ゾ","⇧", - "タ","チ","ツ","テ","ト","ダ","ヂ","ヅ","デ","ド","⊕"}; - -static const char *katakana_page2_grid[] = { - "ナ","ニ","ヌ","ネ","ノ","バ","ビ","ブ","ベ","ボ","⇦", - "ハ","ヒ","フ","ヘ","ホ","パ","ピ","プ","ペ","ポ","⏎", - "マ","ミ","ム","メ","モ","ン","ッ","ャ","ュ","ョ","⇧", - "ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"}; - -int menu_event_get_osk_ptr(void) -{ - return osk_ptr; -} - -void menu_event_set_osk_ptr(int i) -{ - osk_ptr = i; -} - -void menu_event_osk_append(int ptr) -{ - if (ptr < 0) - return; - - if (string_is_equal(osk_grid[ptr],"⇦")) - input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD); - else if (string_is_equal(osk_grid[ptr],"⏎")) - input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD); - else if (string_is_equal(osk_grid[ptr],"⇧")) - osk_idx = OSK_UPPERCASE_LATIN; - else if (string_is_equal(osk_grid[ptr],"⇩")) - osk_idx = OSK_LOWERCASE_LATIN; - else if (string_is_equal(osk_grid[ptr],"⊕")) - if (osk_idx < OSK_TYPE_LAST - 1) - osk_idx = (enum osk_type)(osk_idx + 1); - else - osk_idx = (enum osk_type)(OSK_TYPE_UNKNOWN + 1); - else - input_keyboard_line_append(osk_grid[ptr]); -} - -const char** menu_event_get_osk_grid(void) -{ - return osk_grid; -} - static int menu_event_pointer(unsigned *action) { rarch_joypad_info_t joypad_info; @@ -182,22 +86,27 @@ static int menu_event_pointer(unsigned *action) return 0; } -unsigned char menu_event_keyboard_is_set(enum retro_key key) +unsigned char menu_event_kb_is_set(enum retro_key key) { return menu_keyboard_key_state[key]; } -void menu_event_keyboard_set(bool down, enum retro_key key) +void menu_event_kb_set_internal(unsigned idx, unsigned char key) +{ + menu_keyboard_key_state[idx] = key; +} + +void menu_event_kb_set(bool down, enum retro_key key) { if (key == RETROK_UNKNOWN) { unsigned i; for (i = 0; i < RETROK_LAST; i++) - menu_keyboard_key_state[i] = (menu_keyboard_key_state[i] & 1) << 1; + menu_event_kb_set_internal(i, (menu_event_kb_is_set(i) & 1) << 1); } else - menu_keyboard_key_state[key] = ((menu_keyboard_key_state[key] & 1) << 1) | down; + menu_event_kb_set_internal(key, ((menu_event_kb_is_set(key) & 1) << 1) | down); } unsigned menu_event(uint64_t input, uint64_t trigger_input) @@ -279,73 +188,52 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input) if (menu_input_dialog_get_display_kb()) { - switch (osk_idx) - { - case OSK_HIRAGANA_PAGE1: - memcpy(osk_grid, hiragana_page1_grid, sizeof(hiragana_page1_grid)); - break; - case OSK_HIRAGANA_PAGE2: - memcpy(osk_grid, hiragana_page2_grid, sizeof(hiragana_page2_grid)); - break; - case OSK_KATAKANA_PAGE1: - memcpy(osk_grid, katakana_page1_grid, sizeof(katakana_page1_grid)); - break; - case OSK_KATAKANA_PAGE2: - memcpy(osk_grid, katakana_page2_grid, sizeof(katakana_page2_grid)); - break; - case OSK_UPPERCASE_LATIN: - memcpy(osk_grid, uppercase_grid, sizeof(uppercase_grid)); - break; - case OSK_LOWERCASE_LATIN: - default: - memcpy(osk_grid, lowercase_grid, sizeof(lowercase_grid)); - break; - } + menu_event_osk_iterate(); if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN)) { - if (osk_ptr < 33) - osk_ptr = osk_ptr + OSK_CHARS_PER_LINE; + if (menu_event_get_osk_ptr() < 33) + menu_event_set_osk_ptr(menu_event_get_osk_ptr() + OSK_CHARS_PER_LINE); } if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP)) { - if (osk_ptr >= OSK_CHARS_PER_LINE) - osk_ptr = osk_ptr - OSK_CHARS_PER_LINE; + if (menu_event_get_osk_ptr() >= OSK_CHARS_PER_LINE) + menu_event_set_osk_ptr(menu_event_get_osk_ptr() - OSK_CHARS_PER_LINE); } if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT)) { - if (osk_ptr < 43) - osk_ptr = osk_ptr + 1; + if (menu_event_get_osk_ptr() < 43) + menu_event_set_osk_ptr(menu_event_get_osk_ptr() + 1); } if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT)) { - if (osk_ptr >= 1) - osk_ptr = osk_ptr - 1; + if (menu_event_get_osk_ptr() >= 1) + menu_event_set_osk_ptr(menu_event_get_osk_ptr() - 1); } if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L)) { - if (osk_idx > OSK_TYPE_UNKNOWN + 1) - osk_idx = (enum osk_type)(osk_idx - 1); + if (menu_event_get_osk_idx() > OSK_TYPE_UNKNOWN + 1) + menu_event_set_osk_idx((enum osk_type)(menu_event_get_osk_idx() - 1)); else - osk_idx = (enum osk_type)(OSK_TYPE_LAST - 1); + menu_event_set_osk_idx((enum osk_type)(OSK_TYPE_LAST - 1)); } if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R)) { - if (osk_idx < OSK_TYPE_LAST - 1) - osk_idx = (enum osk_type)(osk_idx + 1); + if (menu_event_get_osk_idx() < OSK_TYPE_LAST - 1) + menu_event_set_osk_idx((enum osk_type)(menu_event_get_osk_idx() + 1)); else - osk_idx = (enum osk_type)(OSK_TYPE_UNKNOWN + 1); + menu_event_set_osk_idx((enum osk_type)(OSK_TYPE_UNKNOWN + 1)); } if (trigger_input & (UINT64_C(1) << menu_ok_btn)) { - if (osk_ptr >= 0) - menu_event_osk_append(osk_ptr); + if (menu_event_get_osk_ptr() >= 0) + menu_event_osk_append(menu_event_get_osk_ptr()); } if (trigger_input & (UINT64_C(1) << menu_cancel_btn)) @@ -388,10 +276,10 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input) else if (trigger_input & (UINT64_C(1) << RARCH_MENU_TOGGLE)) ret = MENU_ACTION_TOGGLE; - if (menu_keyboard_key_state[RETROK_F11]) + if (menu_event_kb_is_set(RETROK_F11)) { command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL); - menu_keyboard_key_state[RETROK_F11] = false; + menu_event_kb_set_internal(RETROK_F11, 0); } if (runloop_cmd_press(trigger_input, RARCH_QUIT_KEY)) diff --git a/menu/menu_event.h b/menu/menu_event.h index c083dafb78..6c7e65447a 100644 --- a/menu/menu_event.h +++ b/menu/menu_event.h @@ -21,7 +21,6 @@ #include #include - #include RETRO_BEGIN_DECLS @@ -35,17 +34,11 @@ RETRO_BEGIN_DECLS */ unsigned menu_event(uint64_t input, uint64_t trigger_state); -void menu_event_keyboard_set(bool down, enum retro_key key); +void menu_event_kb_set(bool down, enum retro_key key); -unsigned char menu_event_keyboard_is_set(enum retro_key key); +unsigned char menu_event_kb_is_set(enum retro_key key); -int menu_event_get_osk_ptr(void); - -void menu_event_set_osk_ptr(int a); - -void menu_event_osk_append(int a); - -const char** menu_event_get_osk_grid(void); +void menu_event_kb_set_internal(unsigned idx, unsigned char key); RETRO_END_DECLS diff --git a/menu/menu_input.c b/menu/menu_input.c index 3300894912..8880854fdb 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -25,6 +25,7 @@ #include "widgets/menu_input_dialog.h" #include "widgets/menu_input_bind_dialog.h" +#include "widgets/menu_osk.h" #include "menu_driver.h" #include "menu_input.h" diff --git a/menu/widgets/menu_osk.c b/menu/widgets/menu_osk.c new file mode 100644 index 0000000000..db9c8c1488 --- /dev/null +++ b/menu/widgets/menu_osk.c @@ -0,0 +1,151 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2011-2016 - Daniel De Matteis + * + * RetroArch 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 Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch 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 for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include +#include +#include + +#include +#include + +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + +#include + +#include "menu_osk.h" + +#include "../../input/input_keyboard.h" + +#if defined(_MSC_VER) && !defined(_XBOX) +/* https://support.microsoft.com/en-us/kb/980263 */ +#pragma execution_character_set("utf-8") +#endif + +static const char *osk_grid[45] = {NULL}; + +static int osk_ptr = 0; +static enum osk_type osk_idx = OSK_LOWERCASE_LATIN; + +static const char *uppercase_grid[] = { + "!","@","#","$","%","^","&","*","(",")","⇦", + "Q","W","E","R","T","Y","U","I","O","P","⏎", + "A","S","D","F","G","H","J","K","L",":","⇩", + "Z","X","C","V","B","N","M"," ","<",">","⊕"}; + +static const char *lowercase_grid[] = { + "1","2","3","4","5","6","7","8","9","0","⇦", + "q","w","e","r","t","y","u","i","o","p","⏎", + "a","s","d","f","g","h","j","k","l",";","⇧", + "z","x","c","v","b","n","m"," ",",",".","⊕"}; + +static const char *hiragana_page1_grid[] = { + "あ","い","う","え","お","ら","り","る","れ","ろ","⇦", + "か","き","く","け","こ","が","ぎ","ぐ","げ","ご","⏎", + "さ","し","す","せ","そ","ざ","じ","ず","ぜ","ぞ","⇧", + "た","ち","つ","て","と","だ","ぢ","づ","で","ど","⊕"}; + +static const char *hiragana_page2_grid[] = { + "な","に","ぬ","ね","の","ば","び","ぶ","べ","ぼ","⇦", + "は","ひ","ふ","へ","ほ","ぱ","ぴ","ぷ","ぺ","ぽ","⏎", + "ま","み","む","め","も","ん","っ","ゃ","ゅ","ょ","⇧", + "や","ゆ","よ","わ","を","ぁ","ぃ","ぅ","ぇ","ぉ","⊕"}; + +static const char *katakana_page1_grid[] = { + "ア","イ","ウ","エ","オ","ラ","リ","ル","レ","ロ","⇦", + "カ","キ","ク","ケ","コ","ガ","ギ","グ","ゲ","ゴ","⏎", + "サ","シ","ス","セ","ソ","ザ","ジ","ズ","ゼ","ゾ","⇧", + "タ","チ","ツ","テ","ト","ダ","ヂ","ヅ","デ","ド","⊕"}; + +static const char *katakana_page2_grid[] = { + "ナ","ニ","ヌ","ネ","ノ","バ","ビ","ブ","ベ","ボ","⇦", + "ハ","ヒ","フ","ヘ","ホ","パ","ピ","プ","ペ","ポ","⏎", + "マ","ミ","ム","メ","モ","ン","ッ","ャ","ュ","ョ","⇧", + "ヤ","ユ","ヨ","ワ","ヲ","ァ","ィ","ゥ","ェ","ォ","⊕"}; + +void menu_event_set_osk_idx(enum osk_type idx) +{ + osk_idx = idx; +} + +enum osk_type menu_event_get_osk_idx(void) +{ + return osk_idx; +} + +int menu_event_get_osk_ptr(void) +{ + return osk_ptr; +} + +void menu_event_set_osk_ptr(int i) +{ + osk_ptr = i; +} + +void menu_event_osk_append(int ptr) +{ + if (ptr < 0) + return; + + if (string_is_equal(osk_grid[ptr],"⇦")) + input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD); + else if (string_is_equal(osk_grid[ptr],"⏎")) + input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD); + else if (string_is_equal(osk_grid[ptr],"⇧")) + menu_event_set_osk_idx(OSK_UPPERCASE_LATIN); + else if (string_is_equal(osk_grid[ptr],"⇩")) + menu_event_set_osk_idx(OSK_LOWERCASE_LATIN); + else if (string_is_equal(osk_grid[ptr],"⊕")) + if (menu_event_get_osk_idx() < OSK_TYPE_LAST - 1) + menu_event_set_osk_idx((enum osk_type)(menu_event_get_osk_idx() + 1)); + else + menu_event_set_osk_idx((enum osk_type)(OSK_TYPE_UNKNOWN + 1)); + else + input_keyboard_line_append(osk_grid[ptr]); +} + +void menu_event_osk_iterate(void) +{ + switch (menu_event_get_osk_idx()) + { + case OSK_HIRAGANA_PAGE1: + memcpy(osk_grid, hiragana_page1_grid, sizeof(hiragana_page1_grid)); + break; + case OSK_HIRAGANA_PAGE2: + memcpy(osk_grid, hiragana_page2_grid, sizeof(hiragana_page2_grid)); + break; + case OSK_KATAKANA_PAGE1: + memcpy(osk_grid, katakana_page1_grid, sizeof(katakana_page1_grid)); + break; + case OSK_KATAKANA_PAGE2: + memcpy(osk_grid, katakana_page2_grid, sizeof(katakana_page2_grid)); + break; + case OSK_UPPERCASE_LATIN: + memcpy(osk_grid, uppercase_grid, sizeof(uppercase_grid)); + break; + case OSK_LOWERCASE_LATIN: + default: + memcpy(osk_grid, lowercase_grid, sizeof(lowercase_grid)); + break; + } +} + +const char** menu_event_get_osk_grid(void) +{ + return osk_grid; +} diff --git a/menu/widgets/menu_osk.h b/menu/widgets/menu_osk.h new file mode 100644 index 0000000000..5869969110 --- /dev/null +++ b/menu/widgets/menu_osk.h @@ -0,0 +1,59 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2010-2014 - Hans-Kristian Arntzen + * Copyright (C) 2011-2016 - Daniel De Matteis + * + * RetroArch 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 Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch 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 for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#ifndef _MENU_WIDGETS_OSK_H +#define _MENU_WIDGETS_OSK_H + +#include +#include + +#include + +#include + +#define OSK_CHARS_PER_LINE 11 + +RETRO_BEGIN_DECLS + +enum osk_type +{ + OSK_TYPE_UNKNOWN = 0U, + OSK_LOWERCASE_LATIN, + OSK_UPPERCASE_LATIN, + OSK_HIRAGANA_PAGE1, + OSK_HIRAGANA_PAGE2, + OSK_KATAKANA_PAGE1, + OSK_KATAKANA_PAGE2, + OSK_TYPE_LAST +}; + +enum osk_type menu_event_get_osk_idx(void); + +void menu_event_set_osk_idx(enum osk_type idx); + +int menu_event_get_osk_ptr(void); + +void menu_event_set_osk_ptr(int a); + +void menu_event_osk_append(int a); + +void menu_event_osk_iterate(void); + +const char** menu_event_get_osk_grid(void); + +RETRO_END_DECLS + +#endif diff --git a/runloop.c b/runloop.c index 7fb94ac8ab..307313a1b4 100644 --- a/runloop.c +++ b/runloop.c @@ -789,7 +789,7 @@ static enum runloop_state runloop_check_state( command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, (void*)(intptr_t)0); #ifdef HAVE_MENU - if (menu_event_keyboard_is_set(RETROK_F1) == 1) + if (menu_event_kb_is_set(RETROK_F1) == 1) { if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) { @@ -797,11 +797,11 @@ static enum runloop_state runloop_check_state( !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)) { rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL); - menu_event_keyboard_set(false, RETROK_F1); + menu_event_kb_set(false, RETROK_F1); } } } - else if ((!menu_event_keyboard_is_set(RETROK_F1) && + else if ((!menu_event_kb_is_set(RETROK_F1) && runloop_cmd_triggered(trigger_input, RARCH_MENU_TOGGLE)) || rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL)) { @@ -818,7 +818,7 @@ static enum runloop_state runloop_check_state( } } else - menu_event_keyboard_set(false, RETROK_F1); + menu_event_kb_set(false, RETROK_F1); if (menu_driver_ctl(RARCH_MENU_CTL_IS_ALIVE, NULL)) {