10 files changed, 104 insertions, 1 deletions
diff --git a/include/Config.hpp b/include/Config.hpp
index 1e2e9cb..0e8e4eb 100644
--- a/include/Config.hpp
+++ b/include/Config.hpp
@@ -126,6 +126,7 @@ namespace gsr {
         bool show_screenshot_saved_notifications = true;
         std::string save_directory;
         ConfigHotkey take_screenshot_hotkey;
+        ConfigHotkey take_screenshot_region_hotkey;
     };
 
     struct Config {
diff --git a/include/CursorTracker.hpp b/include/CursorTracker.hpp
new file mode 100644
index 0000000..ff7374f
--- /dev/null
+++ b/include/CursorTracker.hpp
@@ -0,0 +1,23 @@
+#pragma once
+
+#include <optional>
+#include <string>
+#include <mglpp/system/vec.hpp>
+
+namespace gsr {
+    struct CursorInfo {
+        mgl::vec2i position;
+        std::string monitor_name;
+    };
+
+    class CursorTracker {
+    public:
+        CursorTracker() = default;
+        CursorTracker(const CursorTracker&) = delete;
+        CursorTracker& operator=(const CursorTracker&) = delete;
+        virtual ~CursorTracker() = default;
+
+        virtual void update() = 0;
+        virtual std::optional<CursorInfo> get_latest_cursor_info() = 0;
+    };
+}
+\ No newline at end of file
diff --git a/include/CursorTrackerWayland.hpp b/include/CursorTrackerWayland.hpp
new file mode 100644
index 0000000..1eeee83
--- /dev/null
+++ b/include/CursorTrackerWayland.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "CursorTracker.hpp"
+#include <stdint.h>
+#include <vector>
+
+struct wl_display;
+struct wl_registry;
+struct wl_output;
+struct zxdg_output_manager_v1;
+struct zxdg_output_v1;
+
+namespace gsr {
+    struct WaylandOutput {
+        uint32_t wl_name;
+        struct wl_output *output;
+        struct zxdg_output_v1 *xdg_output;
+        mgl::vec2i pos;
+        mgl::vec2i size;
+        int32_t transform;
+        std::string name;
+    };
+
+    class CursorTrackerWayland : public CursorTracker {
+    public:
+        CursorTrackerWayland(const char *card_path);
+        CursorTrackerWayland(const CursorTrackerWayland&) = delete;
+        CursorTrackerWayland& operator=(const CursorTrackerWayland&) = delete;
+        ~CursorTrackerWayland();
+
+        void update() override;
+        std::optional<CursorInfo> get_latest_cursor_info() override;
+
+        std::vector<WaylandOutput> monitors;
+        struct zxdg_output_manager_v1 *xdg_output_manager = nullptr;
+    private:
+        void set_monitor_outputs_from_xdg_output(struct wl_display *dpy);
+    private:
+        int drm_fd = -1;
+        mgl::vec2i latest_cursor_position; // Position of the cursor within the monitor
+        int latest_crtc_id = -1;
+    };
+}
+\ No newline at end of file
diff --git a/include/CursorTrackerX11.hpp b/include/CursorTrackerX11.hpp
new file mode 100644
index 0000000..66618c4
--- /dev/null
+++ b/include/CursorTrackerX11.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "CursorTracker.hpp"
+
+typedef struct _XDisplay Display;
+
+namespace gsr {
+    class CursorTrackerX11 : public CursorTracker {
+    public:
+        CursorTrackerX11(Display *dpy);
+        CursorTrackerX11(const CursorTrackerX11&) = delete;
+        CursorTrackerX11& operator=(const CursorTrackerX11&) = delete;
+        ~CursorTrackerX11() = default;
+
+        void update() override {}
+        std::optional<CursorInfo> get_latest_cursor_info() override;
+    private:
+        Display *dpy = nullptr;
+    };
+}
+\ No newline at end of file
diff --git a/include/GlobalHotkeysJoystick.hpp b/include/GlobalHotkeysJoystick.hpp
index 1effe3c..30a7689 100644
--- a/include/GlobalHotkeysJoystick.hpp
+++ b/include/GlobalHotkeysJoystick.hpp
@@ -24,6 +24,7 @@ namespace gsr {
         // take_screenshot
         // toggle_record
         // toggle_replay
+        // toggle_show
         bool bind_action(const std::string &id, GlobalHotkeyCallback callback) override;
         void poll_events() override;
     private:
@@ -58,6 +59,7 @@ namespace gsr {
         bool take_screenshot = false;
         bool toggle_record = false;
         bool toggle_replay = false;
+        bool toggle_show = false;
         int hotplug_poll_index = -1;
         Hotplug hotplug;
     };
diff --git a/include/Overlay.hpp b/include/Overlay.hpp
index 5ed7f51..2aeb3f0 100644
--- a/include/Overlay.hpp
+++ b/include/Overlay.hpp
@@ -9,6 +9,7 @@
 #include "GlobalHotkeysJoystick.hpp"
 #include "AudioPlayer.hpp"
 #include "RegionSelector.hpp"
+#include "CursorTracker.hpp"
 
 #include <mglpp/window/Window.hpp>
 #include <mglpp/window/Event.hpp>
@@ -59,6 +60,7 @@ namespace gsr {
         void toggle_replay();
         void save_replay();
         void take_screenshot();
+        void take_screenshot_region();
         void show_notification(const char *str, double timeout_seconds, mgl::Color icon_color, mgl::Color bg_color, NotificationType notification_type);
         bool is_open() const;
         bool should_exit(std::string &reason) const;
@@ -111,9 +113,11 @@ namespace gsr {
         bool on_press_start_replay(bool disable_notification, bool finished_region_selection);
         void on_press_start_record(bool finished_region_selection);
         void on_press_start_stream(bool finished_region_selection);
-        void on_press_take_screenshot(bool finished_region_selection);
+        void on_press_take_screenshot(bool finished_region_selection, bool force_region_capture);
         bool update_compositor_texture(const Monitor &monitor);
 
+        std::string get_capture_target(const std::string &capture_target, const SupportedCaptureOptions &capture_options);
+
         void force_window_on_top();
     private:
         using KeyBindingCallback = std::function<void()>;
@@ -204,5 +208,8 @@ namespace gsr {
         RegionSelector region_selector;
         bool start_region_capture = false;
         std::function<void()> on_region_selected;
+
+        std::unique_ptr<CursorTracker> cursor_tracker;
+        mgl::Clock cursor_tracker_update_clock;
     };
 }
 \ No newline at end of file
diff --git a/include/Theme.hpp b/include/Theme.hpp
index bda8dd4..4305072 100644
--- a/include/Theme.hpp
+++ b/include/Theme.hpp
@@ -44,6 +44,7 @@ namespace gsr {
         mgl::Texture screenshot_texture;
 
         mgl::Texture ps4_home_texture;
+        mgl::Texture ps4_options_texture;
         mgl::Texture ps4_dpad_up_texture;
         mgl::Texture ps4_dpad_down_texture;
         mgl::Texture ps4_dpad_left_texture;
diff --git a/include/WindowUtils.hpp b/include/WindowUtils.hpp
index e31eeb2..72d2179 100644
--- a/include/WindowUtils.hpp
+++ b/include/WindowUtils.hpp
@@ -15,6 +15,7 @@ namespace gsr {
     struct Monitor {
         mgl::vec2i position;
         mgl::vec2i size;
+        std::string name;
     };
 
     std::optional<std::string> get_window_title(Display *dpy, Window window);
diff --git a/include/gui/Button.hpp b/include/gui/Button.hpp
index 7070457..f412521 100644
--- a/include/gui/Button.hpp
+++ b/include/gui/Button.hpp
@@ -21,6 +21,7 @@ namespace gsr {
 
         mgl::vec2f get_size() override;
         void set_border_scale(float scale);
+        void set_icon_padding_scale(float scale);
         void set_bg_hover_color(mgl::Color color);
         void set_icon(mgl::Texture *texture);
 
@@ -38,5 +39,6 @@ namespace gsr {
         mgl::Text text;
         mgl::Sprite sprite;
         float border_scale = 0.0015f;
+        float icon_padding_scale = 1.0f;
     };
 }
 \ No newline at end of file
diff --git a/include/gui/GlobalSettingsPage.hpp b/include/gui/GlobalSettingsPage.hpp
index c261ab6..5df5b9c 100644
--- a/include/gui/GlobalSettingsPage.hpp
+++ b/include/gui/GlobalSettingsPage.hpp
@@ -26,6 +26,7 @@ namespace gsr {
         RECORD_PAUSE_UNPAUSE,
         STREAM_START_STOP,
         TAKE_SCREENSHOT,
+        TAKE_SCREENSHOT_REGION,
         SHOW_HIDE
     };
 
@@ -58,6 +59,7 @@ namespace gsr {
         std::unique_ptr<List> create_record_hotkey_options();
         std::unique_ptr<List> create_stream_hotkey_options();
         std::unique_ptr<List> create_screenshot_hotkey_options();
+        std::unique_ptr<List> create_screenshot_region_hotkey_options();
         std::unique_ptr<List> create_hotkey_control_buttons();
         std::unique_ptr<Subsection> create_keyboard_hotkey_subsection(ScrollablePage *parent_page);
         std::unique_ptr<Subsection> create_controller_hotkey_subsection(ScrollablePage *parent_page);
@@ -91,6 +93,7 @@ namespace gsr {
         Button *pause_unpause_recording_button_ptr = nullptr;
         Button *start_stop_streaming_button_ptr = nullptr;
         Button *take_screenshot_button_ptr = nullptr;
+        Button *take_screenshot_region_button_ptr = nullptr;
         Button *show_hide_button_ptr = nullptr;
 
         ConfigHotkey configure_config_hotkey;