Start separating vulkan, keybinds, overlay and font

src/font.cpp

@@ -0,0 +1,78 @@
+#include "overlay.h"
+#include "file_utils.h"
+#include "font_default.h"
+
+void create_fonts(const overlay_params& params, ImFont*& small_font, ImFont*& text_font)
+{
+   auto& io = ImGui::GetIO();
+   ImGui::GetIO().FontGlobalScale = params.font_scale; // set here too so ImGui::CalcTextSize is correct
+   float font_size = params.font_size;
+   if (font_size < FLT_EPSILON)
+      font_size = 24;
+
+   float font_size_text = params.font_size_text;
+   if (font_size_text < FLT_EPSILON)
+      font_size_text = font_size;
+   if(params.render_mango)
+      font_size = 42;
+   static const ImWchar default_range[] =
+   {
+      0x0020, 0x00FF, // Basic Latin + Latin Supplement
+      //0x0100, 0x017F, // Latin Extended-A
+      //0x2103, 0x2103, // Degree Celsius
+      //0x2109, 0x2109, // Degree Fahrenheit
+      0,
+   };
+
+   ImVector<ImWchar> glyph_ranges;
+   ImFontGlyphRangesBuilder builder;
+   builder.AddRanges(io.Fonts->GetGlyphRangesDefault());
+   if (params.font_glyph_ranges & FG_KOREAN)
+      builder.AddRanges(io.Fonts->GetGlyphRangesKorean());
+   if (params.font_glyph_ranges & FG_CHINESE_FULL)
+      builder.AddRanges(io.Fonts->GetGlyphRangesChineseFull());
+   if (params.font_glyph_ranges & FG_CHINESE_SIMPLIFIED)
+      builder.AddRanges(io.Fonts->GetGlyphRangesChineseSimplifiedCommon());
+   if (params.font_glyph_ranges & FG_JAPANESE)
+      builder.AddRanges(io.Fonts->GetGlyphRangesJapanese()); // Not exactly Shift JIS compatible?
+   if (params.font_glyph_ranges & FG_CYRILLIC)
+      builder.AddRanges(io.Fonts->GetGlyphRangesCyrillic());
+   if (params.font_glyph_ranges & FG_THAI)
+      builder.AddRanges(io.Fonts->GetGlyphRangesThai());
+   if (params.font_glyph_ranges & FG_VIETNAMESE)
+      builder.AddRanges(io.Fonts->GetGlyphRangesVietnamese());
+   if (params.font_glyph_ranges & FG_LATIN_EXT_A) {
+      static const ImWchar latin_ext_a[] { 0x0100, 0x017F, 0 };
+      builder.AddRanges(latin_ext_a);
+   }
+   if (params.font_glyph_ranges & FG_LATIN_EXT_B) {
+      static const ImWchar latin_ext_b[] { 0x0180, 0x024F, 0 };
+      builder.AddRanges(latin_ext_b);
+   }
+   builder.BuildRanges(&glyph_ranges);
+
+   // If both font_file and text_font_file are the same then just use "default" font
+   bool same_font = (params.font_file == params.font_file_text || params.font_file_text.empty());
+   bool same_size = (font_size == font_size_text);
+
+   // ImGui takes ownership of the data, no need to free it
+   if (!params.font_file.empty() && file_exists(params.font_file)) {
+      io.Fonts->AddFontFromFileTTF(params.font_file.c_str(), font_size, nullptr, same_font && same_size ? glyph_ranges.Data : default_range);
+      small_font = io.Fonts->AddFontFromFileTTF(params.font_file.c_str(), font_size * 0.55f, nullptr, default_range);
+   } else {
+      const char* ttf_compressed_base85 = GetDefaultCompressedFontDataTTFBase85();
+      io.Fonts->AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, font_size, nullptr, default_range);
+      small_font = io.Fonts->AddFontFromMemoryCompressedBase85TTF(ttf_compressed_base85, font_size * 0.55f, nullptr, default_range);
+   }
+
+   auto font_file_text = params.font_file_text;
+   if (font_file_text.empty())
+      font_file_text = params.font_file;
+
+   if ((!same_font || !same_size) && file_exists(font_file_text))
+      text_font = io.Fonts->AddFontFromFileTTF(font_file_text.c_str(), font_size_text, nullptr, glyph_ranges.Data);
+   else
+      text_font = io.Fonts->Fonts[0];
+
+   io.Fonts->Build();
+}

src/keybinds.cpp

@@ -0,0 +1,84 @@
+#include "overlay.h"
+#include "timing.hpp"
+#include "logging.h"
+#include "keybinds.h"
+
+void check_keybinds(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID){
+   using namespace std::chrono_literals;
+   bool pressed = false; // FIXME just a placeholder until wayland support
+   auto now = Clock::now(); /* us */
+   auto elapsedF2 = now - last_f2_press;
+   auto elapsedF12 = now - last_f12_press;
+   auto elapsedReloadCfg = now - reload_cfg_press;
+   auto elapsedUpload = now - last_upload_press;
+
+   auto keyPressDelay = 500ms;
+
+  if (elapsedF2 >= keyPressDelay){
+#ifdef HAVE_X11
+     pressed = keys_are_pressed(params.toggle_logging);
+#else
+     pressed = false;
+#endif
+     if (pressed && (now - logger->last_log_end() > 11s)) {
+       last_f2_press = now;
+
+       if (logger->is_active()) {
+         logger->stop_logging();
+       } else {
+         logger->start_logging();
+         std::thread(update_hw_info, std::ref(sw_stats), std::ref(params),
+                     vendorID)
+             .detach();
+         benchmark.fps_data.clear();
+       }
+     }
+   }
+
+   if (elapsedF12 >= keyPressDelay){
+#ifdef HAVE_X11
+      pressed = keys_are_pressed(params.toggle_hud);
+#else
+      pressed = false;
+#endif
+      if (pressed){
+         last_f12_press = now;
+         params.no_display = !params.no_display;
+      }
+   }
+
+   if (elapsedReloadCfg >= keyPressDelay){
+#ifdef HAVE_X11
+      pressed = keys_are_pressed(params.reload_cfg);
+#else
+      pressed = false;
+#endif
+      if (pressed){
+         parse_overlay_config(&params, getenv("MANGOHUD_CONFIG"));
+         reload_cfg_press = now;
+      }
+   }
+
+   if (params.permit_upload && elapsedUpload >= keyPressDelay){
+#ifdef HAVE_X11
+      pressed = keys_are_pressed(params.upload_log);
+#else
+      pressed = false;
+#endif
+      if (pressed){
+         last_upload_press = now;
+         logger->upload_last_log();
+      }
+   }
+   if (params.permit_upload && elapsedUpload >= keyPressDelay){
+#ifdef HAVE_X11
+      pressed = keys_are_pressed(params.upload_logs);
+#else
+      pressed = false;
+#endif
+      if (pressed){
+         last_upload_press = now;
+         logger->upload_last_logs();
+      }
+   }
+}

src/meson.build

@@ -26,19 +26,24 @@ foreach s : ['overlay.frag', 'overlay.vert']
     command : [glslang, '-V', '-x', '-o', '@OUTPUT@', '@INPUT@'])
 endforeach
 
-vklayer_files = []
+vklayer_files = files(
+  'overlay.cpp',
+  'font.cpp',
+  'keybinds.cpp'
+)
 opengl_files  = []
 if ['windows', 'mingw'].contains(host_machine.system())
   vklayer_files += files(
     'win/main.cpp',
     'win/kiero.cpp',
     'win/d3d12_hook.cpp',
+    'win/d3d_shared.cpp'
   )
 endif
 
 if is_unixy
-  vklayer_files = files(
-    'overlay.cpp',
+  vklayer_files += files(
+    'vulkan.cpp',
     'overlay_params.cpp',
     'font_unispace.c',
     'blacklist.cpp',

src/overlay.h

@@ -83,6 +83,7 @@ extern struct benchmark_stats benchmark;
 void position_layer(struct swapchain_stats& data, struct overlay_params& params, ImVec2 window_size);
 void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size, bool is_vulkan);
 void update_hud_info(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID);
+void update_hw_info(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID);
 void init_gpu_stats(uint32_t& vendorID, overlay_params& params);
 void init_cpu_stats(overlay_params& params);
 void check_keybinds(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID);