First version of menu widgets (gl only)

mme4crt · Feb 6, 2019 · c20ab38 · c20ab38
1 parent 0bef880
commit c20ab38
Show file tree

Hide file tree

Showing 88 changed files with 3,095 additions and 419 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -40,9 +40,23 @@
       "ozone_theme.h": "c",
       "ozone_texture.h": "c",
       "string_list.h": "c",
-      "core_info.h": "c"
+      "core_info.h": "c",
       "thread": "c",
-      "xlocale": "c"
+      "xlocale": "c",
+      "menu_widgets.h": "c",
+      "message_queue.h": "c",
+      "task_queue.h": "c",
+      "fifo_queue.h": "c",
+      "file_list.h": "c",
+      "strl.h": "c",
+      "configuration.h": "c",
+      "ozone_display.h": "c",
+      "verbosity.h": "c",
+      "retroarch.h": "c",
+      "menu_animation.h": "c",
+      "audio_driver.h": "c",
+      "netplay.h": "c",
+      "scaler.h": "c"
    },
    "C_Cpp.dimInactiveRegions": false,
 }
diff --git a/Makefile.common b/Makefile.common
@@ -699,6 +699,10 @@ ifeq ($(HAVE_MENU), 1)
    DEFINES += -DHAVE_MENU
    HAVE_MENU_COMMON = 1
 
+   ifeq ($(HAVE_MENU_WIDGETS), 1)
+      DEFINES += -DHAVE_MENU_WIDGETS
+   endif
+
    ifeq ($(HAVE_RGUI), 1)
       OBJ += menu/drivers/rgui.o
       DEFINES += -DHAVE_RGUI
@@ -782,6 +786,10 @@ ifeq ($(HAVE_MENU_COMMON), 1)
    ifeq ($(HAVE_MENU_COMMON),1)
 		OBJ += menu/drivers_display/menu_display_null.o
 	endif
+
+   ifeq ($(HAVE_MENU_WIDGETS), 1)
+      OBJ += menu/widgets/menu_widgets.o
+   endif
 endif
 
 ifeq ($(HAVE_OVERLAY), 1)

diff --git a/audio/audio_driver.c b/audio/audio_driver.c
@@ -1406,7 +1406,7 @@ static void audio_driver_mixer_play_stream_internal(unsigned i, unsigned type)
       audio_mixer_streams[i].state   = (enum audio_mixer_state)type;
 }
 
-static void audio_driver_load_menu_bgm_callback(void *task_data, void *user_data, const char *error)
+static void audio_driver_load_menu_bgm_callback(retro_task_t *task, void *task_data, void *user_data, const char *error)
 {
    bool contentless = false;
    bool is_inited = false;

diff --git a/camera/camera_driver.c b/camera/camera_driver.c
@@ -206,7 +206,8 @@ bool camera_driver_ctl(enum rarch_camera_ctl_state state, void *data)
               return camera_driver->start(camera_data);
 
            runloop_msg_queue_push(
-                 "Camera is explicitly disabled.\n", 1, 180, false);
+                 "Camera is explicitly disabled.\n", 1, 180, false,
+                 NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
         }
         break;
       case RARCH_CAMERA_CTL_SET_CB:

diff --git a/cheevos-new/badges.c b/cheevos-new/badges.c
@@ -34,7 +34,7 @@ void set_badge_menu_texture(badges_ctx_t * badges, int i)
 
 #ifdef HAVE_MENU
    menu_display_reset_textures_list(badge_file, fullpath,
-         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR);
+         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL);
 #endif
 }
 

diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c
@@ -493,8 +493,8 @@ static void cheevos_award(cheevos_cheevo_t* cheevo, int mode)
 
    /* Show the OSD message. */
    snprintf(buffer, sizeof(buffer), "Achievement Unlocked: %s", cheevo->info->title);
-   runloop_msg_queue_push(buffer, 0, 2 * 60, false);
-   runloop_msg_queue_push(cheevo->info->description, 0, 3 * 60, false);
+   runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+   runloop_msg_queue_push(cheevo->info->description, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
    /* Start the award task. */
    if ((mode & CHEEVOS_ACTIVE_HARDCORE) != 0)
@@ -633,7 +633,7 @@ static void cheevos_lboard_submit(cheevos_lboard_t* lboard)
    if (lboard->last_value == 0)
    {
       CHEEVOS_ERR(CHEEVOS_TAG "Leaderboard %s tried to submit 0\n", lboard->info->title);
-      runloop_msg_queue_push("Leaderboard attempt cancelled!", 0, 2 * 60, false);
+      runloop_msg_queue_push("Leaderboard attempt cancelled!", 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
       return;
    }
 
@@ -642,7 +642,7 @@ static void cheevos_lboard_submit(cheevos_lboard_t* lboard)
 
    snprintf(buffer, sizeof(buffer), "Submitted %s for %s",
          value, lboard->info->title);
-   runloop_msg_queue_push(buffer, 0, 2 * 60, false);
+   runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
    /* Start the submit task. */
    cheevos_lboard_submit_task(NULL, lboard, "no error, first try");
@@ -689,8 +689,8 @@ static void cheevos_test_leaderboards(void)
 
             snprintf(buffer, sizeof(buffer),
                   "Leaderboard Active: %s", lboard->info->title);
-            runloop_msg_queue_push(buffer, 0, 2 * 60, false);
-            runloop_msg_queue_push(lboard->info->description, 0, 3 * 60, false);
+            runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+            runloop_msg_queue_push(lboard->info->description, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          }
       }
    }
@@ -958,7 +958,7 @@ bool cheevos_toggle_hardcore_mode(void)
          command_event(CMD_EVENT_REWIND_DEINIT, NULL);
 
       CHEEVOS_LOG("%s\n", msg);
-      runloop_msg_queue_push(msg, 0, 3 * 60, true);
+      runloop_msg_queue_push(msg, 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
    }
    else
    {
@@ -1328,7 +1328,7 @@ static int cheevos_iterate(coro_t* coro)
 
       if (!coro->json)
       {
-         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
+         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          CHEEVOS_ERR(CHEEVOS_TAG "error loading achievements\n");
          CORO_STOP();
       }
@@ -1393,7 +1393,7 @@ static int cheevos_iterate(coro_t* coro)
                "You have %d of %d achievements unlocked.",
                number_of_unlocked, cheevos_locals.patchdata.core_count);
          msg[sizeof(msg) - 1] = 0;
-         runloop_msg_queue_push(msg, 0, 6 * 60, false);
+         runloop_msg_queue_push(msg, 0, 6 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
       }
 
       CORO_GOSUB(GET_BADGES);
@@ -1792,7 +1792,7 @@ static int cheevos_iterate(coro_t* coro)
 
       if (!coro->json)
       {
-         runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false);
+         runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          CHEEVOS_ERR(CHEEVOS_TAG "error getting user token\n");
 
          CORO_STOP();
@@ -1806,7 +1806,7 @@ static int cheevos_iterate(coro_t* coro)
          snprintf(msg, sizeof(msg),
                "RetroAchievements: %s",
                tok);
-         runloop_msg_queue_push(msg, 0, 5 * 60, false);
+         runloop_msg_queue_push(msg, 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          *coro->settings->arrays.cheevos_token = 0;
 
          CHEEVOS_FREE(coro->json);
@@ -1822,7 +1822,7 @@ static int cheevos_iterate(coro_t* coro)
                "RetroAchievements: Logged in as \"%s\".",
                coro->settings->arrays.cheevos_username);
          msg[sizeof(msg) - 1] = 0;
-         runloop_msg_queue_push(msg, 0, 3 * 60, false);
+         runloop_msg_queue_push(msg, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
       }
 
       strlcpy(cheevos_locals.token, tok,
@@ -2047,7 +2047,7 @@ bool cheevos_load(const void *data)
    if (!coro)
       return false;
 
-   task = (retro_task_t*)calloc(1, sizeof(*task));
+   task = task_init();
 
    if (!task)
    {

diff --git a/cheevos/badges.c b/cheevos/badges.c
@@ -49,7 +49,7 @@ void set_badge_menu_texture(badges_ctx_t * badges, int i)
 
 #ifdef HAVE_MENU
    menu_display_reset_textures_list(badge_file, fullpath,
-         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR);
+         &badges->menu_texture_list[i],TEXTURE_FILTER_MIPMAP_LINEAR, NULL, NULL);
 #endif
 }
 

diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
@@ -28,6 +28,7 @@
 #include <retro_math.h>
 #include <net/net_http.h>
 #include <libretro.h>
+#include <queues/task_queue.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -1589,7 +1590,7 @@ static void cheevos_make_unlock_url(const cheevo_t *cheevo,
 #endif
 }
 
-static void cheevos_unlocked(void *task_data, void *user_data,
+static void cheevos_unlocked(retro_task_t *task, void *task_data, void *user_data,
       const char *error)
 {
    cheevo_t *cheevo = (cheevo_t *)user_data;
@@ -1657,8 +1658,8 @@ static void cheevos_test_cheevo_set(const cheevoset_t *set)
             snprintf(msg, sizeof(msg), "Achievement Unlocked: %s",
                   cheevo->title);
             msg[sizeof(msg) - 1] = 0;
-            runloop_msg_queue_push(msg, 0, 2 * 60, false);
-            runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false);
+            runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+            runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
             cheevos_make_unlock_url(cheevo, url, sizeof(url));
             task_push_http_transfer(url, true, NULL,
@@ -1818,7 +1819,7 @@ static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard,
 #endif
 }
 
-static void cheevos_lboard_submit(void *task_data, void *user_data,
+static void cheevos_lboard_submit(retro_task_t *task, void *task_data, void *user_data,
       const char *error)
 {
    cheevos_leaderboard_t *lboard = (cheevos_leaderboard_t *)user_data;
@@ -1866,7 +1867,8 @@ static void cheevos_test_leaderboards(void)
                CHEEVOS_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n",
                      lboard->title);
                runloop_msg_queue_push("Leaderboard attempt cancelled!",
-                     0, 2 * 60, false);
+                     0, 2 * 60, false,
+                     NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
             }
             else
             {
@@ -1884,7 +1886,7 @@ static void cheevos_test_leaderboards(void)
                snprintf(msg, sizeof(msg), "Submitted %s for %s",
                      formatted_value, lboard->title);
                msg[sizeof(msg) - 1] = 0;
-               runloop_msg_queue_push(msg, 0, 2 * 60, false);
+               runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
             }
          }
 
@@ -1893,7 +1895,8 @@ static void cheevos_test_leaderboards(void)
             CHEEVOS_LOG("[CHEEVOS]: cancel lboard %s\n", lboard->title);
             lboard->active = 0;
             runloop_msg_queue_push("Leaderboard attempt cancelled!",
-                  0, 2 * 60, false);
+                  0, 2 * 60, false,
+                  NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          }
       }
       else
@@ -1909,8 +1912,8 @@ static void cheevos_test_leaderboards(void)
             snprintf(msg, sizeof(msg),
                   "Leaderboard Active: %s", lboard->title);
             msg[sizeof(msg) - 1] = 0;
-            runloop_msg_queue_push(msg, 0, 2 * 60, false);
-            runloop_msg_queue_push(lboard->description, 0, 3*60, false);
+            runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
+            runloop_msg_queue_push(lboard->description, 0, 3*60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          }
       }
    }
@@ -2279,7 +2282,7 @@ bool cheevos_toggle_hardcore_mode(void)
          command_event(CMD_EVENT_REWIND_DEINIT, NULL);
 
       CHEEVOS_LOG("%s\n", msg);
-      runloop_msg_queue_push(msg, 0, 3 * 60, true);
+      runloop_msg_queue_push(msg, 0, 3 * 60, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
    }
    else
    {
@@ -2810,7 +2813,7 @@ static int cheevos_iterate(coro_t *coro)
 
       if (!coro->json)
       {
-         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
+         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          CHEEVOS_ERR("[CHEEVOS]: error loading achievements.\n");
          CORO_STOP();
       }
@@ -2839,7 +2842,8 @@ static int cheevos_iterate(coro_t *coro)
       {
          runloop_msg_queue_push(
                "This game has no achievements.",
-               0, 5 * 60, false);
+               0, 5 * 60, false,
+               NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
 
          cheevos_free_cheevo_set(&cheevos_locals.core);
          cheevos_free_cheevo_set(&cheevos_locals.unofficial);
@@ -2887,7 +2891,7 @@ static int cheevos_iterate(coro_t *coro)
                "You have %d of %d achievements unlocked.",
                number_of_unlocked, cheevos_locals.core.count);
          msg[sizeof(msg) - 1] = 0;
-         runloop_msg_queue_push(msg, 0, 6 * 60, false);
+         runloop_msg_queue_push(msg, 0, 6 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
       }
 
       CORO_GOSUB(GET_BADGES);
@@ -3292,10 +3296,12 @@ static int cheevos_iterate(coro_t *coro)
          {
             runloop_msg_queue_push(
                   "Missing RetroAchievements account information.",
-                  0, 5 * 60, false);
+                  0, 5 * 60, false,
+                  NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
             runloop_msg_queue_push(
                   "Please fill in your account information in Settings.",
-                  0, 5 * 60, false);
+                  0, 5 * 60, false,
+                  NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
             CHEEVOS_ERR("[CHEEVOS]: login info not informed.\n");
             CORO_STOP();
          }
@@ -3352,7 +3358,7 @@ static int cheevos_iterate(coro_t *coro)
                         "RetroAchievements: Logged in as \"%s\".",
                         coro->settings->arrays.cheevos_username);
                   msg[sizeof(msg) - 1] = 0;
-                  runloop_msg_queue_push(msg, 0, 3 * 60, false);
+                  runloop_msg_queue_push(msg, 0, 3 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
                }
 
                /* Save token to config and clear pass on success */
@@ -3373,13 +3379,13 @@ static int cheevos_iterate(coro_t *coro)
                "RetroAchievements: %s",
                error_response);
          error_message[sizeof(error_message) - 1] = 0;
-         runloop_msg_queue_push(error_message, 0, 5 * 60, false);
+         runloop_msg_queue_push(error_message, 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          *coro->settings->arrays.cheevos_token = '\0';
 
          CORO_STOP();
       }
 
-      runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false);
+      runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
       CHEEVOS_ERR("[CHEEVOS]: error getting user token.\n");
 
       CORO_STOP();
@@ -3636,7 +3642,7 @@ bool cheevos_load(const void *data)
    if (!coro)
       return false;
 
-   task = (retro_task_t*)calloc(1, sizeof(*task));
+   task = task_init();
 
    if (!task)
    {