pnd_conf_handle g_skinconf = NULL;
void sigquit_handler ( int n );
-unsigned char cat_is_visible ( pnd_conf_handle h, char *catname );
unsigned char app_is_visible ( pnd_conf_handle h, char *uniqueid );
int main ( int argc, char *argv[] ) {
emit_and_quit ( MM_QUIT );
}
+ // init categories
+ category_init();
+
// create all cat
if ( pnd_conf_get_as_int_d ( g_conf, "categories.do_all_cat", 1 ) ) {
- category_push ( g_x11_present ? CATEGORY_ALL " (X11)" : CATEGORY_ALL " (No X11)", NULL /*app*/, 0, NULL /* fspath */ );
+ category_push ( g_x11_present ? CATEGORY_ALL " (X11)" : CATEGORY_ALL " (No X11)", NULL /* parent cat */, NULL /*app*/, 0, NULL /* fspath */, 1 /* visible */ );
}
// set up category mappings
/* actual work now
*/
- unsigned char block = 1;
-
if ( g_autorescan ) {
- block = 0;
// set up notifications
dbh = pnd_dbusnotify_init();
pnd_log ( pndn_debug, "Setting up dbusnotify\n" );
//setup_notifications();
+ // create a timer thread, that will trigger us to check for SD insert notifications every once in awhile
+ ui_threaded_timer_create();
+
} // set up rescan
/* set speed to minimenu run-speed, now that we're all set up
// show the menu, or changes thereof
ui_render();
- // wait for input or time-based events (like animations)
- // deal with inputs
- ui_process_input ( block /* block */ );
-
- // did a rescan event trigger?
- if ( g_autorescan ) {
- unsigned char watch_dbus = 0;
- unsigned char watch_inotify = 0;
-
- if ( dbh ) {
- watch_dbus = pnd_dbusnotify_rediscover_p ( dbh );
- }
-
- if ( nh ) {
- watch_inotify = pnd_notify_rediscover_p ( nh );
- }
-
- if ( watch_dbus || watch_inotify ) {
- pnd_log ( pndn_debug, "dbusnotify detected SD event\n" );
- applications_free();
- applications_scan();
- }
-
- } // rescan?
-
- // sleep? block?
- usleep ( 5000 );
+ // wait for input or time-based events (like animations) and deal with inputs
+ ui_process_input ( dbh, nh );
} // while
void applications_scan ( void ) {
+ // has user disabled pnd scanning, by chance?
+ if ( ! pnd_conf_get_as_int_d ( g_conf, "filesystem.do_pnd_disco", 1 ) ) {
+ goto dirbrowser_scan; // skip pnd's
+ }
+
// show disco screen
ui_discoverscreen ( 1 /* clear screen */ );
( pnd_pxml_get_x11 ( iter -> option_no_x11 ) == pnd_pxml_x11_required && g_x11_present == 1 )
)
{
+
+ if ( iter -> title_en == NULL || iter -> title_en [ 0 ] == '\0' ) {
+ // null title; just skip it.
+ } else {
- // push to All category
- // we do this first, so first category is always All
- if ( pnd_conf_get_as_int_d ( g_conf, "categories.do_all_cat", 1 ) ) {
- category_push ( g_x11_present ? CATEGORY_ALL " (X11)" : CATEGORY_ALL " (No X11)", iter, ovrh, NULL /* fspath */ );
- } // all?
+ // push to All category
+ // we do this first, so first category is always All
+ if ( pnd_conf_get_as_int_d ( g_conf, "categories.do_all_cat", 1 ) ) {
+ category_push ( g_x11_present ? CATEGORY_ALL " (X11)" : CATEGORY_ALL " (No X11)", NULL /* parent cat */, iter, ovrh, NULL /* fspath */, 1 /* visible */ );
+ } // all?
- // is this app suppressed? if not, show it in whatever categories the user is allowing
- if ( iter -> unique_id && app_is_visible ( g_conf, iter -> unique_id ) ) {
+ // is this app suppressed? if not, show it in whatever categories the user is allowing
+ if ( iter -> unique_id && app_is_visible ( g_conf, iter -> unique_id ) ) {
- // main categories
- category_meta_push ( iter -> main_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_maincat", 1 ) );
- category_meta_push ( iter -> main_category1, iter -> main_category, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category1 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_maincat1", 0 ) );
- category_meta_push ( iter -> main_category2, iter -> main_category, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category2 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_maincat2", 0 ) );
- // alt categories
- category_meta_push ( iter -> alt_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_altcat", 0 ) );
- category_meta_push ( iter -> alt_category1, iter -> alt_category, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category1 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_altcat1", 0 ) );
- category_meta_push ( iter -> alt_category2, iter -> alt_category, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category2 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_altcat2", 0 ) );
+ // main categories
+ category_meta_push ( iter -> main_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_maincat", 1 ) );
+ category_meta_push ( iter -> main_category1, iter -> main_category, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category1 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_maincat1", 0 ) );
+ category_meta_push ( iter -> main_category2, iter -> main_category, iter, ovrh, cat_is_visible ( g_conf, iter -> main_category2 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_maincat2", 0 ) );
+ // alt categories
+ category_meta_push ( iter -> alt_category, NULL /* no parent cat */, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_altcat", 0 ) );
+ category_meta_push ( iter -> alt_category1, iter -> alt_category, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category1 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_altcat1", 0 ) );
+ category_meta_push ( iter -> alt_category2, iter -> alt_category, iter, ovrh, cat_is_visible ( g_conf, iter -> alt_category2 ) ); //pnd_conf_get_as_int_d ( g_conf, "tabs.top_altcat2", 0 ) );
- } // app is visible?
+ } // app is visible?
+
+ } // has title?
} // register with categories or filter out
itercount++;
} // while
- // sort (some) categories
- category_sort();
+ dirbrowser_scan:
// set up filesystem browser tabs
if ( pnd_conf_get_as_int_d ( g_conf, "filesystem.do_browser", 0 ) ) {
// check if dir is empty; if so, skip it.
if ( ! is_dir_empty ( buffer ) ) {
- category_push ( tabname /* tab name */, NULL /* app */, 0 /* override */, buffer /* fspath */ );
+ category_push ( tabname /* tab name */, NULL /* parent cat */, NULL /* app */, 0 /* override */, buffer /* fspath */, 1 /* visible */ );
}
}
// dump categories
//category_dump();
+ // publish desired categories
+ category_publish ( CFNORMAL, NULL );
+
// let deferred icon cache go now
ui_post_scan();