mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of input_event_get_osk_ptr/get_osk_grid

Browse Source
This commit is contained in:
twinaphex 2021-10-01 07:37:33 +02:00
parent 8807e2957e
commit fde3406d1b
6 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_driver.c
View File

@ -320,16 +320,6 @@ input_driver_state_t *input_state_get_ptr(void)
return &input_driver_st;
}
int input_event_get_osk_ptr(void)
{
return input_driver_st.osk_ptr;
}
char **input_event_get_osk_grid(void)
{
return input_driver_st.osk_grid;
}
/**
* Finds first suitable joypad driver and initializes. Used as a fallback by
* input_joypad_init_driver when no matching driver is found.

4
input/input_osk.h
View File

@ -47,8 +47,6 @@ enum osk_type
OSK_TYPE_LAST
};
int input_event_get_osk_ptr(void);
void input_event_osk_append(
input_keyboard_line_t *keyboard_line,
enum osk_type *osk_idx,
@ -63,8 +61,6 @@ void osk_update_last_codepoint(
unsigned *last_codepoint_len,
const char *word);
char **input_event_get_osk_grid(void);
RETRO_END_DECLS
#endif

23
menu/drivers/materialui.c
View File

@ -7059,16 +7059,19 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
video_height / 4, msg);
/* Draw onscreen keyboard */
gfx_display_draw_keyboard(
p_disp,
userdata,
video_width,
video_height,
mui->textures.list[MUI_TEXTURE_KEY_HOVER],
mui->font_data.list.font,
input_event_get_osk_grid(),
input_event_get_osk_ptr(),
0xFFFFFFFF);
{
input_driver_state_t *input_st = input_state_get_ptr();
gfx_display_draw_keyboard(
p_disp,
userdata,
video_width,
video_height,
mui->textures.list[MUI_TEXTURE_KEY_HOVER],
mui->font_data.list.font,
input_st->osk_grid,
input_st->osk_ptr,
0xFFFFFFFF);
}
/* Flush message box & osk text
* > Message box & osk only use list font */

23
menu/drivers/ozone.c
View File

@ -5563,16 +5563,19 @@ static void ozone_draw_osk(ozone_handle_t *ozone,
}
/* Keyboard */
gfx_display_draw_keyboard(
p_disp,
userdata,
video_width,
video_height,
ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_STATIC],
ozone->fonts.entries_label.font,
input_event_get_osk_grid(),
input_event_get_osk_ptr(),
ozone->theme->text_rgba);
{
input_driver_state_t *input_st = input_state_get_ptr();
gfx_display_draw_keyboard(
p_disp,
userdata,
video_width,
video_height,
ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_STATIC],
ozone->fonts.entries_label.font,
input_st->osk_grid,
input_st->osk_ptr,
ozone->theme->text_rgba);
}
string_list_deinitialize(&list);
}

6
menu/drivers/rgui.c
View File

@ -4131,8 +4131,10 @@ static void rgui_render_osk(
unsigned osk_width, osk_height;
unsigned osk_x, osk_y;
int osk_ptr = input_event_get_osk_ptr();
char **osk_grid = input_event_get_osk_grid();
input_driver_state_t
*input_st = input_state_get_ptr();
int osk_ptr = input_st->osk_ptr;
char **osk_grid = input_st->osk_grid;
const char *input_str = menu_input_dialog_get_buffer();
const char *input_label = menu_input_dialog_get_label_buffer();

7
menu/drivers/xmb.c
View File

@ -1068,6 +1068,8 @@ static void xmb_render_messagebox_internal(
}
if (input_dialog_display_kb)
{
input_driver_state_t *input_st = input_state_get_ptr();
gfx_display_draw_keyboard(
p_disp,
userdata,
@ -1075,9 +1077,10 @@ static void xmb_render_messagebox_internal(
video_height,
xmb->textures.list[XMB_TEXTURE_KEY_HOVER],
xmb->font,
input_event_get_osk_grid(),
input_event_get_osk_ptr(),
input_st->osk_grid,
input_st->osk_ptr,
0xffffffff);
}
string_list_deinitialize(&list);
}