0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Events: removed unused sdl_handler virtual functions

Browse source 
volatile draw had to do with drawing map labels pre-accelerated rendering. They're unused
now and I don't foresee using them again since they don't offer anything the regular draw
functions don't and they aren't needed for the map labels anymore.

Tooltips are handled by handled by GUI2. There are no more help strings since the related
interface in CVideo got removed.
This commit is contained in:
Charles Dang 2018-05-28 17:36:57 +11:00
parent 3c4da4035f
commit 019848a28f
3 changed files with 0 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/display.cpp
View file

@ -1944,10 +1944,6 @@ void display::draw()
// Draw floating labels (includes map labels).
font::draw_floating_labels();
// TODO: what dis?
// events::raise_volatile_draw_event();
// events::raise_volatile_undraw_event();
// Execute any post-draw actions from derived classes.
post_draw();
}

38
src/events.cpp
View file

@ -550,7 +550,6 @@ void run_event_loop()
case SDL_MOUSEMOTION: {
// Always make sure a cursor is displayed if the mouse moves or if the user clicks
cursor::set_focus(true);
raise_help_string_event(event.motion.x, event.motion.y);
break;
}
@ -686,43 +685,6 @@ void raise_draw_all_event()
}
}
void raise_volatile_draw_event()
{
if(event_contexts.empty() == false) {
for(auto handler : event_contexts.back().handlers) {
handler->volatile_draw();
}
}
}
void raise_volatile_draw_all_event()
{
for(auto& context : event_contexts) {
for(auto handler : context.handlers) {
handler->volatile_draw();
}
}
}
void raise_volatile_undraw_event()
{
if(event_contexts.empty() == false) {
for(auto handler : event_contexts.back().handlers) {
handler->volatile_undraw();
}
}
}
void raise_help_string_event(int mousex, int mousey)
{
if(event_contexts.empty() == false) {
for(auto handler : event_contexts.back().handlers) {
handler->process_help_string(mousex, mousey);
handler->process_tooltip_string(mousex, mousey);
}
}
}
int pump_info::ticks(unsigned* refresh_counter, unsigned refresh_rate)
{
if(!ticks_ && !(refresh_counter && ++*refresh_counter % refresh_rate)) {

10
src/events.hpp
View file

@ -75,14 +75,8 @@ public:
virtual void process_event() {}
virtual void draw() {}
virtual void volatile_draw() {}
virtual void volatile_undraw() {}
virtual bool requires_event_focus(const SDL_Event * = nullptr) const { return false; }
virtual void process_help_string(int /*mousex*/, int /*mousey*/) {}
virtual void process_tooltip_string(int /*mousex*/, int /*mousey*/) {}
virtual void join(); /*joins the current event context*/
virtual void join(context &c); /*joins the specified event context*/
virtual void join_same(sdl_handler* parent); /*joins the same event context as the parent is already associated with */
@ -156,10 +150,6 @@ void raise_process_event();
void raise_resize_event();
void raise_draw_event();
void raise_draw_all_event();
void raise_volatile_draw_event();
void raise_volatile_draw_all_event();
void raise_volatile_undraw_event();
void raise_help_string_event(int mousex, int mousey);
/**