Added threaded background preview loading

So wait 'defer ms' (1sec currently) and move on your way, it'll load the preview in background
If you happen to stay put, it'll redraw once the preview is ready

diff --git a/deployment/etc/pandora/conf/mmenu.conf b/deployment/etc/pandora/conf/mmenu.conf
index 9a5291e..a96014b 100644 (file)
--- a/deployment/etc/pandora/conf/mmenu.conf
+++ b/deployment/etc/pandora/conf/mmenu.conf
@@ -8,6 +8,7 @@ font_ptsize             24
 pndrun                 /usr/pandora/scripts:./testdata/scripts # searchpath to locate "pnd_run.sh"; why aren't I looking in /etc/pandora/conf/apps for this?
 load_previews_now      0       # if >0, will try to load preview pics from pnds at boot time, not defer till later
 load_previews_later    1       # if >0, will try to load preview pics sometime (see defer_timer_ms as well)
+threaded_preview       1       # if 1, will try to load the preview in background, to avoid slowing up navigation
 loglevel               0       # 0 is debug, lots of crap; 3 is better, means 'errors only'. Output may screw up the wrapper!
 x11_present_sh         /bin/pidof X # command to invoke to determine if X11 is running or not; expects a number on X is present.
 desktop_apps           1       # search the pnd standard desktop searchpath for apps

diff --git a/minimenu/mmenu.conf b/minimenu/mmenu.conf
index 4291d86..ee32d17 100644 (file)
--- a/minimenu/mmenu.conf
+++ b/minimenu/mmenu.conf
@@ -8,6 +8,7 @@ font_ptsize             24
 pndrun                 /usr/pandora/scripts:./testdata/scripts # searchpath to locate "pnd_run.sh"; why aren't I looking in /etc/pandora/conf/apps for this?
 load_previews_now      0       # if >0, will try to load preview pics from pnds at boot time, not defer till later
 load_previews_later    0       # if >0, will try to load preview pics sometime (see defer_timer_ms as well)
+threaded_preview       1       # if 1, will try to load the preview in background, to avoid slowing up navigation
 loglevel               0       # 0 is debug, lots of crap; 3 is better, means 'errors only'. Output may screw up the wrapper!
 x11_present_sh         /bin/pidof X # command to invoke to determine if X11 is running or not; expects a number on X is present.
 desktop_apps           1       # search the pnd standard desktop searchpath for apps

diff --git a/minimenu/mmui.c b/minimenu/mmui.c
index 445ad2c..e764e00 100644 (file)
--- a/minimenu/mmui.c
+++ b/minimenu/mmui.c
@@ -10,6 +10,7 @@
 #include "SDL_ttf.h"
 #include "SDL_gfxPrimitives.h"
 #include "SDL_rotozoom.h"
+#include "SDL_thread.h"
 
 #include "pnd_conf.h"
 #include "pnd_logger.h"
@@ -29,6 +30,9 @@
  */
 SDL_Surface *sdl_realscreen = NULL;
 unsigned int sdl_ticks = 0;
+SDL_Thread *g_preview_thread = NULL;
+
+enum { sdl_user_ticker = 0, sdl_user_finishedpreview = 1 };
 
 /* app state
  */
@@ -745,22 +749,53 @@ void ui_process_input ( unsigned char block_p ) {
     case SDL_USEREVENT:
       // update something
 
-      if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.load_previews_later", 0 ) ) {
+      if ( event.user.code == sdl_user_ticker ) {
+
+       // timer went off, time to load something
+       if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.load_previews_later", 0 ) ) {
+
+         pnd_log ( pndn_debug, "Deferred preview pic load ----------\n" );
+
+         // load the preview pics now!
+         pnd_disco_t *iter = ui_selected -> ref;
+
+         if ( iter -> preview_pic1 ) {
+
+           if ( pnd_conf_get_as_int_d ( g_conf, "minimenu.threaded_preview", 0 ) ) {
+
+             g_preview_thread = SDL_CreateThread ( (void*)ui_threaded_defered_preview, iter );
 
-       pnd_log ( pndn_debug, "Deferred preview pic load ----------\n" );
+             if ( ! g_preview_thread ) {
+               pnd_log ( pndn_error, "ERROR: Couldn't create preview thread\n" );
+             }
 
-       // load the preview pics now!
-       pnd_disco_t *iter = ui_selected -> ref;
+           } else {
+
+             if ( ! cache_preview ( iter, pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_width", 200 ),
+                                    pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_height", 180 ) )
+                )
+             {
+               pnd_log ( pndn_debug, "  Couldn't load preview pic: '%s' -> '%s'\n",
+                         IFNULL(iter->title_en,"No Name"), iter -> preview_pic1 );
+             }
+
+           } // threaded?
+
+         } // got a preview at all?
 
-       if ( iter -> preview_pic1 &&
-            ! cache_preview ( iter, pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_width", 200 ), pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_height", 180 ) ) )
-       {
-         pnd_log ( pndn_debug, "  Couldn't load preview pic: '%s' -> '%s'\n", IFNULL(iter->title_en,"No Name"), iter -> preview_pic1 );
+         pnd_log ( pndn_debug, "Deferred preview pic load finish ---\n" );
+
+         ui_event++;
        }
 
-       pnd_log ( pndn_debug, "Deferred preview pic load finish ---\n" );
+      } else if ( event.user.code == sdl_user_finishedpreview ) {
+
+       // if we just finished the one we happen to be looking at, better redraw now; otherwise, if
+       // we finished another, no big woop
+       if ( ui_selected && event.user.data1 == ui_selected -> ref ) {
+         ui_event++;
+       }
 
-       ui_event++;
       }
 
       break;
@@ -1481,7 +1516,9 @@ unsigned int ui_callback_f ( unsigned int t ) {
   }
 
   SDL_Event e;
+  bzero ( &e, sizeof(SDL_Event) );
   e.type = SDL_USEREVENT;
+  e.user.code = sdl_user_ticker;
   SDL_PushEvent ( &e );
 
   return ( 0 );
@@ -1828,3 +1865,24 @@ unsigned char ui_forkexec ( char *argv[] ) {
   // parent, success
   return ( 1 );
 }
+
+unsigned char ui_threaded_defered_preview ( pnd_disco_t *p ) {
+
+  if ( ! cache_preview ( p, pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_width", 200 ),
+                        pnd_conf_get_as_int_d ( g_conf, "previewpic.cell_height", 180 ) )
+     )
+  {
+    pnd_log ( pndn_debug, "THREAD: Couldn't load preview pic: '%s' -> '%s'\n",
+             IFNULL(p->title_en,"No Name"), p -> preview_pic1 );
+  }
+
+  // trigger that we completed
+  SDL_Event e;
+  bzero ( &e, sizeof(SDL_Event) );
+  e.type = SDL_USEREVENT;
+  e.user.code = sdl_user_finishedpreview;
+  e.user.data1 = p;
+  SDL_PushEvent ( &e );
+
+  return ( 0 );
+}

diff --git a/minimenu/mmui.h b/minimenu/mmui.h
index 886d557..a575f48 100644 (file)
--- a/minimenu/mmui.h
+++ b/minimenu/mmui.h
@@ -65,14 +65,17 @@ void ui_loadscreen ( void );        // show screen while loading the menu
 void ui_discoverscreen ( unsigned char clearscreen ); // screen to show while scanning for apps
 void ui_cachescreen ( unsigned char clearscreen, char *filename ); // while caching icons, categories and preview-pics-Now-mode
 
+/* internal functions follow
+ */
+
 // show a menu, return when selection made; -1 means no selection. Enter is pick.
 int ui_modal_single_menu ( char *argv[], unsigned int argc, char *title, char *footer );
 
 // run a forked app (ie: not wait for it to return)
 unsigned char ui_forkexec ( char *argv[] ); // argv[0] is proggy to exec; argv last entry must be NULLptr
 
-/* internal functions follow
- */
+// create a thread of this guy, and it'll try to load the preview pic in background and then signal the app
+unsigned char ui_threaded_defered_preview ( pnd_disco_t *p );
 
 // change the focus
 void ui_process_input ( unsigned char block_p );