Fix static initialization order problem with Horus GUI (#4141)

* [480x272] Fix static initialization order problem with Layout, Theme, & Widget factories.

* [480x272] Fix return from drawTimerMode().

* [480x272] Remove use of macros for registered Layout, Widget, & Theme class lists; remove extern declarations (cosmetic).

* [480x272] Convert Layout and Theme registry to dynamic lists (still max. of 10 each);
  Hide indicator arrow when user is at start/end of available widgets in spinner UI;
  Add some sanity checking to pointer usage in screens_setup;
  Add an (arbitrary) limit of 20 Widgets;
  And a line break! :)
This commit is contained in:
Max Paperno
2016-12-17 23:29:26 +01:00
committed by Bertrand Songis
parent d4d3d51a9d
commit bce42bb25c
8 changed files with 137 additions and 87 deletions
+14 -10
View File
@@ -20,22 +20,26 @@
#include "opentx.h" #include "opentx.h"
const LayoutFactory * registeredLayouts[MAX_REGISTERED_LAYOUTS]; // TODO dynamic std::list<const LayoutFactory *> & getRegisteredLayouts()
unsigned int countRegisteredLayouts = 0; {
static std::list<const LayoutFactory *> layouts;
return layouts;
}
void registerLayout(const LayoutFactory * factory) void registerLayout(const LayoutFactory * factory)
{ {
if (countRegisteredLayouts < MAX_REGISTERED_LAYOUTS) { if (getRegisteredLayouts().size() < MAX_REGISTERED_LAYOUTS) {
TRACE("register layout %s", factory->getName()); TRACE("register layout %s", factory->getName());
registeredLayouts[countRegisteredLayouts++] = factory; getRegisteredLayouts().push_back(factory);
} }
} }
const LayoutFactory * getLayoutFactory(const char * name) const LayoutFactory * getLayoutFactory(const char * name)
{ {
for (unsigned int i=0; i<countRegisteredLayouts; i++) { std::list<const LayoutFactory *>::const_iterator it = getRegisteredLayouts().cbegin();
const LayoutFactory * factory = registeredLayouts[i]; for (; it != getRegisteredLayouts().cend(); ++it) {
if (!strcmp(name, factory->getName())) { if (!strcmp(name, (*it)->getName())) {
return factory; return (*it);
} }
} }
return NULL; return NULL;
@@ -60,8 +64,8 @@ void loadCustomScreens()
customScreens[i] = loadLayout(name, &g_model.screenData[i].layoutData); customScreens[i] = loadLayout(name, &g_model.screenData[i].layoutData);
} }
if (customScreens[0] == NULL) { if (customScreens[0] == NULL && getRegisteredLayouts().size()) {
customScreens[0] = registeredLayouts[0]->create(&g_model.screenData[0].layoutData); customScreens[0] = getRegisteredLayouts().front()->create(&g_model.screenData[0].layoutData);
} }
topbar->load(); topbar->load();
+4 -4
View File
@@ -21,6 +21,7 @@
#ifndef _LAYOUT_H_ #ifndef _LAYOUT_H_
#define _LAYOUT_H_ #define _LAYOUT_H_
#include <list>
#include "widgets_container.h" #include "widgets_container.h"
#define MAX_LAYOUT_ZONES 10 #define MAX_LAYOUT_ZONES 10
@@ -113,11 +114,10 @@ class BaseLayoutFactory: public LayoutFactory
const ZoneOption * options; const ZoneOption * options;
}; };
#define MAX_REGISTERED_LAYOUTS 10
extern unsigned int countRegisteredLayouts;
extern const LayoutFactory * registeredLayouts[MAX_REGISTERED_LAYOUTS];
Layout * loadLayout(const char * name, Layout::PersistentData * persistentData); Layout * loadLayout(const char * name, Layout::PersistentData * persistentData);
void loadCustomScreens(); void loadCustomScreens();
#define MAX_REGISTERED_LAYOUTS 10
std::list<const LayoutFactory *> & getRegisteredLayouts();
#endif // _LAYOUT_H_ #endif // _LAYOUT_H_
+6 -3
View File
@@ -279,10 +279,13 @@ void drawCurveName(coord_t x, coord_t y, int8_t idx, LcdFlags flags)
void drawTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att) void drawTimerMode(coord_t x, coord_t y, int32_t mode, LcdFlags att)
{ {
if (mode >= 0) { if (mode >= 0) {
if (mode < TMRMODE_COUNT) if (mode < TMRMODE_COUNT) {
return lcdDrawTextAtIndex(x, y, STR_VTMRMODES, mode, att); lcdDrawTextAtIndex(x, y, STR_VTMRMODES, mode, att);
else return;
}
else {
mode -= (TMRMODE_COUNT-1); mode -= (TMRMODE_COUNT-1);
}
} }
drawSwitch(x, y, mode, att); drawSwitch(x, y, mode, att);
} }
+73 -43
View File
@@ -209,9 +209,9 @@ bool menuWidgetSettings(event_t event)
bool menuWidgetChoice(event_t event) bool menuWidgetChoice(event_t event)
{ {
static Widget * previousWidget; static Widget * previousWidget = NULL;
static Widget * currentWidget; static Widget * currentWidget = NULL;
static std::list<const WidgetFactory *>::iterator iterator; static std::list<const WidgetFactory *>::const_iterator iterator;
static Widget::PersistentData tempData; static Widget::PersistentData tempData;
switch (event) { switch (event) {
@@ -219,45 +219,55 @@ bool menuWidgetChoice(event_t event)
{ {
previousWidget = currentContainer->getWidget(currentZone); previousWidget = currentContainer->getWidget(currentZone);
currentContainer->setWidget(currentZone, NULL); currentContainer->setWidget(currentZone, NULL);
iterator = registeredWidgets.begin(); iterator = getRegisteredWidgets().cbegin();
if (previousWidget) { if (previousWidget) {
const WidgetFactory * factory = previousWidget->getFactory(); const WidgetFactory * factory = previousWidget->getFactory();
for (std::list<const WidgetFactory *>::iterator it = registeredWidgets.begin(); it != registeredWidgets.end(); ++it) { std::list<const WidgetFactory *>::const_iterator it = getRegisteredWidgets().cbegin();
for (; it != getRegisteredWidgets().cend(); ++it) {
if (factory->getName() == (*it)->getName()) { if (factory->getName() == (*it)->getName()) {
iterator = it; iterator = it;
break; break;
} }
} }
} }
currentWidget = (*iterator)->create(currentContainer->getZone(currentZone), &tempData); if (iterator != getRegisteredWidgets().cend())
currentWidget = (*iterator)->create(currentContainer->getZone(currentZone), &tempData);
break; break;
} }
case EVT_KEY_FIRST(KEY_EXIT): case EVT_KEY_FIRST(KEY_EXIT):
delete currentWidget; if (previousWidget) {
currentContainer->setWidget(currentZone, previousWidget); if (currentWidget)
delete currentWidget;
currentContainer->setWidget(currentZone, previousWidget);
}
popMenu(); popMenu();
return false; return false;
case EVT_KEY_FIRST(KEY_ENTER): case EVT_KEY_FIRST(KEY_ENTER):
delete previousWidget; if (iterator != getRegisteredWidgets().cend()) {
currentContainer->createWidget(currentZone, *iterator); if (previousWidget)
storageDirty(EE_MODEL); delete previousWidget;
currentContainer->createWidget(currentZone, *iterator);
storageDirty(EE_MODEL);
}
popMenu(); popMenu();
return false; return false;
case EVT_ROTARY_RIGHT: case EVT_ROTARY_RIGHT:
if (iterator != registeredWidgets.end() && iterator != --registeredWidgets.end()) { if (iterator != getRegisteredWidgets().cend() && iterator != --getRegisteredWidgets().cend()) {
++iterator; ++iterator;
delete currentWidget; if (currentWidget)
delete currentWidget;
currentWidget = (*iterator)->create(currentContainer->getZone(currentZone), &tempData); currentWidget = (*iterator)->create(currentContainer->getZone(currentZone), &tempData);
} }
break; break;
case EVT_ROTARY_LEFT: case EVT_ROTARY_LEFT:
if (iterator != registeredWidgets.begin()) { if (iterator != getRegisteredWidgets().cbegin()) {
--iterator; --iterator;
delete currentWidget; if (currentWidget)
delete currentWidget;
currentWidget = (*iterator)->create(currentContainer->getZone(currentZone), &tempData); currentWidget = (*iterator)->create(currentContainer->getZone(currentZone), &tempData);
} }
break; break;
@@ -271,13 +281,19 @@ bool menuWidgetChoice(event_t event)
lcdDrawFilledRect(zone.x-2, 0, zone.w+4, zone.y-2, SOLID, OVERLAY_COLOR | (8<<24)); lcdDrawFilledRect(zone.x-2, 0, zone.w+4, zone.y-2, SOLID, OVERLAY_COLOR | (8<<24));
lcdDrawFilledRect(zone.x-2, zone.y+zone.h+2, zone.w+4, LCD_H-zone.y-zone.h-2, SOLID, OVERLAY_COLOR | (8<<24)); lcdDrawFilledRect(zone.x-2, zone.y+zone.h+2, zone.w+4, LCD_H-zone.y-zone.h-2, SOLID, OVERLAY_COLOR | (8<<24));
currentWidget->refresh(); if (currentWidget)
currentWidget->refresh();
lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, TEXT_INVERTED_BGCOLOR); if (iterator != getRegisteredWidgets().cbegin()) {
lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_LEFT, TEXT_INVERTED_COLOR); lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, TEXT_INVERTED_BGCOLOR);
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, TEXT_INVERTED_BGCOLOR); lcdDrawBitmapPattern(zone.x-10, zone.y+zone.h/2-10, LBM_SWIPE_LEFT, TEXT_INVERTED_COLOR);
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_RIGHT, TEXT_INVERTED_COLOR); }
lcdDrawText(zone.x + zone.w, zone.y-1, currentWidget->getFactory()->getName(), RIGHT | TEXT_COLOR | SMLSIZE | INVERS); if (iterator != --getRegisteredWidgets().cend()) {
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_CIRCLE, TEXT_INVERTED_BGCOLOR);
lcdDrawBitmapPattern(zone.x+zone.w-9, zone.y+zone.h/2-10, LBM_SWIPE_RIGHT, TEXT_INVERTED_COLOR);
}
if (currentWidget)
lcdDrawText(zone.x + zone.w, zone.y-1, currentWidget->getFactory()->getName(), RIGHT | TEXT_COLOR | SMLSIZE | INVERS);
return true; return true;
} }
@@ -351,16 +367,20 @@ bool menuWidgetsSetup(event_t event)
} }
template <class T> template <class T>
T * editThemeChoice(coord_t x, coord_t y, T * array[], uint8_t count, T * current, bool needsOffsetCheck, LcdFlags attr, event_t event) T * editThemeChoice(coord_t x, coord_t y, std::list<T *> & elList, T * current, bool needsOffsetCheck, LcdFlags attr, event_t event)
{ {
static uint8_t menuHorizontalOffset; static uint8_t menuHorizontalOffset = 0;
uint8_t elCount = elList.size(), last, idx;
coord_t pos;
int currentIndex = 0; int currentIndex = 0;
for (unsigned int i=0; i<count; i++) { typename std::list<T *>::const_iterator elItr = elList.cbegin();
if (array[i] == current) {
currentIndex = i; if (!elCount)
return NULL;
for (; elItr != elList.cend(); ++elItr, ++currentIndex) {
if ((*elItr) == current)
break; break;
}
} }
if (event == EVT_ENTRY) { if (event == EVT_ENTRY) {
@@ -378,7 +398,7 @@ T * editThemeChoice(coord_t x, coord_t y, T * array[], uint8_t count, T * curren
} }
if (attr) { if (attr) {
if (menuHorizontalPosition < 0) { if (menuHorizontalPosition < 0) {
lcdDrawSolidFilledRect(x-3, y-1, min<uint8_t>(4, count)*56+1, 2*FH-5, TEXT_INVERTED_BGCOLOR); lcdDrawSolidFilledRect(x-3, y-1, min<uint8_t>(4, elCount)*56+1, 2*FH-5, TEXT_INVERTED_BGCOLOR);
} }
else { else {
if (needsOffsetCheck) { if (needsOffsetCheck) {
@@ -392,20 +412,29 @@ T * editThemeChoice(coord_t x, coord_t y, T * array[], uint8_t count, T * curren
} }
} }
} }
unsigned int last = min<int>(menuHorizontalOffset + 4, count); last = min<uint8_t>(menuHorizontalOffset + 4, elCount);
for (unsigned int i=menuHorizontalOffset, pos=x; i<last; i++, pos += 56) { idx = menuHorizontalOffset;
T * element = array[i]; pos = x;
element->drawThumb(pos, y+1, current == element ? ((attr && menuHorizontalPosition < 0) ? TEXT_INVERTED_COLOR : TEXT_INVERTED_BGCOLOR) : LINE_COLOR); elItr = elList.cbegin();
std::advance(elItr, min<uint8_t>(menuHorizontalOffset, elCount - 1));
for (; idx < last && elItr != elList.cend(); ++idx, ++elItr, pos += 56) {
(*elItr)->drawThumb(pos, y+1, current == (*elItr) ? ((attr && menuHorizontalPosition < 0) ? TEXT_INVERTED_COLOR : TEXT_INVERTED_BGCOLOR) : LINE_COLOR);
} }
if (count > 4) { if (elCount > 4) {
lcdDrawBitmapPattern(x - 12, y+1, LBM_CARROUSSEL_LEFT, menuHorizontalOffset > 0 ? LINE_COLOR : CURVE_AXIS_COLOR); lcdDrawBitmapPattern(x - 12, y+1, LBM_CARROUSSEL_LEFT, menuHorizontalOffset > 0 ? LINE_COLOR : CURVE_AXIS_COLOR);
lcdDrawBitmapPattern(x + 4 * 56, y+1, LBM_CARROUSSEL_RIGHT, last < countRegisteredLayouts ? LINE_COLOR : CURVE_AXIS_COLOR); lcdDrawBitmapPattern(x + 4 * 56, y+1, LBM_CARROUSSEL_RIGHT, last < getRegisteredLayouts().size() ? LINE_COLOR : CURVE_AXIS_COLOR);
} }
if (attr && menuHorizontalPosition >= 0) { if (attr && menuHorizontalPosition >= 0) {
lcdDrawSolidRect(x + (menuHorizontalPosition - menuHorizontalOffset) * 56 - 3, y - 1, 57, 35, 1, TEXT_INVERTED_BGCOLOR); lcdDrawSolidRect(x + (menuHorizontalPosition - menuHorizontalOffset) * 56 - 3, y - 1, 57, 35, 1, TEXT_INVERTED_BGCOLOR);
if (event == EVT_KEY_FIRST(KEY_ENTER)) { if (event == EVT_KEY_FIRST(KEY_ENTER)) {
s_editMode = 0; s_editMode = 0;
return array[menuHorizontalPosition]; elItr = elList.cbegin();
if (menuHorizontalPosition < (int)elList.size())
std::advance(elItr, menuHorizontalPosition);
if (elItr != elList.cend())
return (*elItr);
else
return NULL;
} }
} }
return NULL; return NULL;
@@ -424,7 +453,7 @@ bool menuScreensTheme(event_t event)
linesCount = ITEM_SCREEN_SETUP_THEME_OPTION1 + optionsCount + 1; linesCount = ITEM_SCREEN_SETUP_THEME_OPTION1 + optionsCount + 1;
menuPageCount = updateMainviewsMenu(); menuPageCount = updateMainviewsMenu();
uint8_t mstate_tab[2 + MAX_THEME_OPTIONS + 1] = { uint8_t(NAVIGATION_LINE_BY_LINE|uint8_t(countRegisteredThemes-1)), ORPHAN_ROW }; uint8_t mstate_tab[2 + MAX_THEME_OPTIONS + 1] = { uint8_t(NAVIGATION_LINE_BY_LINE | uint8_t(getRegisteredThemes().size()-1)), ORPHAN_ROW };
for (int i=0; i<optionsCount; i++) { for (int i=0; i<optionsCount; i++) {
mstate_tab[2+i] = getZoneOptionColumns(&options[i]); mstate_tab[2+i] = getZoneOptionColumns(&options[i]);
} }
@@ -439,7 +468,7 @@ bool menuScreensTheme(event_t event)
switch (k) { switch (k) {
case ITEM_SCREEN_SETUP_THEME: { case ITEM_SCREEN_SETUP_THEME: {
lcdDrawText(MENUS_MARGIN_LEFT, y + FH / 2, STR_THEME); lcdDrawText(MENUS_MARGIN_LEFT, y + FH / 2, STR_THEME);
Theme * new_theme = editThemeChoice<Theme>(SCREENS_SETUP_2ND_COLUMN, y, registeredThemes, countRegisteredThemes, theme, needsOffsetCheck, attr, event); Theme * new_theme = editThemeChoice<Theme>(SCREENS_SETUP_2ND_COLUMN, y, getRegisteredThemes(), theme, needsOffsetCheck, attr, event);
if (new_theme) { if (new_theme) {
new_theme->init(); new_theme->init();
loadTheme(new_theme); loadTheme(new_theme);
@@ -506,7 +535,7 @@ bool menuScreenSetup(int index, event_t event)
if (menuPageCount > 3) if (menuPageCount > 3)
++linesCount; ++linesCount;
uint8_t mstate_tab[2 + MAX_LAYOUT_OPTIONS + 1] = { uint8_t(NAVIGATION_LINE_BY_LINE|uint8_t(countRegisteredLayouts-1)), ORPHAN_ROW }; uint8_t mstate_tab[2 + MAX_LAYOUT_OPTIONS + 1] = { uint8_t(NAVIGATION_LINE_BY_LINE | uint8_t(getRegisteredLayouts().size()-1)), ORPHAN_ROW };
for (int i=0; i<optionsCount; i++) { for (int i=0; i<optionsCount; i++) {
mstate_tab[3+i] = getZoneOptionColumns(&options[i]); mstate_tab[3+i] = getZoneOptionColumns(&options[i]);
} }
@@ -523,7 +552,7 @@ bool menuScreenSetup(int index, event_t event)
case ITEM_SCREEN_SETUP_LAYOUT: case ITEM_SCREEN_SETUP_LAYOUT:
{ {
lcdDrawText(MENUS_MARGIN_LEFT, y + FH / 2, STR_LAYOUT); lcdDrawText(MENUS_MARGIN_LEFT, y + FH / 2, STR_LAYOUT);
const LayoutFactory * factory = editThemeChoice<const LayoutFactory>(SCREENS_SETUP_2ND_COLUMN, y, registeredLayouts, countRegisteredLayouts, currentScreen->getFactory(), needsOffsetCheck, attr, event); const LayoutFactory * factory = editThemeChoice<const LayoutFactory>(SCREENS_SETUP_2ND_COLUMN, y, getRegisteredLayouts(), currentScreen->getFactory(), needsOffsetCheck, attr, event);
if (factory) { if (factory) {
delete customScreens[index]; delete customScreens[index];
currentScreen = customScreens[index] = factory->create(&g_model.screenData[index].layoutData); currentScreen = customScreens[index] = factory->create(&g_model.screenData[index].layoutData);
@@ -610,9 +639,10 @@ bool menuScreenAdd(event_t event)
{ {
menuPageCount = updateMainviewsMenu(); menuPageCount = updateMainviewsMenu();
if (event == EVT_KEY_FIRST(KEY_ENTER)) { if (event == EVT_KEY_FIRST(KEY_ENTER) && getRegisteredLayouts().size()) {
customScreens[menuPageCount-2] = registeredLayouts[0]->create(&g_model.screenData[menuPageCount-2].layoutData); const LayoutFactory * lf = getRegisteredLayouts().front();
strncpy(g_model.screenData[menuPageCount-2].layoutName, registeredLayouts[0]->getName(), sizeof(g_model.screenData[menuPageCount-2].layoutName)); customScreens[menuPageCount-2] = lf->create(&g_model.screenData[menuPageCount-2].layoutData);
strncpy(g_model.screenData[menuPageCount-2].layoutName, lf->getName(), sizeof(g_model.screenData[menuPageCount-2].layoutName));
s_editMode = 0; s_editMode = 0;
menuHorizontalPosition = -1; menuHorizontalPosition = -1;
killEvents(KEY_ENTER); killEvents(KEY_ENTER);
+18 -14
View File
@@ -24,6 +24,20 @@ const BitmapBuffer * Theme::asterisk = NULL;
const BitmapBuffer * Theme::question = NULL; const BitmapBuffer * Theme::question = NULL;
const BitmapBuffer * Theme::busy = NULL; const BitmapBuffer * Theme::busy = NULL;
std::list<Theme *> & getRegisteredThemes()
{
static std::list<Theme *> themes;
return themes;
}
void registerTheme(Theme * theme)
{
if (getRegisteredThemes().size() < MAX_REGISTERED_THEMES) {
TRACE("register theme %s", theme->getName());
getRegisteredThemes().push_back(theme);
}
}
void Theme::init() const void Theme::init() const
{ {
memset(&g_eeGeneral.themeData, 0, sizeof(Theme::PersistentData)); memset(&g_eeGeneral.themeData, 0, sizeof(Theme::PersistentData));
@@ -112,22 +126,12 @@ void Theme::drawMessageBox(const char * title, const char * text, const char * a
} }
} }
Theme * registeredThemes[MAX_REGISTERED_THEMES]; // TODO dynamic
unsigned int countRegisteredThemes = 0;
void registerTheme(Theme * theme)
{
if (countRegisteredThemes < MAX_REGISTERED_THEMES) {
TRACE("register theme %s", theme->getName());
registeredThemes[countRegisteredThemes++] = theme;
}
}
Theme * getTheme(const char * name) Theme * getTheme(const char * name)
{ {
for (unsigned int i=0; i<countRegisteredThemes; i++) { std::list<Theme *>::const_iterator it = getRegisteredThemes().cbegin();
Theme * theme = registeredThemes[i]; for (; it != getRegisteredThemes().cend(); ++it) {
if (!strcmp(name, theme->getName())) { if (!strcmp(name, (*it)->getName())) {
return theme; return (*it);
} }
} }
return NULL; return NULL;
+5 -5
View File
@@ -21,6 +21,8 @@
#ifndef _THEME_H_ #ifndef _THEME_H_
#define _THEME_H_ #define _THEME_H_
#include <list>
class BitmapBuffer; class BitmapBuffer;
#define MAX_THEME_OPTIONS 5 #define MAX_THEME_OPTIONS 5
@@ -91,13 +93,11 @@ inline const char * getThemePath(const char * filename)
return theme->getFilePath(filename); return theme->getFilePath(filename);
} }
#define MAX_REGISTERED_THEMES 10
extern unsigned int countRegisteredThemes;
void registerTheme(Theme * theme);
extern Theme * registeredThemes[MAX_REGISTERED_THEMES]; // TODO dynamic
Theme * getTheme(const char * name); Theme * getTheme(const char * name);
void loadTheme(Theme * theme); void loadTheme(Theme * theme);
void loadTheme(); void loadTheme();
#define MAX_REGISTERED_THEMES 10
std::list<Theme *> & getRegisteredThemes();
#endif // _THEME_H_ #endif // _THEME_H_
+14 -7
View File
@@ -20,19 +20,26 @@
#include "opentx.h" #include "opentx.h"
std::list<const WidgetFactory *> registeredWidgets; std::list<const WidgetFactory *> & getRegisteredWidgets()
{
static std::list<const WidgetFactory *> widgets;
return widgets;
}
void registerWidget(const WidgetFactory * factory) void registerWidget(const WidgetFactory * factory)
{ {
TRACE("register widget %s", factory->getName()); if (getRegisteredWidgets().size() < MAX_REGISTERED_WIDGETS) {
registeredWidgets.push_back(factory); TRACE("register widget %s", factory->getName());
getRegisteredWidgets().push_back(factory);
}
} }
const WidgetFactory * getWidgetFactory(const char * name) const WidgetFactory * getWidgetFactory(const char * name)
{ {
for (std::list<const WidgetFactory *>::iterator it = registeredWidgets.begin(); it != registeredWidgets.end();++it) { std::list<const WidgetFactory *>::const_iterator it = getRegisteredWidgets().cbegin();
const WidgetFactory * factory = *it; for (; it != getRegisteredWidgets().cend();++it) {
if (!strcmp(name, factory->getName())) { if (!strcmp(name, (*it)->getName())) {
return factory; return (*it);
} }
} }
return NULL; return NULL;
+3 -1
View File
@@ -186,7 +186,9 @@ inline const ZoneOption * Widget::getOptions() const
return getFactory()->getOptions(); return getFactory()->getOptions();
} }
extern std::list<const WidgetFactory *> registeredWidgets;
Widget * loadWidget(const char * name, const Zone & zone, Widget::PersistentData * persistentData); Widget * loadWidget(const char * name, const Zone & zone, Widget::PersistentData * persistentData);
#define MAX_REGISTERED_WIDGETS 20 // TODO: arbitrary limit, not checked
std::list<const WidgetFactory *> & getRegisteredWidgets();
#endif // _WIDGET_H_ #endif // _WIDGET_H_