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 );
unsigned int maxtab = ( screen_width / tab_width ) < g_categorycount ? ( screen_width / tab_width ) + ui_catshift : g_categorycount + ui_catshift;
unsigned int maxtabspot = ( screen_width / tab_width );
- // draw tabs with categories
- for ( col = ui_catshift;
- col < maxtab;
- col++ )
- {
+ if ( g_categorycount > 0 ) {
- SDL_Surface *s;
+ // draw tabs with categories
+ for ( col = ui_catshift;
+ col < maxtab;
+ col++ )
+ {
- // if this is the first (leftmost) tab, we use different artwork
- // than if the other tabs (so skinner can link lines up nicely.)
- if ( col == ui_catshift ) {
- // leftmost tab, special case
+ SDL_Surface *s;
- if ( col == ui_category ) {
- s = g_imagecache [ IMG_TAB_SEL_L ].i;
- } else {
- s = g_imagecache [ IMG_TAB_UNSEL_L ].i;
- }
+ // if this is the first (leftmost) tab, we use different artwork
+ // than if the other tabs (so skinner can link lines up nicely.)
+ if ( col == ui_catshift ) {
+ // leftmost tab, special case
- } else if ( col == maxtab - 1 ) {
- // rightmost tab, special case
+ if ( col == ui_category ) {
+ s = g_imagecache [ IMG_TAB_SEL_L ].i;
+ } else {
+ s = g_imagecache [ IMG_TAB_UNSEL_L ].i;
+ }
- if ( col == ui_category ) {
- s = g_imagecache [ IMG_TAB_SEL_R ].i;
- } else {
- s = g_imagecache [ IMG_TAB_UNSEL_R ].i;
- }
+ } else if ( col == maxtab - 1 ) {
+ // rightmost tab, special case
- } else {
- // normal (not leftmost) tab
+ if ( col == ui_category ) {
+ s = g_imagecache [ IMG_TAB_SEL_R ].i;
+ } else {
+ s = g_imagecache [ IMG_TAB_UNSEL_R ].i;
+ }
- if ( col == ui_category ) {
- s = g_imagecache [ IMG_TAB_SEL ].i;
} else {
- s = g_imagecache [ IMG_TAB_UNSEL ].i;
- }
+ // normal (not leftmost) tab
+
+ if ( col == ui_category ) {
+ s = g_imagecache [ IMG_TAB_SEL ].i;
+ } else {
+ s = g_imagecache [ IMG_TAB_UNSEL ].i;
+ }
- } // first col, or not first col?
+ } // first col, or not first col?
- // draw tab
- src.x = 0;
- src.y = 0;
+ // draw tab
+ src.x = 0;
+ src.y = 0;
#if 0
- src.w = tab_width;
- if ( col == ui_category ) {
- src.h = tab_selheight;
- } else {
- src.h = tab_height;
- }
+ src.w = tab_width;
+ if ( col == ui_category ) {
+ src.h = tab_selheight;
+ } else {
+ src.h = tab_height;
+ }
#else
- src.w = s -> w;
- src.h = s -> h;
+ src.w = s -> w;
+ src.h = s -> h;
#endif
- dest -> x = tab_offset_x + ( (col-ui_catshift) * tab_width );
- dest -> y = tab_offset_y;
+ dest -> x = tab_offset_x + ( (col-ui_catshift) * tab_width );
+ dest -> y = tab_offset_y;
- // store touch info
- ui_register_tab ( col, dest -> x, dest -> y, tab_width, tab_height );
+ // store touch info
+ ui_register_tab ( col, dest -> x, dest -> y, tab_width, tab_height );
- if ( render_jobs_b & R_TABS ) {
- //pnd_log ( pndn_debug, "tab %u at %ux%u\n", col, dest.x, dest.y );
- SDL_BlitSurface ( s, &src, sdl_realscreen, dest );
- dest++;
+ if ( render_jobs_b & R_TABS ) {
+ //pnd_log ( pndn_debug, "tab %u at %ux%u\n", col, dest.x, dest.y );
+ SDL_BlitSurface ( s, &src, sdl_realscreen, dest );
+ dest++;
- // draw tab line
- if ( col == ui_category ) {
- // no line for selected tab
- } else {
- if ( col - ui_catshift == 0 ) {
- s = g_imagecache [ IMG_TAB_LINEL ].i;
- } else if ( col - ui_catshift == maxtabspot - 1 ) {
- s = g_imagecache [ IMG_TAB_LINER ].i;
+ // draw tab line
+ if ( col == ui_category ) {
+ // no line for selected tab
} else {
- s = g_imagecache [ IMG_TAB_LINE ].i;
+ if ( col - ui_catshift == 0 ) {
+ s = g_imagecache [ IMG_TAB_LINEL ].i;
+ } else if ( col - ui_catshift == maxtabspot - 1 ) {
+ s = g_imagecache [ IMG_TAB_LINER ].i;
+ } else {
+ s = g_imagecache [ IMG_TAB_LINE ].i;
+ }
+ dest -> x = tab_offset_x + ( (col-ui_catshift) * tab_width );
+ dest -> y = tab_offset_y + tab_height;
+ SDL_BlitSurface ( s, NULL /* whole image */, sdl_realscreen, dest );
+ dest++;
}
- dest -> x = tab_offset_x + ( (col-ui_catshift) * tab_width );
- dest -> y = tab_offset_y + tab_height;
- SDL_BlitSurface ( s, NULL /* whole image */, sdl_realscreen, dest );
+
+ // draw text
+ SDL_Surface *rtext;
+ SDL_Color tmpfontcolor = { font_rgba_r, font_rgba_g, font_rgba_b, font_rgba_a };
+ rtext = TTF_RenderText_Blended ( g_tab_font, g_categories [ col ].catname, tmpfontcolor );
+ src.x = 0;
+ src.y = 0;
+ src.w = rtext -> w < text_width ? rtext -> w : text_width;
+ src.h = rtext -> h;
+ dest -> x = tab_offset_x + ( (col-ui_catshift) * tab_width ) + text_offset_x;
+ dest -> y = tab_offset_y + text_offset_y;
+ SDL_BlitSurface ( rtext, &src, sdl_realscreen, dest );
+ SDL_FreeSurface ( rtext );
dest++;
- }
- // draw text
- SDL_Surface *rtext;
- SDL_Color tmpfontcolor = { font_rgba_r, font_rgba_g, font_rgba_b, font_rgba_a };
- rtext = TTF_RenderText_Blended ( g_tab_font, g_categories [ col ].catname, tmpfontcolor );
- src.x = 0;
- src.y = 0;
- src.w = rtext -> w < text_width ? rtext -> w : text_width;
- src.h = rtext -> h;
- dest -> x = tab_offset_x + ( (col-ui_catshift) * tab_width ) + text_offset_x;
- dest -> y = tab_offset_y + text_offset_y;
- SDL_BlitSurface ( rtext, &src, sdl_realscreen, dest );
- SDL_FreeSurface ( rtext );
- dest++;
+ } // r_tabs
- } // r_tabs
+ } // for
- } // for
+ } // if we got categories
if ( render_jobs_b & R_TABS ) {
} 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 );
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 ( g_categorycount == 0 ) {
+ return;
+ }
+
if ( ui_category > 0 ) {
ui_category--;
category_fs_restock ( &(g_categories [ ui_category ]) );
void ui_push_rtrigger ( void ) {
unsigned char oldcat = ui_category;
+ if ( g_categorycount == 0 ) {
+ return;
+ }
+
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" );
} // 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
+
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;
+}