Fix griffin

.gitignore

@@ -16,6 +16,7 @@
 .tmp.cxx
 .moc.h
 .moc.cpp
+.ccls-cache
 config.log
 /.project
 /.externalToolBuilders/

Makefile.common

@@ -1054,6 +1054,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/cbs/menu_cbs_select.o \
           menu/cbs/menu_cbs_start.o \
           menu/cbs/menu_cbs_info.o \
+          menu/cbs/menu_cbs_context.o \
           menu/cbs/menu_cbs_left.o \
           menu/cbs/menu_cbs_right.o \
           menu/cbs/menu_cbs_deferred_push.o \

griffin/griffin.c

@@ -1383,6 +1383,7 @@ MENU
 #include "../menu/cbs/menu_cbs_ok.c"
 #include "../menu/cbs/menu_cbs_cancel.c"
 #include "../menu/cbs/menu_cbs_select.c"
+#include "../menu/cbs/menu_cbs_context.c"
 #include "../menu/cbs/menu_cbs_start.c"
 #include "../menu/cbs/menu_cbs_info.c"
 #include "../menu/cbs/menu_cbs_left.c"

menu/cbs/menu_cbs_context.c

@@ -0,0 +1,169 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <queues/task_queue.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#include "../menu_driver.h"
+#include "../menu_cbs.h"
+#include "../menu_entries.h"
+#include "../menu_setting.h"
+#include "../../tasks/tasks_internal.h"
+
+#ifdef HAVE_NETWORKING
+#include "../../network/netplay/netplay.h"
+#endif
+
+#ifndef BIND_ACTION_CONTEXT
+#define BIND_ACTION_CONTEXT(cbs, name) (cbs)->action_context = (name)
+#endif
+
+static int action_context_default(
+      const char *path, const char *label, unsigned type,
+      size_t idx, size_t entry_idx)
+{
+   int ret                    = 0;
+   enum menu_action action    = MENU_ACTION_NOOP;
+   menu_file_list_cbs_t *cbs  = NULL;
+   file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
+
+   if (selection_buf)
+      cbs                     = (menu_file_list_cbs_t*)
+         file_list_get_actiondata_at_offset(selection_buf, idx);
+
+   if (!cbs)
+      return -1;
+
+   if (cbs->setting)
+   {
+      switch (cbs->setting->type)
+      {
+         case ST_BOOL:
+         case ST_INT:
+         case ST_UINT:
+         case ST_SIZE:
+         case ST_FLOAT:
+         case ST_STRING_OPTIONS:
+            if (cbs->action_ok)
+               action     = MENU_ACTION_OK;
+            else
+               action = MENU_ACTION_RIGHT;
+            break;
+         case ST_PATH:
+         case ST_DIR:
+         case ST_ACTION:
+         case ST_STRING:
+         case ST_HEX:
+         case ST_BIND:
+            action = MENU_ACTION_OK;
+            break;
+         default:
+            break;
+      }
+   }
+
+   if (action == MENU_ACTION_NOOP)
+   {
+       if (cbs->action_ok)
+           action     = MENU_ACTION_OK;
+       else
+       {
+           if (cbs->action_start)
+               action = MENU_ACTION_START;
+           if (cbs->action_right)
+               action = MENU_ACTION_RIGHT;
+       }
+   }
+
+   if (action != MENU_ACTION_NOOP)
+   {
+      menu_entry_t entry;
+      MENU_ENTRY_INIT(entry);
+
+      /* Note: If menu_entry_action() is modified,
+       * will have to verify that these parameters
+       * remain unused... */
+      entry.rich_label_enabled = false;
+      entry.value_enabled      = false;
+      entry.sublabel_enabled   = false;
+      menu_entry_get(&entry, 0, idx, NULL, false);
+
+      ret = menu_entry_action(&entry, idx, action);
+   }
+
+   task_queue_check();
+
+   return ret;
+}
+
+static int action_context_path_use_directory(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   return action_ok_path_use_directory(path, label, type, idx, 0 /* unused */);
+}
+
+static int action_context_core_setting(const char *path, const char *label, unsigned type,
+      size_t idx, size_t entry_idx)
+{
+   return action_ok_core_option_dropdown_list(path, label, type, idx, 0);
+}
+
+static int menu_cbs_init_bind_context_compare_type(
+      menu_file_list_cbs_t *cbs, unsigned type)
+{
+   switch (type)
+   {
+      case FILE_TYPE_USE_DIRECTORY:
+         BIND_ACTION_CONTEXT(cbs, action_context_path_use_directory);
+         break;
+      default:
+         return -1;
+   }
+
+   return 0;
+}
+
+static int menu_cbs_init_bind_context_compare_label(menu_file_list_cbs_t *cbs,
+      const char *label)
+{
+   return -1;
+}
+
+int menu_cbs_init_bind_context(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx)
+{
+   if (!cbs)
+      return -1;
+
+   BIND_ACTION_CONTEXT(cbs, action_context_default);
+
+   if ((type >= MENU_SETTINGS_CORE_OPTION_START) &&
+       (type < MENU_SETTINGS_CHEEVOS_START))
+   {
+      BIND_ACTION_CONTEXT(cbs, action_context_core_setting);
+      return 0;
+   }
+
+   if (menu_cbs_init_bind_context_compare_label(cbs, label) == 0)
+      return 0;
+
+   if (menu_cbs_init_bind_context_compare_type(cbs, type) == 0)
+      return 0;
+
+   return -1;
+}

menu/menu_cbs.h

@@ -287,6 +287,9 @@ int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
 int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx);
 
+int menu_cbs_init_bind_context(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx);
+
 int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
       const char *path, const char *label, unsigned type, size_t idx);
 

menu/menu_defines.h

@@ -294,7 +294,7 @@ enum xmb_shader_pipeline
    XMB_SHADER_PIPELINE_SNOW,
    XMB_SHADER_PIPELINE_BOKEH,
    XMB_SHADER_PIPELINE_SNOWFLAKE
-#endif   
+#endif
 };
 
 enum rgui_thumbnail_scaler
@@ -380,6 +380,7 @@ enum menu_action
    MENU_ACTION_OK,
    MENU_ACTION_SEARCH,
    MENU_ACTION_SCAN,
+   MENU_ACTION_CONTEXT,
    MENU_ACTION_CANCEL,
    MENU_ACTION_INFO,
    MENU_ACTION_SELECT,

menu/menu_driver.c

@@ -2508,6 +2508,10 @@ void menu_cbs_init(
     * menu_cbs_select.c, then map this callback to the entry. */
    menu_cbs_init_bind_select(cbs, path, label, type, idx);
 
+   /* It will try to find a corresponding callback function inside
+    * menu_cbs_context.c, then map this callback to the entry. */
+   menu_cbs_init_bind_context(cbs, path, label, type, idx);
+
    /* It will try to find a corresponding callback function inside
     * menu_cbs_info.c, then map this callback to the entry. */
    menu_cbs_init_bind_info(cbs, path, label, type, idx);
@@ -3054,7 +3058,7 @@ void menu_input_key_bind_poll_bind_state(
    {
       /* Poll mouse (on the relevant port)
        *
-       * Check if key was being pressed by 
+       * Check if key was being pressed by
        * user with mouse number 'port'
        *
        * NOTE: We start iterating on 2 (RETRO_DEVICE_ID_MOUSE_LEFT),
@@ -4581,6 +4585,7 @@ void menu_entries_prepend(file_list_t *list,
    cbs->action_iterate             = NULL;
    cbs->action_deferred_push       = NULL;
    cbs->action_select              = NULL;
+   cbs->action_context             = NULL;
    cbs->action_get_title           = NULL;
    cbs->action_ok                  = NULL;
    cbs->action_cancel              = NULL;
@@ -5133,13 +5138,13 @@ static const char * msvc_vercode_to_str(const unsigned vercode)
 int menu_entries_get_core_title(char *s, size_t len)
 {
    struct retro_system_info *system  = &runloop_state_get_ptr()->system.info;
-   const char *core_name             = 
+   const char *core_name             =
        (system && !string_is_empty(system->library_name))
       ? system->library_name
       : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
-   const char *core_version          = 
-      (system && system->library_version) 
-      ? system->library_version 
+   const char *core_version          =
+      (system && system->library_version)
+      ? system->library_version
       : "";
 
    if (!string_is_empty(core_version))
@@ -5329,7 +5334,7 @@ bool menu_input_key_bind_custom_bind_keyboard_cb(
    binds->timer_hold.timeout_end    = current_usec + input_bind_hold_us;
    binds->timer_timeout.timeout_us  = input_bind_timeout_us;
    binds->timer_timeout.current     = current_usec;
-   binds->timer_timeout.timeout_end = current_usec +input_bind_timeout_us; 
+   binds->timer_timeout.timeout_end = current_usec +input_bind_timeout_us;
 
    return (binds->begin <= binds->last);
 }
@@ -5343,7 +5348,7 @@ bool menu_input_key_bind_set_mode(
    input_driver_state_t *input_st      = input_state_get_ptr();
    struct menu_state *menu_st          = &menu_driver_state;
    menu_handle_t       *menu           = menu_st->driver_data;
-   const input_device_driver_t 
+   const input_device_driver_t
       *joypad                          = input_st->primary_joypad;
 #ifdef HAVE_MFI
    const input_device_driver_t
@@ -5507,7 +5512,7 @@ current_time;
 
          /* Run hold timer*/
          new_binds.timer_hold.current    = current_time;
-         new_binds.timer_hold.timeout_us = 
+         new_binds.timer_hold.timeout_us =
             new_binds.timer_hold.timeout_end - current_time;
 
          snprintf(bind->s, bind->len,
@@ -5712,7 +5717,7 @@ unsigned menu_event(
       settings->uints.menu_scroll_delay;
 #ifdef HAVE_OVERLAY
    bool input_overlay_enable                       = settings->bools.input_overlay_enable;
-   bool overlay_active                             = input_overlay_enable 
+   bool overlay_active                             = input_overlay_enable
       && input_st->overlay_ptr
       && input_st->overlay_ptr->alive;
 #else
@@ -6702,7 +6707,7 @@ void menu_driver_toggle(
       video_swap_interval             = settings->uints.video_swap_interval;
    }
 
-   if (on) 
+   if (on)
    {
 #ifdef HAVE_LAKKA
       set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_MENU);
@@ -7096,7 +7101,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
          break;
       case RARCH_MENU_CTL_OSK_PTR_AT_POS:
          {
-            video_driver_state_t 
+            video_driver_state_t
                *video_st              = video_state_get_ptr();
             unsigned width            = video_st->width;
             unsigned height           = video_st->height;
@@ -7210,7 +7215,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
 struct video_shader *menu_shader_get(void)
 {
-   video_driver_state_t 
+   video_driver_state_t
       *video_st                = video_state_get_ptr();
    if (video_shader_any_supported())
       if (video_st)
@@ -7220,7 +7225,7 @@ struct video_shader *menu_shader_get(void)
 
 void menu_shader_manager_free(void)
 {
-   video_driver_state_t 
+   video_driver_state_t
       *video_st                = video_state_get_ptr();
    if (video_st->menu_driver_shader)
       free(video_st->menu_driver_shader);
@@ -7234,7 +7239,7 @@ void menu_shader_manager_free(void)
  **/
 bool menu_shader_manager_init(void)
 {
-   video_driver_state_t 
+   video_driver_state_t
       *video_st                     = video_state_get_ptr();
    enum rarch_shader_type type      = RARCH_SHADER_NONE;
    bool ret                         = true;
@@ -7900,6 +7905,11 @@ int generic_menu_entry_action(
             ret = cbs->action_select(entry->path,
                   entry->label, entry->type, i, entry->entry_idx);
          break;
+      case MENU_ACTION_CONTEXT:
+         if (cbs && cbs->action_select)
+            ret = cbs->action_context(entry->path,
+                  entry->label, entry->type, i, entry->entry_idx);
+         break;
       case MENU_ACTION_SEARCH:
          menu_input_dialog_start_search();
          break;

menu/menu_entries.h

@@ -104,6 +104,8 @@ typedef struct menu_file_list_cbs
    int (*action_deferred_push)(menu_displaylist_info_t *info);
    int (*action_select)(const char *path, const char *label, unsigned type,
          size_t idx, size_t entry_idx);
+   int (*action_context)(const char *path, const char *label, unsigned type,
+         size_t idx, size_t entry_idx);
    int (*action_get_title)(const char *path, const char *label,
          unsigned type, char *s, size_t len);
    int (*action_ok)(const char *path, const char *label, unsigned type,

msg_hash.h

@@ -1074,7 +1074,7 @@ enum msg_hash_enums
 #ifdef HAVE_ODROIDGO2
    MENU_LABEL(VIDEO_RGA_SCALING),
 #endif
-   
+
    MENU_LABEL(VIDEO_CROP_OVERSCAN),
 
    MENU_LABEL(VIDEO_NOTCH_WRITE_OVER),
@@ -1101,7 +1101,7 @@ enum msg_hash_enums
    MENU_LABEL(VIDEO_REFRESH_RATE_AUTO),
    MENU_LABEL(VIDEO_REFRESH_RATE_POLLED),
 
-   MENU_LABEL(VIDEO_HDR_ENABLE), 
+   MENU_LABEL(VIDEO_HDR_ENABLE),
    MENU_LABEL(VIDEO_HDR_MAX_NITS),
    MENU_LABEL(VIDEO_HDR_PAPER_WHITE_NITS),
    MENU_LABEL(VIDEO_HDR_CONTRAST),
@@ -2323,6 +2323,7 @@ enum msg_hash_enums
 
    MENU_ENUM_LABEL_MESSAGE,
    MENU_ENUM_LABEL_INFO_SCREEN,
+   MENU_ENUM_LABEL_CONTEXT_SCREEN,
 
    MENU_LABEL(CUSTOM_RATIO),
    MENU_LABEL(HELP),