diff options
Diffstat (limited to 'apps/gui/statusbar-skinned.c')
-rw-r--r-- | apps/gui/statusbar-skinned.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/apps/gui/statusbar-skinned.c b/apps/gui/statusbar-skinned.c index 63f3197faa..8dd66641dd 100644 --- a/apps/gui/statusbar-skinned.c +++ b/apps/gui/statusbar-skinned.c @@ -27,7 +27,6 @@ #include "appevents.h" #include "screens.h" #include "screen_access.h" -#include "strlcpy.h" #include "skin_parser.h" #include "skin_buffer.h" #include "skin_engine/skin_engine.h" @@ -49,11 +48,13 @@ static int update_delay = DEFAULT_UPDATE_DELAY; static bool sbs_has_title[NB_SCREENS]; -static char* sbs_title[NB_SCREENS]; +static const char* sbs_title[NB_SCREENS]; static enum themable_icons sbs_icon[NB_SCREENS]; static bool sbs_loaded[NB_SCREENS] = { false }; -bool sb_set_title_text(char* title, enum themable_icons icon, enum screen_type screen) +void sb_set_info_vp(enum screen_type screen, OFFSETTYPE(char*) label); + +bool sb_set_title_text(const char* title, enum themable_icons icon, enum screen_type screen) { sbs_title[screen] = title; /* Icon_NOICON == -1 which the skin engine wants at position 1, so + 2 */ @@ -156,7 +157,12 @@ int sb_get_backdrop(enum screen_type screen) else return -1; } - +#else +int sb_get_backdrop(enum screen_type screen) +{ + (void) screen; + return -1; +} #endif static bool force_waiting = false; void sb_skin_update(enum screen_type screen, bool force) @@ -300,18 +306,17 @@ void sb_bypass_touchregions(bool enable) int sb_touch_to_button(int context) { - struct touchregion *region; static int last_context = -1; int button, offset; if (bypass_sb_touchregions) return ACTION_TOUCHSCREEN; - + + struct gui_wps *gwps = skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN); if (last_context != context) - skin_disarm_touchregions(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data); + skin_disarm_touchregions(gwps); last_context = context; - button = skin_get_touchaction(skin_get_gwps(CUSTOM_STATUSBAR, SCREEN_MAIN)->data, - &offset, ®ion); - + + button = skin_get_touchaction(gwps, &offset); switch (button) { #ifdef HAVE_VOLUME_IN_LIST |