clang-tidy: auto fix headers for DiabloUI

Source/.clang-tidy

@@ -92,3 +92,6 @@ CheckOptions:
   - { key: bugprone-signed-char-misuse.CharTypdefsToIgnore, value: "std::int8_t" }
 
   - { key: readability-identifier-length.MinimumLoopCounterNameLength, value: 1 }
+
+  # Ignore warnings for individual SDL headers, e.g. SDL_video.h, SDL_render.h
+  - { key: misc-include-cleaner.IgnoreHeaders, value: 'SDL_.*\\.h' }

Source/DiabloUI/button.cpp

@@ -1,12 +1,19 @@
 #include "DiabloUI/button.h"
 
+#include <optional>
+
+#include <SDL.h>
+
 #include "DiabloUI/diabloui.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "engine/clx_sprite.hpp"
 #include "engine/load_clx.hpp"
 #include "engine/load_pcx.hpp"
+#include "engine/rectangle.hpp"
 #include "engine/render/clx_render.hpp"
 #include "engine/render/text_render.hpp"
-#include "utils/display.h"
+#include "engine/surface.hpp"
 
 namespace devilution {
 

Source/DiabloUI/credits.cpp

@@ -1,23 +1,30 @@
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
-#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
 #include <vector>
 
+#include <SDL.h>
+
 #include "DiabloUI/credits_lines.h"
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/support_lines.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
 #include "controls/input.h"
 #include "controls/menu_controls.h"
 #include "engine/load_clx.hpp"
+#include "engine/point.hpp"
 #include "engine/render/clx_render.hpp"
 #include "engine/render/text_render.hpp"
+#include "engine/surface.hpp"
 #include "hwcursor.hpp"
 #include "utils/display.h"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
-#include "utils/log.hpp"
-#include "utils/sdl_compat.h"
+#include "utils/sdl_geometry.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
@@ -90,7 +97,7 @@ private:
 
 void CreditsRenderer::Render()
 {
-	const int offsetY = -VIEWPORT.h + (SDL_GetTicks() - ticks_begin_) / 40;
+	const int offsetY = -VIEWPORT.h + ((SDL_GetTicks() - ticks_begin_) / 40);
 	if (offsetY == prev_offset_y_)
 		return;
 	prev_offset_y_ = offsetY;

Source/DiabloUI/credits_lines.cpp

@@ -1,3 +1,5 @@
+#include <cstddef>
+
 #include "DiabloUI/credits_lines.h"
 #include "utils/language.h"
 

Source/DiabloUI/diabloui.cpp

@@ -1,45 +1,56 @@
 #include "DiabloUI/diabloui.h"
 
 #include <algorithm>
+#include <array>
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <optional>
 #include <string>
+#include <string_view>
+#include <vector>
+
+#include <SDL.h>
+#include <function_ref.hpp>
 
 #include "DiabloUI/button.h"
-#include "DiabloUI/dialogs.h"
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/text_input.hpp"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
+#include "appfat.h"
 #include "controls/control_mode.hpp"
 #include "controls/controller.h"
 #include "controls/input.h"
 #include "controls/menu_controls.h"
-#include "controls/plrctrls.h"
 #include "diablo.h"
 #include "discord/discord.h"
-#include "engine/assets.hpp"
+#include "effects.h"
 #include "engine/clx_sprite.hpp"
 #include "engine/dx.h"
 #include "engine/load_pcx.hpp"
 #include "engine/palette.h"
 #include "engine/render/clx_render.hpp"
 #include "engine/render/text_render.hpp"
+#include "engine/sound.h"
+#include "engine/surface.hpp"
 #include "engine/ticks.hpp"
+#include "headless_mode.hpp"
 #include "hwcursor.hpp"
 #include "init.hpp"
+#include "options.h"
+#include "player.h"
+#include "playerdat.hpp"
+#include "sound_effect_enums.h"
 #include "utils/algorithm/container.hpp"
 #include "utils/display.h"
+#include "utils/enum_traits.h"
 #include "utils/is_of.hpp"
-#include "utils/language.h"
-#include "utils/log.hpp"
-#include "utils/pcx_to_clx.hpp"
 #include "utils/screen_reader.hpp"
 #include "utils/sdl_compat.h"
 #include "utils/sdl_geometry.h"
-#include "utils/sdl_ptrs.h"
-#include "utils/sdl_wrap.h"
 #include "utils/str_cat.hpp"
-#include "utils/stubs.h"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 #ifdef __SWITCH__
@@ -765,7 +776,7 @@ void DrawSelector(const SDL_Rect &rect)
 	const ClxSprite sprite = sprites[GetAnimationFrame(sprites.numSprites())];
 
 	// TODO FOCUS_MED appears higher than the box
-	const int y = rect.y + (rect.h - static_cast<int>(sprite.height())) / 2;
+	const int y = rect.y + ((rect.h - static_cast<int>(sprite.height())) / 2);
 
 	const Surface &out = Surface(DiabloUiSurface());
 	RenderClxSprite(out, sprite, { rect.x, y });

Source/DiabloUI/dialogs.cpp

@@ -1,26 +1,33 @@
 #include "DiabloUI/dialogs.h"
 
 #include <cstdint>
+#include <memory>
+#include <optional>
+#include <string>
 #include <string_view>
-#include <utility>
+#include <vector>
+
+#include <SDL.h>
 
 #include "DiabloUI/button.h"
 #include "DiabloUI/diabloui.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "controls/input.h"
 #include "controls/menu_controls.h"
 #include "engine/clx_sprite.hpp"
-#include "engine/dx.h"
 #include "engine/load_clx.hpp"
 #include "engine/load_pcx.hpp"
-#include "engine/palette.h"
+#include "engine/point.hpp"
+#include "engine/render/text_render.hpp"
 #include "headless_mode.hpp"
 #include "hwcursor.hpp"
 #include "init.hpp"
-#include "utils/display.h"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
 #include "utils/log.hpp"
+#include "utils/sdl_geometry.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 

Source/DiabloUI/hero/selhero.cpp

@@ -1,11 +1,17 @@
 #include "DiabloUI/hero/selhero.h"
 
 #include <algorithm>
-#include <chrono>
+#include <cstddef>
 #include <cstdint>
-#include <random>
+#include <cstdlib>
+#include <cstring>
+#include <memory>
+#include <optional>
+#include <utility>
+#include <vector>
 
-#include <fmt/format.h>
+#include <SDL.h>
+#include <fmt/core.h>
 
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/dialogs.h"
@@ -13,16 +19,21 @@
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/selok.h"
 #include "DiabloUI/selyesno.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "controls/control_mode.hpp"
-#include "controls/plrctrls.h"
 #include "engine/assets.hpp"
+#include "engine/point.hpp"
 #include "game_mode.hpp"
-#include "menu.h"
+#include "levels/gendung.h"
 #include "options.h"
 #include "pfile.h"
+#include "playerdat.hpp"
+#include "utils/enum_traits.h"
 #include "utils/language.h"
+#include "utils/sdl_geometry.h"
 #include "utils/str_cat.hpp"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {

Source/DiabloUI/mainmenu.cpp

@@ -1,12 +1,20 @@
+#include <cstddef>
 #include <cstdint>
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include <SDL.h>
 
 #include "DiabloUI/diabloui.h"
-#include "DiabloUI/selok.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "engine/assets.hpp"
 #include "engine/load_clx.hpp"
+#include "engine/point.hpp"
 #include "game_mode.hpp"
 #include "utils/language.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 namespace {

Source/DiabloUI/multi/selconn.cpp

@@ -1,11 +1,21 @@
+#include <cstddef>
+#include <memory>
+#include <optional>
 #include <string_view>
+#include <vector>
 
-#include <fmt/format.h>
+#include <SDL.h>
+#include <fmt/core.h>
 
 #include "DiabloUI/diabloui.h"
-#include "stores.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
+#include "engine/point.hpp"
+#include "engine/render/text_render.hpp"
+#include "multi.h"
 #include "storm/storm_net.hpp"
 #include "utils/language.h"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {

Source/DiabloUI/multi/selgame.cpp

@@ -1,21 +1,35 @@
 #include "DiabloUI/multi/selgame.h"
 
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <memory>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
 
-#include <fmt/format.h>
+#include <SDL.h>
+#include <fmt/core.h>
 
 #include "DiabloUI/diabloui.h"
-#include "DiabloUI/dialogs.h"
 #include "DiabloUI/hero/selhero.h"
 #include "DiabloUI/scrollbar.h"
 #include "DiabloUI/selok.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "config.h"
-#include "control.h"
+#include "diablo.h"
+#include "engine/point.hpp"
+#include "engine/render/text_render.hpp"
+#include "levels/gendung.h"
 #include "menu.h"
+#include "multi.h"
 #include "options.h"
 #include "storm/storm_net.hpp"
 #include "utils/language.h"
 #include "utils/str_cat.hpp"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {

Source/DiabloUI/progress.cpp

@@ -1,19 +1,24 @@
+#include <memory>
+#include <optional>
+#include <vector>
+
 #include <SDL.h>
 
 #include "DiabloUI/button.h"
 #include "DiabloUI/diabloui.h"
-#include "control.h"
+#include "DiabloUI/ui_item.h"
 #include "controls/input.h"
 #include "controls/menu_controls.h"
 #include "engine/clx_sprite.hpp"
 #include "engine/dx.h"
 #include "engine/load_pcx.hpp"
-#include "engine/palette.h"
+#include "engine/point.hpp"
 #include "engine/render/clx_render.hpp"
-#include "hwcursor.hpp"
+#include "engine/surface.hpp"
 #include "utils/display.h"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 namespace {

Source/DiabloUI/scrollbar.cpp

@@ -1,5 +1,8 @@
 #include "scrollbar.h"
 
+#include <optional>
+
+#include "engine/clx_sprite.hpp"
 #include "engine/load_pcx.hpp"
 
 namespace devilution {

Source/DiabloUI/selok.cpp

@@ -1,10 +1,20 @@
 #include "DiabloUI/selok.h"
 
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include <SDL.h>
+
 #include "DiabloUI/diabloui.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
+#include "engine/point.hpp"
 #include "engine/render/text_render.hpp"
 #include "game_mode.hpp"
 #include "utils/language.h"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {

Source/DiabloUI/selstart.cpp

@@ -1,11 +1,18 @@
 #include "selstart.h"
 
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <vector>
+
 #include "DiabloUI/diabloui.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "engine/load_clx.hpp"
+#include "engine/point.hpp"
 #include "options.h"
 #include "utils/language.h"
-#include "utils/sdl_geometry.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 namespace {

Source/DiabloUI/selyesno.cpp

@@ -1,8 +1,19 @@
 #include "selyesno.h"
 
+#include <cstddef>
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include <SDL.h>
+
 #include "DiabloUI/diabloui.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
+#include "engine/point.hpp"
+#include "engine/render/text_render.hpp"
 #include "utils/language.h"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {

Source/DiabloUI/settingsmenu.cpp

@@ -1,24 +1,38 @@
-#include "selstart.h"
-
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
 #include <cstdint>
+#include <memory>
 #include <optional>
+#include <string>
 #include <vector>
 
+#include <SDL.h>
 #include <function_ref.hpp>
 
 #include "DiabloUI/diabloui.h"
 #include "DiabloUI/scrollbar.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
+#include "controls/controller.h"
+#include "controls/controller_buttons.h"
 #include "controls/controller_motion.h"
 #include "controls/plrctrls.h"
 #include "controls/remap_keyboard.h"
 #include "engine/assets.hpp"
+#include "engine/rectangle.hpp"
 #include "engine/render/text_render.hpp"
+#include "game_mode.hpp"
 #include "hwcursor.hpp"
+#include "items.h"
 #include "options.h"
-#include "utils/display.h"
+#include "utils/enum_traits.h"
 #include "utils/is_of.hpp"
 #include "utils/language.h"
+#include "utils/sdl_geometry.h"
+#include "utils/static_vector.hpp"
+#include "utils/str_cat.hpp"
+#include "utils/ui_fwd.h"
 #include "utils/utf8.hpp"
 
 namespace devilution {

Source/DiabloUI/support_lines.cpp

@@ -1,3 +1,5 @@
+#include <cstddef>
+
 #include "DiabloUI/support_lines.h"
 #include "utils/language.h"
 

Source/DiabloUI/text_input.cpp

@@ -15,7 +15,6 @@
 #include "utils/parse_int.hpp"
 #include "utils/sdl_ptrs.h"
 #include "utils/str_cat.hpp"
-#include "utils/utf8.hpp"
 
 namespace devilution {
 

Source/DiabloUI/title.cpp

@@ -1,15 +1,23 @@
+#include <memory>
 #include <optional>
+#include <vector>
+
+#include <SDL.h>
 
 #include "DiabloUI/diabloui.h"
-#include "control.h"
+#include "DiabloUI/ui_flags.hpp"
+#include "DiabloUI/ui_item.h"
 #include "controls/input.h"
 #include "controls/menu_controls.h"
 #include "discord/discord.h"
+#include "engine/clx_sprite.hpp"
 #include "engine/load_clx.hpp"
 #include "engine/load_pcx.hpp"
+#include "engine/point.hpp"
 #include "utils/algorithm/container.hpp"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 namespace {