7 files changed, 104 insertions, 41 deletions

diff --git a/apps/gui/list.c b/apps/gui/list.c
index 85046ead54..c119c4f193 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -51,6 +51,7 @@ void list_draw(struct screen *display, struct gui_synclist *list);
 
 static long last_dirty_tick;
 static struct viewport parent[NB_SCREENS];
+static struct gui_synclist *current_lists;
 
 static bool list_is_dirty(struct gui_synclist *list)
 {
@@ -160,7 +161,6 @@ void gui_synclist_init(struct gui_synclist * gui_list,
     gui_list->nb_items = 0;
     gui_list->selected_item = 0;
     gui_synclist_init_display_settings(gui_list);
-
 #ifdef HAVE_TOUCHSCREEN
     gui_list->y_pos = 0;
 #endif
@@ -586,16 +586,19 @@ bool gui_synclist_keyclick_callback(int action, void* data)
  * loop.
  *
  * The GUI_EVENT_NEED_UI_UPDATE event is registered for in list_do_action_timeout()
- * and unregistered in gui_synclict_do_button(). This is done because
- * if something is using the list UI they *must* be calling those
+ * as a oneshot and current_lists updated. later current_lists is set to NULL
+ * in gui_synclist_do_button() effectively disabling the callback. 
+*  This is done because if something is using the list UI they *must* be calling those
  * two functions in the correct order or the list wont work.
  */
-static struct gui_synclist *current_lists;
-static bool ui_update_event_registered = false;
-static void _lists_uiviewport_update_callback(unsigned short id, void *data)
+
+static void _lists_uiviewport_update_callback(unsigned short id,
+                                              void *data, void *userdata)
 {
     (void)id;
     (void)data;
+    (void)userdata;
+
     if (current_lists)
         gui_synclist_draw(current_lists);
 }
@@ -697,6 +700,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, int *actionptr)
         case ACTION_TREE_PGRIGHT:
             gui_synclist_scroll_right(lists);
             gui_synclist_draw(lists);
+            yield();
             return true;
         case ACTION_TREE_ROOT_INIT:
          /* After this button press ACTION_TREE_PGLEFT is allowed
@@ -724,6 +728,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, int *actionptr)
             gui_synclist_draw(lists);
             pgleft_allow_cancel = false; /* stop ACTION_TREE_PAGE_LEFT
                                             skipping to root */
+            yield();
             return true;
 /* for pgup / pgdown, we are obliged to have a different behaviour depending
  * on the screen for which the user pressed the key since for example, remote
@@ -769,13 +774,8 @@ int list_do_action_timeout(struct gui_synclist *lists, int timeout)
 /* Returns the lowest of timeout or the delay until a postponed
    scheduled announcement is due (if any). */
 {
-    if (lists != current_lists)
-    {
-        if (!ui_update_event_registered)
-            ui_update_event_registered =
-                    add_event(GUI_EVENT_NEED_UI_UPDATE, _lists_uiviewport_update_callback);
-        current_lists = lists;
-    }
+    add_event_ex(GUI_EVENT_NEED_UI_UPDATE, true, _lists_uiviewport_update_callback, NULL);
+    current_lists = lists;
     if(lists->scheduled_talk_tick)
     {
         long delay = lists->scheduled_talk_tick -current_tick +1;
@@ -944,7 +944,9 @@ bool simplelist_show_list(struct simplelist_info *info)
             old_line_count = simplelist_line_count;
         }
         else if(default_event_handler(action) == SYS_USB_CONNECTED)
+        {
             return true;
+        }
     }
     talk_shutup();
 
diff --git a/apps/gui/list.h b/apps/gui/list.h
index 40a27d1061..1060a3edde 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -134,7 +134,7 @@ struct list_selection_color
     unsigned bg_color;
     /* To enable:
      * call gui_synclist_set_sel_color(gui_synclist*, list_selection_color*)
-     * If using the default viewport you should call 
+     * If using the default viewport you should call
      * gui_synclist_set_sel_color(gui_synclist*, NULL) when finished */
 };
 #endif
@@ -264,8 +264,8 @@ extern bool list_do_action(int context, int timeout,
 
 
 /** Simplelist implementation.
-    USe this if you dont need to reimplement the list code, 
-    and just need to show a list 
+    USe this if you dont need to reimplement the list code,
+    and just need to show a list
  **/
 
 struct simplelist_info {
@@ -282,7 +282,7 @@ struct simplelist_info {
                        was exited with ACTION_STD_CANCEL                  */
     int (*action_callback)(int action, struct gui_synclist *lists); /* can be NULL */
         /* action_callback notes:
-            action == the action pressed by the user 
+            action == the action pressed by the user
                 _after_ gui_synclist_do_button returns.
             lists == the lists struct so the callback can get selection and count etc. */
     enum themable_icons title_icon;
@@ -312,7 +312,7 @@ void simplelist_set_line_count(int lines);
 /* get the current amount of lines shown */
 int simplelist_get_line_count(void);
 /* add a line in the list. */
-void simplelist_addline(const char *fmt, ...);
+void simplelist_addline(const char *fmt, ...) ATTRIBUTE_PRINTF(1,2);
 
 /* setup the info struct. members not setup in this function need to be assigned manually
    members set in this function:
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 1ce7fd5026..65f2a0491d 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -219,10 +219,15 @@ static int option_talk(int selected_item, void * data)
 void option_select_next_val(const struct settings_list *setting,
                             bool previous, bool apply)
 {
+    bool repeated = get_action_statuscode(NULL) & ACTION_REPEAT;
+
     int val = 0;
     int *value = setting->setting;
     if (HASFLAG(setting, F_BOOL_SETTING))
     {
+        if (repeated)
+            return;
+
         *(bool*)value = !*(bool*)value;
         if (apply && setting->bool_setting->option_callback)
             setting->bool_setting->option_callback(*(bool*)value);
@@ -236,13 +241,13 @@ void option_select_next_val(const struct settings_list *setting,
         {
             val = *value + info->step;
             if (neg_step ? (val < info->max) : (val > info->max))
-                val = info->min;
+                val = repeated ? *value : info->min;
         }
         else
         {
             val = *value - info->step;
             if (neg_step ? (val > info->min) : (val < info->min))
-                val = info->max;
+                val = repeated ? *value : info->max;
         }
         *value = val;
         if (apply && info->option_callback)
@@ -258,13 +263,13 @@ void option_select_next_val(const struct settings_list *setting,
         {
             val = *value + steps;
             if (val >= max)
-                val = min;
+                val = repeated ? *value :  min;
         }
         else
         {
             val = *value - steps;
             if (val < min)
-                val = max;
+                val = repeated ? *value : max;
         }
         *value = val;
         if (apply)
@@ -277,13 +282,13 @@ void option_select_next_val(const struct settings_list *setting,
         {
             val = *value + 1;
             if (val >= info->count)
-                val = 0;
+                val = repeated ? *value :  0;
         }
         else
         {
             val = *value - 1;
             if (val < 0)
-                val = info->count-1;
+                val = repeated ? *value : info->count-1;
         }
         *value = val;
         if (apply && info->option_callback)
@@ -300,7 +305,11 @@ void option_select_next_val(const struct settings_list *setting,
                   (settings->flags&F_ALLOW_ARBITRARY_VALS &&
                     *value < tbl_info->values[i]))
             {
-                val = tbl_info->values[(i+add)%tbl_info->count];
+                int index = (i+add)%tbl_info->count;
+                if (repeated && ((i == 0 && previous) || (!previous && i == tbl_info->count -1)))
+                    val = *value;
+                else
+                    val = tbl_info->values[index];
                 break;
             }
         }
@@ -504,7 +513,6 @@ bool option_screen(const struct settings_list *setting,
         title = P2STR(option_title);
 
     gui_synclist_set_title(&lists, title, Icon_Questionmark);
-    gui_synclist_set_icon_callback(&lists, NULL);
     if(global_settings.talk_menu)
         gui_synclist_set_voice_callback(&lists, option_talk);
 
diff --git a/apps/gui/skin_engine/skin_engine.c b/apps/gui/skin_engine/skin_engine.c
index c007ed35d4..e11102ffe5 100644
--- a/apps/gui/skin_engine/skin_engine.c
+++ b/apps/gui/skin_engine/skin_engine.c
@@ -352,13 +352,13 @@ bool dbg_skin_engine(void)
             struct skin_stats *stats = skin_get_stats(i, j);
             if (stats->buflib_handles)
             {
-                simplelist_addline("Skin ID: %d, %d allocations",
+                simplelist_addline("Skin ID: %d, %zd allocations",
                         i, stats->buflib_handles);
-                simplelist_addline("\tskin: %d bytes",
+                simplelist_addline("\tskin: %zd bytes",
                         stats->tree_size);
-                simplelist_addline("\tImages: %d bytes",
+                simplelist_addline("\tImages: %zd bytes",
                         stats->images_size);
-                simplelist_addline("\tTotal: %d bytes",
+                simplelist_addline("\tTotal: %zd bytes",
                         stats->tree_size + stats->images_size);
                 total += stats->tree_size + stats->images_size;
             }
@@ -375,7 +375,7 @@ bool dbg_skin_engine(void)
                 path += path_prefix_len;
             simplelist_addline("%s", path);
             simplelist_addline("\tref_count: %d", ref_count);
-            simplelist_addline("\tsize: %d", bytes);
+            simplelist_addline("\tsize: %zd", bytes);
             total += bytes;
         }
     }
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 42c56f7203..4bd1ffea31 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -66,6 +66,7 @@
 #include "fixedpoint.h"
 #endif
 #include "list.h"
+#include "option_select.h"
 #include "wps.h"
 
 #define NOINLINE __attribute__ ((noinline))
@@ -73,7 +74,7 @@
 static const char* get_codectype(const struct mp3entry* id3)
 {
     if (id3 && id3->codectype < AFMT_NUM_CODECS) {
-        return audio_formats[id3->codectype].label;
+        return get_codec_string(id3->codectype);
     } else {
         return NULL;
     }
@@ -555,20 +556,29 @@ static struct mp3entry* get_mp3entry_from_offset(int offset, char **filename)
         pid3 = state->nid3;
     else
     {
-        static char filename_buf[MAX_PATH + 1];
-        fname = playlist_peek(offset, filename_buf, sizeof(filename_buf));
+        static struct mp3entry tempid3; /* Note: path gets passed to outside fns */
+        memset(&tempid3, 0, sizeof(struct mp3entry));
+        /*static char filename_buf[MAX_PATH + 1];removed g#5926 */
+        fname = playlist_peek(offset, tempid3.path, sizeof(tempid3.path));
         *filename = (char*)fname;
-        static struct mp3entry tempid3;
+
         if (
 #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
-            tagcache_fill_tags(&tempid3, fname) ||
+            tagcache_fill_tags(&tempid3, NULL) ||
 #endif
             audio_peek_track(&tempid3, offset)
         )
         {
             pid3 = &tempid3;
         }
+        else /* failed */
+        {
+            /* ensure *filename gets the path, audio_peek_track() cleared it */
+            fname = playlist_peek(offset, tempid3.path, sizeof(tempid3.path));
+            *filename = (char*)fname;
+        }
     }
+
     return pid3;
 }
 
@@ -658,6 +668,23 @@ static const char* NOINLINE get_lif_token_value(struct gui_wps *gwps,
     return NULL;
 }
 
+#ifdef HAVE_QUICKSCREEN
+static const char* get_qs_token_value(enum quickscreen_item item, bool data_token,
+                                       char *buf, int buf_size)
+{
+    const struct settings_list *qs_setting = global_settings.qs_items[item];
+
+    if (qs_setting == NULL)
+        return "ERR";
+
+    if (data_token)
+        return option_get_valuestring(qs_setting, buf, buf_size,
+                                      option_value_as_int(qs_setting));
+
+    return P2STR(ID2P(qs_setting->lang_id));
+}
+#endif
+
 /* Return the tags value as text. buf should be used as temp storage if needed.
 
    intval is used with conditionals/enums: when this function is called,
@@ -692,8 +719,6 @@ const char *get_token_value(struct gui_wps *gwps,
         return NULL;
 
     id3 = get_mp3entry_from_offset(token->next? 1: offset, &filename);
-    if (id3)
-        filename = id3->path;
 
 #if CONFIG_RTC
     struct tm* tm = NULL;
@@ -1374,6 +1399,25 @@ const char *get_token_value(struct gui_wps *gwps,
             return NULL;
 #endif
 
+#ifdef HAVE_QUICKSCREEN
+        case SKIN_TOKEN_TOP_QUICKSETTING_NAME:
+            return get_qs_token_value(QUICKSCREEN_TOP, false, buf, buf_size);
+        case SKIN_TOKEN_TOP_QUICKSETTING_VALUE:
+            return get_qs_token_value(QUICKSCREEN_TOP, true, buf, buf_size);
+        case SKIN_TOKEN_RIGHT_QUICKSETTING_NAME:
+            return get_qs_token_value(QUICKSCREEN_RIGHT, false, buf, buf_size);
+        case SKIN_TOKEN_RIGHT_QUICKSETTING_VALUE:
+            return get_qs_token_value(QUICKSCREEN_RIGHT, true, buf, buf_size);
+        case SKIN_TOKEN_BOTTOM_QUICKSETTING_NAME:
+            return get_qs_token_value(QUICKSCREEN_BOTTOM, false, buf, buf_size);
+        case SKIN_TOKEN_BOTTOM_QUICKSETTING_VALUE:
+            return get_qs_token_value(QUICKSCREEN_BOTTOM, true, buf, buf_size);
+        case SKIN_TOKEN_LEFT_QUICKSETTING_NAME:
+            return get_qs_token_value(QUICKSCREEN_LEFT, false, buf, buf_size);
+        case SKIN_TOKEN_LEFT_QUICKSETTING_VALUE:
+            return get_qs_token_value(QUICKSCREEN_LEFT, true, buf, buf_size);
+#endif
+
         case SKIN_TOKEN_SETTING:
         {
             const struct settings_list *s = token->value.xdata;
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index fb59f820b6..8a3510ea15 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -243,7 +243,13 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
 
 void gui_usb_screen_run(bool early_usb)
 {
-    (void) early_usb;
+#ifdef SIMULATOR /* the sim allows toggling USB fast enough to overflow viewportmanagers stack */
+    static bool in_usb_screen = false;
+    if (in_usb_screen)
+        return;
+    in_usb_screen = true;
+#endif
+
     struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS];
 #if defined HAVE_TOUCHSCREEN
     enum touchscreen_mode old_mode = touchscreen_get_mode();
@@ -334,4 +340,7 @@ void gui_usb_screen_run(bool early_usb)
     }
 
     pop_current_activity();
+#ifdef SIMULATOR
+    in_usb_screen = false;
+#endif
 }
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 0de805bd02..82b0394a53 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -806,7 +806,7 @@ long gui_wps_show(void)
                     theme_enabled = false;
                     gwps_leave_wps(theme_enabled);
                     onplay(state->id3->path,
-                           FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey);
+                           FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey, ONPLAY_NO_CUSTOMACTION);
                     if (!audio_status())
                     {
                         /* re-enable theme since we're returning to SBS */
@@ -823,7 +823,7 @@ long gui_wps_show(void)
             {
                 gwps_leave_wps(true);
                 int retval = onplay(state->id3->path,
-                       FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey);
+                       FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey, ONPLAY_NO_CUSTOMACTION);
                 /* if music is stopped in the context menu we want to exit the wps */
                 if (retval == ONPLAY_MAINMENU
                     || !audio_status())