unsigned char ui_category = 0; // current category
unsigned char ui_catshift = 0; // how many cats are offscreen to the left
-extern mm_category_t g_categories [ MAX_CATS ];
+extern mm_category_t *g_categories;
extern unsigned char g_categorycount;
+extern mm_category_t _categories_invis [ MAX_CATS ];
+extern unsigned char _categories_inviscount;
static SDL_Surface *ui_scale_image ( SDL_Surface *s, unsigned int maxwidth, int maxheight ); // height -1 means ignore
static int ui_selected_index ( void );
} else if ( event.key.keysym.sym == SDLK_SPACE || event.key.keysym.sym == SDLK_END ) {
ui_push_exec();
ui_event++;
- } else if ( event.key.keysym.sym == SDLK_z || event.key.keysym.sym == SDLK_RSHIFT ) {
+ } else if ( event.key.keysym.sym == SDLK_RSHIFT ) {
ui_push_ltrigger();
ui_event++;
- } else if ( event.key.keysym.sym == SDLK_x || event.key.keysym.sym == SDLK_RCTRL ) {
+ } else if ( event.key.keysym.sym == SDLK_RCTRL ) {
ui_push_rtrigger();
ui_event++;
- } else if ( event.key.keysym.sym == SDLK_y || event.key.keysym.sym == SDLK_PAGEUP ) {
+ } else if ( event.key.keysym.sym == SDLK_PAGEUP ) {
// info
if ( ui_selected ) {
ui_show_info ( pnd_run_script, ui_selected -> ref );
} else if ( event.key.keysym.sym == SDLK_LCTRL /*LALT*/ ) { // select button
char *opts [ 20 ] = {
- "Return to Minimenu",
+ "Reveal hidden category",
"Shutdown Pandora",
- "Rescan for Applications",
+ "Rescan for applications",
"Cache previews to SD now",
- "Run xfce4 from Minimenu",
"Run a terminal/console",
- "Switch preferred GUI",
+ "Run another GUI (xfce, etc)",
"Quit (<- beware)",
"Select a Minimenu skin",
"About Minimenu"
};
- int sel = ui_modal_single_menu ( opts, 10, "Minimenu", "Enter to select; other to return." );
+ int sel = ui_modal_single_menu ( opts, 9, "Minimenu", "Enter to select; other to return." );
char buffer [ 100 ];
if ( sel == 0 ) {
// do nothing
+ ui_revealscreen();
} else if ( sel == 1 ) {
// shutdown
sprintf ( buffer, "sudo poweroff" );
applications_free();
pnd_log ( pndn_debug, "Rescanning applications\n" );
applications_scan();
- // reset view
- ui_selected = NULL;
- ui_rows_scrolled_down = 0;
- // set back to first tab, to be safe
- ui_category = 0;
- ui_catshift = 0;
} else if ( sel == 3 ) {
// cache preview to SD now
extern pnd_box_handle g_active_apps;
} // while
} else if ( sel == 4 ) {
- // run xfce
- char buffer [ PATH_MAX ];
- sprintf ( buffer, "%s %s\n", MM_RUN, "/usr/bin/startxfce4" );
- emit_and_quit ( buffer );
- } else if ( sel == 5 ) {
// run terminal
char *argv[5];
argv [ 0 ] = pnd_conf_get_as_char ( g_conf, "utility.terminal" );
ui_forkexec ( argv );
}
- } else if ( sel == 6 ) {
+ } else if ( sel == 5 ) {
char buffer [ PATH_MAX ];
sprintf ( buffer, "%s %s\n", MM_RUN, "/usr/pandora/scripts/op_switchgui.sh" );
emit_and_quit ( buffer );
- } else if ( sel == 7 ) {
+ } else if ( sel == 6 ) {
emit_and_quit ( MM_QUIT );
- } else if ( sel == 8 ) {
+ } else if ( sel == 7 ) {
// select skin
if ( ui_pick_skin() ) {
emit_and_quit ( MM_RESTART );
}
- } else if ( sel == 9 ) {
+ } else if ( sel == 8 ) {
// about
char buffer [ PATH_MAX ];
sprintf ( buffer, "%s/about.txt", g_skinpath );
ui_event++;
render_mask |= CHANGED_EVERYTHING;
- }
+
+ } else {
+ // unknown SDLK_ keycode?
+
+ // many SDLK_keycodes map to ASCII ("a" is ascii(a)), so try to jump to a filename of that name, in this category?
+ // and if already there, try to jump to next, maybe?
+ // future: look for sequence typing? ie: user types 'm' then 'a', look for 'ma*' instead of 'm' then 'a' matching
+ if ( isalpha ( event.key.keysym.sym ) && g_categories [ ui_category ].refcount > 0 ) {
+ mm_appref_t *app = g_categories [ ui_category ].refs;
+
+ // walk the category, looking for a first-char match
+ while ( app ) {
+ if ( app -> ref -> title_en && toupper ( app -> ref -> title_en [ 0 ] ) == toupper ( event.key.keysym.sym ) ) {
+ break;
+ }
+ app = app -> next;
+ }
+
+ // found something, or no?
+ if ( app ) {
+ // looks like we found a potential match; try switching it to visible selection
+ ui_selected = app;
+ ui_set_selected ( ui_selected );
+ }
+
+ } // SDLK_alphanumeric?
+
+ } // SDLK_....
// extras
+#if 0
if ( event.key.keysym.sym == SDLK_q ) {
emit_and_quit ( MM_QUIT );
}
+#endif
break;
#endif
}
- } else if ( event.key.keysym.sym == SDLK_RETURN ) {
+ } else if ( event.key.keysym.sym == SDLK_RETURN || event.key.keysym.sym == SDLK_END ) { // return, or "B"
return ( sel );
+#if 0
} else if ( event.key.keysym.sym == SDLK_q ) {
exit ( 0 );
+#endif
} else {
return ( -1 ); // nada
} // deferred icon load
+ // reset view
+ ui_selected = NULL;
+ ui_rows_scrolled_down = 0;
+ // set back to first tab, to be safe
+ ui_category = 0;
+ ui_catshift = 0;
+
+ // do we have a preferred category to jump to?
+ char *dc = pnd_conf_get_as_char ( g_conf, "categories.default_cat" );
+ if ( dc ) {
+
+ // attempt to find default cat; if we do find it, select it; otherwise
+ // default behaviour will pick first cat (ie: usually All)
+ unsigned int i;
+ for ( i = 0; i < g_categorycount; i++ ) {
+ if ( strcasecmp ( g_categories [ i ].catname, dc ) == 0 ) {
+ ui_category = i;
+ // ensure visibility
+ unsigned int screen_width = pnd_conf_get_as_int_d ( g_conf, "display.screen_width", 800 );
+ unsigned int tab_width = pnd_conf_get_as_int ( g_conf, "tabs.tab_width" );
+ if ( ui_category > ui_catshift + ( screen_width / tab_width ) - 1 ) {
+ ui_catshift = ui_category - ( screen_width / tab_width ) + 1;
+ }
+ break;
+ }
+ }
+
+ if ( i == g_categorycount ) {
+ pnd_log ( pndn_warning, " User defined default category '%s' but not found, so using default behaviour\n", dc );
+ }
+
+ } // default cat
+
+ // redraw all
+ render_mask |= CHANGED_EVERYTHING;
+
return;
}
return;
}
+
+void ui_revealscreen ( void ) {
+ char *labels [ 500 ];
+ unsigned int labelmax = 0;
+ unsigned int i;
+
+ if ( ! _categories_inviscount ) {
+ return; // nothing to do
+ }
+
+ for ( i = 0; i < _categories_inviscount; i++ ) {
+ labels [ labelmax++ ] = _categories_invis [ i ].catname;
+ }
+
+ int sel = ui_modal_single_menu ( labels, labelmax, "Temporary Category Reveal",
+ "Enter to select; other to return." );
+
+ if ( sel >= 0 ) {
+
+ if ( category_query ( _categories_invis [ sel ].catname ) ) {
+ // already present
+ return;
+ }
+
+ // fix up category name, if its been hacked
+ if ( strchr ( _categories_invis [ sel ].catname, '.' ) ) {
+ char *t = _categories_invis [ sel ].catname;
+ _categories_invis [ sel ].catname = strdup ( strchr ( _categories_invis [ sel ].catname, '.' ) + 1 );
+ free ( t );
+ }
+ // copy invisi-cat into live-cat
+ memmove ( &(g_categories [ g_categorycount ]), &(_categories_invis [ sel ]), sizeof(mm_category_t) );
+ g_categorycount++;
+ // move subsequent invisi-cats up, so the selected invisi-cat is nolonger existing in invisi-list at
+ // all (avoid double-free() later)
+ memmove ( &(_categories_invis [ sel ]), &(_categories_invis [ sel + 1 ]), sizeof(mm_category_t) * ( _categories_inviscount - sel - 1 ) );
+ _categories_inviscount--;
+
+ // switch to the new category
+ ui_category = g_categorycount - 1;
+
+ // ensure visibility
+ unsigned int screen_width = pnd_conf_get_as_int_d ( g_conf, "display.screen_width", 800 );
+ unsigned int tab_width = pnd_conf_get_as_int ( g_conf, "tabs.tab_width" );
+ if ( ui_category > ui_catshift + ( screen_width / tab_width ) - 1 ) {
+ ui_catshift = ui_category - ( screen_width / tab_width ) + 1;
+ }
+
+ // redraw tabs
+ render_mask |= CHANGED_CATEGORY;
+ }
+
+ return;
+}
git.openpandora.org / pandora-libraries.git / blobdiff