From 93ed2d60da6f7c500d7fb368d51c7bf5bf4d5675 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 16 Aug 2015 02:10:16 +0200 Subject: [PATCH] Reimplement mouse input code - triggers 'select' callback --- menu/menu_input.c | 20 ++------------------ menu/menu_input.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 215ac15f05..d89fbd3581 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -732,10 +732,7 @@ static int menu_input_mouse_frame( if (BIT64_GET(input_mouse, MOUSE_ACTION_BUTTON_L)) { if (BIT64_GET(input_mouse, MOUSE_ACTION_BUTTON_L_TOGGLE)) - return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_RIGHT); - - if (BIT64_GET(input_mouse, MOUSE_ACTION_BUTTON_L_OK)) - return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_OK); + return menu_entry_action(entry, nav->selection_ptr, MENU_ACTION_SELECT); if (BIT64_GET(input_mouse, MOUSE_ACTION_BUTTON_L_SET_NAVIGATION)) menu_navigation_set(nav, menu_input->mouse.ptr, false); @@ -781,12 +778,8 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse, { if (!menu_input->mouse.oldleft) { - rarch_setting_t *setting = NULL; - BIT64_SET(*input_mouse, MOUSE_ACTION_BUTTON_L); - setting = menu_setting_find( - menu_list->selection_buf->list[nav->selection_ptr].label); menu_input->mouse.oldleft = true; if ((unsigned)menu_input->mouse.y < disp->header_height) @@ -797,19 +790,10 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse, if ( (menu_input->mouse.ptr == nav->selection_ptr) && cbs && - cbs->action_right && - setting && - (setting->type == ST_BOOL || setting->type == ST_UINT || setting->type == ST_FLOAT - || setting->type == ST_STRING) - ) + cbs->action_select ) { BIT64_SET(*input_mouse, MOUSE_ACTION_BUTTON_L_TOGGLE); } - else if (menu_input->mouse.ptr == nav->selection_ptr - && cbs && cbs->action_ok) - { - BIT64_SET(*input_mouse, MOUSE_ACTION_BUTTON_L_OK); - } else if (menu_input->mouse.ptr <= menu_list_get_size(menu_list)-1) { BIT64_SET(*input_mouse, MOUSE_ACTION_BUTTON_L_SET_NAVIGATION); diff --git a/menu/menu_input.h b/menu/menu_input.h index 1d80986752..c3cf12dd38 100644 --- a/menu/menu_input.h +++ b/menu/menu_input.h @@ -66,7 +66,6 @@ enum mouse_action { MOUSE_ACTION_NONE = 0, MOUSE_ACTION_BUTTON_L, - MOUSE_ACTION_BUTTON_L_OK, MOUSE_ACTION_BUTTON_L_TOGGLE, MOUSE_ACTION_BUTTON_L_SET_NAVIGATION, MOUSE_ACTION_BUTTON_R,