clip: make g_clipboard live globally on stack

Author: Toni500github

include/clipboard.hpp

@@ -1,7 +1,6 @@
 #ifndef _CLIPBOARD_HPP_
 #define _CLIPBOARD_HPP_
 
-#include <memory>
 #include <string>
 
 #include "screen_capture.hpp"
@@ -10,13 +9,14 @@ class Clipboard
 {
 public:
     Clipboard(SessionType session) : m_session(session) {}
+    void     SetSession(SessionType session) { m_session = session; }
     Result<> CopyText(const std::string& text);
     Result<> CopyImage(const capture_result_t& cap);
 
 private:
     SessionType m_session;
 };
 
-extern std::unique_ptr<Clipboard> g_clipboard;
+extern Clipboard g_clipboard;
 
 #endif  // !_CLIPBOARD_HPP_

src/main.cpp

@@ -61,11 +61,11 @@ struct GLFWwindow;
 // clang-format on
 
 // Extern variables declariaions
-std::deque<std::string>    g_dropped_paths;
-std::unique_ptr<Config>    g_config;
-std::unique_ptr<Clipboard> g_clipboard;
-bool                       g_is_systray = false;
-int                        g_scr_w{}, g_scr_h{};
+std::deque<std::string> g_dropped_paths;
+std::unique_ptr<Config> g_config;
+bool                    g_is_systray = false;
+int                     g_scr_w{}, g_scr_h{};
+Clipboard               g_clipboard(SessionType::Unknown);
 
 std::error_code ec;
 
@@ -238,7 +238,7 @@ void capture_worker(const std::string& imgui_ini_path)
             do_copy_image        = false;
             capture_result_t img = std::move(pending_image);
             lk.unlock();
-            g_clipboard->CopyImage(img);
+            g_clipboard.CopyImage(img);
             continue;
         }
 
@@ -378,9 +378,10 @@ int main(int argc, char* argv[])
     logger.info("=== oshot starting ===");
     logger.info("Log file path: {}", file->filename());
     logger.flush();
-
     spdlog::flush_every(std::chrono::seconds(1));
 
+    g_clipboard.SetSession(get_session_type());
+
     // Check if demo build.
     // removing it once the hackaton has ended
     std::string configDir = get_config_dir().string();
@@ -390,7 +391,6 @@ int main(int argc, char* argv[])
     const std::string& configFile     = parse_config_path(argc, argv, configDir).string();
     const std::string& imgui_ini_path = configDir + "/imgui.ini";
 
-    g_clipboard = std::make_unique<Clipboard>(get_session_type());
     g_config    = std::make_unique<Config>(configFile, configDir);
     if (!parseargs(argc, argv, configFile))
         return EXIT_FAILURE;

src/screenshot_tool.cpp

@@ -1182,7 +1182,7 @@ void ScreenshotTool::DrawMenuItems()
             ImGui::Text("%s", version_infos.c_str());
 
             if (ImGui::Button("Copy text"))
-                g_clipboard->CopyText(version_infos);
+                g_clipboard.CopyText(version_infos);
             ImGui::EndChild();
             ImGui::TreePop();
         }
@@ -2578,7 +2578,7 @@ void ScreenshotTool::CreateCopyTextButton(const std::string& text_copy)
 
     if (ImGui::Button(just_copied ? "Copied!" : "Copy Text"))
     {
-        const Result<>& res = g_clipboard->CopyText(text_copy);
+        const Result<>& res = g_clipboard.CopyText(text_copy);
         if (!res.ok())
         {
             SetError(FailedToCopyText, res.error_v());

src/util.cpp

@@ -313,7 +313,7 @@ Result<std::string> get_config_image_out_fmt()
 Result<> save_png(SavingOp op, const capture_result_t& img)
 {
     if (op == SavingOp::Clipboard)
-        return g_clipboard->CopyImage(img);
+        return g_clipboard.CopyImage(img);
 
     const Result<std::string>& r = get_config_image_out_fmt();
     if (!r.ok())