libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 07:03:30 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Revert "Refactor menu_input.c"

Browse Source 
This reverts commit 3ddbf2d5cc.
This commit is contained in:
twinaphex 2015-09-24 14:17:03 +02:00
parent a8acea98b2
commit 172e75c758
9 changed files with 146 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
menu/drivers/glui.c
View File

@ -28,7 +28,6 @@
#include "../menu.h"
#include "../menu_driver.h"
#include "../menu_hash.h"
#include "../menu_input.h"
#include "../menu_display.h"
#include "../menu_video.h"
@ -234,26 +233,25 @@ static void glui_render(void)
if (settings->menu.pointer.enable)
{
unsigned new_ptr = (menu_input_pressed(MENU_INPUT_POINTER_AXIS_Y) - glui->line_height + menu->scroll_y - 16)
menu_input->pointer.ptr =
(menu_input->pointer.y - glui->line_height + menu->scroll_y - 16)
/ glui->line_height;
menu_input_set_pointer(MENU_INPUT_PTR_TYPE_POINTER, new_ptr);
menu->scroll_y -= menu_input_get_acceleration(MENU_INPUT_PTR_ACCELERATION) / 60.0;
menu_input_set_acceleration(MENU_INPUT_PTR_ACCELERATION, menu_input_get_acceleration(MENU_INPUT_PTR_ACCELERATION) * 0.96);
menu->scroll_y -= menu_input->pointer.accel / 60.0;
menu_input->pointer.accel = menu_input->pointer.accel * 0.96;
}
if (settings->menu.mouse.enable)
{
if (menu_input_pressed(MENU_INPUT_MOUSE_SCROLL_DOWN))
if (menu_input->mouse.scrolldown)
menu->scroll_y += 10;
if (menu_input_pressed(MENU_INPUT_MOUSE_SCROLL_UP))
if (menu_input->mouse.scrollup)
menu->scroll_y -= 10;
menu_input_set_pointer(MENU_INPUT_PTR_TYPE_MOUSE,
(menu_input_pressed(MENU_INPUT_MOUSE_AXIS_Y) - glui->line_height + menu->scroll_y - 16)
/ glui->line_height);
menu_input->mouse.ptr =
(menu_input->mouse.y - glui->line_height + menu->scroll_y - 16)
/ glui->line_height;
}
if (menu->scroll_y < 0)
@ -476,16 +474,16 @@ static void glui_frame(void)
TEXT_ALIGN_RIGHT);
}
if (menu_input_key_displayed())
if (menu_input->keyboard.display)
{
char msg[PATH_MAX_LENGTH];
const char *str = menu_input_key_get_buff();
const char *str = *menu_input->keyboard.buffer;
msg[0] = '\0';
if (!str)
str = "";
glui_render_quad(gl, 0, 0, width, height, width, height, &black_bg[0]);
snprintf(msg, sizeof(msg), "%s\n%s", menu_input_key_get_label(), str);
snprintf(msg, sizeof(msg), "%s\n%s", menu_input->keyboard.label, str);
glui_render_messagebox(msg);
}
@ -497,10 +495,7 @@ static void glui_frame(void)
}
if (settings->menu.mouse.enable)
glui_render_quad(gl,
menu_input_pressed(MENU_INPUT_MOUSE_AXIS_X) - 5,
menu_input_pressed(MENU_INPUT_MOUSE_AXIS_Y) - 5,
10, 10, width, height, &white_bg[0]);
glui_render_quad(gl, menu_input->mouse.x - 5, menu_input->mouse.y - 5, 10, 10, width, height, &white_bg[0]);
gl->shader->use(gl, GL_SHADER_STOCK_BLEND);

34
menu/drivers/rgui.c
View File

@ -372,8 +372,10 @@ end:
static void rgui_blit_cursor(menu_handle_t *menu)
{
int16_t x = menu_input_pressed(MENU_INPUT_MOUSE_AXIS_X);
int16_t y = menu_input_pressed(MENU_INPUT_MOUSE_AXIS_Y);
menu_input_t *menu_input = menu_input_get_ptr();
int16_t x = menu_input->mouse.x;
int16_t y = menu_input->mouse.y;
color_rect(menu, x, y - 5, 1, 11, 0xFFFF);
color_rect(menu, x - 5, y, 11, 1, 0xFFFF);
@ -441,13 +443,11 @@ static void rgui_render(void)
if (settings->menu.pointer.enable)
{
unsigned new_ptr = menu_input_pressed(MENU_INPUT_POINTER_AXIS_Y) / 11 - 2 + menu_entries_get_start();
menu_input->pointer.ptr = menu_input->pointer.y / 11 - 2 + menu_entries_get_start();
menu_input_set_pointer(MENU_INPUT_PTR_TYPE_POINTER, new_ptr);
if (menu_input_pressed(MENU_INPUT_POINTER_DRAGGED))
if (menu_input->pointer.dragging)
{
menu->scroll_y += menu_input_pressed(MENU_INPUT_POINTER_DELTA_AXIS_Y);
menu->scroll_y += menu_input->pointer.dy;
menu_entries_set_start(-menu->scroll_y / 11 + 2);
if (menu->scroll_y > 0)
menu->scroll_y = 0;
@ -456,16 +456,14 @@ static void rgui_render(void)
if (settings->menu.mouse.enable)
{
if (menu_input_pressed(MENU_INPUT_MOUSE_SCROLL_DOWN))
if ((menu_entries_get_start() < menu_entries_get_end() - RGUI_TERM_HEIGHT))
menu_entries_set_start(menu_entries_get_start() + 1);
if (menu_input->mouse.scrolldown
&& (menu_entries_get_start() < menu_entries_get_end() - RGUI_TERM_HEIGHT))
menu_entries_set_start(menu_entries_get_start() + 1);
if (menu_input_pressed(MENU_INPUT_MOUSE_SCROLL_UP))
if (menu_entries_get_start() > 0)
menu_entries_set_start(menu_entries_get_start() - 1);
if (menu_input->mouse.scrollup && (menu_entries_get_start() > 0))
menu_entries_set_start(menu_entries_get_start() - 1);
menu_input_set_pointer(MENU_INPUT_PTR_TYPE_MOUSE,
menu_input_pressed(MENU_INPUT_MOUSE_AXIS_Y) / 11 - 2 + menu_entries_get_start());
menu_input->mouse.ptr = menu_input->mouse.y / 11 - 2 + menu_entries_get_start();
}
/* Do not scroll if all items are visible. */
@ -576,14 +574,14 @@ static void rgui_render(void)
rgui_render_messagebox( message_queue);
#endif
if (menu_input_key_displayed())
if (menu_input->keyboard.display)
{
char msg[PATH_MAX_LENGTH] = {0};
const char *str = menu_input_key_get_buff();
const char *str = *menu_input->keyboard.buffer;
if (!str)
str = "";
snprintf(msg, sizeof(msg), "%s\n%s", menu_input_key_get_label(), str);
snprintf(msg, sizeof(msg), "%s\n%s", menu_input->keyboard.label, str);
rgui_render_messagebox(msg);
}

6
menu/drivers/rmenu_xui.cpp
View File

@ -590,14 +590,14 @@ static void rmenu_xui_render(void)
}
XuiListSetCurSelVisible(m_menulist, menu_navigation_get_selection(nav));
if (menu_input_key_displayed())
if (menu->keyboard.display)
{
char msg[1024] = {0};
const char *str = menu_input_key_get_ptr();
const char *str = *menu->keyboard.buffer;
if (!str)
str = "";
snprintf(msg, sizeof(msg), "%s\n%s", menu_input_key_get_label(), str);
snprintf(msg, sizeof(msg), "%s\n%s", menu->keyboard.label, str);
rmenu_xui_render_messagebox(msg);
}
}

25
menu/drivers/xmb.c
View File

@ -1433,22 +1433,19 @@ static void xmb_render(void)
{
for (i = 0; i < end; i++)
{
float item_y1 = xmb->margins.screen.top + xmb_item_y(xmb, i, current);
float item_y2 = item_y1 + xmb->icon.size;
int16_t y_axis = menu_input_pressed(MENU_INPUT_POINTER_AXIS_Y);
float item_y1 = xmb->margins.screen.top + xmb_item_y(xmb, i, current);
float item_y2 = item_y1 + xmb->icon.size;
if (settings->menu.pointer.enable)
{
if ((y_axis > item_y1) && (y_axis < item_y2))
menu_input_set_pointer(MENU_INPUT_PTR_TYPE_POINTER, i);
if (menu_input->pointer.y > item_y1 && menu_input->pointer.y < item_y2)
menu_input->pointer.ptr = i;
}
if (settings->menu.mouse.enable)
{
y_axis = menu_input_pressed(MENU_INPUT_MOUSE_AXIS_Y);
if ((y_axis > item_y1) && (y_axis < item_y2))
menu_input_set_pointer(MENU_INPUT_PTR_TYPE_MOUSE, i);
if (menu_input->mouse.y > item_y1 && menu_input->mouse.y < item_y2)
menu_input->mouse.ptr = i;
}
}
}
@ -1633,14 +1630,14 @@ static void xmb_frame(void)
menu_display_font_flush_block(menu, font_driver);
if (menu_input_key_displayed())
if (menu_input->keyboard.display)
{
const char *str = menu_input_key_get_buff();
const char *str = *menu_input->keyboard.buffer;
if (!str)
str = "";
snprintf(msg, sizeof(msg), "%s\n%s",
menu_input_key_get_label(), str);
menu_input->keyboard.label, str);
render_background = true;
}
@ -1664,9 +1661,7 @@ static void xmb_frame(void)
if (settings->menu.mouse.enable)
xmb_draw_cursor(gl, xmb, &coord_color2[0],
menu_input_pressed(MENU_INPUT_MOUSE_AXIS_X),
menu_input_pressed(MENU_INPUT_MOUSE_AXIS_Y),
width, height);
menu_input->mouse.x, menu_input->mouse.y, width, height);
menu_display_unset_viewport();
}

5
menu/menu.c
View File

@ -196,7 +196,7 @@ void menu_free(menu_handle_t *menu)
menu->playlist = NULL;
menu_shader_free(menu);
menu_input_free(menu);
menu_driver_free(menu);
#ifdef HAVE_DYNAMIC
@ -243,9 +243,6 @@ void *menu_init(const void *data)
strlcpy(settings->menu.driver, menu_ctx->ident,
sizeof(settings->menu.driver));
if (!menu_input_init(menu))
goto error;
if (!menu_entries_init(menu))
goto error;

4
menu/menu_driver.h
View File

@ -21,12 +21,12 @@
#include <stdint.h>
#include <boolean.h>
#include <retro_miscellaneous.h>
#include "menu_input.h"
#include "menu_animation.h"
#include "menu_display.h"
#include "menu_displaylist.h"
#include "menu_entries.h"
#include "menu_list.h"
#include "menu_input.h"
#include "menu_navigation.h"
#include "menu_setting.h"
#include "../libretro.h"
@ -110,7 +110,7 @@ typedef struct
char default_cgp[PATH_MAX_LENGTH];
struct video_shader *shader;
menu_input_t *input;
menu_input_t input;
content_playlist_t *playlist;
char db_playlist_file[PATH_MAX_LENGTH];

251
menu/menu_input.c
View File

@ -39,100 +39,6 @@
#include "../input/input_remapping.h"
#include "../input/input_common.h"
struct menu_bind_state_port
{
bool buttons[MENU_MAX_BUTTONS];
int16_t axes[MENU_MAX_AXES];
uint16_t hats[MENU_MAX_HATS];
};
struct menu_bind_axis_state
{
/* Default axis state. */
int16_t rested_axes[MENU_MAX_AXES];
/* Locked axis state. If we configured an axis,
* avoid having the same axis state trigger something again right away. */
int16_t locked_axes[MENU_MAX_AXES];
};
struct menu_bind_state
{
struct retro_keybind *target;
/* For keyboard binding. */
int64_t timeout_end;
unsigned begin;
unsigned last;
unsigned user;
struct menu_bind_state_port state[MAX_USERS];
struct menu_bind_axis_state axis_state[MAX_USERS];
bool skip;
};
typedef struct menu_input
{
struct menu_bind_state binds;
struct
{
int16_t dx;
int16_t dy;
int16_t x;
int16_t y;
int16_t screen_x;
int16_t screen_y;
bool left;
bool right;
bool oldleft;
bool oldright;
bool wheelup;
bool wheeldown;
bool hwheelup;
bool hwheeldown;
bool scrollup;
bool scrolldown;
unsigned ptr;
uint64_t state;
} mouse;
struct
{
int16_t x;
int16_t y;
int16_t dx;
int16_t dy;
int16_t old_x;
int16_t old_y;
int16_t start_x;
int16_t start_y;
float accel;
float accel0;
float accel1;
bool pressed[2];
bool oldpressed[2];
bool dragging;
bool back;
bool oldback;
unsigned ptr;
} pointer;
struct
{
const char **buffer;
const char *label;
const char *label_setting;
bool display;
unsigned type;
unsigned idx;
} keyboard;
/* Used for key repeat */
struct
{
float timer;
float count;
} delay;
} menu_input_t;
unsigned bind_port;
menu_input_t *menu_input_get_ptr(void)
@ -140,133 +46,7 @@ menu_input_t *menu_input_get_ptr(void)
menu_handle_t *menu = menu_driver_get_ptr();
if (!menu)
return NULL;
return menu->input;
}
void menu_input_set_binds(unsigned min, unsigned max)
{
menu_input_t *ptr = menu_input_get_ptr();
if (!ptr)
return;
ptr->binds.begin = min;
ptr->binds.last = max;
}
void menu_input_set_pointer(enum menu_input_pointer_type type, unsigned val)
{
menu_input_t *ptr = menu_input_get_ptr();
if (!ptr)
return;
switch (type)
{
case MENU_INPUT_PTR_TYPE_POINTER:
ptr->pointer.ptr = val;
break;
case MENU_INPUT_PTR_TYPE_MOUSE:
ptr->mouse.ptr = val;
break;
}
}
int16_t menu_input_pressed(enum menu_input_action axis)
{
menu_input_t *ptr = menu_input_get_ptr();
switch (axis)
{
case MENU_INPUT_POINTER_AXIS_X:
return ptr->pointer.x;
case MENU_INPUT_POINTER_AXIS_Y:
return ptr->pointer.y;
case MENU_INPUT_POINTER_DELTA_AXIS_X:
return ptr->pointer.dx;
case MENU_INPUT_POINTER_DELTA_AXIS_Y:
return ptr->pointer.dy;
case MENU_INPUT_POINTER_DRAGGED:
return ptr->pointer.dragging;
case MENU_INPUT_MOUSE_AXIS_X:
return ptr->mouse.x;
case MENU_INPUT_MOUSE_AXIS_Y:
return ptr->mouse.y;
case MENU_INPUT_MOUSE_SCROLL_UP:
return ptr->mouse.scrollup;
case MENU_INPUT_MOUSE_SCROLL_DOWN:
return ptr->mouse.scrolldown;
}
return 0;
}
void menu_input_set_acceleration(enum menu_input_pointer_acceleration accel, float val)
{
menu_input_t *ptr = menu_input_get_ptr();
if (!ptr)
return;
switch (accel)
{
case MENU_INPUT_PTR_ACCELERATION:
ptr->pointer.accel = val;
break;
case MENU_INPUT_PTR_ACCELERATION_1:
ptr->pointer.accel0 = val;
break;
case MENU_INPUT_PTR_ACCELERATION_2:
ptr->pointer.accel1 = val;
break;
}
}
float menu_input_get_acceleration(enum menu_input_pointer_acceleration accel)
{
menu_input_t *ptr = menu_input_get_ptr();
if (!ptr)
return 0.0f;
switch (accel)
{
case MENU_INPUT_PTR_ACCELERATION:
return ptr->pointer.accel;
case MENU_INPUT_PTR_ACCELERATION_1:
return ptr->pointer.accel0;
case MENU_INPUT_PTR_ACCELERATION_2:
return ptr->pointer.accel1;
}
return 0.0f;
}
bool menu_input_key_displayed(void)
{
menu_input_t *menu_input = menu_input_get_ptr();
if (!menu_input)
return false;
return menu_input->keyboard.display;
}
const char *menu_input_key_get_buff(void)
{
menu_input_t *menu_input = menu_input_get_ptr();
if (!menu_input)
return NULL;
return *menu_input->keyboard.buffer;
}
const char *menu_input_key_get_label(void)
{
menu_input_t *menu_input = menu_input_get_ptr();
if (!menu_input)
return NULL;
return menu_input->keyboard.label;
return &menu->input;
}
void menu_input_key_start_line(const char *label,
@ -1146,12 +926,12 @@ void menu_input_post_iterate(int *ret, unsigned action)
menu_entry_get(&entry, selected, NULL, false);
if (settings && settings->menu.mouse.enable)
if (settings->menu.mouse.enable)
*ret = menu_input_mouse_post_iterate (&menu_input->mouse.state, cbs, action);
*ret = menu_input_mouse_frame(cbs, &entry, menu_input->mouse.state);
if (settings && settings->menu.pointer.enable)
if (settings->menu.pointer.enable)
*ret |= menu_input_pointer_post_iterate(cbs, &entry, action);
}
@ -1254,28 +1034,3 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input)
return ret;
}
void menu_input_free(void *data)
{
menu_handle_t *menu = (menu_handle_t*)data;
if (!menu)
return;
if (menu->input)
free(menu->input);
menu->input = NULL;
}
bool menu_input_init(void *data)
{
menu_handle_t *menu = (menu_handle_t*)data;
if (!menu)
return false;
menu->input = (menu_input_t*)calloc(1, sizeof(*menu->input));
if (!menu->input)
return false;
return true;
}

140
menu/menu_input.h
View File

@ -73,32 +73,6 @@ enum mouse_action
MOUSE_ACTION_WHEEL_DOWN
};
enum menu_input_action
{
MENU_INPUT_POINTER_AXIS_X = 0,
MENU_INPUT_POINTER_AXIS_Y,
MENU_INPUT_POINTER_DELTA_AXIS_X,
MENU_INPUT_POINTER_DELTA_AXIS_Y,
MENU_INPUT_POINTER_DRAGGED,
MENU_INPUT_MOUSE_AXIS_X,
MENU_INPUT_MOUSE_AXIS_Y,
MENU_INPUT_MOUSE_SCROLL_UP,
MENU_INPUT_MOUSE_SCROLL_DOWN
};
enum menu_input_pointer_acceleration
{
MENU_INPUT_PTR_ACCELERATION = 0,
MENU_INPUT_PTR_ACCELERATION_1,
MENU_INPUT_PTR_ACCELERATION_2
};
enum menu_input_pointer_type
{
MENU_INPUT_PTR_TYPE_POINTER = 0,
MENU_INPUT_PTR_TYPE_MOUSE
};
enum menu_input_bind_mode
{
MENU_INPUT_BIND_NONE,
@ -106,7 +80,99 @@ enum menu_input_bind_mode
MENU_INPUT_BIND_ALL
};
typedef struct menu_input menu_input_t;
struct menu_bind_state_port
{
bool buttons[MENU_MAX_BUTTONS];
int16_t axes[MENU_MAX_AXES];
uint16_t hats[MENU_MAX_HATS];
};
struct menu_bind_axis_state
{
/* Default axis state. */
int16_t rested_axes[MENU_MAX_AXES];
/* Locked axis state. If we configured an axis,
* avoid having the same axis state trigger something again right away. */
int16_t locked_axes[MENU_MAX_AXES];
};
struct menu_bind_state
{
struct retro_keybind *target;
/* For keyboard binding. */
int64_t timeout_end;
unsigned begin;
unsigned last;
unsigned user;
struct menu_bind_state_port state[MAX_USERS];
struct menu_bind_axis_state axis_state[MAX_USERS];
bool skip;
};
typedef struct menu_input
{
struct menu_bind_state binds;
struct
{
int16_t dx;
int16_t dy;
int16_t x;
int16_t y;
int16_t screen_x;
int16_t screen_y;
bool left;
bool right;
bool oldleft;
bool oldright;
bool wheelup;
bool wheeldown;
bool hwheelup;
bool hwheeldown;
bool scrollup;
bool scrolldown;
unsigned ptr;
uint64_t state;
} mouse;
struct
{
int16_t x;
int16_t y;
int16_t dx;
int16_t dy;
int16_t old_x;
int16_t old_y;
int16_t start_x;
int16_t start_y;
float accel;
float accel0;
float accel1;
bool pressed[2];
bool oldpressed[2];
bool dragging;
bool back;
bool oldback;
unsigned ptr;
} pointer;
struct
{
const char **buffer;
const char *label;
const char *label_setting;
bool display;
unsigned type;
unsigned idx;
} keyboard;
/* Used for key repeat */
struct
{
float timer;
float count;
} delay;
} menu_input_t;
void menu_input_key_event(bool down, unsigned keycode, uint32_t character,
uint16_t key_modifiers);
@ -115,12 +181,6 @@ void menu_input_key_start_line(const char *label,
const char *label_setting, unsigned type, unsigned idx,
input_keyboard_line_complete_t cb);
bool menu_input_key_displayed(void);
const char *menu_input_key_get_buff(void);
const char *menu_input_key_get_label(void);
void menu_input_st_uint_callback(void *userdata, const char *str);
void menu_input_st_hex_callback(void *userdata, const char *str);
@ -140,22 +200,8 @@ int menu_input_set_keyboard_bind_mode(void *data, enum menu_input_bind_mode type
int menu_input_set_input_device_bind_mode(void *data, enum menu_input_bind_mode type);
void menu_input_set_binds(unsigned min, unsigned max);
void menu_input_set_pointer(enum menu_input_pointer_type type, unsigned val);
int16_t menu_input_pressed(enum menu_input_action axis);
void menu_input_set_acceleration(enum menu_input_pointer_acceleration accel, float val);
float menu_input_get_acceleration(enum menu_input_pointer_acceleration accel);
menu_input_t *menu_input_get_ptr(void);
void menu_input_free(void *data);
bool menu_input_init(void *data);
#ifdef __cplusplus
}
#endif

6
menu/menu_setting.c
View File

@ -996,11 +996,14 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
struct retro_keybind *target = NULL;
const struct retro_keybind *def_binds = NULL;
rarch_setting_t *setting = (rarch_setting_t*)data;
menu_input_t *menu_input = menu_input_get_ptr();
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
(void)wraparound;
if (!menu_input)
return -1;
if (!setting)
return -1;
@ -1012,7 +1015,8 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
if (!target)
return -1;
menu_input_set_binds(MENU_SETTINGS_BIND_BEGIN, MENU_SETTINGS_BIND_LAST);
menu_input->binds.begin = MENU_SETTINGS_BIND_BEGIN;
menu_input->binds.last = MENU_SETTINGS_BIND_LAST;
for (i = MENU_SETTINGS_BIND_BEGIN;
i <= MENU_SETTINGS_BIND_LAST; i++, target++)