core: remove socket and ipc stuff

Author: Toni500github

include/socket.hpp

@@ -6,7 +6,6 @@
 
 #include "clip/clip.h"
 #include "screen_capture.hpp"
-#include "socket.hpp"
 
 #ifdef __linux__
 #  include <sys/wait.h>

src/clipboard.cpp

@@ -31,7 +31,6 @@
 #include "oshot_png.h"
 #include "screen_capture.hpp"
 #include "screenshot_tool.hpp"
-#include "socket.hpp"
 #include "spdlog/sinks/basic_file_sink.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include "switch_fnv1a.hpp"
@@ -51,12 +50,6 @@ struct GLFWwindow;
 #  pragma comment(lib, "legacy_stdio_definitions")
 #endif
 
-#if (!__has_include("version.h"))
-#  error "version.h not found, please generate it with ./scripts/generateVersion.sh"
-#else
-#  include "version.h"
-#endif
-
 // clang-format off
 // https://cfengine.com/blog/2021/optional-arguments-with-getopt-long/
 // because "--opt-arg arg" won't work
@@ -357,11 +350,6 @@ int main(int argc, char* argv[])
         setenv("LD_LIBRARY_PATH", orig, 1);
     else
         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
 
     atexit(exit_handler_nc);
@@ -403,7 +391,6 @@ int main(int argc, char* argv[])
     const std::string& imgui_ini_path = configDir + "/imgui.ini";
 
     g_clipboard = std::make_unique<Clipboard>(get_session_type());
-    g_sender    = std::make_unique<SocketSender>();
     g_config    = std::make_unique<Config>(configFile, configDir);
     if (!parseargs(argc, argv, configFile))
         return EXIT_FAILURE;
@@ -443,107 +430,6 @@ int main(int argc, char* argv[])
     // AppKit), so capture_worker must not run, because it would call run_main_tool
     // from a background thread and crash with NSInternalInconsistencyException.
     std::thread worker(capture_worker, imgui_ini_path);
-
-    std::thread ipc([&] {
-        while (!quit.load())
-        {
-            const int client = ::accept(g_sock, nullptr, nullptr);
-            if (client < 0)
-            {
-                if (quit.load())
-                    break;
-                continue;
-            }
-
-            // Set receive timeout
-            struct timeval tv;
-            tv.tv_sec  = 2;
-            tv.tv_usec = 0;
-            setsockopt(client, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
-
-            auto recv_all = [](int fd, void* dst, size_t n) {
-                uint8_t* p         = static_cast<uint8_t*>(dst);
-                size_t   remaining = n;
-                while (remaining > 0)
-                {
-                    const ssize_t r = ::recv(fd, p, remaining, 0);
-                    if (r <= 0)
-                    {
-                        if (r == 0)
-                            spdlog::debug("Connection closed by peer");
-                        else
-                            spdlog::debug("recv error: {}", strerror(errno));
-                        return false;
-                    }
-                    p += static_cast<size_t>(r);
-                    remaining -= static_cast<size_t>(r);
-                }
-                return true;
-            };
-
-            char     type = 0;
-            uint32_t len  = 0;
-
-            bool ok = recv_all(client, &type, 1) && recv_all(client, &len, sizeof(len));
-
-            if (ok)
-                spdlog::debug("IPC received type={}, len={}", type, len);
-
-            std::vector<uint8_t> payload;
-            if (ok && len > 0 && len < 100 * 1024 * 1024)  // Sanity check: max 100MB
-            {
-                payload.resize(len);
-                ok = recv_all(client, payload.data(), payload.size());
-            }
-
-            close(client);
-
-            if (!ok)
-                continue;
-
-            if (type == 'T')
-            {
-                std::string text(payload.begin(), payload.end());
-                g_clipboard->CopyText(text);
-            }
-            else if (type == 'I')
-            {
-                if (payload.size() < 8)
-                {
-                    spdlog::debug("IPC image payload too small: {}", payload.size());
-                    continue;
-                }
-
-                int w = 0, h = 0;
-                std::memcpy(&w, payload.data() + 0, 4);
-                std::memcpy(&h, payload.data() + 4, 4);
-
-                spdlog::debug("IPC received image: {}x{}", w, h);
-
-                if (w <= 0 || h <= 0)
-                    continue;
-
-                const size_t expected = static_cast<size_t>(w) * h * 4;
-                if (payload.size() != expected + 8)
-                {
-                    spdlog::debug("IPC image size mismatch: got {}, expected {}", payload.size(), expected + 8);
-                    continue;
-                }
-
-                // Strip the 8-byte header
-                payload.erase(payload.begin(), payload.begin() + 8);
-                capture_result_t cap{ std::move(payload), w, h };
-                {
-                    std::lock_guard lk(mtx);
-                    pending_image = std::move(cap);
-                    do_copy_image = true;
-                    cv.notify_all();
-                }
-            }
-        }
-        close(g_sock);
-        unlink(g_sock_path);
-    });
 #endif
 
     std::vector<TrayMenu*> menu;
@@ -596,8 +482,6 @@ int main(int argc, char* argv[])
     // Quitted the tray
 #if !OSHOT_TOOL_ON_MAIN_THREAD
     worker.join();
-    if (ipc.joinable())
-        ipc.join();
 #endif
 
     return EXIT_SUCCESS;

src/main.cpp

@@ -309,8 +309,6 @@ int run_main_tool(const std::string& imgui_ini_path)
     glfwDestroyWindow(window);
     glfwTerminate();
 
-    g_sender->Close();
-
     return EXIT_SUCCESS;
 }
 

src/main_tool_metal.mm

@@ -5,7 +5,6 @@
 #  include "imgui/imgui_impl_opengl3.h"
 #  include "screen_capture.hpp"
 #  include "screenshot_tool.hpp"
-#  include "socket.hpp"
 #  include "util.hpp"
 #  define GL_SILENCE_DEPRECATION
 #  if defined(IMGUI_IMPL_OPENGL_ES2)
@@ -298,10 +297,7 @@ int run_main_tool(const std::string& imgui_ini_path)
     window = nullptr;
 
     if (!g_is_systray)
-    {
         glfwTerminate();
-        g_sender->Close();
-    }
 
     return EXIT_SUCCESS;
 }

src/main_tool_opengl3.cpp

@@ -16,7 +16,6 @@
 #include "fmt/format.h"
 #include "screen_capture.hpp"
 #include "screenshot_tool.hpp"
-#include "socket.hpp"
 #include "tinyfiledialogs.h"
 
 #define SVPNG_LINKAGE inline
@@ -61,6 +60,7 @@
 #  include <fcntl.h>
 #  include <sys/select.h>
 #  include <sys/socket.h>
+#  include <sys/file.h>
 #  include <unistd.h>
 #  include <sys/un.h>
 #endif
@@ -155,34 +155,23 @@ fs::path get_runtime_dir()
 
 bool acquire_tray_lock()
 {
-    // we are the "client" (not systray)
-    if (g_sender->Start().ok())
+    std::string lock_path = (get_runtime_dir() / "oshot.lock").string();
+    int         fd        = open(lock_path.c_str(), O_CREAT | O_RDWR, 0600);
+    if (fd < 0)
         return false;
 
-    g_sock = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (g_sock < 0)
-        return false;
-
-    sockaddr_un addr{};
-    addr.sun_family = AF_UNIX;
-
-    // Write 99 bytes at most to `addr.sun_path`, with the path to `oshot.sock`.
-    strncpy(addr.sun_path, (get_runtime_dir() / "oshot.sock").c_str(), 99);
-    // ensure null-termination
-    addr.sun_path[99] = '\0';
-
-    strncpy(g_sock_path, addr.sun_path, 100);
+    struct flock fl{};
+    fl.l_type   = F_WRLCK;
+    fl.l_whence = SEEK_SET;
 
-    unlink(addr.sun_path);  // remove stale socket
-    if (bind(g_sock, reinterpret_cast<sockaddr*>(&addr), sizeof(addr)) < 0)
+    if (fcntl(fd, F_SETLK, &fl) == -1)
     {
-        close(g_sock);
-        g_sock = -1;
+        // Another instance holds the lock
+        close(fd);
         return false;
     }
 
-    fcntl(g_sock, F_SETFD, FD_CLOEXEC);
-    listen(g_sock, 1);
+    // We hold the lock. it's released automatically when the process exits
     return true;
 }