Skip to content

Commit

Permalink
Cleanup|libcommon|Menu: Removed unused menu::Widget, action callback …
Browse files Browse the repository at this point in the history 
…return value
  • Loading branch information
@danij-deng
danij-deng committed Jul 23, 2014
1 parent 0dba156 commit 64c3a05
Show file tree
Hide file tree
Showing 5 changed files with 146 additions and 188 deletions.
24 changes: 11 additions & 13 deletions doomsday/plugins/common/include/hu_lib.h
View file
Expand Up @@ -160,9 +160,7 @@ struct Widget
///
/// @param ob Object being referenced for this callback.
/// @param action Identifier of the Menu Action to be processed.
/// @return Callback return value. Callback should return zero if the action
/// was recognised and processed, regardless of outcome.
int (*callback) (Widget *wi, mn_actionid_t action);
void (*callback) (Widget *wi, mn_actionid_t action);
};

public:
Expand Down Expand Up @@ -281,6 +279,10 @@ struct Widget
/// @return Index of the font used from the owning/active page.
int font();

de::String const &helpInfo() const;
Widget &setHelpInfo(de::String newHelpInfo);
inline bool hasHelpInfo() const { return !helpInfo().isEmpty(); }

/// @return @c true if this object has a registered executeable action
/// associated with the unique identifier @a action.
dd_bool hasAction(mn_actionid_t action);
Expand All @@ -296,11 +298,7 @@ struct Widget
* @param action Identifier of the action to be executed (if found).
* @return Return value of the executed action else @c -1 if NOP.
*/
int execAction(mn_actionid_t action);

de::String const &helpInfo() const;
Widget &setHelpInfo(de::String newHelpInfo);
inline bool hasHelpInfo() const { return !helpInfo().isEmpty(); }
void execAction(mn_actionid_t action);

private:
DENG2_PRIVATE(d)
Expand Down Expand Up @@ -569,7 +567,7 @@ struct CVarToggleWidget : public ButtonWidget
};

int CVarToggleWidget_CommandResponder(Widget *wi, menucommand_e cmd);
int CvarToggleWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);
void CvarToggleWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);

struct cvarbutton_t
{
Expand Down Expand Up @@ -659,7 +657,7 @@ struct LineEditWidget : public Widget

int LineEditWidget_CommandResponder(Widget *wi, menucommand_e command);

int CvarLineEditWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);
void CvarLineEditWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);

/**
* List selection.
Expand Down Expand Up @@ -738,7 +736,7 @@ struct ListWidget : public Widget

int ListWidget_CommandResponder(Widget *wi, menucommand_e command);

int CvarListWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);
void CvarListWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);

struct InlineListWidget : public ListWidget
{
Expand Down Expand Up @@ -839,7 +837,7 @@ struct ColorPreviewWidget : public Widget

int ColorPreviewWidget_CommandResponder(Widget *wi, menucommand_e command);

int CvarColorPreviewWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);
void CvarColorPreviewWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);

/**
* Graphical slider.
Expand Down Expand Up @@ -908,7 +906,7 @@ struct SliderWidget : public Widget

int SliderWidget_CommandResponder(Widget *wi, menucommand_e command);

int CvarSliderWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);
void CvarSliderWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action);

struct TextualSliderWidget : public SliderWidget
{
Expand Down
2 changes: 1 addition & 1 deletion doomsday/plugins/common/include/hu_menu.h
View file
Expand Up @@ -197,7 +197,7 @@ void Hu_MenuInitNewGame(dd_bool confirmed);

void Hu_MenuCommand(menucommand_e cmd);

int Hu_MenuDefaultFocusAction(menu::Widget *wi, menu::Widget::mn_actionid_t action);
void Hu_MenuDefaultFocusAction(menu::Widget *wi, menu::Widget::mn_actionid_t action);

} // namespace common

Expand Down
81 changes: 36 additions & 45 deletions doomsday/plugins/common/src/hu_lib.cpp
View file
Expand Up @@ -1652,6 +1652,17 @@ int Widget::color()
return _pageColorIdx;
}

String const &Widget::helpInfo() const
{
return d->helpInfo;
}

Widget &Widget::setHelpInfo(String newHelpInfo)
{
d->helpInfo = newHelpInfo;
return *this;
}

int Widget_DefaultCommandResponder(Widget *ob, menucommand_e cmd)
{
DENG2_ASSERT(ob);
Expand Down Expand Up @@ -1689,26 +1700,14 @@ dd_bool Widget::hasAction(mn_actionid_t id)
return (info && info->callback != 0);
}

int Widget::execAction(mn_actionid_t id)
void Widget::execAction(mn_actionid_t id)
{
if(hasAction(id))
{
return action(id)->callback(this, id);
action(id)->callback(this, id);
return;
}
DENG2_ASSERT(!"MNObject::ExecAction: Attempt to execute non-existent action.");
/// @todo Need an error handling mechanic.
return -1; // NOP
}

String const &Widget::helpInfo() const
{
return d->helpInfo;
}

Widget &Widget::setHelpInfo(String newHelpInfo)
{
d->helpInfo = newHelpInfo;
return *this;
}

RectWidget::RectWidget()
Expand Down Expand Up @@ -2148,13 +2147,13 @@ void LineEditWidget::updateGeometry(Page * /*page*/)
Rect_SetWidthHeight(_geometry, 170, 14);
}

int CvarLineEditWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
void CvarLineEditWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
{
DENG2_ASSERT(wi != 0);
LineEditWidget const &edit = wi->as<LineEditWidget>();
cvartype_t varType = Con_GetVariableType((char const *)edit.data1);

if(Widget::MNA_MODIFIED != action) return 1;
if(Widget::MNA_MODIFIED != action) return;

switch(varType)
{
Expand All @@ -2170,7 +2169,6 @@ int CvarLineEditWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)

default: break;
}
return 0;
}

mndata_listitem_t::mndata_listitem_t(char const *text, int data)
Expand Down Expand Up @@ -2383,16 +2381,16 @@ dd_bool ListWidget::selectItemByValue(int flags, int dataValue)
return selectItem(flags, findItem(dataValue));
}

int CvarListWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
void CvarListWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
{
ListWidget const *list = &wi->as<ListWidget>();

if(Widget::MNA_MODIFIED != action) return 1;
if(Widget::MNA_MODIFIED != action) return;

if(list->selection() < 0) return 0; // Hmm?
if(list->selection() < 0) return; // Hmm?

cvartype_t varType = Con_GetVariableType((char const *)list->data);
if(CVT_NULL == varType) return 0;
if(CVT_NULL == varType) return;

mndata_listitem_t const *item = list->items()[list->_selection];
int value;
Expand All @@ -2414,11 +2412,9 @@ int CvarListWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
case CVT_BYTE:
Con_SetInteger2((char const *)list->data, (byte) value, SVF_WRITE_OVERRIDE);
break;
default:
Con_Error("Hu_MenuCvarList: Unsupported variable type %i", (int)varType);
break;

default: Con_Error("Hu_MenuCvarList: Unsupported variable type %i", (int)varType);
}
return 0;
}

InlineListWidget::InlineListWidget()
Expand Down Expand Up @@ -2756,18 +2752,18 @@ int CVarToggleWidget_CommandResponder(Widget *wi, menucommand_e cmd)
return false; // Not eaten.
}

int CvarToggleWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
void CvarToggleWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
{
CVarToggleWidget *tog = &wi->as<CVarToggleWidget>();
cvarbutton_t const *cb = (cvarbutton_t *)wi->data1;
cvartype_t varType = Con_GetVariableType(cb->cvarname);
int value;

if(Widget::MNA_MODIFIED != action) return 1;
if(Widget::MNA_MODIFIED != action) return;

tog->setText(cb->active? cb->yes : cb->no);

if(CVT_NULL == varType) return 0;
if(CVT_NULL == varType) return;

if(cb->mask)
{
Expand All @@ -2787,22 +2783,21 @@ int CvarToggleWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
}

Con_SetInteger2(cb->cvarname, value, SVF_WRITE_OVERRIDE);
return 0;
}

ColorPreviewWidget::ColorPreviewWidget()
: Widget()
, width (0)
, height (0)
, width (0)
, height (0)
, _r (0)
, _g (0)
, _b (0)
, _a (0)
, _rgbaMode(false)
, data1 (0)
, data2 (0)
, data3 (0)
, data4 (0)
, data1 (0)
, data2 (0)
, data3 (0)
, data4 (0)
{
Widget::_pageFontIdx = MENU_FONT1;
Widget::_pageColorIdx = MENU_COLOR1;
Expand Down Expand Up @@ -3142,11 +3137,11 @@ dd_bool ColorPreviewWidget::copyColor(int flags, ColorPreviewWidget const &other
return setColor4f(flags, other.redf(), other.greenf(), other.bluef(), other.alphaf());
}

int CvarColorPreviewWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
void CvarColorPreviewWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
{
ColorPreviewWidget *cbox = &wi->as<ColorPreviewWidget>();

if(action != Widget::MNA_MODIFIED) return 1;
if(action != Widget::MNA_MODIFIED) return;

// MNColorBox's current color has already been updated and we know
// that at least one of the color components have changed.
Expand All @@ -3158,8 +3153,6 @@ int CvarColorPreviewWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
{
Con_SetFloat2((char const *)cbox->data4, cbox->alphaf(), SVF_WRITE_OVERRIDE);
}

return 0;
}

SliderWidget::SliderWidget()
Expand Down Expand Up @@ -3312,13 +3305,13 @@ int SliderWidget_CommandResponder(Widget *wi, menucommand_e cmd)
}
}

int CvarSliderWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
void CvarSliderWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)
{
if(Widget::MNA_MODIFIED != action) return 1;
if(Widget::MNA_MODIFIED != action) return;

SliderWidget &sldr = wi->as<SliderWidget>();
cvartype_t varType = Con_GetVariableType((char const *)sldr.data1);
if(CVT_NULL == varType) return 0;
if(CVT_NULL == varType) return;

float value = sldr.value();
switch(varType)
Expand All @@ -3344,8 +3337,6 @@ int CvarSliderWidget_UpdateCvar(Widget *wi, Widget::mn_actionid_t action)

default: break;
}

return 0;
}

static inline dd_bool valueIsOne(float value, dd_bool floatMode)
Expand Down

0 comments on commit 64c3a05

Please sign in to comment.