TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Delegate newmenu subfunction handling into virtual function

Browse source
This commit is contained in:
Kp 2020-12-19 16:13:26 +00:00
parent d4cf9943c5
commit 56122687d1
2 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/main/newmenu.h
View file

@ -237,15 +237,13 @@ struct newmenu_layout
struct newmenu : newmenu_layout, window
{
using subfunction_type = int(*)(newmenu *menu, const d_event &event, void *userdata);
newmenu(grs_canvas &src, newmenu_layout &&l, subfunction_type subfunction, void *userdata) :
newmenu_layout(std::move(l)), window(src, x, y, w, h),
subfunction(subfunction), userdata(userdata)
newmenu(grs_canvas &src, newmenu_layout &&l) :
newmenu_layout(std::move(l)), window(src, x, y, w, h)
{
}
const subfunction_type subfunction;
int *rval = nullptr; // Pointer to return value (for polling newmenus)
void *const userdata; // For whatever - like with window system
int *rval = nullptr; // Pointer to return value (for polling newmenus)
virtual window_event_result event_handler(const d_event &) override;
virtual int subfunction_handler(const d_event &event) = 0;
};
template <typename T>

42
similar/main/newmenu.cpp
View file

@ -140,6 +140,18 @@ const char *Newmenu_allowed_chars;
namespace {
struct callback_newmenu : newmenu
{
callback_newmenu(grs_canvas &src, newmenu_layout &&l, subfunction_type subfunction, void *userdata) :
newmenu(src, std::move(l)),
subfunction(subfunction), userdata(userdata)
{
}
const subfunction_type subfunction;
void *const userdata; // For whatever - like with window system
virtual int subfunction_handler(const d_event &event) override;
};
struct step_down
{
template <typename T>
@ -214,6 +226,13 @@ newmenu_layout::adjusted_citem newmenu_layout::adjusted_citem::create(const part
return adjusted_citem{items, citem, all_text};
}
int callback_newmenu::subfunction_handler(const d_event &event)
{
if (!subfunction)
return 0;
return (*subfunction)(this, event, userdata);
}
}
namespace dsx {
@ -982,7 +1001,7 @@ static window_event_result newmenu_mouse(const d_event &event, newmenu *menu, in
if (((mx > x1) && (mx < x2)) && ((my > y1) && (my < y2))) {
// Tell callback, allow staying in menu
const d_select_event selected{menu->citem};
if (menu->subfunction && (*menu->subfunction)(menu, selected, menu->userdata))
if (menu->subfunction_handler(selected))
return window_event_result::handled;
if (menu->rval)
@ -1011,9 +1030,9 @@ static window_event_result newmenu_mouse(const d_event &event, newmenu *menu, in
gr_set_current_canvas(save_canvas);
if (changed && menu->subfunction)
if (changed)
{
(*menu->subfunction)(menu, d_change_event{menu->citem}, menu->userdata);
menu->subfunction_handler(d_change_event{menu->citem});
}
break;
}
@ -1160,7 +1179,7 @@ static window_event_result newmenu_key_command(const d_event &event, newmenu *co
// Tell callback, allow staying in menu
const d_select_event selected{menu->citem};
if (menu->subfunction && (*menu->subfunction)(menu, selected, menu->userdata))
if (menu->subfunction_handler(selected))
return window_event_result::handled;
if (menu->rval)
@ -1290,9 +1309,9 @@ static window_event_result newmenu_key_command(const d_event &event, newmenu *co
}
if (changed && menu->subfunction)
if (changed)
{
(*menu->subfunction)(menu, d_change_event{menu->citem}, menu->userdata);
menu->subfunction_handler(d_change_event{menu->citem});
}
return rval;
@ -1583,12 +1602,8 @@ static window_event_result newmenu_draw(newmenu *menu)
gr_string(*grd_curcanv, cv_font, sx, sy, (scroll_offset + menu->max_displayable < menu->items.size()) ? DOWN_ARROW_MARKER(*grd_curcanv->cv_font, *GAME_FONT) : " ");
}
if (menu->subfunction)
(*menu->subfunction)(menu, d_event{EVENT_NEWMENU_DRAW}, menu->userdata);
menu->subfunction_handler(d_event{EVENT_NEWMENU_DRAW});
gr_set_current_canvas(save_canvas);
return window_event_result::handled;
}
@ -1603,9 +1618,8 @@ window_event_result newmenu::event_handler(const d_event &event)
return window_event_result::handled;
#endif
if (subfunction)
{
const auto rval = (*subfunction)(this, event, userdata);
const auto rval = subfunction_handler(event);
#if 0 // No current instances of the subfunction closing the window itself (which is preferred)
// Enable when all subfunctions return a window_event_result
if (rval == window_event_result::deleted)
@ -1671,7 +1685,7 @@ newmenu *newmenu_do4(const menu_title title, const menu_subtitle subtitle, const
return nullptr;
newmenu_layout nl(title, subtitle, filename, TinyMode, TabsFlag, newmenu_layout::adjusted_citem::create(items, citem));
newmenu_create_structure(nl, *(TinyMode != tiny_mode_flag::normal ? GAME_FONT : MEDIUM1_FONT));
auto menu = std::make_unique<newmenu>(grd_curscreen->sc_canvas, std::move(nl), subfunction, userdata);
auto menu = std::make_unique<callback_newmenu>(grd_curscreen->sc_canvas, std::move(nl), subfunction, userdata);
newmenu_free_background();
menu->send_creation_events();