len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Feature, Plugin] lastfm_scrobbler_viewer

Browse source 
a plugin to view lastfm scrobbler logs

uses print cell to give a spreadsheet view of scrobbler logs

buffers the whole file if possible otherwise it reads entries from disk

rudimentary text searching for columns
include / exclude; all/any and case sensitive

Change-Id: Id9616e5796658952fba4ea747f596cb77d6f34c0
This commit is contained in:
William Wilgus 2023-04-01 12:32:47 -04:00 • committed by William Wilgus
parent 43b0fba75d
commit dfe12252bb
11 changed files with 1361 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/filetypes.c
View file

@ -129,6 +129,7 @@ static const struct filetype inbuilt_filetypes[] = {
{ "fmr", FILE_ATTR_FMR }, { "fmr", FILE_ATTR_FMR },
{ "fms", FILE_ATTR_FMS }, { "fms", FILE_ATTR_FMS },
#endif #endif
{ "log", FILE_ATTR_LOG },
{ "lng", FILE_ATTR_LNG }, { "lng", FILE_ATTR_LNG },
{ "rock", FILE_ATTR_ROCK }, { "rock", FILE_ATTR_ROCK },
{ "lua", FILE_ATTR_LUA }, { "lua", FILE_ATTR_LUA },

1
apps/filetypes.h
View file

@ -48,6 +48,7 @@
#define FILE_ATTR_FMS 0x1200 /* FM screen skin file */ #define FILE_ATTR_FMS 0x1200 /* FM screen skin file */
#define FILE_ATTR_RFMS 0x1300 /* FM screen skin file */ #define FILE_ATTR_RFMS 0x1300 /* FM screen skin file */
#define FILE_ATTR_OPX 0x1400 /* open plugins shortcut */ #define FILE_ATTR_OPX 0x1400 /* open plugins shortcut */
#define FILE_ATTR_LOG 0x1500 /* log file */
#define FILE_ATTR_MASK 0xFF00 /* which bits tree.c uses for file types */ #define FILE_ATTR_MASK 0xFF00 /* which bits tree.c uses for file types */
struct filetype { struct filetype {

1
apps/plugins/CATEGORIES
View file

@ -50,6 +50,7 @@ keybox,apps
keyremap,apps keyremap,apps
lamp,apps lamp,apps
lastfm_scrobbler,apps lastfm_scrobbler,apps
lastfm_scrobbler_viewer,viewers
logo,demos logo,demos
lrcplayer,apps lrcplayer,apps
lua,viewers lua,viewers

1
apps/plugins/SOURCES
View file

@ -13,6 +13,7 @@ jackpot.c
keybox.c keybox.c
keyremap.c keyremap.c
lastfm_scrobbler.c lastfm_scrobbler.c
lastfm_scrobbler_viewer.c
logo.c logo.c
lrcplayer.c lrcplayer.c
mosaique.c mosaique.c

29
apps/plugins/keyremap.c
View file

@ -1422,6 +1422,17 @@ static int list_voice_cb(int list_index, void* data)
else else
rb->talk_spell(name, true); rb->talk_spell(name, true);
} }
else if(data == MENU_ID(M_SETKEYS))
{
char buf[MAX_MENU_NAME];
int selcol = printcell_get_column_selected();
const char* name = printcell_get_column_text(selcol, buf, sizeof(buf));
long id = P2ID((const unsigned char *)name);
if(id>=0)
rb->talk_id(id, true);
else
rb->talk_spell(name, true);
}
else else
{ {
char buf[MAX_MENU_NAME]; char buf[MAX_MENU_NAME];
@ -1606,14 +1617,14 @@ int menu_action_setkeys(int *action, int selected_item, bool* exit, struct gui_s
} }
else else
{ {
keyset.view_lastcol = printcell_increment_column(lists, 1, true); keyset.view_lastcol = printcell_increment_column(1, true);
*action = ACTION_NONE; *action = ACTION_NONE;
} }
} }
} }
else if (*action == ACTION_STD_CANCEL) else if (*action == ACTION_STD_CANCEL)
{ {
keyset.view_lastcol = printcell_increment_column(lists, -1, true); keyset.view_lastcol = printcell_increment_column(-1, true);
if (keyset.view_lastcol != keyset.view_columns - 1) if (keyset.view_lastcol != keyset.view_columns - 1)
{ {
*action = ACTION_NONE; *action = ACTION_NONE;
@ -2038,7 +2049,7 @@ static void synclist_set(int id, int selected_item, int items, int sel_size)
rb->gui_synclist_set_voice_callback(&lists, list_voice_cb); rb->gui_synclist_set_voice_callback(&lists, list_voice_cb);
rb->gui_synclist_set_nb_items(&lists,items); rb->gui_synclist_set_nb_items(&lists,items);
rb->gui_synclist_select_item(&lists, selected_item); rb->gui_synclist_select_item(&lists, selected_item);
printcell_enable(&lists, false, false); printcell_enable(false);
if (menu_id == MENU_ID(M_ROOT)) if (menu_id == MENU_ID(M_ROOT))
{ {
@ -2047,15 +2058,16 @@ static void synclist_set(int id, int selected_item, int items, int sel_size)
} }
else if (menu_id == MENU_ID(M_SETKEYS)) else if (menu_id == MENU_ID(M_SETKEYS))
{ {
printcell_enable(&lists, true, true); keyset.view_columns = printcell_set_columns(&lists, NULL,
keyset.view_columns = printcell_set_columns(&lists, ACTVIEW_HEADER, Icon_Rockbox); ACTVIEW_HEADER, Icon_Rockbox);
int curcol = printcell_increment_column(&lists, 0, true); printcell_enable(true);
int curcol = printcell_get_column_selected();
if (keyset.view_lastcol >= keyset.view_columns) if (keyset.view_lastcol >= keyset.view_columns)
keyset.view_lastcol = -1; keyset.view_lastcol = -1;
/* restore column position */ /* restore column position */
while (keyset.view_lastcol > -1 && curcol != keyset.view_lastcol) while (keyset.view_lastcol > -1 && curcol != keyset.view_lastcol)
{ {
curcol = printcell_increment_column(&lists, 1, true); curcol = printcell_increment_column(1, true);
} }
keyset.view_lastcol = curcol; keyset.view_lastcol = curcol;
} }
@ -2065,9 +2077,8 @@ static void synclist_set(int id, int selected_item, int items, int sel_size)
PEEK_MENU_ID(id); PEEK_MENU_ID(id);
lang_strlcpy(menu_title, mainitem(id)->name, sizeof(menu_title)); lang_strlcpy(menu_title, mainitem(id)->name, sizeof(menu_title));
rb->gui_synclist_set_title(&lists, menu_title, Icon_Submenu_Entered); rb->gui_synclist_set_title(&lists, menu_title, Icon_Submenu_Entered);
/* if (menu_title[0] == '$'){ printcell_enable(&lists, true, true); } */ /* if (menu_title[0] == '$'){ printcell_enable(true); } */
} }
} }
static void keyremap_set_buffer(void* buffer, size_t buf_size) static void keyremap_set_buffer(void* buffer, size_t buf_size)

2
apps/plugins/lastfm_scrobbler.c
View file

@ -160,6 +160,8 @@ static int config_settings_menu(void)
case 3: case 3:
rb->set_int("Beep Level", "", UNIT_INT, rb->set_int("Beep Level", "", UNIT_INT,
&gConfig.beeplvl, NULL, 1, 0, 10, NULL); &gConfig.beeplvl, NULL, 1, 0, 10, NULL);
if (gConfig.beeplvl > 0)
rb->beep_play(1500, 100, 100 * gConfig.beeplvl);
case 4: /*sep*/ case 4: /*sep*/
continue; continue;
case 5: case 5:

1033
apps/plugins/lastfm_scrobbler_viewer.c Normal file
View file

File diff suppressed because it is too large Load diff

303
apps/plugins/lib/printcell_helper.c
View file

@ -22,10 +22,6 @@
#include "plugin.h" #include "plugin.h"
#include "lib/printcell_helper.h" #include "lib/printcell_helper.h"
#ifndef PRINTCELL_MAX_COLUMNS
#define PRINTCELL_MAX_COLUMNS 16
#endif
#define COLUMN_ENDLEN 3 #define COLUMN_ENDLEN 3
#define TITLE_FLAG 0xFF #define TITLE_FLAG 0xFF
#define SELECTED_FLAG 0x1 #define SELECTED_FLAG 0x1
@ -37,48 +33,54 @@
#endif #endif
struct printcell_info_t { struct printcell_info_t {
int offw[NB_SCREENS]; struct gui_synclist *gui_list; /* list to display */
int iconw[NB_SCREENS]; int offw[NB_SCREENS]; /* padding between column boundries and text */
int selcol_offw[NB_SCREENS]; int iconw[NB_SCREENS]; /* width of an icon */
int totalcolw[NB_SCREENS]; int selcol_offw[NB_SCREENS]; /* offset width calculated for selected item */
int firstcolxw[NB_SCREENS]; int totalcolw[NB_SCREENS]; /* total width of all columns */
uint16_t colw[NB_SCREENS][PRINTCELL_MAX_COLUMNS]; int firstcolxw[NB_SCREENS]; /* first column x + width, save recalculating */
int ncols; int ncols; /* number of columns */
int selcol; int selcol; /* selected column (-1 to ncols-1) */
int selcol_index; uint32_t hidecol_flags; /*bits 0-31 set bit to 1 to hide a column (1<<col#) */
char title[PRINTCELL_MAXLINELEN]; uint16_t colw[NB_SCREENS][PRINTCELL_MAX_COLUMNS]; /* width of title text
bool separator; or MIN(or user defined width / screen width) */
char title[PRINTCELL_MAXLINELEN]; /* title buffer */
char titlesep; /* character that separates title column items (ex '$') */
char colsep; /* character that separates text column items (ex ',') */
bool separator; /* draw grid */
}; };
static struct printcell_info_t printcell; static struct printcell_info_t printcell;
static void parse_dsptext(int ncols, const char *dsp_text, char* buffer, uint16_t *sidx) static void parse_dsptext(char splitchr, int ncols, const char *dsp_text,
char* buffer, size_t bufsz, uint16_t *sidx)
{ {
/*Internal function loads sidx with split offsets indexing /*Internal function loads sidx with split offsets indexing
the buffer of null terminated strings, splits on '$' the buffer of null terminated strings, splits on 'splitchr'
_assumptions_: _assumptions_:
dsp_text[len - 1] = \0, dsp_text[len - 1] = \0,
buffer[PRINTCELL_MAXLINELEN],
sidx[PRINTCELL_MAX_COLUMNS] sidx[PRINTCELL_MAX_COLUMNS]
*/ */
int i = 0; int i = 0;
int j = 0; size_t j = 0;
int ch = '$'; /* first column $ is optional */ int ch = splitchr; /* first column $ is optional */
if (*dsp_text == '$') if (*dsp_text == splitchr)
dsp_text++; dsp_text++;
/* add null to the start of the text buffer */ /* add null to the start of the text buffer */
buffer[j++] = '\0'; buffer[j++] = '\0';
do do
{ {
if (ch == '$') if (ch == splitchr)
{ {
sidx[i] = j; sidx[i] = j; /* save start index and copy next column to the buffer */
if (*dsp_text == '$') /* $$ escaped user must want to display $*/ while (*dsp_text != '\0' && *dsp_text != splitchr && j < (bufsz - 1))
buffer[j++] = *dsp_text++; {
while (*dsp_text != '\0' && *dsp_text != '$' && j < PRINTCELL_MAXLINELEN - 1)
buffer[j++] = *dsp_text++; buffer[j++] = *dsp_text++;
}
buffer[j++] = '\0'; buffer[j++] = '\0';
i++; i++;
if (i >= ncols || j >= (PRINTCELL_MAXLINELEN - 1)) if (i >= ncols || j >= (bufsz - 1))
break; break;
} }
ch = *dsp_text++; ch = *dsp_text++;
@ -146,23 +148,39 @@ static inline void set_cell_width(struct viewport *vp, int max_w, int new_w)
static inline int printcells(struct screen *display, char* buffer, static inline int printcells(struct screen *display, char* buffer,
uint16_t *sidx, struct line_desc *linedes, uint16_t *sidx, struct line_desc *linedes,
struct viewport *vp, int vp_w, int separator, struct viewport *vp, int vp_w, int separator,
int x, int y, int offw, int selected_flag, bool scroll) int x, int y, int offw, int selected_flag, int last_col,
bool scroll, bool is_title)
{ {
/* Internal function prints remaining cells */ /* Internal function prints remaining cells */
int text_offset = offw + offw; int text_offset = offw + offw;
int ncols = printcell.ncols;
int screen = display->screen_type; int screen = display->screen_type;
int height = linedes->height; int height = linedes->height;
int selsep = (selected_flag == 0) ? 0: separator; int selsep = (selected_flag == 0) ? 0: separator;
uint16_t *screencolwidth = printcell.colw[screen]; uint16_t *screencolwidth = printcell.colw[screen];
for(int i = 1; i < ncols; i++) for(int i = 1; i <= last_col; i++)
{ {
int ny = y; int ny = y;
int nw = screencolwidth[i] + text_offset; int nw = screencolwidth[i] + text_offset;
int offx = 0;
if (i == last_col || x + nw >= vp_w - offw + 1)
{ /* not enough space for next column use up excess */
if (nw < (vp_w - x))
{
if (is_title)
offx = ((vp_w - x) - nw) / 2;
nw = vp_w - x;
}
}
if (!PRINTCELL_COLUMN_IS_VISIBLE(printcell.hidecol_flags, i))
nw = 0;
int nx = x + nw; int nx = x + nw;
char *buftext; char *buftext;
if (nx > 0 && x < vp_w)
if (nx > 0 && nw > offw && x < vp_w)
{ {
set_cell_width(vp, vp_w, nx); set_cell_width(vp, vp_w, nx);
@ -173,11 +191,15 @@ static inline int printcells(struct screen *display, char* buffer,
} }
else else
{ {
if (vp_w < x + text_offset)
{
scroll = false;
}
linedes->scroll = scroll; linedes->scroll = scroll;
linedes->separator_height = separator; linedes->separator_height = separator;
} }
buftext = &buffer[sidx[i]]; buftext = &buffer[sidx[i]];
display->put_line(x + offw, ny, linedes, "$t", buftext); display->put_line(x + offw + offx, ny, linedes, "$t", buftext);
vp->width += COLUMN_ENDLEN + 1; vp->width += COLUMN_ENDLEN + 1;
draw_selector(display, linedes, selected_flag, i, separator, x, ny, nw, height); draw_selector(display, linedes, selected_flag, i, separator, x, ny, nw, height);
} }
@ -200,6 +222,10 @@ static inline int calcvisible(int screen, int vp_w, int text_offset, int sbwidth
for (int i = printcell.selcol - 1; i >= 0; i--) for (int i = printcell.selcol - 1; i >= 0; i--)
{ {
int cw = screencolwidth[i] + text_offset; int cw = screencolwidth[i] + text_offset;
if (!PRINTCELL_COLUMN_IS_VISIBLE(printcell.hidecol_flags, i))
cw = 0;
if (i == 0) if (i == 0)
cw += screenicnwidth; cw += screenicnwidth;
if (offset > 0 || cw > maxw) if (offset > 0 || cw > maxw)
@ -257,15 +283,30 @@ static void printcell_listdraw_fn(struct list_putlineinfo_t *list_info)
separator = 1; separator = 1;
int nx = x; int nx = x;
int last_col = printcell.ncols - 1;
int hidden_w = 0;
int nw, colxw; int nw, colxw;
char *buftext;
printcell_buffer[0] = '\0'; printcell_buffer[0] = '\0';
parse_dsptext(printcell.ncols, dsp_text, printcell_buffer, sidx);
char *buftext = &printcell_buffer[sidx[0]];
uint16_t *screencolwidth = printcell.colw[screen]; uint16_t *screencolwidth = printcell.colw[screen];
if (printcell.hidecol_flags > 0)
{
for (int i = 0; i < printcell.ncols; i++)
{
if (PRINTCELL_COLUMN_IS_VISIBLE(printcell.hidecol_flags, i))
last_col = i;
else
hidden_w += (screencolwidth[i] + text_offset);
}
}
if (is_title) if (is_title)
{ {
parse_dsptext(printcell.titlesep, printcell.ncols, dsp_text,
printcell_buffer, sizeof(printcell_buffer), sidx);
buftext = &printcell_buffer[sidx[0]]; /* set to first column text */
int sbwidth = 0; int sbwidth = 0;
if (rb->global_settings->scrollbar == SCROLLBAR_LEFT) if (rb->global_settings->scrollbar == SCROLLBAR_LEFT)
sbwidth = rb->global_settings->scrollbar_width; sbwidth = rb->global_settings->scrollbar_width;
@ -278,6 +319,9 @@ static void printcell_listdraw_fn(struct list_putlineinfo_t *list_info)
nx -= printcell.selcol_offw[screen]; nx -= printcell.selcol_offw[screen];
nw = screencolwidth[0] + printcell.iconw[screen] + text_offset; nw = screencolwidth[0] + printcell.iconw[screen] + text_offset;
if (!PRINTCELL_COLUMN_IS_VISIBLE(printcell.hidecol_flags, 0))
nw = printcell.iconw[screen] - 1;
nw += sbwidth; nw += sbwidth;
colxw = nx + nw; colxw = nx + nw;
@ -301,20 +345,21 @@ static void printcell_listdraw_fn(struct list_putlineinfo_t *list_info)
} }
else else
{ {
parse_dsptext(printcell.colsep, printcell.ncols, dsp_text,
printcell_buffer, sizeof(printcell_buffer), sidx);
buftext = &printcell_buffer[sidx[0]]; /* set to first column text */
int cursor = Icon_NOICON; int cursor = Icon_NOICON;
nx -= printcell.selcol_offw[screen]; nx -= printcell.selcol_offw[screen];
if (selected_flag & SELECTED_FLAG) if (selected_flag & SELECTED_FLAG)
{ {
if (printcell.selcol >= 0)
printcell.selcol_index = sidx[printcell.selcol]; /* save the item offset*/
else
printcell.selcol_index = -1;
cursor = Icon_Cursor; cursor = Icon_Cursor;
/* limit length of selection if columns don't reach end */ /* limit length of selection if columns don't reach end */
int maxw = nx + printcell.totalcolw[screen] + printcell.iconw[screen]; int maxw = nx + printcell.totalcolw[screen] + printcell.iconw[screen];
maxw += text_offset * printcell.ncols; maxw += text_offset * printcell.ncols;
maxw -= hidden_w;
if (vp_w > maxw) if (vp_w > maxw)
vp->width = maxw; vp->width = maxw;
/* display a blank line first to draw selector across all cells */ /* display a blank line first to draw selector across all cells */
@ -364,7 +409,7 @@ static void printcell_listdraw_fn(struct list_putlineinfo_t *list_info)
nx += nw; nx += nw;
/* display remaining cells */ /* display remaining cells */
printcells(display, printcell_buffer, sidx, linedes, vp, vp_w, separator, printcells(display, printcell_buffer, sidx, linedes, vp, vp_w, separator,
nx, y, col_offset_width, selected_flag, scroll_items); nx, y, col_offset_width, selected_flag, last_col, scroll_items, is_title);
/* draw a line at the bottom of the list */ /* draw a line at the bottom of the list */
if (separator > 0 && line == list->nb_items - 1) if (separator > 0 && line == list->nb_items - 1)
@ -377,14 +422,17 @@ static void printcell_listdraw_fn(struct list_putlineinfo_t *list_info)
vp->width = vp_w; vp->width = vp_w;
} }
void printcell_enable(struct gui_synclist *gui_list, bool enable, bool separator) void printcell_enable(bool enable)
{ {
printcell.separator = separator; if (!printcell.gui_list)
return;
struct gui_synclist *gui_list = printcell.gui_list;
#ifdef HAVE_LCD_COLOR #ifdef HAVE_LCD_COLOR
static int list_sep_color = INT_MIN; static int list_sep_color = INT_MIN;
if (enable) if (enable)
{ {
list_sep_color = rb->global_settings->list_separator_color; if (list_sep_color == INT_MIN)
list_sep_color = rb->global_settings->list_separator_color;
rb->global_settings->list_separator_color = rb->global_settings->fg_color; rb->global_settings->list_separator_color = rb->global_settings->fg_color;
gui_list->callback_draw_item = printcell_listdraw_fn; gui_list->callback_draw_item = printcell_listdraw_fn;
} }
@ -404,8 +452,11 @@ void printcell_enable(struct gui_synclist *gui_list, bool enable, bool separator
} }
int printcell_increment_column(struct gui_synclist *gui_list, int increment, bool wrap) int printcell_increment_column(int increment, bool wrap)
{ {
if (!printcell.gui_list)
return -1;
struct gui_synclist *gui_list = printcell.gui_list;
int item = printcell.selcol + increment; int item = printcell.selcol + increment;
int imin = -1; int imin = -1;
int imax = printcell.ncols - 1; int imax = printcell.ncols - 1;
@ -425,36 +476,94 @@ int printcell_increment_column(struct gui_synclist *gui_list, int increment, boo
FOR_NB_SCREENS(n) /* offset needs recalculated */ FOR_NB_SCREENS(n) /* offset needs recalculated */
printcell.selcol_offw[n] = 0; printcell.selcol_offw[n] = 0;
printcell.selcol = item; printcell.selcol = item;
printcell.selcol_index = 0;
rb->gui_synclist_draw(gui_list); rb->gui_synclist_draw(gui_list);
rb->gui_synclist_speak_item(gui_list);
} }
return item; return item;
} }
int printcell_set_columns(struct gui_synclist *gui_list, int printcell_get_column_selected(void)
char * title, enum themable_icons icon)
{ {
if (!printcell.gui_list)
return -1;
return printcell.selcol;
}
uint32_t printcell_get_column_visibility(int col)
{
if (col >= 0)
return (PRINTCELL_COLUMN_IS_VISIBLE(printcell.hidecol_flags, col) ? 0:1);
else /* return flag of all columns */
return printcell.hidecol_flags;
}
void printcell_set_column_visible(int col, bool visible)
{
/* visible columns have 0 for the column bit hidden columns have the bit set */
if (col >= 0)
{
if (visible)
printcell.hidecol_flags &= ~(PRINTCELL_COLUMN_FLAG(col));
else
printcell.hidecol_flags |= PRINTCELL_COLUMN_FLAG(col);
}
else
{
if (visible) /* set to everything visible */
printcell.hidecol_flags = 0;
else /* set to everything hidden */
printcell.hidecol_flags = ((uint32_t)-1);
}
}
int printcell_set_columns(struct gui_synclist *gui_list,
struct printcell_settings * pcs,
char * title, enum themable_icons icon)
{
if (title == NULL) if (title == NULL)
title = "$PRINTCELL NOT SETUP"; title = "$PRINTCELL NOT SETUP";
if (pcs == NULL) /* DEFAULTS */
{
#if LCD_DEPTH > 1
/* If line sep is set to automatic then outline cells */
bool sep = (rb->global_settings->list_separator_height < 0);
#else
bool sep = (rb->global_settings->cursor_style == 0);
#endif
pcs = &(struct printcell_settings){ .cell_separator = sep,
.title_delimeter = '$',
.text_delimeter = '$',
.hidecol_flags = 0};
}
uint16_t sidx[PRINTCELL_MAX_COLUMNS]; /* starting position of column in title string */ uint16_t sidx[PRINTCELL_MAX_COLUMNS]; /* starting position of column in title string */
int width, height, user_minwidth; int width, height, user_minwidth;
int i = 0; int i = 0;
int j = 0; size_t j = 0;
int ch = '$'; /* first column $ is optional */
rb->memset(&printcell, 0, sizeof(struct printcell_info_t)); rb->memset(&printcell, 0, sizeof(struct printcell_info_t));
printcell.gui_list = gui_list;
printcell.separator = pcs->cell_separator;
printcell.titlesep = pcs->title_delimeter;
printcell.colsep = pcs->text_delimeter;
printcell.hidecol_flags = pcs->hidecol_flags;
int ch = printcell.titlesep; /* first column $ is optional */
FOR_NB_SCREENS(n) FOR_NB_SCREENS(n)
{ {
rb->screens[n]->getstringsize("W", &width, &height); rb->screens[n]->getstringsize("W", &width, &height);
printcell.offw[n] = width; /* set column text offset */ printcell.offw[n] = width; /* set column text offset */
} }
if (*title == '$') if (*title == printcell.titlesep)
title++; title++;
do do
{ {
if (ch == '$') if (ch == printcell.titlesep)
{ {
printcell.title[j++] = ch; printcell.title[j++] = ch;
user_minwidth = 0; user_minwidth = 0;
@ -466,7 +575,7 @@ int printcell_set_columns(struct gui_synclist *gui_list,
user_minwidth = 10*user_minwidth + *title - '0'; user_minwidth = 10*user_minwidth + *title - '0';
title++; title++;
} }
if (*title != '$') /* user forgot $ or wants to display '*' */ if (*title != printcell.titlesep) /* user forgot titlesep or wants to display '*' */
{ {
title = dspst; title = dspst;
user_minwidth = 0; user_minwidth = 0;
@ -476,17 +585,25 @@ int printcell_set_columns(struct gui_synclist *gui_list,
} }
sidx[i] = j; sidx[i] = j;
if (*title == '$') /* $$ escaped user must want to display $*/
printcell.title[j++] = *title++;
while (*title != '\0' && *title != '$' && j < PRINTCELL_MAXLINELEN - 1) while (*title != '\0'
&& *title != printcell.titlesep
&& j < PRINTCELL_MAXLINELEN - 1)
{
printcell.title[j++] = *title++; printcell.title[j++] = *title++;
}
FOR_NB_SCREENS(n) FOR_NB_SCREENS(n)
{ {
rb->screens[n]->getstringsize(&printcell.title[sidx[i]], &width, &height); rb->screens[n]->getstringsize(&printcell.title[sidx[i]],
&width, &height);
if (width < user_minwidth) if (width < user_minwidth)
width = user_minwidth; width = user_minwidth;
if (width > LCD_WIDTH)
width = LCD_WIDTH;
printcell.colw[n][i] = width; printcell.colw[n][i] = width;
printcell.totalcolw[n] += width; printcell.totalcolw[n] += width;
} }
@ -498,37 +615,67 @@ int printcell_set_columns(struct gui_synclist *gui_list,
printcell.ncols = i; printcell.ncols = i;
printcell.title[j] = '\0'; printcell.title[j] = '\0';
printcell.selcol = -1; printcell.selcol = -1;
printcell.selcol_index = 0;
rb->gui_synclist_set_title(gui_list, printcell.title, icon); rb->gui_synclist_set_title(gui_list, printcell.title, icon);
return printcell.ncols; return printcell.ncols;
} }
char *printcell_get_selected_column_text(struct gui_synclist *gui_list, char *buf, size_t bufsz) char *printcell_get_title_text(int selcol, char *buf, size_t bufsz)
{ {
int selected = gui_list->selected_item; /* note offsets are calculated everytime this function is called
int index = printcell.selcol_index - 1; * shouldn't be used in hot code paths */
int index = 0;
buf[0] = '\0';
if (selcol < 0) /* return entire string incld col formatting '$'*/
return printcell.title;
if (index < 0) if (selcol < printcell.ncols)
index = 0;
char *bpos;
if (gui_list->callback_get_item_name(selected, gui_list->data, buf, bufsz) == buf)
{ {
bpos = &buf[index]; uint16_t sidx[PRINTCELL_MAX_COLUMNS]; /*indexes zero terminated strings in buffer*/
if (printcell.selcol < 0) /* return entire string incld col formatting '$'*/ parse_dsptext(printcell.titlesep, selcol + 1, printcell.title, buf, bufsz, sidx);
return bpos; index = sidx[selcol];
while(bpos < &buf[bufsz - 1]) }
return &buf[index];
}
char *printcell_get_column_text(int selcol, char *buf, size_t bufsz)
{
int index = 0;
char *bpos;
struct gui_synclist *gui_list = printcell.gui_list;
if (gui_list && gui_list->callback_draw_item == printcell_listdraw_fn)
{
int col = selcol;
int item = gui_list->selected_item;
void *data = gui_list->data;
if (col < printcell.ncols
&& gui_list->callback_get_item_name(item, data, buf, bufsz) == buf)
{ {
if (*bpos == '$' || *bpos == '\0') bpos = buf;
goto success; if (col < 0) /* return entire string incld col formatting '$'*/
bpos++; {
return bpos;
}
bpos++; /* Skip sep/NULL */
while(bpos < &buf[bufsz - 1])
{
if (*bpos == printcell.colsep || *bpos == '\0')
{
if (col-- == 0)
goto success;
index = bpos - buf + 1; /* Skip sep/NULL */
}
bpos++;
}
} }
} }
/*failure*/ /*failure*/
bpos = buf; bpos = buf;
index = 0; index = 0;
success: success:
*bpos = '\0'; *bpos = '\0';
return &buf[index]; return &buf[index];
} }

68
apps/plugins/lib/printcell_helper.h
View file

@ -21,25 +21,67 @@
#ifndef _PRINTCELL_LIST_H_ #ifndef _PRINTCELL_LIST_H_
#define _PRINTCELL_LIST_H_ #define _PRINTCELL_LIST_H_
#ifndef PRINTCELL_MAX_COLUMNS
#define PRINTCELL_MAX_COLUMNS 16 /* Max 32 (hidecol_flags)*/
#endif
#define PRINTCELL_MAXLINELEN MAX_PATH #define PRINTCELL_MAXLINELEN MAX_PATH
#define PC_COL_FLAG(col) ((uint32_t)(col >= 0 \
&& col < PRINTCELL_MAX_COLUMNS) ? 1u<<col : -1u)
/* sets the printcell function enabled */ #define PRINTCELL_COLUMN_IS_VISIBLE(flag, col) ((flag & PC_COL_FLAG(col)) == 0)
void printcell_enable(struct gui_synclist *gui_list, bool enable, bool separator); #define PRINTCELL_COLUMN_FLAG(col) (PC_COL_FLAG(col))
/* sets title and calculates cell widths each column is identified by '$' character struct printcell_settings
ex 3 columns title = "Col1$Col2$Col3" also accepts $*WIDTH$ {
ex 3 columns varying width title = "$*64$Col1$*128$Col2$Col3 bool cell_separator;
returns number of columns char title_delimeter;
char text_delimeter;
uint32_t hidecol_flags;
};
/* Printcell initialization - Sets title and calculates cell widths
* by default each column is identified by '$' character
* ex 3 columns title = "Col1$Col2$Col3" also accepts $*WIDTH$
* ex 3 columns varying width title = "$*64$Col1$*128$Col2$Col3
* supplying struct printcell_settings pcs allows changing default settings
* supply NULL to use defaults
*
* Returns number of columns
*/ */
int printcell_set_columns(struct gui_synclist *gui_list, int printcell_set_columns(struct gui_synclist *gui_list,
char * title, enum themable_icons icon); struct printcell_settings * pcs,
char * title, enum themable_icons icon);
/* increments the current selected column negative increment is allowed /* Sets the printcell function enabled (use after initializing with set_column)
returns the selected column * Note you should call printcell_enable(false) if the list might be reused */
void printcell_enable(bool enable);
/* Increments the current selected column negative increment is allowed
returns the selected column
range: -1(no selection) to ncols - 1 */ range: -1(no selection) to ncols - 1 */
int printcell_increment_column(struct gui_synclist *gui_list, int increment, bool wrap); int printcell_increment_column(int increment, bool wrap);
/* return the text of currently selected column buffer should be sized /* Return index of the currently selected column (-1 to ncols - 1) */
int printcell_get_column_selected(void);
/* Return the text of currently selected column buffer should be sized
* for max item len, buf[PRINTCELL_MAXLINELEN] is a safe bet */ * for max item len, buf[PRINTCELL_MAXLINELEN] is a safe bet */
char *printcell_get_selected_column_text(struct gui_synclist *gui_list, char *buf, size_t bufsz); char *printcell_get_column_text(int selcol, char *buf, size_t bufsz);
/* Return the text of currently selected column title should be sized
* for max item len, buf[PRINTCELL_MAXLINELEN] is a safe bet */
char *printcell_get_title_text(int selcol, char *buf, size_t bufsz);
/* Hide or show a specified column - supply col = -1 to affect all columns */
void printcell_set_column_visible(int col, bool visible);
/* Return visibility of a specified column
* returns (1 visible or 0 hidden)
* if supply col == -1 a flag with visibility of all columns will be returned
* NOTE: flag denotes a hidden column by a 1 in the column bit (1 << col#)
* PRINTCELL_COLUMN_IS_VISIBLE(flag,col) macro will convert to bool
*/
uint32_t printcell_get_column_visibility(int col);
#endif /*_PRINTCELL_LIST_H_*/ #endif /*_PRINTCELL_LIST_H_*/

35
apps/plugins/rb_info.c
View file

@ -335,6 +335,17 @@ static int list_voice_cb(int list_index, void* data)
rb->talk_spell(name, true); rb->talk_spell(name, true);
} }
} }
else if (data == MENU_ID(M_TESTPUT))
{
char buf[64];
const char* name = printcell_get_column_text(printcell_get_column_selected(),
buf, sizeof(buf));
long id = P2ID((const unsigned char *)name);
if(id>=0)
rb->talk_id(id, true);
else
rb->talk_spell(name, true);
}
else else
{ {
char buf[64]; char buf[64];
@ -354,12 +365,12 @@ int menu_action_cb(int *action, int selected_item, bool* exit, struct gui_syncli
{ {
if (*action == ACTION_STD_OK) if (*action == ACTION_STD_OK)
{ {
printcell_increment_column(lists, 1, true); printcell_increment_column(1, true);
*action = ACTION_NONE; *action = ACTION_NONE;
} }
else if (*action == ACTION_STD_CANCEL) else if (*action == ACTION_STD_CANCEL)
{ {
if (printcell_increment_column(lists, -1, true) != testput_cols - 1) if (printcell_increment_column(-1, true) != testput_cols - 1)
{ {
*action = ACTION_NONE; *action = ACTION_NONE;
} }
@ -368,7 +379,8 @@ int menu_action_cb(int *action, int selected_item, bool* exit, struct gui_syncli
{ {
char buf[PRINTCELL_MAXLINELEN]; char buf[PRINTCELL_MAXLINELEN];
char* bufp = buf; char* bufp = buf;
bufp = printcell_get_selected_column_text(lists, bufp, PRINTCELL_MAXLINELEN); int selcol = printcell_get_column_selected();
bufp = printcell_get_column_text(selcol, bufp, PRINTCELL_MAXLINELEN);
rb->splashf(HZ * 2, "Item: %s", bufp); rb->splashf(HZ * 2, "Item: %s", bufp);
} }
} }
@ -429,18 +441,12 @@ int menu_action_cb(int *action, int selected_item, bool* exit, struct gui_syncli
if (cur->menuid == MENU_ID(M_TESTPUT)) if (cur->menuid == MENU_ID(M_TESTPUT))
{ {
synclist_set(cur->menuid, 0, cur->items, 1); synclist_set(cur->menuid, 0, cur->items, 1);
#if LCD_DEPTH > 1 printcell_enable(true);
/* If line sep is set to automatic then outline cells */
bool showlinesep = (rb->global_settings->list_separator_height < 0);
#else
bool showlinesep = (rb->global_settings->cursor_style == 0);
#endif
printcell_enable(lists, true, showlinesep);
//lists->callback_draw_item = test_listdraw_fn; //lists->callback_draw_item = test_listdraw_fn;
} }
else else
{ {
printcell_enable(lists, false, false); printcell_enable(false);
synclist_set(cur->menuid, 1, cur->items, 1); synclist_set(cur->menuid, 1, cur->items, 1);
} }
rb->gui_synclist_draw(lists); rb->gui_synclist_draw(lists);
@ -473,7 +479,7 @@ int menu_action_cb(int *action, int selected_item, bool* exit, struct gui_syncli
if (lists->data == MENU_ID(M_TESTPUT)) if (lists->data == MENU_ID(M_TESTPUT))
{ {
//lists->callback_draw_item = NULL; //lists->callback_draw_item = NULL;
printcell_enable(lists, false, false); printcell_enable(false);
} }
if (lists->data != MENU_ID(M_ROOT)) if (lists->data != MENU_ID(M_ROOT))
{ {
@ -505,7 +511,8 @@ static void synclist_set(char* menu_id, int selected_item, int items, int sel_si
menu_id, false, sel_size, NULL); menu_id, false, sel_size, NULL);
if (menu_id == MENU_ID(M_TESTPUT)) if (menu_id == MENU_ID(M_TESTPUT))
{ {
testput_cols = printcell_set_columns(&lists, TESTPUT_HEADER, Icon_Rockbox); testput_cols = printcell_set_columns(&lists, NULL,
TESTPUT_HEADER, Icon_Rockbox);
} }
else else
{ {
@ -562,6 +569,6 @@ enum plugin_status plugin_start(const void* parameter)
selected_item = rb->gui_synclist_get_sel_pos(&lists); selected_item = rb->gui_synclist_get_sel_pos(&lists);
} }
} }
printcell_enable(false);
return ret; return ret;
} }

1
apps/plugins/viewers.config
View file

@ -105,4 +105,5 @@ shopper,viewers/shopper,1
lnk,viewers/windows_lnk,- lnk,viewers/windows_lnk,-
#ifdef HAVE_TAGCACHE #ifdef HAVE_TAGCACHE
*,demos/pictureflow,- *,demos/pictureflow,-
log,viewers/lastfm_scrobbler_viewer,4
#endif #endif