ui: simplify figure path handler in info window

Author: s.kushnirenko

src/graphics/elements/generic_button.cpp

@@ -3,9 +3,36 @@
 #include "input/mouse.h"
 
 namespace ui {
+    struct state {
+        vec2i offset;
+        std::vector<generic_button> buttons;
+    };
+
     state g_state;
 }
 
+void ui::begin_window(vec2i offset) {
+    g_state.offset = offset;
+    g_state.buttons.clear();
+}
+
+int ui::handle_mouse(const mouse *m) {
+    int tmp_btn;
+    return generic_buttons_handle_mouse(m, g_state.offset, g_state.buttons, tmp_btn);
+}
+
+generic_button &ui::button(pcstr label, vec2i pos, vec2i size) {
+    const vec2i offset = g_state.offset;
+
+    g_state.buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, button_none, button_none, 0, 0});
+    int focused = is_button_hover(g_state.buttons.back(), offset);
+
+    button_border_draw(offset.x + pos.x, offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
+    text_draw_centered((uint8_t *)label, offset.x + pos.x + 1, offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
+
+    return g_state.buttons.back();
+}
+
 static int get_button(const mouse* m, int x, int y, const generic_button* buttons, int num_buttons) {
     for (int i = 0; i < num_buttons; i++) {
         if (x + buttons[i].x <= m->x && x + buttons[i].x + buttons[i].width > m->x && y + buttons[i].y <= m->y
@@ -39,8 +66,8 @@ int generic_buttons_handle_mouse(const mouse* m, int x, int y, const generic_but
     const generic_button* button = &buttons[button_id - 1];
     if (m->left.went_up) {
         button->left_click_handler(button->parameter1, button->parameter2);
-        if (button->onclick) {
-            button->onclick(button->parameter1, button->parameter2);
+        if (button->_onclick) {
+            button->_onclick(button->parameter1, button->parameter2);
         }
     } else if (m->right.went_up) {
         button->right_click_handler(button->parameter1, button->parameter2);

src/graphics/elements/generic_button.h

@@ -19,7 +19,9 @@ struct generic_button {
     int parameter1;
     int parameter2;
 
-    std::function<void(int,int)> onclick;
+    std::function<void(int,int)> _onclick;
+
+    template<class Func> void onclick(Func f) { _onclick = f; }
 };
 
 int generic_buttons_handle_mouse(const mouse* m, int x, int y, const generic_button* buttons, int num_buttons, int* focus_button_id);
@@ -39,32 +41,8 @@ inline int generic_buttons_handle_mouse(const mouse *m, vec2i pos, const T &butt
 
 namespace ui {
 
-struct state {
-    vec2i offset;
-    std::vector<generic_button> buttons;
-};
-
-extern state g_state;
-
-inline void begin_window(vec2i offset) {
-    g_state.offset = offset;
-    g_state.buttons.clear();
-}
-
-inline int handle_mouse(const mouse *m) {
-    int tmp_btn;
-    return generic_buttons_handle_mouse(m, g_state.offset, g_state.buttons, tmp_btn);
-}
-
-template<class Func>
-void button(pcstr label, vec2i pos, vec2i size, Func func) {
-    const vec2i offset = g_state.offset;
-
-    g_state.buttons.push_back({pos.x, pos.y, size.x + 4, size.y + 4, button_none, button_none, 0, 0, func});
-    int focused = is_button_hover(g_state.buttons.back(), offset);
-
-    button_border_draw(offset.x + pos.x, offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
-    text_draw_centered((uint8_t *)label, offset.x + pos.x + 1, offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
-}
+void begin_window(vec2i offset);
+int handle_mouse(const mouse *m);
+generic_button &button(pcstr label, vec2i pos, vec2i size);
 
 }

src/window/window_building_info.cpp

@@ -72,8 +72,6 @@ static void button_help(int param1, int param2);
 static void button_close(int param1, int param2);
 static void button_advisor(int advisor, int param2);
 static void button_mothball(int mothball, int param2);
-static void button_debugpath(int debug, int param2);
-static void button_overlay(int overlay, int param2);
 
 object_info g_building_info_context;
 
@@ -82,10 +80,6 @@ struct building_info_data {
     int generic_button_id = 0;
     int debug_path_button_id = 0;
 
-    generic_button generic_button_figures[1] = {
-        {400, 3, 24, 24, button_debugpath, button_none, 0, 0}
-    };
-
     generic_button generic_button_mothball[1] = {
         {400, 3, 24, 24, button_mothball, button_none, 0, 0}
     };
@@ -574,13 +568,6 @@ static void draw_mothball_button(int x, int y, int focused) {
     }
 }
 
-static void draw_debugpath_button(int x, int y, int focused) {
-    auto &context = g_building_info_context;
-    button_border_draw(x, y, 20, 20, focused ? 1 : 0);
-    figure* f = figure_get(context.figure.figure_ids[0]);
-    text_draw_centered((uint8_t *)(f->draw_debug_mode ? "P" : "p"), x + 1, y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
-}
-
 static void draw_refresh_background() {
     auto &context = g_building_info_context;
     if (context.type == BUILDING_INFO_NONE) {
@@ -837,19 +824,26 @@ static void draw_foreground() {
     }
 
     if (context.figure.draw_debug_path) {
-        draw_debugpath_button(context.offset.x + 400, context.offset.y + 3 + 16 * context.height_blocks - 40, g_building_info.debug_path_button_id);
+        figure* f = figure_get(context.figure.figure_ids[0]);
+        pcstr label = (f->draw_debug_mode ? "P" : "p");
+        ui::button(label, {400, 3 + 16 * context.height_blocks - 40}, {24, 24})
+            .onclick([&context, f] (int, int) {
+                f->draw_debug_mode = f->draw_debug_mode ? 0 :FIGURE_DRAW_DEBUG_ROUTING;
+                window_invalidate();
+            });
     }
 
     if (context.show_overlay != OVERLAY_NONE) {
         pcstr label = (game_state_overlay() != context.show_overlay ? "v" : "V");
-        ui::button(label, {375, 3 + 16 * context.height_blocks - 40}, {20, 20}, [&context] (int, int) {
-            if (game_state_overlay() != context.show_overlay) {
-                game_state_set_overlay((e_overlay)context.show_overlay);
-            } else {
-                game_state_reset_overlay();
-            }
-            window_invalidate();
-        });
+        ui::button(label, {375, 3 + 16 * context.height_blocks - 40}, {20, 20})
+             .onclick([&context] (int, int) {
+                if (game_state_overlay() != context.show_overlay) {
+                    game_state_set_overlay((e_overlay)context.show_overlay);
+                } else {
+                    game_state_reset_overlay();
+                }
+                window_invalidate();
+             });
     }
 
 }
@@ -946,11 +940,6 @@ static void handle_input(const mouse* m, const hotkeys* h) {
         button_id |= !!handle_specific_building_info_mouse(m);
     }
 
-    if (context.figure.draw_debug_path) {
-        button_id |= generic_buttons_handle_mouse(m, context.offset + vec2i(0, 16 * context.height_blocks - 40),
-                                                  g_building_info.generic_button_figures, g_building_info.debug_path_button_id);
-    }
-
     button_id |= ui::handle_mouse(m);
 
     if (!button_id && input_go_back_requested(m, h)) {
@@ -997,13 +986,6 @@ static void button_mothball(int mothball, int param2) {
     }
 }
 
-static void button_debugpath(int debug, int param2) {
-    auto &context = g_building_info_context;
-    figure* f = figure_get(context.figure.figure_ids[0]);
-    f->draw_debug_mode = f->draw_debug_mode ? 0 :FIGURE_DRAW_DEBUG_ROUTING;
-    window_invalidate();
-}
-
 void window_building_info_show(const map_point& point) {
     window_type window = {
         WINDOW_BUILDING_INFO,