rbutil: Enforce requirement of QT 6.6 or newer

Change-Id: I96064633c00ca2e13cfd9308a7f5d71cba7933cb

.gitignore

@@ -82,7 +82,15 @@ __pycache__
 /utils/bspatch/bspatch
 
 # imxtools
+/utils/imxtools/misc/io_pins
+/utils/imxtools/misc/wiki_gen
 /utils/imxtools/scsitools/scsitool
+/utils/imxtools/sbtools/elftosb
+/utils/imxtools/sbtools/elftosb1
+/utils/imxtools/sbtools/rsrctool
+/utils/imxtools/sbtools/sbloader
+/utils/imxtools/sbtools/sbtoelf
+/utils/mkimxboot/mkimxboot
 
 # /utils/rbutilqt/
 /utils/rbutilqt/build
@@ -100,16 +108,22 @@ __pycache__
 # /utils/rbutilqt/lang/
 /utils/rbutilqt/lang/*.qm
 
-# More rbutil
+# More target-specific utilities
 /utils/*/buildposix
 /utils/*/uninstall_script.[ch]
 /utils/*/install_script.[ch]
-/utils/mkimxboot/mkimxboot
+/utils/e200tool/e200load
 /utils/mknwzboot/mknwzboot
 /utils/mkzenboot/mkzenboot
 /utils/sansapatcher/sansapatcher
 /utils/jztool/jztool
 /utils/tools/bin2c
+/utils/rk27utils/nandextract/nandextract
+/utils/rk27utils/rk27load/rk27load
+/utils/rk27utils/rkwtool/rkwtool
+/utils/rk27utils/rkusbtool/rkusbtool
+/utils/mkmpioboot/mkmpioboot
+/utils/mktccboot/mktccboot
 
 # /tools/
 /tools/bdf2bmp
@@ -188,8 +202,9 @@ __pycache__
 # /utils/nwztools
 /utils/nwztools/scsitools/scsitool
 /utils/nwztools/upgtools/upgtool
+/utils/nwztools/emmctools/emmctool
 
-#  utils/rk27utils 
+#  utils/rk27utils
 /utils/rk27utils/rkboottool/rkboottool
 
 # /utils/themeeditor/

android/android.make

@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 PACKAGE=org.rockbox

android/src/org/rockbox/Helper/Logger.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *

android/src/org/rockbox/Helper/MediaButtonReceiver.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

android/src/org/rockbox/RockboxActivity.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

android/src/org/rockbox/RockboxFramebuffer.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

android/src/org/rockbox/RockboxKeyboardInput.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *

android/src/org/rockbox/RockboxPCM.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

android/src/org/rockbox/RockboxService.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

android/src/org/rockbox/RockboxYesno.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *

android/src/org/rockbox/monitors/BatteryMonitor.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *

android/src/org/rockbox/monitors/HeadphoneMonitor.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Thomas Martitz
  *

android/src/org/rockbox/monitors/TelephonyMonitor.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

android/src/org/rockbox/widgets/RockboxWidgetConfigure.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *

android/src/org/rockbox/widgets/RockboxWidgetProvider.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *

android/src/org/rockbox/widgets/RockboxWidgetProvider2x2.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *

android/src/org/rockbox/widgets/RockboxWidgetProvider3x3.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *

android/src/org/rockbox/widgets/RockboxWidgetProvider4x1.java

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 Antoine Cellerier <dionoea at videolan dot org>
  *

apps/abrepeat.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Ray Lambert
  *

apps/abrepeat.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Ray Lambert
  *

apps/action.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Jonathan Gordon
  * Copyright (C) 2017 William Wilgus
@@ -430,6 +429,7 @@ static inline bool get_action_touchscreen(action_last_t *last, action_cur_t *cur
     {
         intptr_t data = button_get_data();
         long now = current_tick;
+        last->repeated = false;
 
         if (has_flag(last->button, BUTTON_TOUCHSCREEN) &&
             !has_flag(last->button, BUTTON_REL))
@@ -439,7 +439,6 @@ static inline bool get_action_touchscreen(action_last_t *last, action_cur_t *cur
             if (!has_flag(cur->button, BUTTON_REL))
                 last->ts_data = data;
 
-            /* Historical baggage... may be unnecessary. */
             if (has_flag(cur->button, BUTTON_REPEAT))
                 last->repeated = true;
         }

apps/alarm_menu.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Uwe Freese
  *

apps/alarm_menu.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2003 Uwe Freese
  *

apps/appevents.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
@@ -73,11 +72,13 @@ enum {
 
 /** Generic GUI class events **/
 enum {
-    GUI_EVENT_STATUSBAR_TOGGLE = (EVENT_CLASS_GUI|1),
+    /* Redraw skin as needed (or by force) */
+    GUI_EVENT_ACTIONREDRAW = (EVENT_CLASS_GUI|1),
+    /* Redraw skin, and update the screen if it's dirty */
     GUI_EVENT_ACTIONUPDATE,
     GUI_EVENT_THEME_CHANGED,
     /* Called when the UI viewport is cleared in the skin engine to
-     * notify the current screen that it needs to do an update */
+     * notify the current screen that it needs to redraw itself */
     GUI_EVENT_NEED_UI_UPDATE,
 };
 

apps/applimits.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Linus Nielsen Feltzing
  *

apps/apps.make

@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 INCLUDES += -I$(APPSDIR) $(patsubst %,-I$(APPSDIR)/%,$(subst :, ,$(APPEXTRA)))

apps/audio_path.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Audio signal path management APIs
  *

apps/audio_thread.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin

apps/audio_thread.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin

apps/beep.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (c) 2011 Michael Sevakis
  *

apps/bitmaps/bitmaps.make

@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 
 BITMAPDIR = $(ROOTDIR)/apps/bitmaps

apps/bookmark.c

@@ -959,14 +959,15 @@ static bool delete_bookmark(const char* bookmark_file_name, int bookmark_id)
 }
 
 /* ----------------------------------------------------------------------- */
-/* This displays the bookmarks in a file and allows the user to            */
+/* Displays bookmarks in a file, so user can select one to play.           */
-/* select one to play.                                                     */
+/*                                                                         */
-/* *selected_bookmark contains a non NULL value on successful bookmark     */
+/* Returns                                                                 */
-/* selection.                                                              */
+/* BOOKMARK_SUCCESS              A bookmark or 'Don't Resume' was selected */
-/* Returns BOOKMARK_SUCCESS on successful bookmark selection, BOOKMARK_FAIL*/
+/* BOOKMARK_FAIL                 No selection was made                     */
-/* if no selection was made and BOOKMARK_USB_CONNECTED if the selection    */
+/* BOOKMARK_USB_CONNECTED        USB connection forced exit of menu        */
-/* menu is forced to exit due to a USB connection.                         */
+/*                                                                         */
-/* ------------------------------------------------------------------------*/
+/* *selected_bookmark will point to bookmark if selected, or will be NULL  */
+/* ----------------------------------------------------------------------- */
 static int select_bookmark(const char* bookmark_file_name,
                            bool show_dont_resume,
                            char** selected_bookmark)
@@ -979,6 +980,7 @@ static int select_bookmark(const char* bookmark_file_name,
     bool exit = false;
     bool refresh = true;
     int ret = BOOKMARK_FAIL;
+    *selected_bookmark = NULL;
 
     bookmarks = plugin_get_buffer(&size);
     bookmarks->buffer_size = size;
@@ -996,9 +998,9 @@ static int select_bookmark(const char* bookmark_file_name,
 
     while (!exit)
     {
-
         if (refresh)
         {
+            refresh = false;
             int count = get_bookmark_count(bookmark_file_name);
             bookmarks->total_count = count;
 
@@ -1007,8 +1009,7 @@ static int select_bookmark(const char* bookmark_file_name,
                 /* No more bookmarks, delete file and exit */
                 splash(HZ, ID2P(LANG_BOOKMARK_LOAD_EMPTY));
                 remove(bookmark_file_name);
-                *selected_bookmark = NULL;
+                break;
-                return BOOKMARK_FAIL;
             }
 
             if (bookmarks->show_dont_resume)
@@ -1032,80 +1033,61 @@ static int select_bookmark(const char* bookmark_file_name,
             gui_synclist_draw(&list);
             cond_talk_ids_fq(VOICE_EXT_BMARK);
             gui_synclist_speak_item(&list);
-            refresh = false;
         }
 
         list_do_action(CONTEXT_BOOKMARKSCREEN, HZ / 2, &list, &action);
         item = gui_synclist_get_sel_pos(&list) / 2;
 
         if (bookmarks->show_dont_resume)
-        {
             item--;
-        }
 
         if (action == ACTION_STD_CONTEXT)
         {
-            MENUITEM_STRINGLIST(menu_items, ID2P(LANG_BOOKMARK_CONTEXT_MENU),
+            gui_synclist_scroll_stop(&list);
-                NULL, ID2P(LANG_BOOKMARK_CONTEXT_RESUME),
+            MENUITEM_STRINGLIST(menu_items, ID2P(LANG_BOOKMARK_CONTEXT_MENU), NULL,
-                ID2P(LANG_DELETE));
+                                ID2P(LANG_BOOKMARK_CONTEXT_RESUME),
-            static const int menu_actions[] =
+                                ID2P(LANG_DELETE));
-            {
+            static const int menu_actions[] = {ACTION_STD_OK,
-                ACTION_STD_OK, ACTION_BMS_DELETE
+                                               ACTION_BMS_DELETE};
-            };
             int selection = do_menu(&menu_items, NULL, NULL, false);
-
             refresh = true;
 
             if (selection >= 0 && selection <=
                 (int) (sizeof(menu_actions) / sizeof(menu_actions[0])))
-            {
                 action = menu_actions[selection];
-            }
         }
-
         switch (action)
         {
         case ACTION_STD_OK:
-            if (item >= 0)
-            {
-                talk_shutup();
-                *selected_bookmark = bookmarks->items[item - bookmarks->start];
-                return BOOKMARK_SUCCESS;
-            }
-            exit = true;
             ret = BOOKMARK_SUCCESS;
-            break;
+            if (item >= 0)
-
+                *selected_bookmark = bookmarks->items[item - bookmarks->start];
+            /* fall through */
         case ACTION_TREE_WPS:
         case ACTION_STD_CANCEL:
             exit = true;
             break;
-
         case ACTION_BMS_DELETE:
-            if (item >= 0)
+            if (item < 0)
+                break;
+            if (confirm_delete_yesno("", str(LANG_BOOKMARK_CONTEXT_MENU)) == YESNO_YES)
             {
-                if (confirm_delete_yesno("", str(LANG_BOOKMARK_CONTEXT_MENU)) == YESNO_YES)
+                delete_bookmark(bookmark_file_name, item);
-                {
+                bookmarks->reload = true;
-                    delete_bookmark(bookmark_file_name, item);
-                    bookmarks->reload = true;
-                }
-                refresh = true;
             }
+            refresh = true;
             break;
-
         default:
             if (default_event_handler(action) == SYS_USB_CONNECTED)
             {
                 ret = BOOKMARK_USB_CONNECTED;
                 exit = true;
             }
-
             break;
         }
     }
-
+    gui_synclist_scroll_stop(&list);
     talk_shutup();
-    *selected_bookmark = NULL;
     return ret;
 }
 

apps/buffering.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *

apps/buffering.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *

apps/codec_thread.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005-2007 Miika Pekkarinen
  * Copyright (C) 2007-2008 Nicolas Pennequin

apps/codec_thread.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Miika Pekkarinen
  *

apps/codecs.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *

apps/core_keymap.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 by William Wilgus
  *

apps/core_keymap.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2020 by William Wilgus
  *

apps/cuesheet.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin, Jonathan Gordon
  *

apps/cuesheet.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin, Jonathan Gordon
  *

apps/debug_menu.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Heikki Hannikainen
  *
@@ -219,6 +218,22 @@ static int dbg_threads_action_callback(int action, struct gui_synclist *lists)
     }
 #if LCD_WIDTH <= 128
     int *x_offset = ((int*) lists->data);
+#if CONFIG_CPU == AS3525v2
+    if (action == ACTION_STD_MENU)
+    {
+        *x_offset += 1;
+        action = ACTION_REDRAW;
+    }
+    else if (IS_SYSEVENT(action))
+    {
+        return ACTION_REDRAW;
+    }
+    else if (action == ACTION_STD_OK)
+    {
+        *x_offset = 0;
+        action = ACTION_REDRAW;
+    }
+#else
     if (action == ACTION_STD_OK)
     {
         *x_offset += 1;
@@ -232,6 +247,7 @@ static int dbg_threads_action_callback(int action, struct gui_synclist *lists)
     {
         *x_offset = 0;
     }
+#endif
 #else
     (void) lists;
 #endif

apps/debug_menu.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Heikki Hannikainen
  *

apps/enc_config.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *

apps/enc_config.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Michael Sevakis
  *

apps/fileop.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  * Copyright (C) 2024 William Wilgus

apps/fileop.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *

apps/filetree.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Björn Stenberg
  *

apps/filetree.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Björn Stenberg
  *

apps/filetypes.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *

apps/filetypes.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Henrik Backe
  *

apps/gesture.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 by Aidan MacDonald
  *

apps/gesture.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2022 Aidan MacDonald
  *

apps/gui/backdrop.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *

apps/gui/backdrop.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2006 Dave Chapman
  *

apps/gui/bitmap/list-skinned.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2011 by Jonathan Gordon
  *
@@ -44,6 +43,7 @@
 
 static struct listitem_viewport_cfg *listcfg[NB_SCREENS] = {NULL};
 static struct gui_synclist *current_list;
+static bool needs_scrollbar[NB_SCREENS];
 
 static int current_row;
 static int current_column;
@@ -56,6 +56,7 @@ void skinlist_set_cfg(enum screen_type screen,
         if (listcfg[screen])
             screens[screen].scroll_stop_viewport(&listcfg[screen]->selected_item_vp.vp);
         listcfg[screen] = cfg;
+        needs_scrollbar[screen] = false;
         current_list = NULL;
         current_column = -1;
         current_row = -1;
@@ -145,7 +146,6 @@ int skinlist_get_line_count(enum screen_type screen, struct gui_synclist *list)
 
 static int current_item;
 static int current_nbitems;
-static bool needs_scrollbar[NB_SCREENS];
 bool skinlist_needs_scrollbar(enum screen_type screen)
 {
     return needs_scrollbar[screen];
@@ -281,7 +281,7 @@ bool skinlist_draw(struct screen *display, struct gui_synclist *list)
     }
     current_column = -1;
     current_row = -1;
-    skin_render_deferred(display, parent);
     current_drawing_line = list->selected_item;
+    sb_skin_force_next_update(); /* update scroll bar */
     return true;
 }

apps/gui/bitmap/list.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 by Jonathan Gordon
  *
@@ -446,7 +445,6 @@ void list_draw(struct screen *display, struct gui_synclist *list)
 
         callback_draw_item(&list_info);
     }
-    skin_render_deferred(display, parent);
     display->set_viewport(last_vp);
 }
 

apps/gui/color_picker.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Jonathan Gordon (2006)
  *

apps/gui/color_picker.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Jonathan Gordon (2006)
  *

apps/gui/icon.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Jonathan Gordon
  *

apps/gui/icon.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/gui/line.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Thomas Martitz
  *

apps/gui/line.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2013 Thomas Martitz
  *

apps/gui/list.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
@@ -49,8 +48,6 @@
 void list_draw(struct screen *display, struct gui_synclist *list);
 
 static long last_dirty_tick;
-static bool sb_title_is_dirty;
-static bool theme_enabled;
 static struct viewport parent[NB_SCREENS];
 static struct gui_synclist *current_lists;
 
@@ -183,6 +180,9 @@ void gui_synclist_init(struct gui_synclist * gui_list,
     gui_list->data = data;
     gui_list->scroll_all = scroll_all;
     gui_list->selected_size = selected_size;
+    if (selected_size != 1)
+        FOR_NB_SCREENS(i)
+            skinlist_set_cfg(i, NULL);
     gui_list->title = NULL;
     gui_list->title_icon = Icon_NOICON;
 
@@ -221,32 +221,11 @@ int gui_list_get_item_offset(struct gui_synclist * gui_list,
     return item_offset;
 }
 
-static void sb_title_cb(unsigned short id, void *data, void *userdata)
-{
-    (void)id;
-    (void)data;
-    theme_enabled = true;
-    gui_synclist_draw((struct gui_synclist *) userdata);
-}
-
 /*
  * Force a full screen update.
  */
 void gui_synclist_draw(struct gui_synclist *gui_list)
 {
-    if (sb_title_is_dirty)
-    {
-        sb_title_is_dirty = theme_enabled = false;
-
-        /* tell skin engine to refresh, then call us back */
-        add_event_ex(GUI_EVENT_NEED_UI_UPDATE, true, sb_title_cb, gui_list);
-        send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
-        remove_event_ex(GUI_EVENT_NEED_UI_UPDATE, sb_title_cb, gui_list);
-
-        /* sb_title_cb was only called if theme is enabled */
-        if (theme_enabled)
-            return;
-    }
     if (list_is_dirty(gui_list))
     {
         list_init_viewports(gui_list);
@@ -258,6 +237,7 @@ void gui_synclist_draw(struct gui_synclist *gui_list)
     {
         if (!skinlist_draw(&screens[i], gui_list))
             list_draw(&screens[i], gui_list);
+        skin_mark_dirty(i);
     }
 }
 
@@ -461,7 +441,7 @@ void gui_synclist_set_title(struct gui_synclist * gui_list,
     gui_list->title_icon = icon;
     FOR_NB_SCREENS(i)
         sb_set_title_text(title, icon, i);
-    sb_title_is_dirty = true;
+    send_event(GUI_EVENT_ACTIONREDRAW, (void*)1);
 }
 
 void gui_synclist_set_nb_items(struct gui_synclist * lists, int nb_items)
@@ -952,7 +932,7 @@ bool simplelist_show_list(struct simplelist_info *info)
 
     while(1)
     {
-        list_do_action(CONTEXT_LIST, info->timeout, &lists, &action);
+        list_do_action(CONTEXT_TREE|ALLOW_SOFTLOCK, info->timeout, &lists, &action);
 
         /* We must yield in this case or no other thread can run */
         if (info->timeout == TIMEOUT_NOBLOCK)
@@ -978,6 +958,11 @@ bool simplelist_show_list(struct simplelist_info *info)
             info->selection = -1;
             break;
         }
+        else if (action == ACTION_TREE_WPS)
+        {
+            info->selection = -2;
+            break;
+        }
         else if (action == ACTION_STD_OK)
         {
             info->selection = gui_synclist_get_sel_pos(&lists);

apps/gui/list.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/gui/option_select.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  * Copyright (C) 2007 by Jonathan Gordon
@@ -533,7 +532,7 @@ bool option_screen(const struct settings_list *setting,
         if (!allow_wrap)
             lists.wraparound = false;
 
-        if (list_do_action(CONTEXT_LIST, HZ, /* HZ so the status bar redraws */
+        if (list_do_action(CONTEXT_LIST|ALLOW_SOFTLOCK, HZ, /* HZ so the status bar redraws */
                            &lists, &action))
         {
             /* setting changed */

apps/gui/option_select.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/gui/pitchscreen.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *

apps/gui/pitchscreen.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 Thomas Martitz
  *

apps/gui/quickscreen.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
@@ -40,6 +39,7 @@
 #include "debug.h"
 #include "shortcuts.h"
 #include "appevents.h"
+#include "statusbar-skinned.h"
 
  /* 1 top, 1 bottom, 2 on either side, 1 for the icons
   * if enough space, top and bottom have 2 lines */
@@ -233,7 +233,7 @@ static void quickscreen_draw(struct quickscreen *qs, enum screen_type screen)
             (vp_icons->width/2) - 4, vp_icons->height - 8, 7, 8);
     }
 
-    skin_render_deferred(display, parent);
+    skin_mark_dirty(display->screen_type);
     display->set_viewport(last_vp);
 }
 
@@ -418,13 +418,11 @@ static void quickscreen_run(struct quickscreen * qs)
             can_quit = true;
         else if (button == ACTION_QS_VOLUP) {
             adjust_volume(1);
-            FOR_NB_SCREENS(i)
+            sb_skin_force_next_update();
-                skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_NON_STATIC);
         }
         else if (button == ACTION_QS_VOLDOWN) {
             adjust_volume(-1);
-            FOR_NB_SCREENS(i)
+            sb_skin_force_next_update();
-                skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_NON_STATIC);
         }
         else if (button == ACTION_STD_CONTEXT)
         {

apps/gui/quickscreen.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/gui/scrollbar.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Markus Braun (2002)
  *

apps/gui/scrollbar.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 Kevin Ferrare
  *

apps/gui/skin_engine/skin_backdrops.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *

apps/gui/skin_engine/skin_display.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002-2007 Björn Stenberg
  * Copyright (C) 2007-2008 Nicolas Pennequin
@@ -71,8 +70,20 @@
 #include "statusbar-skinned.h"
 #include "skin_display.h"
 
+static bool dirty[NB_SCREENS];
+
 void skin_render(struct gui_wps *gwps, unsigned refresh_mode);
 
+bool skin_is_dirty(enum screen_type screen)
+{
+    return dirty[screen] && !(dirty[screen] = false);
+}
+
+void skin_mark_dirty(enum screen_type screen)
+{
+    dirty[screen] = true;
+}
+
 /* update a skinned screen, update_type is WPS_REFRESH_* values.
  * Usually it should only be WPS_REFRESH_NON_STATIC
  * A full update will be done if required (skin_do_full_update() == true)
@@ -90,6 +101,7 @@ void skin_update(enum skinnable_screens skin, enum screen_type screen,
 
     skin_render(gwps, skin_do_full_update(skin, screen) ?
                         SKIN_REFRESH_ALL : update_type);
+    skin_mark_dirty(screen);
 }
 
 #ifdef AB_REPEAT_ENABLE
@@ -198,6 +210,23 @@ void draw_progressbar(struct gui_wps *gwps, struct skin_viewport* skin_viewport,
         length = 100;
         end = battery_level();
     }
+    else if (pb->type == SKIN_TOKEN_PLAYLIST_PROGRESSBAR)
+    {
+        unsigned long pl_elapsed, pl_total;
+        if (id3 && wps_get_playlist_percent(id3,
+                       id3->elapsed + state->ff_rewind_count,
+                       &pl_elapsed, &pl_total)
+            && pl_total > 0)
+        {
+            length = pl_total;
+            end = pl_elapsed;
+        }
+        else
+        {
+            length = 1;
+            end = 0;
+        }
+    }
     else if (pb->type == SKIN_TOKEN_PEAKMETER_LEFTBAR ||
              pb->type == SKIN_TOKEN_PEAKMETER_RIGHTBAR)
     {
@@ -397,8 +426,17 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
     (void)vp;
     struct wps_data *data = gwps->data;
     struct screen *display = gwps->display;
-    struct skin_token_list *list = SKINOFFSETTOPTR(get_skin_buffer(data), data->images);
 
+    /* Start with album art, as it may be drawn over by mask images */
+#ifdef HAVE_ALBUMART
+    struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart);
+    if (aa && aa->draw_handle >= 0)
+    {
+        draw_album_art(gwps, aa->draw_handle, false);
+        aa->draw_handle = -1;
+    }
+#endif
+    struct skin_token_list *list = SKINOFFSETTOPTR(get_skin_buffer(data), data->images);
     while (list)
     {
         struct wps_token *token = SKINOFFSETTOPTR(get_skin_buffer(data), list->token);
@@ -420,15 +458,6 @@ void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
         }
         list = SKINOFFSETTOPTR(get_skin_buffer(data), list->next);
     }
-#ifdef HAVE_ALBUMART
-    /* now draw the AA */
-    struct skin_albumart *aa = SKINOFFSETTOPTR(get_skin_buffer(data), data->albumart);
-    if (aa && aa->draw_handle >= 0)
-    {
-        draw_album_art(gwps, aa->draw_handle, false);
-        aa->draw_handle = -1;
-    }
-#endif
 
     display->set_drawmode(DRMODE_SOLID);
 }

apps/gui/skin_engine/skin_display.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002-2007 Björn Stenberg
  * Copyright (C) 2007-2008 Nicolas Pennequin

apps/gui/skin_engine/skin_engine.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
@@ -50,9 +49,6 @@ char* wps_default_skin(enum screen_type screen);
 char* default_radio_skin(enum screen_type screen);
 static bool skins_initialised = false;
 
-static char* get_skin_filename(char *buf, size_t buf_size,
-                               enum skinnable_screens skin, enum screen_type screen);
-
 struct gui_skin_helper {
     void (*process)(enum screen_type screen, struct wps_data *data, bool preprocess);
     char* (*default_skin)(enum screen_type screen);
@@ -153,11 +149,6 @@ void gui_sync_skin_init(void)
     }
 }
 
-void skin_unload_all(void)
-{
-    gui_sync_skin_init();
-}
-
 static void skin_reset_buffers(int item, int screen)
 {
     skin_data_free_buflib_allocs(&skins[item][screen].data);
@@ -174,7 +165,6 @@ static void skin_reset_buffers(int item, int screen)
 void settings_apply_skins(void)
 {
     int i;
-    char filename[MAX_PATH];
 
     if (audio_status() & AUDIO_STATUS_PLAY)
         audio_stop();
@@ -197,7 +187,6 @@ void settings_apply_skins(void)
     {
         FOR_NB_SCREENS(j)
         {
-            get_skin_filename(filename, MAX_PATH, i,j);
             gui_skin_reset(&skins[i][j]);
             skins[i][j].gui_wps.display = &screens[j];
             if (skin_helpers[i]->load_on_boot)

apps/gui/skin_engine/skin_engine.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  * Copyright (C) 2009 Jonathan Gordon
@@ -50,12 +49,8 @@ void skin_disarm_touchregions(struct gui_wps *gwps);
 /* Do a update_type update of the skinned screen */
 void skin_update(enum skinnable_screens skin, enum screen_type screen,
                  unsigned int update_type);
-
+void skin_mark_dirty(enum screen_type screen);
-/* Defer updates in skin_render */
+bool skin_is_dirty(enum screen_type screen);
-void skin_defer_rendering(bool deferred);
-/* Render viewport together with deferred updates */
-void skin_render_deferred(struct screen *display, struct viewport *vp);
-
 bool skin_has_sbs(struct gui_wps *gwps);
 
 
@@ -83,8 +78,6 @@ void skin_load(enum skinnable_screens skin, enum screen_type screen,
 struct gui_wps *skin_get_gwps(enum skinnable_screens skin, enum screen_type screen);
 void gui_sync_skin_init(void);
 
-void skin_unload_all(void);
-
 bool skin_do_full_update(enum skinnable_screens skin, enum screen_type screen);
 void skin_request_full_update(enum skinnable_screens skin);
 void skin_request_update_locked(bool locked);

apps/gui/skin_engine/skin_parser.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin, Dan Everton, Matthias Mohr
  *               2010 Jonathan Gordon
@@ -1235,6 +1234,13 @@ static int parse_progressbar_tag(struct skin_element* element,
         token->type = SKIN_TOKEN_VOLUMEBAR;
     else if (token->type == SKIN_TOKEN_BATTERY_PERCENT)
         token->type = SKIN_TOKEN_BATTERY_PERCENTBAR;
+    else if (token->type == SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT)
+    {
+#ifndef __PCTOOL__
+        wps_playlist_percent_enable(); /* enable scanning track lengths */
+#endif
+        token->type = SKIN_TOKEN_PLAYLIST_PROGRESSBAR;
+    }
     else if (token->type == SKIN_TOKEN_TUNER_RSSI)
         token->type = SKIN_TOKEN_TUNER_RSSI_BAR;
     else if (token->type == SKIN_TOKEN_PEAKMETER_LEFT)
@@ -2417,6 +2423,7 @@ static int skin_element_callback(struct skin_element* element, void* data)
                 case SKIN_TOKEN_PROGRESSBAR:
                 case SKIN_TOKEN_VOLUME:
                 case SKIN_TOKEN_BATTERY_PERCENT:
+                case SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT:
                 case SKIN_TOKEN_PLAYER_PROGRESSBAR:
                 case SKIN_TOKEN_PEAKMETER_LEFT:
                 case SKIN_TOKEN_PEAKMETER_RIGHT:

apps/gui/skin_engine/skin_render.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id: skin_parser.c 26752 2010-06-10 21:22:16Z bieber $
  *
  * Copyright (C) 2010 Jonathan Gordon
  *
@@ -84,8 +83,6 @@ static void skin_render_playlistviewer(struct playlistviewer* viewer,
                                        unsigned long refresh_type);
 
 static char* skin_buffer;
-static bool defer_rendering;
-static bool dirty[NB_SCREENS];
 
 static inline struct skin_element*
 get_child(OFFSETTYPE(struct skin_element**) children, int child)
@@ -230,6 +227,7 @@ static bool do_non_text_tags(struct gui_wps *gwps, struct skin_draw_info *info,
         case SKIN_TOKEN_PLAYLIST_PERCENTBAR:
         case SKIN_TOKEN_SETTINGBAR:
         case SKIN_TOKEN_PROGRESSBAR:
+        case SKIN_TOKEN_PLAYLIST_PROGRESSBAR:
         case SKIN_TOKEN_TUNER_RSSI_BAR:
         case SKIN_TOKEN_LIST_SCROLLBAR:
         {
@@ -843,29 +841,6 @@ void skin_render_viewport(struct skin_element* viewport, struct gui_wps *gwps,
     wps_display_images(gwps, &skin_viewport->vp);
 }
 
-void skin_defer_rendering(bool deferred)
-{
-    defer_rendering = deferred;
-}
-
-void skin_render_deferred(struct screen *display, struct viewport *vp)
-{
-    if (defer_rendering)
-        return;
-
-    if (dirty[display->screen_type])
-    {
-        dirty[display->screen_type] = false;
-        display->set_viewport(NULL);
-        display->update();
-    }
-    else
-    {
-        display->set_viewport(vp);
-        display->update_viewport();
-    }
-}
-
 void skin_render(struct gui_wps *gwps, unsigned refresh_mode)
 {
     const int vp_is_appearing = (VP_DRAW_WASHIDDEN|VP_DRAW_HIDEABLE);
@@ -957,19 +932,14 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode)
     skin_backdrop_show(data->backdrop_id);
 #endif
 
-    dirty[display->screen_type] = defer_rendering;
     if (((refresh_mode&SKIN_REFRESH_ALL) == SKIN_REFRESH_ALL))
     {
-        defer_rendering = true;
         /* If this is the UI viewport then let the UI know
          * to redraw itself */
         send_event(GUI_EVENT_NEED_UI_UPDATE, NULL);
-        defer_rendering = dirty[display->screen_type];
     }
     /* Restore the default viewport */
     display->set_viewport_ex(NULL, VP_FLAG_VP_SET_CLEAN);
-    if (!defer_rendering)
-        display->update();
 }
 
 static __attribute__((noinline))

apps/gui/skin_engine/skin_tokens.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002-2007 Björn Stenberg
  * Copyright (C) 2007-2008 Nicolas Pennequin
@@ -42,10 +41,15 @@
 #include "misc.h"
 #include "led.h"
 #include "peakmeter.h"
+#include "splash.h"
 /* Image stuff */
 #include "albumart.h"
 #include "playlist.h"
 #include "playback.h"
+#include "metadata.h"
+#include "crc32.h"
+#include "file.h"
+#include "core_alloc.h"
 #include "tdspeed.h"
 #include "viewport.h"
 #include "tagcache.h"
@@ -69,6 +73,10 @@
 #include "option_select.h"
 #include "wps.h"
 
+#if (CONFIG_STORAGE & STORAGE_ATA)
+#include "ata.h" /* ata_disk_isssd() */
+#endif
+
 #define NOINLINE __attribute__ ((noinline))
 
 static const char* get_codectype(const struct mp3entry* id3)
@@ -199,6 +207,167 @@ const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
     return NULL;
 }
 
+/* Whole-playlist progress by time (%pX). if track count exceeds MAX_TRACKS
+ * the tag falls back to position-based progress.
+ * The cache is keyed on the track count and a crc of the
+ * first, middle and last filenames, so a playlist change, same-length swap,
+ * or reshuffle causes a reload of the length data. */
+#define PLPCT_MAX_TRACKS 500
+
+static struct {
+    uint32_t sig;           /* signature of the playlist to detect changed playlist or reshuffle*/
+    int amount;
+    bool nomem;             /* allocation failed -> position fallback */
+    bool enabled;           /* tag was parsed */
+    uint16_t track_mins[PLPCT_MAX_TRACKS];
+    unsigned long total_min;
+} plpct = { .amount = -1, .enabled = false };
+
+static uint32_t plpct_sig(void)
+{
+    struct playlist_info *pl = playlist_get_current();
+    /* changes on any playlist swap or reshuffle */
+    return pl->seed ^ pl->first_index ^ pl->amount ^ pl->last_insert_pos ^ pl->dirlen
+           ^ pl->created_tick ^ pl->max_playlist_size ^ pl->last_shuffled_start;
+}
+
+/* Equal-weight estimate (every track the same length)
+     scaled by 1000 as %pX is percent-only. */
+static void plpct_estimate(const struct mp3entry *id3, unsigned long elapsed_ms,
+                           int index, int amount,
+                           unsigned long *elapsed_s, unsigned long *total_s)
+{
+    unsigned long frac = 0;  /* 0..1000 through the current track */
+    if (id3->length)
+        frac = MIN(1000UL, 1000UL * elapsed_ms / id3->length);
+    *elapsed_s = (unsigned long)(index - 1) * 1000 + frac;
+    *total_s   = (unsigned long)amount * 1000;
+}
+
+void wps_playlist_percent_enable(void)
+{
+    plpct.enabled = true;
+}
+
+void wps_playlist_percent_prepare(void)
+{
+    if (!plpct.enabled)
+        return;
+
+    plpct.nomem = true;
+
+    int amount = playlist_amount();
+    plpct.sig = plpct_sig();
+    plpct.amount = amount;
+    if (amount <= 0 || amount > PLPCT_MAX_TRACKS) /* too many tracks abort */
+    {
+        return;
+    }
+
+    struct playlist_track_info info;
+
+    struct mp3entry *tmp = get_temp_mp3entry(NULL); /* shared scratch */
+
+    if (!tmp)
+        return;
+#if (CONFIG_STORAGE & STORAGE_ATA) /* Harddrive estimate length based on filesize */
+    unsigned int last_afmt = AFMT_UNKNOWN;
+    uint32_t last_bps = 0;
+#endif
+    for (int n = 0; n < amount; n++)
+    {
+        unsigned long secs = 0;
+        uint16_t mins = 0;
+        if (playlist_get_track_info(NULL, n, &info) < 0) /* couldn't get track filename abort */
+            goto abort;
+
+        int slot = info.display_index - 1;
+        if (slot < 0 || slot >= amount)
+            goto abort;
+
+#if (CONFIG_STORAGE & STORAGE_ATA) /* Harddrive */
+        int fd = open(info.filename, O_RDONLY);
+        if (fd >= 0)
+        {
+            unsigned int afmt = probe_file_format(info.filename);
+            off_t size = filesize(fd);
+
+            if (size > 0)
+            {
+                if (afmt != last_afmt || last_bps == 0
+                    || amount <= 50 || (amount <= 250 && ata_disk_isssd())) // TODO tune this for harddisk devices
+                {
+                    if (get_metadata_afmt(tmp, fd, info.filename, afmt,
+                        METADATA_EXCLUDE_ID3_PATH | METADATA_EXCLUDE_NORMALIZE))
+                    {
+                        secs = tmp->length / 1000;
+                        last_bps = (uint32_t)((uint64_t)size * 1000 / tmp->length);
+                        last_afmt = afmt;
+                    }
+                }
+                else /* file size only -- no per-track metadata parse */
+                {
+                    secs = (unsigned long)((uint64_t)size / last_bps);
+                }
+                mins = MIN(MAX(1, (secs + 30) / 60), 65535ul);/* minutes, rounded to nearest */
+            }
+            close(fd);
+        }
+#else
+        if (get_metadata_ex(tmp, -1, info.filename,
+                            METADATA_EXCLUDE_ID3_PATH | METADATA_EXCLUDE_NORMALIZE))
+        {
+            secs = tmp->length / 1000;
+            mins = MIN(MAX(1, (secs + 30) / 60), 65535ul);/* minutes, rounded to nearest */
+        }
+#endif
+        /* unreadable tracks count as zero length */
+        plpct.track_mins[slot] = mins;
+    }
+
+    plpct.total_min = 0;
+    for (int t = 0; t < plpct.amount; t++)
+        plpct.total_min += plpct.track_mins[t];
+    plpct.nomem = false;
+abort:
+    get_temp_mp3entry(tmp); /* release scratch */
+}
+
+bool wps_get_playlist_percent(struct mp3entry *id3, unsigned long elapsed_ms,
+                              unsigned long *elapsed_s, unsigned long *total_s)
+{
+    int amount = playlist_amount();
+    int index = playlist_get_display_index();  /* 1-based */
+
+    if (!id3 || amount <= 0 || index < 1 || index > amount)
+        return false;
+
+    uint32_t sig = plpct_sig();
+    if (amount != plpct.amount || sig != plpct.sig)
+    {
+        splashf(0, ID2P(LANG_WAIT));
+        wps_playlist_percent_enable();
+        wps_playlist_percent_prepare();
+    }
+    /* error parsing playlist or more than MAX_TRACKS fall back to
+       position-based progress rather than blank */
+    if (plpct.nomem)
+    {
+        plpct_estimate(id3, elapsed_ms, index, amount, elapsed_s, total_s);
+        return true;
+    }
+
+    unsigned long before_min = 0;
+    for (int t = 0; t < index - 1; t++)
+        before_min += plpct.track_mins[t];
+
+    *elapsed_s = before_min * 60 + elapsed_ms / 1000;
+    *total_s = plpct.total_min * 60;
+    if (*elapsed_s > *total_s)
+        *elapsed_s = *total_s;
+    return true;
+}
+
 static const char* get_filename_token(struct wps_token *token, char* filename,
                                char *buf, int buf_size)
 {
@@ -334,6 +503,24 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
                 snprintf(buf, buf_size, "%lu", 100 * elapsed / length);
                 return buf;
 
+            case SKIN_TOKEN_PLAYLIST_ELAPSED_PERCENT:
+            {
+                unsigned long pl_elapsed, pl_total;
+                if (!wps_get_playlist_percent(id3, elapsed,
+                                              &pl_elapsed, &pl_total)
+                    || pl_total == 0)
+                    return NULL;
+
+                /* %pX always yields a value for a valid playlist now (the
+                   equal-weight estimate until the scan finishes, then the exact
+                   time-weighted figure), so it behaves like any percent tag;
+                   %?pX<...> is true whenever the tag applies (a sized playlist). */
+                if (intval && limit == TOKEN_VALUE_ONLY)
+                    *intval = 100 * pl_elapsed / pl_total;
+                snprintf(buf, buf_size, "%lu", 100 * pl_elapsed / pl_total);
+                return buf;
+            }
+
             case SKIN_TOKEN_TRACK_STARTING:
                 {
                     unsigned long time = token->value.i * (HZ/TIMEOUT_UNIT);
@@ -510,7 +697,7 @@ const char *get_radio_token(struct wps_token *token, int preset_offset,
             if (preset < 0)
                 preset += preset_count;
             if (token->type == SKIN_TOKEN_PRESET_NAME)
-                snprintf(buf, buf_size, "%s", radio_get_preset_name(preset));
+                radio_get_preset_name(preset, buf, buf_size);
             else if (token->type == SKIN_TOKEN_PRESET_FREQ)
                 format_freq_MHz(radio_get_preset_freq(preset),
                                 region_data->freq_step, buf, buf_size);

apps/gui/skin_engine/skin_touchsupport.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 - Jonathan Gordon
  *
@@ -204,24 +203,11 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
         if (!gwps->id3)
             break;
 
-        if (gevent.id == GESTURE_HOLD ||
+        audio_pre_ff_rewind();
-            gevent.id == GESTURE_DRAGSTART ||
+        gwps->id3->elapsed = gwps->id3->length / 1000 * (*edge_offset);
-            gevent.id == GESTURE_DRAG)
-        {
-            audio_pre_ff_rewind();
-            gwps->id3->elapsed = gwps->id3->length * (*edge_offset) / 1000;
-        }
-        else if (gevent.id == GESTURE_RELEASE)
-        {
-            audio_ff_rewind(gwps->id3->elapsed);
-        }
-        else
-        {
-            gwps->id3->elapsed = gwps->id3->length * (*edge_offset) / 1000;
-            audio_pre_ff_rewind();
-            audio_ff_rewind(gwps->id3->elapsed);
-        }
 
+        if (gevent.id == GESTURE_TAP || gevent.id == GESTURE_RELEASE)
+            audio_ff_rewind(gwps->id3->elapsed);
     } break;
 
     case ACTION_TOUCH_VOLUME:

apps/gui/skin_engine/wps_internals.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2007 Nicolas Pennequin
  *
@@ -429,6 +428,12 @@ const char *get_cuesheetid3_token(struct wps_token *token, struct mp3entry *id3,
                                   int offset_tracks, char *buf, int buf_size);
 const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
                           char *filename, char *buf, int buf_size, int limit, int *intval);
+/* whole-playlist progress backing %pX (number and bar forms) */
+bool wps_get_playlist_percent(struct mp3entry *id3, unsigned long elapsed_ms,
+                              unsigned long *elapsed_s, unsigned long *total_s);
+void wps_playlist_percent_enable(void);
+void wps_playlist_percent_prepare(void);
+
 #if CONFIG_TUNER
 const char *get_radio_token(struct wps_token *token, int preset_offset,
                             char *buf, int buf_size, int limit, int *intval);

apps/gui/splash.c

@@ -5,9 +5,9 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Daniel Stenberg (2002)
+ * Copyright (C) William Wilgus (2026)
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -39,109 +39,235 @@
 static long progress_next_tick, talked_tick;
 
 #define MAXLINES  (LCD_HEIGHT/6)
-#define MAXBUFFER 512
+
+
+#ifndef BOOTLOADER
+#if MEMORYSIZE > 8
+    #define MAXBUFFER MAX(1024, (LCD_WIDTH/SYSFONT_WIDTH) * MAXLINES + 1)
+#else
+    #define MAXBUFFER MAX(512, (LCD_WIDTH/SYSFONT_WIDTH) * MAXLINES + 1)
+#endif
+#else
+    #define MAXBUFFER (512)
+#endif
+
 #define RECT_SPACING 3
 #define SPLASH_MEMORY_INTERVAL (HZ)
 
+/* splash_internal does the actual drawing of the splash box and text
+ * each call to splash remembers the max size and will not shrink the splash box
+ * until it is reset by an activity change or \f at the beginning of a string
+ *
+ * splash supports several escape sequences ("\n\t\f\r\v\b")
+ * '\n' (new line) indicates the end of a line of text and starts a new one
+ *  ("\n\n" will end a line and create a blank line)
+ *  '\n' as the first character of the text will create a blank line
+ *
+ * '\t' (tab) starts a new line and adds several spaces to the beginning of the
+ *  new line it also left/right justifies the splash text box
+ *  (RTL languages will right justify)
+ * '\t' as the last character of the text will left/right justify
+ *  without adding any tabs to the text output
+ *
+ * '\f' (form feed) as the first character of the text will reset the text box
+ *  width and height
+ *
+ * Others:
+ * '\f', \r', '\v' '\b' will be treated as a breaking space character
+ *  they will not be displayed as output and multiple sequences will be
+ *  treated as a single character
+ *  eg. "\b\v\f\r" will break the line but only once and will not show as a space
+ *  where as "\n\n" will break a line and add a blank line
+ *  "\t\t" would break a line and add a total of 4 spaces to the next line
+*/
 static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
                             struct viewport *vp, int addl_lines)
 {
-    static int max_width[NB_SCREENS] = {2*RECT_SPACING};
+    static const char matchstr[] = "\r\n\f\v\t\b";
+    static int max_width[NB_SCREENS] = {0};
+    static int max_height[NB_SCREENS] = {0};
 #ifndef BOOTLOADER
+    static char splash_buf[MAXBUFFER] = {0};
     static enum current_activity last_act = ACTIVITY_UNKNOWN;
     enum current_activity act = get_current_activity();
 
-    if (last_act != act) /* changed activities reset max_width */
+    if (last_act != act) /* changed activities reset width / height */
     {
         FOR_NB_SCREENS(i)
-            max_width[i] = 2*RECT_SPACING;
+        {
+            max_width[i] = 0;
+            max_height[i] = 0;
+        }
         last_act = act;
     }
+#else /*def BOOTLOADER*/
+    char splash_buf[MAXBUFFER] = {0}; /* on the stack for the bootloader */
 #endif
-    /* prevent screen artifacts by keeping the max width seen */
+
-    int min_width = max_width[screen->screen_type];
-    char splash_buf[MAXBUFFER];
     struct splash_lines {
         const char *str;
-        size_t len;
+        uint16_t x;
+        uint16_t len;
     } lines[MAXLINES];
-    const char *next;
+    memset(lines, 0, sizeof(lines));
-    const char *lastbreak = NULL;
+
-    const char *store = NULL;
+    char *buf = splash_buf;
+    const char *next, *store;
+
+    bool has_tabs = false;
     int line = 0;
-    int x = 0;
+    int x = 0, w = 0;
-    int y, i;
+    int y;
-    int space_w, w, chr_h;
+    int space_w, chr_h;
-    int width, height;
+    int width = vp->width - RECT_SPACING*2;
-    int maxw = min_width - 2*RECT_SPACING;
+    int height = vp->height;
+
+    /* prevent screen artifacts by keeping the max width / height seen */
+    int maxw = max_width[screen->screen_type];
+    int maxh = max_height[screen->screen_type];
     int fontnum = vp->font;
 
-    char lastbrkchr;
+    size_t next_len;
-    size_t len, next_len;
-    const char matchstr[] = "\r\n\f\v\t ";
-    font_getstringsize(" ", &space_w, &chr_h, fontnum);
-    y = chr_h + (addl_lines * chr_h);
 
-    vsnprintf(splash_buf, sizeof(splash_buf), fmt, ap);
+    font_getstringsize(" ", &space_w, &chr_h, fontnum);
+    y = (addl_lines * chr_h);
+
+    int res = vsnprintf(splash_buf, sizeof(splash_buf), fmt, ap);
     va_end(ap);
 
-    /* break splash string into display lines, doing proper word wrap */
+    if (res <= 0 || width < space_w || height < chr_h)
-    next = strptokspn_r(splash_buf, matchstr, &next_len, &store);
-    if (!next)
-        return false; /* nothing to display */
-
-    lines[line].len = next_len;
-    lines[line].str = next;
-    while (true)
     {
-        w = font_getstringnsize(next, next_len, NULL, NULL, fontnum);
+#ifdef SIMULATOR
-        if (lastbreak)
+        if (res <= 0)
+            printf("ERROR: %s %d\n", __func__, res);
+        else
+            printf("WARNING: %s vp too small\n", __func__);
+#endif
+        return false; /* nothing to display */
+    }
+
+    const char *lastbreak = splash_buf;
+    if (*lastbreak == '\f') /* only as first character - Reset splash box size */
+    {
+        maxw = 0;
+        maxh = 0;
+    }
+
+    while(true) /* break splash string into display lines, doing proper word wrap */
+    {
+#ifndef BOOTLOADER
+        while (*lastbreak != '\0') /* handle escape chars*/
         {
-            len = next - lastbreak;
+            switch (*lastbreak) /* all chars in matchstr */
-            int next_w = len * space_w;
-            if (x + next_w + w > vp->width - RECT_SPACING*2 || lastbrkchr != ' ')
-            {   /* too wide, or control character wrap */
-                if (x > maxw)
-                    maxw = x;
-                if ((y + chr_h * 2 > vp->height) || (line >= (MAXLINES-1)))
-                    break;  /* screen full or out of lines */
-                x = 0;
-                y += chr_h;
-
-                /* split when it fits since we didn't find a valid token to break on */
-                size_t nl = next_len;
-                while (w > vp->width && --nl > 0)
-                    w = font_getstringnsize(next, nl, NULL, NULL, fontnum);
-
-                if (nl > 1 && nl != next_len)
-                {
-                    next_len = nl;
-                    store = next + nl; /* move the start pos for the next token read */
-                }
-
-                lines[++line].len = next_len;
-                lines[line].str = next;
-            }
-            else
             {
-                /*  restore & calculate spacing */
+                case '\t': /*fallthrough*/
-                lines[line].len += next_len + 1;
+                    has_tabs = true; /* left justify (right justify for RTL)*/
-                x += next_w;
+                case '\n':
+                {
+                    if (lines[line].len > 0 || *lastbreak != '\t')
+                    {
+                        x += w;
+                        if (x > maxw)
+                            maxw = x;
+
+                        x = 0;
+                        y += chr_h;
+                        if (y >= height || line >= MAXLINES-1)
+                        {
+                            break;  /* out of lines */
+                        }
+                        line++;
+                    }
+                    /* /t as last char left justifies only */
+                    if (lastbreak[0] == '\t' && lastbreak[1] != '\0')
+                    {
+                        /* add offset for tab */
+                        lines[line].x += space_w * 2;
+                        x += space_w * 2;
+                    }
+                    break;
+                }
+                case '\b': /*fallthrough*/
+                case '\f': /*fallthrough*/
+                case '\v': /*fallthrough*/
+                case '\r':
+                    break; /* acts the same as a space character */
+                default: /* No valid break chars */
+                    lastbreak = " "; /* exit */
+                    break;
             }
+            lastbreak++;
         }
-        x += w;
+#endif
-
+        if (lines[line].len > 0)
-        lastbreak = next + next_len;
+        {
-        lastbrkchr = *lastbreak;
+            x += w;
-
-        next = strptokspn_r(NULL, matchstr, &next_len, &store);
-
-        if (!next)
-        {   /* no more words */
             if (x > maxw)
                 maxw = x;
+            x = 0;
+            y += chr_h;
+            if (y >= height || line >= MAXLINES-1)
+            {
+                if (y > maxh)
+                    maxh = y;
+                break;  /* out of lines */
+            }
+            line++;
+        }
+
+        next = strptokspn_r(buf, matchstr, &next_len, &store);
+
+        if (!next)
+        {
+            x += w;
+            if (x > maxw)
+                maxw = x;
+            if (y > maxh)
+                maxh = y;
             break;
         }
+        buf = NULL; /* uses store for continuation */
+
+        lines[line].str = next;
+        lines[line].len = next_len;
+
+        w = font_getstringnsize(next, next_len, NULL, NULL, fontnum);
+        if (w > width)
+        {
+            const char *nxp, *nx = next;
+            int nw, newlen;
+            int oldlen = next_len;
+
+            while (nx - next < oldlen) /* try to split at a space char */
+            {
+                nxp = nx;
+                nx++;
+                if (*nxp != ' ' && *nx != '\0') /* split on space or EOL */
+                    continue;
+                newlen = nxp - next;
+                nw = font_getstringnsize(next, newlen, NULL, NULL, fontnum);
+
+                if (nw > width)
+                {
+                    /* is next word larger than max width & room left on this line? */
+                    if (nw - w > width && w + space_w * 8 < width)
+                        w = nw;
+                    break;
+                }
+                w = nw;
+                next_len = newlen;
+                store = nx; /* we want to skip the space char */
+            }
+            if (w > width) /* split when it fits */
+            {
+                w = width;
+                next_len = font_measurestring(next, oldlen, w, &w, NULL, fontnum);
+                store = next + next_len;
+            }
+
+            lines[line].len = next_len;
+        }
+        lastbreak = next + next_len;
     }
 
     /* prepare viewport
@@ -151,22 +277,25 @@ static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
     screen->scroll_stop();
 
     width = maxw + 2*RECT_SPACING;
-    height = y + 2*RECT_SPACING;
+    height = maxh + 2*RECT_SPACING;
 
     if (width > vp->width)
         width = vp->width;
     if (height > vp->height)
         height = vp->height;
 
+    /* center the vp in the screen area */
     vp->x += (vp->width - width) / 2;
     vp->y += (vp->height - height) / 2;
     vp->width = width;
     vp->height = height;
+    if (!has_tabs)
+        vp->flags |=  VP_FLAG_ALIGN_CENTER;
 
-    /* prevent artifacts by locking to max width observed on repeated calls */
+    /* prevent artifacts by locking to max width & height observed on repeated calls */
-    max_width[screen->screen_type] = width;
+    max_width[screen->screen_type] = width - 2*RECT_SPACING;
+    max_height[screen->screen_type] = height - 2*RECT_SPACING;
 
-    vp->flags |=  VP_FLAG_ALIGN_CENTER;
 #if LCD_DEPTH > 1
     unsigned fg = 0, bg = 0;
     bool broken = false;
@@ -203,11 +332,22 @@ static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
 
     screen->draw_border_viewport();
 
+    /* center y within the available splash box */
+    if (y < maxh)
+        y = (maxh - y) / 2;
+    else
+        y = RECT_SPACING;
+
     /* print the message to screen */
-    for(i = 0, y = RECT_SPACING; i <= line; i++, y+= chr_h)
+    for(int i = 0; i < line && y < height; i++, y+= chr_h)
     {
-        screen->putsxyf(0, y, "%.*s", lines[i].len, lines[i].str);
+        if (lines[i].len > 0)
+        {
+            x = lines[i].x;
+            screen->putsxyf(x, y, "%.*s", lines[i].len, lines[i].str);
+        }
     }
+
     return true; /* needs update */
 }
 

apps/gui/splash.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *
@@ -29,6 +28,9 @@
  * Puts a splash message centered on all the screens for a given period
  *  - ticks : how long the splash is displayed (in rb ticks)
  *  - fmt : what to say *printf style
+ *  /f at the beginning of a string will reset the max width and height seen
+ *  /n will end a line /n/n will add a blank line
+ *  /t will start a new line and indent the string on that line
  */
 extern void splashf(int ticks, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
 

apps/gui/statusbar-skinned.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Thomas Martitz
  *

apps/gui/statusbar-skinned.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2009 Thomas Martitz
  *

apps/gui/statusbar.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) Robert E. Hak (2002), Linus Nielsen Feltzing (2002)
  *

apps/gui/statusbar.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/gui/usb_screen.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *
@@ -53,55 +52,63 @@
 #include "ata_mmc.h"
 #endif
 
-#ifdef USB_ENABLE_HID
+struct usb_screen_vps_t
-int usb_keypad_mode;
-static bool usb_hid;
-#endif
-
-#ifndef SIMULATOR
-
-static int handle_usb_events(void)
 {
-#if (CONFIG_STORAGE & STORAGE_MMC)
+    struct viewport parent;
-    int next_update=0;
+    struct viewport logo;
-#endif /* STORAGE_MMC */
+#ifndef USB_ENABLE_HID
+};
+#else
+    struct viewport title;
+};
 
-    /* Don't return until we get SYS_USB_DISCONNECTED or SYS_TIMEOUT */
+int usb_keypad_mode;
+static void draw_usb_keypad_mode(struct viewport *title)
+{
+    struct screen *screen = &screens[SCREEN_MAIN];
+    struct viewport *last_vp = screen->set_viewport(title);
+    screen->clear_viewport();
+    title->flags |= VP_FLAG_ALIGN_CENTER;
+    if (title->width > 1)
+        screen->puts_scroll(0, 0, str(keypad_mode_name_get(usb_keypad_mode)));
+    screen->set_viewport(last_vp);
+}
+#endif /* USB_ENABLE_HID */
+
+static void handle_usb_events(struct viewport *title)
+{
+#if (CONFIG_STORAGE & STORAGE_MMC) && !defined(SIMULATOR)
+    int next_update = 0;
+#endif /* STORAGE_MMC */
+    int button;
+
+    /* Don't return until we get SYS_USB_DISCONNECTED */
     while(1)
     {
-        int button;
+#ifndef USB_ENABLE_HID
-#ifdef USB_ENABLE_HID
+        (void)title;
-        if (usb_hid)
+#else
+        if (global_settings.usb_hid)
         {
             button = get_hid_usb_action();
-
-            /* On mode change, we need to refresh the screen */
             if (button == ACTION_USB_HID_MODE_SWITCH_NEXT ||
-                    button == ACTION_USB_HID_MODE_SWITCH_PREV)
+                button == ACTION_USB_HID_MODE_SWITCH_PREV)
-            {
+                draw_usb_keypad_mode(title);
-                break;
-            }
         }
         else
 #endif
         {
-            button = button_get_w_tmo(HZ/2);
             /* hid emits the event in get_action */
             send_event(GUI_EVENT_ACTIONUPDATE, NULL);
+            button = button_get_w_tmo(HZ/2);
         }
+        if (button == SYS_USB_DISCONNECTED)
+            return;
+        if (button == SYS_CHARGER_DISCONNECTED)
+            reset_runtime();
 
-        switch(button)
+/* USB-MMC bridge can report activity */
-        {
+#if (CONFIG_STORAGE & STORAGE_MMC) && !defined(SIMULATOR)
-            case SYS_USB_DISCONNECTED:
-                return 1;
-            case SYS_CHARGER_DISCONNECTED:
-                reset_runtime();
-                break;
-            case SYS_TIMEOUT:
-                break;
-        }
-
-#if (CONFIG_STORAGE & STORAGE_MMC) /* USB-MMC bridge can report activity */
         if(TIME_AFTER(current_tick,next_update))
         {
             if(usb_inserted()) {
@@ -111,21 +118,7 @@ static int handle_usb_events(void)
         }
 #endif /* STORAGE_MMC */
     }
-
-    return 0;
 }
-#endif /* SIMULATOR */
-
-#define MODE_NAME_LEN 32
-
-struct usb_screen_vps_t
-{
-    struct viewport parent;
-    struct viewport logo;
-#ifdef USB_ENABLE_HID
-    struct viewport title;
-#endif
-};
 
 static void usb_screen_fix_viewports(struct screen *screen,
         struct usb_screen_vps_t *usb_screen_vps)
@@ -178,7 +171,7 @@ static void usb_screen_fix_viewports(struct screen *screen,
     logo->height = logo_height;
 
 #ifdef USB_ENABLE_HID
-    if (usb_hid)
+    if (global_settings.usb_hid)
     {
         struct viewport *title = &usb_screen_vps->title;
         int char_height = font_get(parent->font)->height;
@@ -211,11 +204,9 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
         &bm_remote_usblogo,
 #endif
     };
-
     FOR_NB_SCREENS(i)
     {
         struct screen *screen = &screens[i];
-
         struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i];
         struct viewport *parent = &usb_screen_vps->parent;
         struct viewport *logo = &usb_screen_vps->logo;
@@ -223,29 +214,14 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
         last_vp = screen->set_viewport(parent);
         screen->clear_viewport();
         screen->backlight_on();
-
         screen->set_viewport(logo);
         screen->bmp(logos[i], 0, 0);
-        if (i == SCREEN_MAIN)
-        {
-#ifdef USB_ENABLE_HID
-            if (usb_hid)
-            {
-                char modestring[100];
-                screen->set_viewport(&usb_screen_vps->title);
-                usb_screen_vps->title.flags |= VP_FLAG_ALIGN_CENTER;
-                snprintf(modestring, sizeof(modestring), "%s: %s",
-                        str(LANG_USB_KEYPAD_MODE),
-                        str(keypad_mode_name_get(usb_keypad_mode)));
-                screen->puts_scroll(0, 0, modestring);
-            }
-#endif /* USB_ENABLE_HID */
-        }
-        screen->set_viewport(parent);
-
         screen->set_viewport(last_vp);
-        screen->update_viewport();
     }
+#ifdef USB_ENABLE_HID
+    if (global_settings.usb_hid)
+        draw_usb_keypad_mode(&usb_screen_vps_ar[SCREEN_MAIN].title);
+#endif
 }
 
 void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
@@ -258,6 +234,7 @@ void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
 #endif
 
     struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS];
+    struct viewport *title = NULL;
 #if defined HAVE_TOUCHSCREEN
     enum touchscreen_mode old_mode = touchscreen_get_mode();
 
@@ -269,8 +246,10 @@ void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
     push_current_activity(ACTIVITY_USBSCREEN);
 
 #ifdef USB_ENABLE_HID
-    usb_hid = global_settings.usb_hid;
     usb_keypad_mode = global_settings.usb_keypad_mode;
+    title = &usb_screen_vps_ar[SCREEN_MAIN].title;
+#else
+    title = NULL;
 #endif
 
     FOR_NB_SCREENS(i)
@@ -296,33 +275,13 @@ void gui_usb_screen_run(bool early_usb, intptr_t seqnum)
         /* The font system leaves the .fnt fd's open, so we need for force close them all */
         font_disable_all();
     }
-
     usb_acknowledge(SYS_USB_CONNECTED_ACK, seqnum);
-
+    usb_screens_draw(usb_screen_vps_ar);
-    while (1)
+    handle_usb_events(title);
-    {
-        usb_screens_draw(usb_screen_vps_ar);
-#ifdef SIMULATOR
-        if (button_get_w_tmo(HZ/2))
-            break;
-        send_event(GUI_EVENT_ACTIONUPDATE, NULL);
-#else
-        if (handle_usb_events())
-            break;
-#endif /* SIMULATOR */
-    }
-
-    FOR_NB_SCREENS(i)
-    {
-        const struct viewport* vp = NULL;
 
 #if defined(USB_ENABLE_HID)
-        vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL;
+    if (global_settings.usb_hid)
-#endif
+        screens[SCREEN_MAIN].scroll_stop_viewport(title);
-        if (vp)
-            screens[i].scroll_stop_viewport(vp);
-    }
-#ifdef USB_ENABLE_HID
     if (global_settings.usb_keypad_mode != usb_keypad_mode)
     {
         global_settings.usb_keypad_mode = usb_keypad_mode;

apps/gui/usb_screen.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *

apps/gui/viewport.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *
@@ -83,7 +82,7 @@ static void evt_toggle(bool enable, unsigned short id,
 
 static void toggle_events(bool enable)
 {
-    evt_toggle(enable, GUI_EVENT_ACTIONUPDATE, viewportmanager_redraw);
+    evt_toggle(enable, GUI_EVENT_ACTIONREDRAW, viewportmanager_redraw);
     evt_toggle(enable, PLAYBACK_EVENT_TRACK_CHANGE, do_sbs_update_callback);
     evt_toggle(enable, PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, do_sbs_update_callback);
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
@@ -113,14 +112,14 @@ static void toggle_theme(enum screen_type screen, bool force)
         if (!sb_get_persistent_title(i))
             sb_set_title_text(NULL, Icon_NOICON, i);
     }
+    skinlist_set_cfg(screen, NULL);
     toggle_events(enable_event);
 
     if (is_theme_enabled(screen))
     {
         last_vp = screens[screen].set_viewport(NULL);
         bool first_boot = theme_stack_top[screen] == 0;
-        /* remove the left overs from the previous screen.
+        /* Remove the left overs from the previous screen */
-         * could cause a tiny flicker. Redo your screen code if that happens */
 #ifdef HAVE_BACKDROP_IMAGE
         skin_backdrop_show(sb_get_backdrop(screen));
 #endif
@@ -154,9 +153,7 @@ static void toggle_theme(enum screen_type screen, bool force)
         }
         intptr_t force = first_boot?0:1;
 
-        skin_defer_rendering(true);
+        send_event(GUI_EVENT_ACTIONREDRAW, (void*)force);
-        send_event(GUI_EVENT_ACTIONUPDATE, (void*)force);
-        skin_defer_rendering(false);
         if (!first_boot)
             sb_skin_force_next_update();
     }
@@ -166,7 +163,7 @@ static void toggle_theme(enum screen_type screen, bool force)
         screens[screen].backdrop_show(NULL);
 #endif
         screens[screen].scroll_stop();
-        skinlist_set_cfg(screen, NULL);
+        skin_is_dirty(screen); /* remove dirty flag */
     }
     /* let list initialize viewport in case viewport dimensions is changed. */
     send_event(GUI_EVENT_THEME_CHANGED, NULL);
@@ -219,10 +216,16 @@ static void viewportmanager_redraw(unsigned short id, void* data)
 {
     (void)id;
     FOR_NB_SCREENS(i)
-    {
         if (is_theme_enabled(i))
             sb_skin_update(i, NULL != data);
-    }
+}
+
+static void viewportmanager_update(unsigned short id, void* data)
+{
+    viewportmanager_redraw(id, data);
+    FOR_NB_SCREENS(i)
+        if (skin_is_dirty(i))
+            screens[i].update();
 }
 
 void viewportmanager_init(void)
@@ -233,6 +236,7 @@ void viewportmanager_init(void)
         /* We always want the theme enabled by default... */
         viewportmanager_theme_enable(i, true, NULL);
     }
+    add_event(GUI_EVENT_ACTIONUPDATE, viewportmanager_update);
 }
 
 void viewportmanager_theme_changed(const int which)

apps/gui/viewport.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2008 by Jonathan Gordon
  *

apps/gui/wps.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Jerome Kuptz
  *
@@ -533,11 +532,7 @@ static void gwps_leave_wps(bool theme_enabled)
                viewports drawn by the WPS. May need further thought... */
             struct wps_data *sbs = skin_get_gwps(CUSTOM_STATUSBAR, i)->data;
             if (gwps->data->use_extra_framebuffer && sbs->use_extra_framebuffer)
-            {
-                skin_defer_rendering(true);
                 skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
-                skin_defer_rendering(false);
-            }
 #endif
             viewportmanager_theme_undo(i, skin_has_sbs(gwps));
         }
@@ -599,11 +594,7 @@ static void gwps_enter_wps(bool theme_enabled)
         skin_backdrop_show(gwps->data->backdrop_id);
 #endif
         display->clear_display();
-        if (skin_has_sbs(gwps))
-            skin_defer_rendering(true);
         skin_update(WPS, i, SKIN_REFRESH_ALL);
-        skin_defer_rendering(false);
-
     }
 #ifdef HAVE_TOUCHSCREEN
     gwps = skin_get_gwps(WPS, SCREEN_MAIN);
@@ -611,7 +602,7 @@ static void gwps_enter_wps(bool theme_enabled)
     if (gwps->data->touchregions < 0)
         touchscreen_set_mode(TOUCHSCREEN_BUTTON);
 #endif
-    /* force statusbar/skin update since we just cleared the whole screen */
+     /* Screen was cleared, so redraw SBS if enabled, and update screen */
     send_event(GUI_EVENT_ACTIONUPDATE, (void*)1);
 }
 
@@ -806,9 +797,10 @@ long gui_wps_show(void)
             case ACTION_WPS_HOTKEY:
             {
                 hotkey = true;
-                if (!global_settings.hotkey_wps)
+                int act = HK_CTX_GET(0, global_settings.context_wps);
+                if (act == HOTKEY_OFF)
                     break;
-                if (get_hotkey(global_settings.hotkey_wps)->flags & HOTKEY_FLAG_NOSBS)
+                if (get_hotkey(act)->flags & HOTKEY_FLAG_NOSBS)
                 {
                     /* leave WPS without re-enabling theme */
                     theme_enabled = false;
@@ -844,7 +836,7 @@ long gui_wps_show(void)
                 {
                     restore_theme();
                     theme_enabled = false;
-                    open_plugin_run(ID2P(LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN));
+                    open_plugin_run(ID2P(LANG_ONPLAY_MENU_TITLE));
                 }
 
                 restore = true;

apps/gui/wps.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2002 Björn Stenberg
  *

apps/gui/yesno.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/gui/yesno.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2005 by Kevin Ferrare
  *

apps/hosted/android/keyboard.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Jonathan Gordon
  *

apps/hosted/android/notification.c

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *

apps/hosted/android/notification.h

@@ -5,7 +5,6 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
- * $Id$
  *
  * Copyright (C) 2010 Thomas Martitz
  *