misc: some coding stuff

Author: Toni500github

include/util.hpp

@@ -13,6 +13,7 @@
 #include "fmt/base.h"
 #include "fmt/color.h"
 #include "spdlog/spdlog.h"
+#include "version.h"
 
 namespace fs = std::filesystem;
 enum class SavingOp;
@@ -144,6 +145,18 @@ extern int  g_sock;
 extern char g_sock_path[100];
 extern int  g_scr_w, g_scr_h;
 
+static inline const std::string version_infos = fmt::format(
+    "oshot v{} built from branch '{}' at {} commit '{}' ({}).\n"
+    "Date: {}\n"
+    "Tag: {}\n",
+    VERSION,
+    GIT_BRANCH,
+    GIT_DIRTY,
+    GIT_COMMIT_HASH,
+    GIT_COMMIT_MESSAGE,
+    GIT_COMMIT_DATE,
+    GIT_TAG);
+
 #ifdef __linux__
 std::vector<uint8_t> ximage_to_rgba(XImage* image, int width, int height);
 #endif

src/main.cpp

@@ -38,6 +38,9 @@
 
 using namespace Tray;
 
+// Avoid dragging glfw headers
+struct GLFWwindow;
+
 // [Win32] Our example includes a copy of glfw3.lib pre-compiled with VS2010 to maximize ease of testing and
 // compatibility with old VS compilers. To link with VS2010-era libraries, VS2015+ requires linking with
 // legacy_stdio_definitions.lib, which we do using this pragma. Your own project should not be affected, as you are
@@ -74,19 +77,8 @@ std::error_code ec;
 // Print the version and some other infos, then exit successfully
 static void version()
 {
-    fmt::print(
-        "oshot v{} built from branch '{}' at {} commit '{}' ({}).\n"
-        "Date: {}\n"
-        "Tag: {}\n",
-        VERSION,
-        GIT_BRANCH,
-        GIT_DIRTY,
-        GIT_COMMIT_HASH,
-        GIT_COMMIT_MESSAGE,
-        GIT_COMMIT_DATE,
-        GIT_TAG);
-
-    // if only everyone would not return error when querying the program version :(
+    fmt::print(FMT_COMPILE("{}"), version_infos);
+    fmt::print("\n");
     std::exit(EXIT_SUCCESS);
 }
 
@@ -98,22 +90,6 @@ static void help(bool invalid_opt = false)
     std::exit(invalid_opt);
 }
 
-#ifndef _WIN32
-static bool recv_all(int fd, void* dst, size_t n)
-{
-    uint8_t* p = static_cast<uint8_t*>(dst);
-    while (n)
-    {
-        const ssize_t r = ::recv(fd, p, n, 0);
-        if (r <= 0)
-            return false;
-        p += static_cast<size_t>(r);
-        n -= static_cast<size_t>(r);
-    }
-    return true;
-}
-#endif
-
 // clang-format off
 // parseargs() but only for parsing the user config path trough args
 // and so we can directly construct Config
@@ -218,11 +194,6 @@ static bool                    do_capture = false;
 static capture_result_t        pending_image;
 static bool                    do_copy_image = false;
 
-struct GLFWwindow;
-
-// Avoid dragging glfw headers
-void extern_glfwTerminate();
-
 void exit_handler(int _)
 {
     quit.store(true);
@@ -365,12 +336,20 @@ int main(int argc, char* argv[])
 #endif
 
 #ifdef __linux__
+    // AppRun prepends bundled libs to LD_LIBRARY_PATH so the AppImage is self-contained.
+    // Child processes (zenity, grim, etc.) inherit it and resolve against the bundled
+    // (older) libs instead of the host's, causing symbol version mismatches.
+    // AppRun saves the original value here, restore it so that spawned system binaries
+    // use the host libs.
     const char* orig = std::getenv("APPIMAGE_ORIG_LD_LIBRARY_PATH");
     if (orig)
         setenv("LD_LIBRARY_PATH", orig, 1);
     else
-        unsetenv("LD_LIBRARY_PATH");
+        unsetenv("LD_LIBRARY_PATH");  // not running from AppImage, clear any stale value
 
+    // Xlib is not thread-safe by default. We call it from both the render thread
+    // and the IPC/clipboard thread; this enables Xlib's internal locking.
+    // Must be called before glfwInit(), which opens a Display* immediately.
     XInitThreads();
 #endif
 
@@ -455,6 +434,19 @@ int main(int argc, char* argv[])
                 continue;
             }
 
+            auto recv_all = [](int fd, void* dst, size_t n) {
+                uint8_t* p = static_cast<uint8_t*>(dst);
+                while (n)
+                {
+                    const ssize_t r = ::recv(fd, p, n, 0);
+                    if (r <= 0)
+                        return false;
+                    p += static_cast<size_t>(r);
+                    n -= static_cast<size_t>(r);
+                }
+                return true;
+            };
+
             char     type = 0;
             uint32_t len  = 0;
 

src/screenshot_tool.cpp

@@ -1057,7 +1057,7 @@ void ScreenshotTool::DrawMenuItems()
         ImGui::Text("%s", text_display.data());
         ImGui::Spacing();
 
-        text_display = centered_text("Screenshot tool to extract text on the fly");
+        text_display = centered_text("Screenshot tool for extracting text on the fly");
         ImGui::Text("%s", text_display.data());
         ImGui::Spacing();
 
@@ -1067,22 +1067,10 @@ void ScreenshotTool::DrawMenuItems()
         {
             ImGui::BeginChild("##scrollable_region", ImVec2(0, 100), false, ImGuiWindowFlags_HorizontalScrollbar);
 
-            static std::string infos = fmt::format(
-                "oshot v{} built from branch '{}' at {} commit '{}' ({}).\n"
-                "Date: {}\n"
-                "Tag: {}\n",
-                VERSION,
-                GIT_BRANCH,
-                GIT_DIRTY,
-                GIT_COMMIT_HASH,
-                GIT_COMMIT_MESSAGE,
-                GIT_COMMIT_DATE,
-                GIT_TAG);
-
-            ImGui::Text("%s", infos.c_str());
+            ImGui::Text("%s", version_infos.c_str());
 
             if (ImGui::Button("Copy text"))
-                g_clipboard->CopyText(infos);
+                g_clipboard->CopyText(version_infos);
             ImGui::EndChild();
             ImGui::TreePop();
         }
@@ -1134,7 +1122,6 @@ void ScreenshotTool::DrawOcrTools()
 
     const bool invalid_path  = HasError(InvalidPath);
     const bool invalid_model = HasError(InvalidModel);
-    const bool has_errors    = invalid_path || invalid_model;
 
     // --- Path input ---
     push_error_style(invalid_path);
@@ -1178,7 +1165,7 @@ void ScreenshotTool::DrawOcrTools()
     }
 
     // --- Extract button + result details ---
-    if (!has_errors)
+    if (!invalid_path && !invalid_model)
     {
         if (ImGui::Button("Extract Text"))
         {
@@ -1205,21 +1192,21 @@ void ScreenshotTool::DrawOcrTools()
             HelpMarker("If results seem off, try Edit > Optimize OCR for...");
         }
 
-        const auto& results = m_inputs.ocr_results;
-        if (results.confidence > 0 && ImGui::TreeNode("Details"))
+        if (m_inputs.ocr_results.confidence > 0 && ImGui::TreeNode("Details"))
         {
-            ImGui::Text("Confidence:");
-            ImGui::SameLine();
-            ImGui::TextColored(get_confidence_color(results.confidence), "%d%%", results.confidence);
+            ImGui::BulletText("Confidence:");
             ImGui::SameLine();
-            ImGui::Text("  PSM: %s", results.psm_str.c_str());
+            ImGui::TextColored(
+                get_confidence_color(m_inputs.ocr_results.confidence), "%d%%", m_inputs.ocr_results.confidence);
+
+            ImGui::BulletText("PSM: %s", m_inputs.ocr_results.psm_str.c_str());
             ImGui::TreePop();
         }
     }
 
     ImGui::InputTextMultiline("##source",
                               &m_inputs.ocr_results.data,
-                              ImVec2(-1, ImGui::GetTextLineHeight() * 10),
+                              ImVec2(-1, ImGui::GetTextLineHeight() * 8),
                               g_config->File.allow_out_edit ? 0 : ImGuiInputTextFlags_ReadOnly);
 
     if (!m_inputs.ocr_results.data.empty())
@@ -1265,7 +1252,7 @@ void ScreenshotTool::DrawBarDecodeTools()
 
     ImGui::InputTextMultiline("##barcode",
                               &m_inputs.barcode_text,
-                              ImVec2(-1, ImGui::GetTextLineHeight() * 10),
+                              ImVec2(-1, ImGui::GetTextLineHeight() * 8),
                               g_config->File.allow_out_edit ? 0 : ImGuiInputTextFlags_ReadOnly);
 
     if (!m_inputs.barcode_text.empty())