mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename menu_osk.c to input_osk.c

Browse Source
This commit is contained in:
twinaphex 2020-02-26 05:49:03 +01:00
parent e43f34376d
commit 01a65fa5ba
12 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.common
View File

@ -817,7 +817,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/widgets/menu_filebrowser.o \
menu/widgets/menu_dialog.o \
menu/widgets/menu_input_bind_dialog.o \
menu/widgets/menu_osk.o \
menu/menu_cbs.o \
menu/cbs/menu_cbs_ok.o \
menu/cbs/menu_cbs_cancel.o \
@ -840,6 +839,8 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/drivers/menu_generic.o
endif
OBJ += input/input_osk.o
ifeq ($(HAVE_GFX_WIDGETS), 1)
OBJ += gfx/gfx_widgets.o
endif

3
griffin/griffin.c
View File

@ -1265,6 +1265,8 @@ MENU
#include "../gfx/gfx_widgets.c"
#endif
#include "../input/input_osk.c"
#ifdef HAVE_MENU
#include "../menu/menu_driver.c"
#include "../menu/menu_setting.c"
@ -1277,7 +1279,6 @@ MENU
#include "../menu/widgets/menu_filebrowser.c"
#include "../menu/widgets/menu_dialog.c"
#include "../menu/widgets/menu_input_bind_dialog.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"

23
menu/widgets/menu_osk.c → input/input_osk.c
View File

@ -23,14 +23,13 @@
#include <string/stdstring.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#include "../config.h"
#endif
#include <encodings/utf.h>
#include "menu_osk.h"
#include "../../input/input_driver.h"
#include "input_osk.h"
#include "input_driver.h"
static char *osk_grid[45] = {NULL};
@ -39,7 +38,7 @@ static enum osk_type osk_idx = OSK_LOWERCASE_LATIN;
#ifdef HAVE_LANGEXTRA
/* This file has a UTF8 BOM, we assume HAVE_LANGEXTRA is only enabled for compilers that can support this. */
#include "menu_osk_utf8_pages.h"
#include "input_osk_utf8_pages.h"
#else
/* Otherwise define some ascii-friendly pages. */
static const char *symbols_page1_grid[] = {
@ -61,27 +60,27 @@ static const char *lowercase_grid[] = {
"z","x","c","v","b","n","m"," ","-",".","Next"};
#endif
void menu_event_set_osk_idx(enum osk_type idx)
void input_event_set_osk_idx(enum osk_type idx)
{
osk_idx = idx;
}
enum osk_type menu_event_get_osk_idx(void)
enum osk_type input_event_get_osk_idx(void)
{
return osk_idx;
}
int menu_event_get_osk_ptr(void)
int input_event_get_osk_ptr(void)
{
return osk_ptr;
}
void menu_event_set_osk_ptr(int i)
void input_event_set_osk_ptr(int i)
{
osk_ptr = i;
}
void menu_event_osk_append(int ptr, bool is_rgui)
void input_event_osk_append(int ptr, bool is_rgui)
{
#ifdef HAVE_LANGEXTRA
if (string_is_equal(osk_grid[ptr],"\xe2\x87\xa6")) /* backspace character */
@ -114,7 +113,7 @@ void menu_event_osk_append(int ptr, bool is_rgui)
input_keyboard_line_append(osk_grid[ptr]);
}
void menu_event_osk_iterate(void)
void input_event_osk_iterate(void)
{
switch (osk_idx)
{
@ -145,7 +144,7 @@ void menu_event_osk_iterate(void)
}
}
char** menu_event_get_osk_grid(void)
char **input_event_get_osk_grid(void)
{
return osk_grid;
}

18
menu/widgets/menu_osk.h → input/input_osk.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MENU_WIDGETS_OSK_H
#define _MENU_WIDGETS_OSK_H
#ifndef _INPUT_OSK_H
#define _INPUT_OSK_H
#include <stdint.h>
#include <stdlib.h>
@ -47,19 +47,19 @@ enum osk_type
OSK_TYPE_LAST
};
enum osk_type menu_event_get_osk_idx(void);
enum osk_type input_event_get_osk_idx(void);
void menu_event_set_osk_idx(enum osk_type idx);
void input_event_set_osk_idx(enum osk_type idx);
int menu_event_get_osk_ptr(void);
int input_event_get_osk_ptr(void);
void menu_event_set_osk_ptr(int a);
void input_event_set_osk_ptr(int a);
void menu_event_osk_append(int a, bool is_rgui);
void input_event_osk_append(int a, bool is_rgui);
void menu_event_osk_iterate(void);
void input_event_osk_iterate(void);
char** menu_event_get_osk_grid(void);
char **input_event_get_osk_grid(void);
RETRO_END_DECLS

0
menu/widgets/menu_osk_utf8_pages.h → input/input_osk_utf8_pages.h
View File

5
menu/drivers/materialui.c
View File

@ -48,7 +48,7 @@
#include "../../gfx/gfx_thumbnail_path.h"
#include "../../gfx/gfx_thumbnail.h"
#include "../widgets/menu_osk.h"
#include "../../input/input_osk.h"
#include "../widgets/menu_filebrowser.h"
#include "../../core_info.h"
@ -4997,7 +4997,8 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
mui->textures.list[MUI_TEXTURE_KEY_HOVER],
mui->font_data.list.font,
video_info,
menu_event_get_osk_grid(), menu_event_get_osk_ptr(),
input_event_get_osk_grid(),
input_event_get_osk_ptr(),
0xFFFFFFFF);
/* Flush message box & osk text

2
menu/drivers/ozone/ozone.c
View File

@ -44,7 +44,7 @@
#include "../../playlist.h"
#include "../../runtime_file.h"
#include "../../widgets/menu_osk.h"
#include "../../input/input_osk.h"
#include "../../widgets/menu_filebrowser.h"
#include "../../../configuration.h"

6
menu/drivers/ozone/ozone_display.c
View File

@ -30,7 +30,7 @@
#include "../../menu_input.h"
#include "../../../gfx/gfx_animation.h"
#include "../../widgets/menu_osk.h"
#include "../../../input/input_osk.h"
static void ozone_cursor_animation_cb(void *userdata);
@ -336,8 +336,8 @@ void ozone_draw_osk(ozone_handle_t *ozone,
ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_STATIC],
ozone->fonts.entries_label,
video_info,
menu_event_get_osk_grid(),
menu_event_get_osk_ptr(),
input_event_get_osk_grid(),
input_event_get_osk_ptr(),
ozone->theme->text_rgba);
string_list_free(list);

6
menu/drivers/rgui.c
View File

@ -51,7 +51,7 @@
#include "../menu_driver.h"
#include "../../gfx/gfx_animation.h"
#include "../widgets/menu_osk.h"
#include "../../input/input_osk.h"
#include "../../configuration.h"
#include "../../gfx/drivers_font_renderer/bitmap.h"
@ -2953,8 +2953,8 @@ static void rgui_render_osk(
unsigned osk_width, osk_height;
unsigned osk_x, osk_y;
int osk_ptr = menu_event_get_osk_ptr();
char **osk_grid = menu_event_get_osk_grid();
int osk_ptr = input_event_get_osk_ptr();
char **osk_grid = input_event_get_osk_grid();
const char *input_str = menu_input_dialog_get_buffer();
const char *input_label = menu_input_dialog_get_label_buffer();

7
menu/drivers/stripes.c
View File

@ -49,8 +49,9 @@
#include "../../core_info.h"
#include "../../core.h"
#include "../../input/input_osk.h"
#include "../widgets/menu_input_dialog.h"
#include "../widgets/menu_osk.h"
#include "../widgets/menu_filebrowser.h"
#include "../../verbosity.h"
@ -846,8 +847,8 @@ static void stripes_render_messagebox_internal(
if (menu_input_dialog_get_display_kb())
stripes_render_keyboard(stripes,
video_info,
menu_event_get_osk_grid(),
menu_event_get_osk_ptr());
input_event_get_osk_grid(),
input_event_get_osk_ptr());
end:
string_list_free(list);

6
menu/drivers/xmb.c
View File

@ -52,7 +52,7 @@
#include "../../core_info.h"
#include "../../core.h"
#include "../widgets/menu_osk.h"
#include "../../input/input_osk.h"
#include "../widgets/menu_filebrowser.h"
#include "../../verbosity.h"
@ -884,8 +884,8 @@ static void xmb_render_messagebox_internal(
xmb->textures.list[XMB_TEXTURE_KEY_HOVER],
xmb->font,
video_info,
menu_event_get_osk_grid(),
menu_event_get_osk_ptr(),
input_event_get_osk_grid(),
input_event_get_osk_ptr(),
0xffffffff);
end:

43
retroarch.c
View File

@ -134,12 +134,13 @@
#include "gfx/gfx_animation.h"
#include "gfx/gfx_display.h"
#include "input/input_osk.h"
#ifdef HAVE_MENU
#include "menu/menu_driver.h"
#include "menu/menu_input.h"
#include "menu/widgets/menu_dialog.h"
#include "menu/widgets/menu_input_bind_dialog.h"
#include "menu/widgets/menu_osk.h"
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
#include "menu/menu_shader.h"
#endif
@ -14956,59 +14957,59 @@ static unsigned menu_event(
if (display_kb)
{
menu_event_osk_iterate();
input_event_osk_iterate();
if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_DOWN))
{
if (menu_event_get_osk_ptr() < 33)
menu_event_set_osk_ptr(menu_event_get_osk_ptr()
if (input_event_get_osk_ptr() < 33)
input_event_set_osk_ptr(input_event_get_osk_ptr()
+ OSK_CHARS_PER_LINE);
}
if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_UP))
{
if (menu_event_get_osk_ptr() >= OSK_CHARS_PER_LINE)
menu_event_set_osk_ptr(menu_event_get_osk_ptr()
if (input_event_get_osk_ptr() >= OSK_CHARS_PER_LINE)
input_event_set_osk_ptr(input_event_get_osk_ptr()
- OSK_CHARS_PER_LINE);
}
if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_RIGHT))
{
if (menu_event_get_osk_ptr() < 43)
menu_event_set_osk_ptr(menu_event_get_osk_ptr() + 1);
if (input_event_get_osk_ptr() < 43)
input_event_set_osk_ptr(input_event_get_osk_ptr() + 1);
}
if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_LEFT))
{
if (menu_event_get_osk_ptr() >= 1)
menu_event_set_osk_ptr(menu_event_get_osk_ptr() - 1);
if (input_event_get_osk_ptr() >= 1)
input_event_set_osk_ptr(input_event_get_osk_ptr() - 1);
}
if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_L))
{
enum osk_type osk_type_idx = menu_event_get_osk_idx();
enum osk_type osk_type_idx = input_event_get_osk_idx();
if (osk_type_idx > OSK_TYPE_UNKNOWN + 1)
menu_event_set_osk_idx((enum osk_type)(
input_event_set_osk_idx((enum osk_type)(
osk_type_idx - 1));
else
menu_event_set_osk_idx((enum osk_type)(is_rgui ? OSK_SYMBOLS_PAGE1 : OSK_TYPE_LAST - 1));
input_event_set_osk_idx((enum osk_type)(is_rgui ? OSK_SYMBOLS_PAGE1 : OSK_TYPE_LAST - 1));
}
if (BIT256_GET_PTR(p_trigger_input, RETRO_DEVICE_ID_JOYPAD_R))
{
enum osk_type osk_type_idx = menu_event_get_osk_idx();
enum osk_type osk_type_idx = input_event_get_osk_idx();
if (osk_type_idx < (is_rgui ? OSK_SYMBOLS_PAGE1 : OSK_TYPE_LAST - 1))
menu_event_set_osk_idx((enum osk_type)(
input_event_set_osk_idx((enum osk_type)(
osk_type_idx + 1));
else
menu_event_set_osk_idx((enum osk_type)(OSK_TYPE_UNKNOWN + 1));
input_event_set_osk_idx((enum osk_type)(OSK_TYPE_UNKNOWN + 1));
}
if (BIT256_GET_PTR(p_trigger_input, menu_ok_btn))
{
int ptr = menu_event_get_osk_ptr();
int ptr = input_event_get_osk_ptr();
if (ptr >= 0)
menu_event_osk_append(ptr, is_rgui);
input_event_osk_append(ptr, is_rgui);
}
if (BIT256_GET_PTR(p_trigger_input, menu_cancel_btn))
@ -15382,7 +15383,7 @@ static int menu_input_pointer_post_iterate(
menu_driver_ctl(RARCH_MENU_CTL_OSK_PTR_AT_POS, &point);
if (point.retcode > -1)
menu_event_set_osk_ptr(point.retcode);
input_event_set_osk_ptr(point.retcode);
}
/* Select + X/Y position */
@ -15669,8 +15670,8 @@ static int menu_input_pointer_post_iterate(
menu_driver_ctl(RARCH_MENU_CTL_OSK_PTR_AT_POS, &point);
if (point.retcode > -1)
{
menu_event_set_osk_ptr(point.retcode);
menu_event_osk_append(point.retcode,
input_event_set_osk_ptr(point.retcode);
input_event_osk_append(point.retcode,
string_is_equal(
configuration_settings->arrays.menu_driver, "rgui"));
}