ui: unified using buttons in user interface

Author: s.kushnirenko

src/graphics/elements/generic_button.cpp

@@ -2,6 +2,10 @@
 
 #include "input/mouse.h"
 
+namespace ui {
+    state g_state;
+}
+
 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

src/graphics/elements/generic_button.h

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "button.h"
+#include "core/string.h"
 #include "input/mouse.h"
+#include "graphics/text.h"
+#include "graphics/elements/button.h"
 
 #include <vector>
 #include <cstdint>
@@ -32,5 +34,37 @@ inline int generic_buttons_handle_mouse(const mouse *m, vec2i pos, const T (&but
 
 template<class T>
 inline int generic_buttons_handle_mouse(const mouse *m, vec2i pos, const T &buttons, int &focus_button_id) {
-    return generic_buttons_handle_mouse(m, pos.x, pos.y, &buttons.front(), buttons.size(), &focus_button_id);
+    return generic_buttons_handle_mouse(m, pos.x, pos.y, &buttons.front(), (int)buttons.size(), &focus_button_id);
+}
+
+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);
+}
+
 }

src/graphics/window.cpp

@@ -25,12 +25,12 @@ static void noop(void) {
 }
 static void noop_input(const mouse* m, const hotkeys* h) {
 }
-static void reset_input(void) {
+static void reset_input() {
     mouse_reset_button_state();
     reset_touches(1);
     scroll_stop();
 }
-static void increase_queue_index(void) {
+static void increase_queue_index() {
     auto& data = g_window;
     data.queue_index++;
     if (data.queue_index >= MAX_QUEUE)
@@ -59,7 +59,7 @@ int window_is_invalid(void) {
     return data.refresh_immediate;
 }
 
-void window_request_refresh(void) {
+void window_request_refresh() {
     auto& data = g_window;
     data.refresh_on_draw = true;
 }
@@ -69,7 +69,7 @@ int window_is(e_window_id id) {
     return data.current_window->id == id;
 }
 
-e_window_id window_get_id(void) {
+e_window_id window_get_id() {
     auto& data = g_window;
     return data.current_window->id;
 }
@@ -89,14 +89,15 @@ void window_show(const window_type* window) {
         data.current_window->handle_input = noop_input;
     window_invalidate();
 }
-void window_go_back(void) {
+
+void window_go_back() {
     auto& data = g_window;
     reset_input();
     decrease_queue_index();
     data.current_window = &data.window_queue[data.queue_index];
     window_invalidate();
 }
-static void update_input_before(void) {
+static void update_input_before() {
     if (!touch_to_mouse()) {
         mouse_determine_button_state(); // touch overrides mouse
     }
@@ -146,7 +147,7 @@ window_type *window_current() {
     return g_window.current_window;
 }
 
-void window_draw_underlying_window(void) {
+void window_draw_underlying_window() {
     auto& data = g_window;
     if (data.underlying_windows_redrawing < MAX_QUEUE) {
         ++data.underlying_windows_redrawing;

src/window/window_building_info.cpp

@@ -82,8 +82,6 @@ struct building_info_data {
     int generic_button_id = 0;
     int debug_path_button_id = 0;
 
-    std::vector<generic_button> btns;
-
     generic_button generic_button_figures[1] = {
         {400, 3, 24, 24, button_debugpath, button_none, 0, 0}
     };
@@ -576,21 +574,6 @@ static void draw_mothball_button(int x, int y, int focused) {
     }
 }
 
-template<class Func>
-static void make_button(pcstr label, vec2i pos, vec2i size, Func func) {
-    auto &context = g_building_info_context;
-    auto &data = g_building_info;
-
-    data.btns.push_back({pos.x, pos.y, size.x + 4, size.y + 4, button_none, button_none, 0, 0, func});
-    int focused = is_button_hover(data.btns.back(), context.offset);
-
-    button_border_draw(context.offset.x + pos.x, context.offset.y + pos.y, size.x, size.y, focused ? 1 : 0);
-
-    if (context.show_overlay != OVERLAY_NONE) {
-        text_draw_centered((uint8_t *)label, context.offset.x + pos.x + 1, context.offset.y + pos.y + 4, 20, FONT_NORMAL_BLACK_ON_LIGHT, 0);
-    }
-}
-
 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);
@@ -772,11 +755,10 @@ static void draw_background() {
 }
 
 static void draw_foreground() {
+    ui::begin_window(g_building_info_context.offset);
     auto &context = g_building_info_context;
     auto &data = g_building_info;
 
-    data.btns.clear();
-
     // building-specific buttons
     if (context.type == BUILDING_INFO_BUILDING) {
         building *b = building_get(context.building_id);
@@ -860,7 +842,7 @@ static void draw_foreground() {
 
     if (context.show_overlay != OVERLAY_NONE) {
         pcstr label = (game_state_overlay() != context.show_overlay ? "v" : "V");
-        make_button(label, {375, 3 + 16 * context.height_blocks - 40}, {20, 20}, [&context] (int, int) {
+        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 {
@@ -969,8 +951,7 @@ static void handle_input(const mouse* m, const hotkeys* h) {
                                                   g_building_info.generic_button_figures, g_building_info.debug_path_button_id);
     }
 
-    int tmp_btn;
-    button_id |= generic_buttons_handle_mouse(m, context.offset, data.btns, tmp_btn);
+    button_id |= ui::handle_mouse(m);
 
     if (!button_id && input_go_back_requested(m, h)) {
         if (context.storage_show_special_orders) {