Minor entry improvements

README.md

@@ -14,7 +14,7 @@ A program called `gsr-ui-cli` is also installed when installing this software. T
 # Installation
 If you are using an Arch Linux based distro then you can find gpu screen recorder ui on aur under the name gpu-screen-recorder-ui (`yay -S gpu-screen-recorder-ui`).\
 If you are running another distro then you can run `sudo ./install.sh`, but you need to manually install the dependencies, as described below.\
-You can also install gpu screen recorder from [flathub](https://flathub.org/apps/details/com.dec05eba.gpu_screen_recorder). This flatpak includes both this UI and gpu-screen-recorder so no need to install that first.
+You can also install gpu screen recorder from [flathub](https://flathub.org/apps/details/com.dec05eba.gpu_screen_recorder) which includes this UI.
 
 # Dependencies
 GPU Screen Recorder UI uses meson build system so you need to install `meson` to build GPU Screen Recorder UI.
@@ -28,6 +28,7 @@ These are the dependencies needed to build GPU Screen Recorder UI:
 * libpulse (libpulse-simple)
 * libdrm
 * wayland (wayland-client, wayland-egl, wayland-scanner)
+* setcap (libcap)
 
 ## Runtime dependencies
 There are also additional dependencies needed at runtime:
@@ -60,11 +61,13 @@ I'm looking for somebody that can create sound effects for the notifications.
 ![](https://dec05eba.com/images/settings_page.jpg)
 
 # Known issues
-* When the UI is open the wallpaper is shown instead of the game on Hyprland. This is an issue with Hyprland. It cant be fixed until the UI is redesigned to not be a fullscreen overlay.
-* Opening the UI when a game is fullscreen can mess up the game window a bit on Hyprland. This is an issue with Hyprland.
+* When the UI is open the wallpaper is shown instead of the game on Hyprland. This is an issue with Hyprland. It cant be fixed until the UI is redesigned to not be a fullscreen overlay. Change your waybar dock mode to "dock" in its config to fix this.
+* Opening the UI when a game is fullscreen can mess up the game window a bit on Hyprland. This is an issue with Hyprland. Change your waybar dock mode to "dock" in its config to fix this.
 * The background of the UI is black when opening the UI while a Wayland application is focused on COSMIC. This is an issue with COSMIC.
 * Unable to close the region selection with escape key while a Wayland application is focused on COSMIC. This is an issue with COSMIC.
 
 # FAQ
 ## I get an error when trying to start the gpu-screen-recorder-ui.service systemd service
 If you have previously used the flatpak version of GPU Screen Recorder with the new UI then the non-flatpak version of the systemd service will conflict with that. Run `gsr-ui` to fix that.
+## I use a non-qwerty keyboard layout and I have an issue with incorrect keys registered in the software
+This is a KDE Plasma Wayland issue. Use `setxkbmap <language>` command, for example `setxkbmap se` to make sure X11 applications (such as this one) gets updated to use your languages keyboard layout.

TODO

@@ -12,8 +12,6 @@ Handle events in draw function because the render position of elements is availa
 
 Add nvidia overclock option.
 
-Add support for window selection in capture.
-
 Filechooser should have the option to select list view, search bar and common folders/mounted drives on the left side for quick navigation. Also a button to create a new directory.
 
 Restart replay on system start if monitor resolution changes.
@@ -37,8 +35,6 @@ Fix first frame being black when running without a compositor.
 
 Add support for systray.
 
-Add option to take screenshot.
-
 Move event callbacks to a global list instead of std::function object in each widget. This reduces the size of widgets,
     since most widgets wont have the event callback set.
     This event callback would pass the widget as an argument.
@@ -72,8 +68,6 @@ Run `systemctl status --user gpu-screen-recorder` when starting recording and gi
 
 Add option to select which gpu to record with, or list all monitors and automatically use the gpu associated with the monitor. Do the same in gtk application.
 
-Dont allow autostart of replay if capture option is window recording (when window recording is added).
-
 Use global shortcuts desktop portal protocol on wayland when available.
 
 Support CJK.
@@ -93,14 +87,12 @@ Dont put widget position to int position when scrolling. This makes the UI jitte
 Show warning if another instance of gpu screen recorder is already running when starting recording?
 
 Keyboard leds get turned off when stopping gsr-global-hotkeys (for example numlock). The numlock key has to be pressed twice again to make it look correct to match its state.
+    Fix this by writing 0 or 1 to /sys/class/leds/input2::numlock/brightness.
 
 Make gsr-ui flatpak systemd work nicely with non-flatpak gsr-ui. Maybe change ExecStart to do flatpak run ... || gsr-ui, but make it run as a shell command first with /bin/sh -c "".
 
 When enabling X11 global hotkey again only grab lalt, not ralt.
 
-When adding window capture only add it to recording and streaming and do the window selection when recording starts, to make it more ergonomic with hotkeys.
-    If hotkey for recording/streaming start is pressed on the button for start is clicked then hide the ui if it's visible and show the window selection option (cursor).
-
 Show an error that prime run will be disabled when using desktop portal capture option. This can cause issues as the user may have selected a video codec option that isn't available on their iGPU but is available on the prime-run dGPU.
 
 For keyboards that report supporting mice the keyboard grab will be delayed until any key has been pressed (and then released), see: https://github.com/dec05eba/gpu-screen-recorder-issues/issues/97
@@ -118,9 +110,6 @@ When clicking on current directory in file manager show a dropdown menu where yo
 
 Maybe change gsr-ui startup retry time in the systemd service, from 5 seconds to 2 seconds.
 
-Add support for window capture. This should not prompt for window selection directly but instead prompt for window selection when recording starts and hide the ui first.
-    For screenshots window capture should exist but "follow focused" option should not exist.
-
 Make it possible to take a screenshot through a button in the ui instead of having to use hotkey.
 
 Handle failing to save a replay. gsr should output "failed to save replay, or something like that" to make it possible to detect that.
@@ -141,8 +130,6 @@ Make inactive buttons gray (in dropdown boxes and in the front page with save, e
 
 Add option to do screen-direct recording. But make it clear that it should not be used, except for gsync on x11 nvidia.
 
-Add window capture option (for x11).
-
 Add systray for recording status.
 
 Add a desktop icon when gsr-ui has a window mode option (which should be the default launch option).
@@ -193,3 +180,33 @@ Show message that replay/streaming has to be restarted if recording settings are
 Support vector graphics. Maybe support svg, rendering it to a texture for better performance.
 
 Support freetype for text rendering. Maybe load freetype as runtime (with dlopen) and use that when available and fallback to stb_freetype if not available.
+
+Show .webm container option. It's currently chosen automatically if vp8/vp9 is chosen. The available containers should automatically switch depending on the video codec.
+
+In settings show audio levels for each audio. Maybe show audio level image beside the audio name in the dropdown box and switch to a different image (have 3-4 different images for each level) depending on the volume.
+
+Only use fake cursor on wayland if the focused x11 window is fullscreen.
+
+Create window as a real overlay window, using layer shell protocol, when possible. This will however minimize windows on floating wms. Check if this can be fixed somehow, or only use layer shell in tiling wms.
+
+Add timeout option for screenshots.
+
+Add a window that shows a warning for wayland users, that wayland doesn't support this software and if they experience issues then they should use x11 instead.
+
+Add a window that shows a warning if gpu video encoding isn't supported.
+
+Disable system notifications when recording. Does the notification dbus interface support pausing notifications?
+
+Disable hotkeys if virtual keyboard is found (either at startup or after running), if grab type if not virtual. Show a notification if that happens that hotkeys have been disabled.
+    Detect if keyboard is locked by listening to gsr-ui virtual keyboard events and if no event is received after pressing a key (when writing to it after receiving input from another keyboard)
+    then remove the keyboard grab and show a message or something.
+        This can happen if the gsr-ui virtual keyboard is grabbed by some other software.
+        Maybe this can be fixed automatically by grabbing gsr-ui virtual keyboard and releasing it just before we write to it and then release it again.
+        But wont keyboard remapping software grab the keyboard first if they detect it quickly?
+            If we fail to grab it because some other software did then dont grab any keyboards nor gsr-ui virtual keyboards, just listen to them.
+
+Support localization.
+
+Add option to not capture cursor in screenshot when doing region/window capture.
+
+Window selection doesn't work when a window is fullscreen on x11.

flatpak/gpu-screen-recorder-ui.service

@@ -2,7 +2,7 @@
 Description=GPU Screen Recorder UI Service
 
 [Service]
-ExecStart=flatpak run com.dec05eba.gpu_screen_recorder gsr-ui launch-daemon
+ExecStart=flatpak run com.dec05eba.gpu_screen_recorder gsr-ui
 KillSignal=SIGINT
 Restart=on-failure
 RestartSec=5s

include/Config.hpp

@@ -45,7 +45,7 @@ namespace gsr {
         int32_t video_width = 0;
         int32_t video_height = 0;
         int32_t fps = 60;
-        int32_t video_bitrate = 15000;
+        int32_t video_bitrate = 8000;
         bool merge_audio_tracks = true; // TODO: Remove in the future
         bool application_audio_invert = false; // TODO: Remove in the future
         bool change_video_resolution = false;
@@ -55,7 +55,7 @@ namespace gsr {
         std::string video_quality = "very_high";
         std::string video_codec = "auto";
         std::string audio_codec = "opus";
-        std::string framerate_mode = "vfr";
+        std::string framerate_mode = "auto";
         bool advanced_view = false;
         bool overclock = false;
         bool record_cursor = true;
@@ -79,8 +79,13 @@ namespace gsr {
         std::string stream_key;
     };
 
+    struct RumbleStreamConfig {
+        std::string stream_key;
+    };
+
     struct CustomStreamConfig {
         std::string url;
+        std::string key;
         std::string container = "flv";
     };
 
@@ -91,6 +96,7 @@ namespace gsr {
         std::string streaming_service = "twitch";
         YoutubeStreamConfig youtube;
         TwitchStreamConfig twitch;
+        RumbleStreamConfig rumble;
         CustomStreamConfig custom;
         ConfigHotkey start_stop_hotkey;
     };
@@ -140,6 +146,7 @@ namespace gsr {
         std::string save_directory;
         ConfigHotkey take_screenshot_hotkey;
         ConfigHotkey take_screenshot_region_hotkey;
+        ConfigHotkey take_screenshot_window_hotkey; // Or desktop portal, on wayland
     };
 
     struct Config {

include/GlobalHotkeys/GlobalHotkeysJoystick.hpp

@@ -56,6 +56,8 @@ namespace gsr {
         bool down_pressed = false;
         bool left_pressed = false;
         bool right_pressed = false;
+        bool l3_button_pressed = false;
+        bool r3_button_pressed = false;
 
         bool save_replay = false;
         bool save_1_min_replay = false;

include/Overlay.hpp

@@ -9,6 +9,7 @@
 #include "GlobalHotkeys/GlobalHotkeysJoystick.hpp"
 #include "AudioPlayer.hpp"
 #include "RegionSelector.hpp"
+#include "WindowSelector.hpp"
 #include "CursorTracker/CursorTracker.hpp"
 
 #include <mglpp/window/Window.hpp>
@@ -40,6 +41,12 @@ namespace gsr {
         SCREENSHOT
     };
 
+    enum class ScreenshotForceType {
+        NONE,
+        REGION,
+        WINDOW
+    };
+
     class Overlay {
     public:
         Overlay(std::string resources_path, GsrInfo gsr_info, SupportedCaptureOptions capture_options, egl_functions egl_funcs);
@@ -63,6 +70,7 @@ namespace gsr {
         void save_replay_10_min();
         void take_screenshot();
         void take_screenshot_region();
+        void take_screenshot_window();
         void show_notification(const char *str, double timeout_seconds, mgl::Color icon_color, mgl::Color bg_color, NotificationType notification_type, const char *capture_target = nullptr);
         bool is_open() const;
         bool should_exit(std::string &reason) const;
@@ -86,10 +94,12 @@ namespace gsr {
 
         void close_gpu_screen_recorder_output();
 
+        double get_time_passed_in_replay_buffer_seconds();
         void update_notification_process_status();
         void save_video_in_current_game_directory(const char *video_filepath, NotificationType notification_type);
         void on_replay_saved(const char *replay_saved_filepath);
         void process_gsr_output();
+        void on_gsr_process_error(int exit_code, NotificationType notification_type);
         void update_gsr_process_status();
         void update_gsr_screenshot_process_status();
 
@@ -116,10 +126,10 @@ namespace gsr {
         void on_press_save_replay();
         void on_press_save_replay_1_min_replay();
         void on_press_save_replay_10_min_replay();
-        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, bool force_region_capture);
+        bool on_press_start_replay(bool disable_notification, bool finished_selection);
+        void on_press_start_record(bool finished_selection);
+        void on_press_start_stream(bool finished_selection);
+        void on_press_take_screenshot(bool finished_selection, ScreenshotForceType force_type);
         bool update_compositor_texture(const Monitor &monitor);
 
         std::string get_capture_target(const std::string &capture_target, const SupportedCaptureOptions &capture_options);
@@ -211,16 +221,29 @@ namespace gsr {
         bool try_replay_startup = true;
         bool replay_recording = false;
         int replay_save_duration_min = 0;
+        double replay_buffer_save_duration_sec = 0.0;
+        mgl::Clock replay_duration_clock;
+        double replay_saved_duration_sec = 0.0;
+        bool replay_restart_on_save = false;
+
+        mgl::Clock recording_duration_clock;
 
         AudioPlayer audio_player;
+    
         RegionSelector region_selector;
         bool start_region_capture = false;
         std::function<void()> on_region_selected;
 
+        WindowSelector window_selector;
+        bool start_window_capture = false;
+        std::function<void()> on_window_selected;
+
         std::string recording_capture_target;
         std::string screenshot_capture_target;
 
         std::unique_ptr<CursorTracker> cursor_tracker;
         mgl::Clock cursor_tracker_update_clock;
+
+        bool hide_ui = false;
     };
 }

include/RegionSelector.hpp

@@ -26,7 +26,6 @@ namespace gsr {
 
         bool failed() const;
         bool poll_events();
-        bool is_selected() const;
         bool take_selection();
         bool take_canceled();
         Region get_selection() const;

include/Utils.hpp

@@ -16,6 +16,7 @@ namespace gsr {
     void string_split_char(std::string_view str, char delimiter, StringSplitCallback callback_func);
     bool starts_with(std::string_view str, const char *substr);
     bool ends_with(std::string_view str, const char *substr);
+    std::string strip(const std::string &str);
 
     std::string get_home_dir();
     std::string get_config_dir();

include/WindowSelector.hpp

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <X11/Xlib.h>
+
+#include <mglpp/graphics/Color.hpp>
+
+namespace gsr {
+    class WindowSelector {
+    public:
+        WindowSelector();
+        WindowSelector(const WindowSelector&) = delete;
+        WindowSelector& operator=(const WindowSelector&) = delete;
+        ~WindowSelector();
+
+        bool start(mgl::Color border_color);
+        void stop();
+        bool is_started() const;
+
+        bool failed() const;
+        bool poll_events();
+        bool take_selection();
+        bool take_canceled();
+        Window get_selection() const;
+    private:
+        Display *dpy = nullptr;
+        Cursor crosshair_cursor = None;
+        Colormap border_window_colormap = None;
+        Window border_window = None;
+        Window selected_window = None;
+        bool selected = false;
+        bool canceled = false;
+    };
+}

include/WindowUtils.hpp

@@ -24,6 +24,7 @@ namespace gsr {
     std::string get_window_name_at_position(Display *dpy, mgl::vec2i position, Window ignore_window);
     std::string get_window_name_at_cursor_position(Display *dpy, Window ignore_window);
     void set_window_size_not_resizable(Display *dpy, Window window, int width, int height);
+    Window window_get_target_window_child(Display *display, Window window);
     mgl::vec2i get_cursor_position(Display *dpy, Window *window);
     mgl::vec2i create_window_get_center_position(Display *display);
     std::string get_window_manager_name(Display *display);

include/gui/Entry.hpp

@@ -5,9 +5,17 @@
 
 #include <mglpp/graphics/Color.hpp>
 #include <mglpp/graphics/Text.hpp>
+#include <mglpp/graphics/Rectangle.hpp>
 
 namespace gsr {
-    using EntryValidateHandler = std::function<bool(std::string &str)>;
+    class Entry;
+
+    enum class EntryValidateHandlerResult {
+        DENY,
+        ALLOW,
+        REPLACED
+    };
+    using EntryValidateHandler = std::function<EntryValidateHandlerResult(Entry &entry, const std::string &str)>;
 
     class Entry : public Widget {
     public:
@@ -20,19 +28,39 @@ namespace gsr {
 
         mgl::vec2f get_size() override;
 
-        void set_text(std::string str);
+        EntryValidateHandlerResult set_text(std::string str);
         const std::string& get_text() const;
 
+        // Also updates the cursor position
+        void replace_text(size_t index, size_t size, const std::string &replacement);
+
         // Return false to specify that the string should not be accepted. This reverts the string back to its previous value.
         // The input can be changed by changing the input parameter and returning true.
         EntryValidateHandler validate_handler;
 
         std::function<void(const std::string &text)> on_changed;
     private:
+        EntryValidateHandlerResult set_text_internal(std::string str);
+        void draw_caret(mgl::Window &window, mgl::vec2f draw_pos, mgl::vec2f caret_size);
+        void draw_caret_selection(mgl::Window &window, mgl::vec2f draw_pos, mgl::vec2f caret_size);
+        mgl_index_codepoint_pair find_closest_caret_index_by_position(mgl::vec2f position);
+    private:
+        struct Caret {
+            float offset_x = 0.0f;
+            int utf8_index = 0;
+            int byte_index = 0;
+        };
+
+        mgl::Rectangle background;
         mgl::Text text;
         float max_width;
         bool selected = false;
-        float caret_offset_x = 0.0f;
+        bool selecting_text = false;
+        bool selecting_with_keyboard = false;
+        bool show_selection = false;
+        Caret caret;
+        Caret selection_start_caret;
+        float text_overflow = 0.0f;
     };
 
     EntryValidateHandler create_entry_validator_integer_in_range(int min, int max);

include/gui/GlobalSettingsPage.hpp

@@ -29,6 +29,7 @@ namespace gsr {
         STREAM_START_STOP,
         TAKE_SCREENSHOT,
         TAKE_SCREENSHOT_REGION,
+        TAKE_SCREENSHOT_WINDOW,
         SHOW_HIDE
     };
 
@@ -63,6 +64,7 @@ namespace gsr {
         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_screenshot_window_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);
@@ -99,6 +101,7 @@ namespace gsr {
         Button *start_stop_streaming_button_ptr = nullptr;
         Button *take_screenshot_button_ptr = nullptr;
         Button *take_screenshot_region_button_ptr = nullptr;
+        Button *take_screenshot_window_button_ptr = nullptr;
         Button *show_hide_button_ptr = nullptr;
 
         ConfigHotkey configure_config_hotkey;

include/gui/ScreenshotSettingsPage.hpp

@@ -26,7 +26,6 @@ namespace gsr {
     private:
         std::unique_ptr<ComboBox> create_record_area_box();
         std::unique_ptr<Widget> create_record_area();
-        std::unique_ptr<List> create_select_window();
         std::unique_ptr<Entry> create_image_width_entry();
         std::unique_ptr<Entry> create_image_height_entry();
         std::unique_ptr<List> create_image_resolution();
@@ -56,7 +55,6 @@ namespace gsr {
 
         GsrPage *content_page_ptr = nullptr;
         ScrollablePage *settings_scrollable_page_ptr = nullptr;
-        List *select_window_list_ptr = nullptr;
         List *image_resolution_list_ptr = nullptr;
         List *restore_portal_session_list_ptr = nullptr;
         List *color_range_list_ptr = nullptr;

include/gui/SettingsPage.hpp

@@ -46,7 +46,6 @@ namespace gsr {
         std::unique_ptr<RadioButton> create_view_radio_button();
         std::unique_ptr<ComboBox> create_record_area_box();
         std::unique_ptr<Widget> create_record_area();
-        std::unique_ptr<List> create_select_window();
         std::unique_ptr<Entry> create_area_width_entry();
         std::unique_ptr<Entry> create_area_height_entry();
         std::unique_ptr<List> create_area_size();
@@ -119,7 +118,7 @@ namespace gsr {
         std::unique_ptr<ComboBox> create_streaming_service_box();
         std::unique_ptr<List> create_streaming_service_section();
         std::unique_ptr<List> create_stream_key_section();
-        std::unique_ptr<List> create_stream_url_section();
+        std::unique_ptr<List> create_stream_custom_section();
         std::unique_ptr<ComboBox> create_stream_container_box();
         std::unique_ptr<List> create_stream_container_section();
         void add_stream_widgets();
@@ -147,7 +146,6 @@ namespace gsr {
         GsrPage *content_page_ptr = nullptr;
         ScrollablePage *settings_scrollable_page_ptr = nullptr;
         List *settings_list_ptr = nullptr;
-        List *select_window_list_ptr = nullptr;
         List *area_size_list_ptr = nullptr;
         List *video_resolution_list_ptr = nullptr;
         List *restore_portal_session_list_ptr = nullptr;
@@ -192,7 +190,9 @@ namespace gsr {
         Button *save_directory_button_ptr = nullptr;
         Entry *twitch_stream_key_entry_ptr = nullptr;
         Entry *youtube_stream_key_entry_ptr = nullptr;
+        Entry *rumble_stream_key_entry_ptr = nullptr;
         Entry *stream_url_entry_ptr = nullptr;
+        Entry *stream_key_entry_ptr = nullptr;
         Entry *replay_time_entry_ptr = nullptr;
         RadioButton *replay_storage_button_ptr = nullptr;
         Label *replay_time_label_ptr = nullptr;

include/gui/Utils.hpp

@@ -2,6 +2,7 @@
 
 #include <mglpp/system/vec.hpp>
 #include <mglpp/graphics/Color.hpp>
+#include <mglpp/window/Window.hpp>
 
 namespace mgl {
     class Window;
@@ -14,4 +15,5 @@ namespace gsr {
     void set_frame_delta_seconds(double frame_delta);
     mgl::vec2f scale_keep_aspect_ratio(mgl::vec2f from, mgl::vec2f to);
     mgl::vec2f clamp_keep_aspect_ratio(mgl::vec2f from, mgl::vec2f to);
+    mgl::Scissor scissor_get_sub_area(mgl::Scissor parent, mgl::Scissor child);
 }

meson.build

@@ -1,4 +1,4 @@
-project('gsr-ui', ['c', 'cpp'], version : '1.6.4', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
+project('gsr-ui', ['c', 'cpp'], version : '1.7.2', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
 
 if get_option('buildtype') == 'debug'
     add_project_arguments('-g3', language : ['c', 'cpp'])
@@ -40,6 +40,7 @@ src = [
     'src/Utils.cpp',
     'src/WindowUtils.cpp',
     'src/RegionSelector.cpp',
+    'src/WindowSelector.cpp',
     'src/Config.cpp',
     'src/GsrInfo.cpp',
     'src/Process.cpp',
@@ -61,7 +62,7 @@ datadir = get_option('datadir')
 gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui')
 
 add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp'])
-add_project_arguments('-DGSR_FLATPAK_VERSION="5.6.0"', language: ['c', 'cpp'])
+add_project_arguments('-DGSR_FLATPAK_VERSION="5.7.5"', language: ['c', 'cpp'])
 
 executable(
     meson.project_name(),

project.conf

@@ -1,7 +1,7 @@
 [package]
 name = "gsr-ui"
 type = "executable"
-version = "1.6.4"
+version = "1.7.2"
 platforms = ["posix"]
 
 [lang.cpp]

src/Config.cpp

@@ -119,7 +119,7 @@ namespace gsr {
 
         streaming_config.record_options.video_quality = "custom";
         streaming_config.record_options.audio_tracks_list.push_back({std::vector<std::string>{"default_output"}, false});
-        streaming_config.record_options.video_bitrate = 15000;
+        streaming_config.record_options.video_bitrate = 8000;
 
         record_config.save_directory = default_videos_save_directory;
         record_config.record_options.audio_tracks_list.push_back({std::vector<std::string>{"default_output"}, false});
@@ -153,6 +153,7 @@ namespace gsr {
 
         screenshot_config.take_screenshot_hotkey = {mgl::Keyboard::Printscreen, 0};
         screenshot_config.take_screenshot_region_hotkey = {mgl::Keyboard::Printscreen, HOTKEY_MOD_LCTRL};
+        screenshot_config.take_screenshot_window_hotkey = {mgl::Keyboard::Printscreen, HOTKEY_MOD_LSHIFT};
 
         main_config.show_hide_hotkey = {mgl::Keyboard::Z, HOTKEY_MOD_LALT};
     }
@@ -201,7 +202,9 @@ namespace gsr {
             {"streaming.service", &config.streaming_config.streaming_service},
             {"streaming.youtube.key", &config.streaming_config.youtube.stream_key},
             {"streaming.twitch.key", &config.streaming_config.twitch.stream_key},
+            {"streaming.rumble.key", &config.streaming_config.rumble.stream_key},
             {"streaming.custom.url", &config.streaming_config.custom.url},
+            {"streaming.custom.key", &config.streaming_config.custom.key},
             {"streaming.custom.container", &config.streaming_config.custom.container},
             {"streaming.start_stop_hotkey", &config.streaming_config.start_stop_hotkey},
 
@@ -283,7 +286,8 @@ namespace gsr {
             {"screenshot.show_screenshot_saved_notifications", &config.screenshot_config.show_screenshot_saved_notifications},
             {"screenshot.save_directory", &config.screenshot_config.save_directory},
             {"screenshot.take_screenshot_hotkey", &config.screenshot_config.take_screenshot_hotkey},
-            {"screenshot.take_screenshot_region_hotkey", &config.screenshot_config.take_screenshot_region_hotkey}
+            {"screenshot.take_screenshot_region_hotkey", &config.screenshot_config.take_screenshot_region_hotkey},
+            {"screenshot.take_screenshot_window_hotkey", &config.screenshot_config.take_screenshot_window_hotkey}
         };
     }
 

src/CursorTracker/CursorTrackerWayland.cpp

@@ -9,14 +9,8 @@
 
 namespace gsr {
     static const int MAX_CONNECTORS = 32;
-    static const int CONNECTOR_TYPE_COUNTS = 32;
     static const uint32_t plane_property_all = 0xF;
 
-    typedef struct {
-        int type;
-        int count;
-    } drm_connector_type_count;
-
     typedef enum {
         PLANE_PROPERTY_CRTC_X      = 1 << 0,
         PLANE_PROPERTY_CRTC_Y      = 1 << 1,
@@ -105,22 +99,6 @@ namespace gsr {
         return get_drm_property_by_name(drm_fd, &properties, name, result);
     }
 
-    static drm_connector_type_count* drm_connector_types_get_index(drm_connector_type_count *type_counts, int *num_type_counts, int connector_type) {
-        for(int i = 0; i < *num_type_counts; ++i) {
-            if(type_counts[i].type == connector_type)
-                return &type_counts[i];
-        }
-
-        if(*num_type_counts == CONNECTOR_TYPE_COUNTS)
-            return NULL;
-
-        const int index = *num_type_counts;
-        type_counts[index].type = connector_type;
-        type_counts[index].count = 0;
-        ++*num_type_counts;
-        return &type_counts[index];
-    }
-
     // Note: this monitor name logic is kept in sync with gpu screen recorder
     static std::string get_monitor_name_from_crtc_id(int drm_fd, uint32_t crtc_id) {
         std::string result;
@@ -128,27 +106,23 @@ namespace gsr {
         if(!resources)
             return result;
 
-        drm_connector_type_count type_counts[CONNECTOR_TYPE_COUNTS];
-        int num_type_counts = 0;
-
         for(int i = 0; i < resources->count_connectors; ++i) {
             uint64_t connector_crtc_id = 0;
             drmModeConnectorPtr connector = drmModeGetConnectorCurrent(drm_fd, resources->connectors[i]);
             if(!connector)
                 continue;
 
-            drm_connector_type_count *connector_type = drm_connector_types_get_index(type_counts, &num_type_counts, connector->connector_type);
             const char *connection_name = drmModeGetConnectorTypeName(connector->connector_type);
-            if(connector_type)
-                ++connector_type->count;
+            if(!connection_name)
+                goto next;
 
             if(connector->connection != DRM_MODE_CONNECTED)
                 goto next;
 
-            if(connector_type && connector_get_property_by_name(drm_fd, connector, "CRTC_ID", &connector_crtc_id) && connector_crtc_id == crtc_id) {
+            if(connector_get_property_by_name(drm_fd, connector, "CRTC_ID", &connector_crtc_id) && connector_crtc_id == crtc_id) {
                 result = connection_name;
                 result += "-";
-                result += std::to_string(connector_type->count);
+                result += std::to_string(connector->connector_type_id);
                 drmModeFreeConnector(connector);
                 break;
             }

src/GlobalHotkeys/GlobalHotkeysJoystick.cpp

@@ -11,9 +11,73 @@ namespace gsr {
     static constexpr int triangle_button = 2;
     static constexpr int options_button = 9;
     static constexpr int playstation_button = 10;
+    static constexpr int l3_button = 11;
+    static constexpr int r3_button = 12;
     static constexpr int axis_up_down = 7;
     static constexpr int axis_left_right = 6;
 
+    struct DeviceId {
+        uint16_t vendor;
+        uint16_t product;
+    };
+
+    static bool read_file_hex_number(const char *path, unsigned int *value) {
+        *value = 0;
+        FILE *f = fopen(path, "rb");
+        if(!f)
+            return false;
+
+        fscanf(f, "%x", value);
+        fclose(f);
+        return true;
+    }
+
+    static DeviceId joystick_get_device_id(const char *path) {
+        DeviceId device_id;
+        device_id.vendor = 0;
+        device_id.product = 0;
+
+        const char *js_path_id = nullptr;
+        const int len = strlen(path);
+        for(int i = len - 1; i >= 0; --i) {
+            if(path[i] == '/') {
+                js_path_id = path + i + 1;
+                break;
+            }
+        }
+
+        if(!js_path_id)
+            return device_id;
+
+        unsigned int vendor = 0;
+        unsigned int product = 0;
+        char path_buf[1024];
+
+        snprintf(path_buf, sizeof(path_buf), "/sys/class/input/%s/device/id/vendor", js_path_id);
+        if(!read_file_hex_number(path_buf, &vendor))
+            return device_id;
+
+        snprintf(path_buf, sizeof(path_buf), "/sys/class/input/%s/device/id/product", js_path_id);
+        if(!read_file_hex_number(path_buf, &product))
+            return device_id;
+
+        device_id.vendor = vendor;
+        device_id.product = product;
+        return device_id;
+    }
+
+    static bool is_ps4_controller(DeviceId device_id) {
+        return device_id.vendor == 0x054C && (device_id.product == 0x09CC || device_id.product == 0x0BA0 || device_id.product == 0x05C4);
+    }
+
+    static bool is_ps5_controller(DeviceId device_id) {
+        return device_id.vendor == 0x054C && (device_id.product == 0x0DF2 || device_id.product == 0x0CE6);
+    }
+
+    static bool is_stadia_controller(DeviceId device_id) {
+        return device_id.vendor == 0x18D1 && (device_id.product == 0x9400);
+    }
+
     // Returns -1 on error
     static int get_js_dev_input_id_from_filepath(const char *dev_input_filepath) {
         if(strncmp(dev_input_filepath, "/dev/input/js", 13) != 0)
@@ -38,7 +102,8 @@ namespace gsr {
             close(event_fd);
 
         for(int i = 0; i < num_poll_fd; ++i) {
-            close(poll_fd[i].fd);
+            if(poll_fd[i].fd > 0)
+                close(poll_fd[i].fd);
         }
     }
 
@@ -157,6 +222,9 @@ namespace gsr {
                     if(i == event_index)
                         goto done;
 
+                    char dev_input_filepath[256];
+                    snprintf(dev_input_filepath, sizeof(dev_input_filepath), "/dev/input/js%d", extra_data[i].dev_input_id);
+                    fprintf(stderr, "Info: removed joystick: %s\n", dev_input_filepath);
                     if(remove_poll_fd(i))
                         --i; // This item was removed so we want to repeat the same index to continue to the next item
 
@@ -170,18 +238,13 @@ namespace gsr {
                     goto done;
                 } else if(i == hotplug_poll_index) {
                     hotplug.process_event_data(poll_fd[i].fd, [&](HotplugAction hotplug_action, const char *devname) {
-                        char dev_input_filepath[1024];
-                        snprintf(dev_input_filepath, sizeof(dev_input_filepath), "/dev/%s", devname);
                         switch(hotplug_action) {
                             case HotplugAction::ADD: {
-                                // Cant open the /dev/input device immediately or it fails.
-                                // TODO: Remove this hack when a better solution is found.
-                                usleep(50 * 1000);
-                                add_device(dev_input_filepath);
+                                add_device(devname);
                                 break;
                             }
                             case HotplugAction::REMOVE: {
-                                if(remove_device(dev_input_filepath))
+                                if(remove_device(devname))
                                     --i; // This item was removed so we want to repeat the same index to continue to the next item
                                 break;
                             }
@@ -204,7 +267,8 @@ namespace gsr {
         if((event.type & JS_EVENT_BUTTON) == JS_EVENT_BUTTON) {
             switch(event.number) {
                 case playstation_button: {
-                    playstation_button_pressed = event.value == button_pressed;
+                    // Workaround weird steam input (in-game) behavior where steam triggers playstation button + options when pressing both l3 and r3 at the same time
+                    playstation_button_pressed = (event.value == button_pressed) && !l3_button_pressed && !r3_button_pressed;
                     break;
                 }
                 case options_button: {
@@ -222,6 +286,14 @@ namespace gsr {
                         save_10_min_replay = true;
                     break;
                 }
+                case l3_button: {
+                    l3_button_pressed = event.value == button_pressed;
+                    break;
+                }
+                case r3_button: {
+                    r3_button_pressed = event.value == button_pressed;
+                    break;
+                }
             }
         } else if((event.type & JS_EVENT_AXIS) == JS_EVENT_AXIS && playstation_button_pressed) {
             const int trigger_threshold = 16383;
@@ -276,6 +348,8 @@ namespace gsr {
             dev_input_id
         };
 
+        //const DeviceId device_id = joystick_get_device_id(dev_input_filepath);
+
         ++num_poll_fd;
         fprintf(stderr, "Info: added joystick: %s\n", dev_input_filepath);
         return true;
@@ -298,7 +372,9 @@ namespace gsr {
         if(index < 0 || index >= num_poll_fd)
             return false;
 
-        close(poll_fd[index].fd);
+        if(poll_fd[index].fd > 0)
+            close(poll_fd[index].fd);
+
         for(int i = index + 1; i < num_poll_fd; ++i) {
             poll_fd[i - 1] = poll_fd[i];
             extra_data[i - 1] = extra_data[i];

src/Hotplug.cpp

@@ -59,10 +59,9 @@ namespace gsr {
 
     /* TODO: This assumes SUBSYSTEM= is output before DEVNAME=, is that always true? */
     void Hotplug::parse_netlink_data(const char *line, const HotplugEventCallback &callback) {
-        const char *at_symbol = strchr(line, '@');
-        if(at_symbol) {
-            event_is_add = strncmp(line, "add@", 4) == 0;
-            event_is_remove = strncmp(line, "remove@", 7) == 0;
+        if(strncmp(line, "ACTION=", 7) == 0) {
+            event_is_add = strncmp(line+7, "add", 3) == 0;
+            event_is_remove = strncmp(line+7, "remove", 6) == 0;
             subsystem_is_input = false;
         } else if(event_is_add || event_is_remove) {
             if(strcmp(line, "SUBSYSTEM=input") == 0)

src/Overlay.cpp

@@ -26,6 +26,8 @@
 #include <malloc.h>
 #include <stdexcept>
 #include <algorithm>
+#include <inttypes.h>
+#include <math.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -37,6 +39,7 @@
 #include <X11/Xcursor/Xcursor.h>
 #include <mglpp/system/Rect.hpp>
 #include <mglpp/window/Event.hpp>
+#include <mglpp/system/Utf8.hpp>
 
 extern "C" {
 #include <mgl/mgl.h>
@@ -47,7 +50,7 @@ namespace gsr {
     static const double force_window_on_top_timeout_seconds = 1.0;
     static const double replay_status_update_check_timeout_seconds = 1.5;
     static const double replay_saving_notification_timeout_seconds = 0.5;
-    static const double notification_timeout_seconds = 2.5;
+    static const double notification_timeout_seconds = 3.0;
     static const double notification_error_timeout_seconds = 5.0;
     static const double cursor_tracker_update_timeout_sec = 0.1;
 
@@ -271,6 +274,33 @@ namespace gsr {
         return true;
     }
 
+    static bool is_hyprland_waybar_running_as_dock() {
+        const char *args[] = { "hyprctl", "layers", nullptr };
+        std::string stdout_str;
+        if(exec_program_on_host_get_stdout(args, stdout_str) != 0)
+            return false;
+
+        int waybar_layer_level = -1;
+        int current_layer_level = 0;
+        string_split_char(stdout_str, '\n', [&](const std::string_view line) {
+            if(line.find("Layer level 0") != std::string_view::npos)
+                current_layer_level = 0;
+            else if(line.find("Layer level 1") != std::string_view::npos)
+                current_layer_level = 1;
+            else if(line.find("Layer level 2") != std::string_view::npos)
+                current_layer_level = 2;
+            else if(line.find("Layer level 3") != std::string_view::npos)
+                current_layer_level = 3;
+            else if(line.find("namespace: waybar") != std::string_view::npos) {
+                waybar_layer_level = current_layer_level;
+                return false;
+            }
+            return true;
+        });
+
+        return waybar_layer_level >= 0 && waybar_layer_level <= 1;
+    }
+
     static Hotkey config_hotkey_to_hotkey(ConfigHotkey config_hotkey) {
         return {
             (uint32_t)mgl::Keyboard::key_to_x11_keysym((mgl::Keyboard::Key)config_hotkey.key),
@@ -349,6 +379,13 @@ namespace gsr {
                 overlay->take_screenshot_region();
             });
 
+        global_hotkeys->bind_key_press(
+            config_hotkey_to_hotkey(overlay->get_config().screenshot_config.take_screenshot_window_hotkey),
+            "take_screenshot_window", [overlay](const std::string &id) {
+                fprintf(stderr, "pressed %s\n", id.c_str());
+                overlay->take_screenshot_window();
+            });
+
         global_hotkeys->bind_key_press(
             config_hotkey_to_hotkey(ConfigHotkey{ mgl::Keyboard::Key::Escape, HOTKEY_MOD_LCTRL | HOTKEY_MOD_LSHIFT | HOTKEY_MOD_LALT }),
             "exit", [overlay](const std::string &id) {
@@ -677,6 +714,22 @@ namespace gsr {
             on_region_selected = nullptr;
         }
 
+        window_selector.poll_events();
+        if(window_selector.take_canceled()) {
+            on_window_selected = nullptr;
+        } else if(window_selector.take_selection() && on_window_selected) {
+            mgl_context *context = mgl_get_context();
+            Display *display = (Display*)context->connection;
+
+            const Window selected_window = window_selector.get_selection();
+            if(selected_window && selected_window != DefaultRootWindow(display)) {
+                on_window_selected();
+            } else {
+                show_notification("No window selected", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE);
+            }
+            on_window_selected = nullptr;
+        }
+
         if(!visible || !window)
             return;
 
@@ -713,6 +766,12 @@ namespace gsr {
         update_gsr_screenshot_process_status();
         replay_status_update_status();
 
+        if(hide_ui) {
+            hide_ui = false;
+            hide();
+            return false;
+        }
+
         if(start_region_capture) {
             start_region_capture = false;
             hide();
@@ -722,7 +781,16 @@ namespace gsr {
             }
         }
 
-        if(region_selector.is_started()) {
+        if(start_window_capture) {
+            start_window_capture = false;
+            hide();
+            if(!window_selector.start(get_color_theme().tint_color)) {
+                show_notification("Failed to start window capture", notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::NONE);
+                on_window_selected = nullptr;
+            }
+        }
+
+        if(region_selector.is_started() || window_selector.is_started()) {
             usleep(5 * 1000); // 5 ms
             return true;
         }
@@ -856,7 +924,7 @@ namespace gsr {
         if(visible)
             return;
 
-        if(region_selector.is_started())
+        if(region_selector.is_started() || window_selector.is_started())
             return;
 
         drawn_first_frame = false;
@@ -877,6 +945,8 @@ namespace gsr {
         const std::string wm_name = get_window_manager_name(display);
         const bool is_kwin = wm_name == "KWin";
         const bool is_wlroots = wm_name.find("wlroots") != std::string::npos;
+        const bool is_hyprland = wm_name.find("Hyprland") != std::string::npos;
+        const bool hyprland_waybar_is_dock = is_hyprland && is_hyprland_waybar_running_as_dock();
 
         std::optional<CursorInfo> cursor_info;
         if(cursor_tracker) {
@@ -903,7 +973,8 @@ namespace gsr {
         // Wayland doesn't allow XGrabPointer/XGrabKeyboard when a wayland application is focused.
         // If the focused window is a wayland application then don't use override redirect and instead create
         // a fullscreen window for the ui.
-        const bool prevent_game_minimizing = gsr_info.system_info.display_server != DisplayServer::WAYLAND || x11_cursor_window || is_wlroots;
+        // TODO: (x11_cursor_window && is_window_fullscreen_on_monitor(display, x11_cursor_window, *focused_monitor))
+        const bool prevent_game_minimizing = gsr_info.system_info.display_server != DisplayServer::WAYLAND || x11_cursor_window || is_wlroots || is_hyprland;
 
         if(prevent_game_minimizing) {
             window_pos = focused_monitor->position;
@@ -1007,7 +1078,7 @@ namespace gsr {
         // Owlboy seems to use xi events and XGrabPointer doesn't prevent owlboy from receiving events.
         xi_grab_all_mouse_devices(xi_display);
 
-        if(!is_wlroots)
+        if(!is_wlroots && !hyprland_waybar_is_dock)
             window->set_fullscreen(true);
 
         visible = true;
@@ -1281,6 +1352,8 @@ namespace gsr {
         if(!visible)
             return;
 
+        hide_ui = false;
+
         mgl_context *context = mgl_get_context();
         Display *display = (Display*)context->connection;
 
@@ -1311,6 +1384,7 @@ namespace gsr {
         visible = false;
         drawn_first_frame = false;
         start_region_capture = false;
+        start_window_capture = false;
 
         if(xi_input_xev) {
             free(xi_input_xev);
@@ -1415,11 +1489,15 @@ namespace gsr {
     }
 
     void Overlay::take_screenshot() {
-        on_press_take_screenshot(false, false);
+        on_press_take_screenshot(false, ScreenshotForceType::NONE);
     }
 
     void Overlay::take_screenshot_region() {
-        on_press_take_screenshot(false, true);
+        on_press_take_screenshot(false, ScreenshotForceType::REGION);
+    }
+
+    void Overlay::take_screenshot_window() {
+        on_press_take_screenshot(false, ScreenshotForceType::WINDOW);
     }
 
     static const char* notification_type_to_string(NotificationType notification_type) {
@@ -1433,6 +1511,27 @@ namespace gsr {
         return nullptr;
     }
 
+    static void truncate_string(std::string &str, int max_length) {
+        int index = 0;
+        size_t byte_index = 0;
+
+        while(index < max_length && byte_index < str.size()) {
+            uint32_t codepoint = 0;
+            size_t codepoint_length = 0;
+            mgl::utf8_decode((const unsigned char*)str.c_str() + byte_index, str.size() - byte_index, &codepoint, &codepoint_length);
+            if(codepoint_length == 0)
+                codepoint_length = 1;
+
+            index += 1;
+            byte_index += codepoint_length;
+        }
+
+        if(byte_index < str.size()) {
+            str.erase(byte_index);
+            str += "...";
+        }
+    }
+
     static bool is_hex_num(char c) {
         return (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f') || (c >= '0' && c <= '9');
     }
@@ -1460,8 +1559,46 @@ namespace gsr {
         return is_hex && !hex_start;
     }
 
+    static bool is_number(const char *str) {
+        const char *p = str;
+        while(*p) {
+            char c = *p;
+            if(c < '0' || c > '9')
+                return false;
+            ++p;
+        }
+        return true;
+    }
+
     static bool is_capture_target_monitor(const char *capture_target) {
-        return strcmp(capture_target, "focused") != 0 && strcmp(capture_target, "region") != 0 && strcmp(capture_target, "portal") != 0 && contains_non_hex_number(capture_target);
+        return strcmp(capture_target, "window") != 0 && strcmp(capture_target, "focused") != 0 && strcmp(capture_target, "region") != 0 && strcmp(capture_target, "portal") != 0 && contains_non_hex_number(capture_target);
+    }
+
+    static std::string capture_target_get_notification_name(const char *capture_target, bool save) {
+        std::string result;
+        if(is_capture_target_monitor(capture_target)) {
+            result = "this monitor";
+        } else if(is_number(capture_target)) {
+            mgl_context *context = mgl_get_context();
+            Display *display = (Display*)context->connection;
+
+            int64_t window_id = None;
+            sscanf(capture_target, "%" PRIi64, &window_id);
+
+            const std::optional<std::string> window_title = get_window_title(display, window_id);
+            if(save) {
+                result = "window";
+            } else if(window_title) {
+                result = strip(window_title.value());
+                truncate_string(result, 30);
+                result = "window \"" + result + "\"";
+            } else {
+                result = std::string("window ") + capture_target;
+            }
+        } else {
+            result = capture_target;
+        }
+        return result;
     }
 
     static std::string get_valid_monitor_x11(const std::string &target_monitor_name, const std::vector<Monitor> &monitors) {
@@ -1640,9 +1777,43 @@ namespace gsr {
         return result;
     }
 
-    static void truncate_string(std::string &str, int max_length) {
-        if((int)str.size() > max_length)
-            str.replace(str.begin() + max_length, str.end(), "...");
+    static std::string to_duration_string(double duration_sec) {
+        int seconds = ceil(duration_sec);
+
+        const int hours = seconds / 60 / 60;
+        seconds -= (hours * 60 * 60);
+
+        const int minutes = seconds / 60;
+        seconds -= (minutes * 60);
+
+        std::string result;
+        if(hours > 0)
+            result += std::to_string(hours) + " hour" + (hours == 1 ? "" : "s");
+
+        if(minutes > 0) {
+            if(!result.empty())
+                result += " ";
+            result += std::to_string(minutes) + " minute" + (minutes == 1 ? "" : "s");
+        }
+
+        if(seconds > 0 || (hours == 0 && minutes == 0)) {
+            if(!result.empty())
+                result += " ";
+            result += std::to_string(seconds) + " second" + (seconds == 1 ? "" : "s");
+        }
+
+        fprintf(stderr, "to duration string: %f, %d, %d, %d\n", duration_sec, seconds, minutes, hours);
+
+        return result;
+    }
+
+    double Overlay::get_time_passed_in_replay_buffer_seconds() {
+        double replay_duration_sec = replay_saved_duration_sec;
+        if(replay_duration_sec > replay_buffer_save_duration_sec)
+            replay_duration_sec = replay_buffer_save_duration_sec;
+        if(replay_save_duration_min > 0 && replay_duration_sec > replay_save_duration_min * 60)
+            replay_duration_sec = replay_save_duration_min * 60;
+        return replay_duration_sec;
     }
 
     void Overlay::save_video_in_current_game_directory(const char *video_filepath, NotificationType notification_type) {
@@ -1665,7 +1836,7 @@ namespace gsr {
         const std::string new_video_filepath = video_directory + "/" + video_filename;
         rename(video_filepath, new_video_filepath.c_str());
 
-        truncate_string(focused_window_name, 20);
+        truncate_string(focused_window_name, 40);
         const char *capture_target = nullptr;
         char msg[512];
 
@@ -1674,11 +1845,10 @@ namespace gsr {
                 if(!config.record_config.show_video_saved_notifications)
                     return;
 
-                if(is_capture_target_monitor(recording_capture_target.c_str()))
-                    snprintf(msg, sizeof(msg), "Saved a recording of this monitor to \"%s\"", focused_window_name.c_str());
-                else
-                    snprintf(msg, sizeof(msg), "Saved a recording of %s to \"%s\"", recording_capture_target.c_str(), focused_window_name.c_str());
-
+                const std::string duration_str = to_duration_string(recording_duration_clock.get_elapsed_time_seconds());
+                snprintf(msg, sizeof(msg), "Saved a %s recording of %s\nto \"%s\"",
+                    duration_str.c_str(),
+                    capture_target_get_notification_name(recording_capture_target.c_str(), true).c_str(), focused_window_name.c_str());
                 capture_target = recording_capture_target.c_str();
                 break;
             }
@@ -1686,17 +1856,10 @@ namespace gsr {
                 if(!config.replay_config.show_replay_saved_notifications)
                     return;
 
-                char duration[32];
-                if(replay_save_duration_min > 0)
-                    snprintf(duration, sizeof(duration), " %d minute ", replay_save_duration_min);
-                else
-                    snprintf(duration, sizeof(duration), " ");
-
-                if(is_capture_target_monitor(recording_capture_target.c_str()))
-                    snprintf(msg, sizeof(msg), "Saved a%sreplay of this monitor to \"%s\"", duration, focused_window_name.c_str());
-                else
-                    snprintf(msg, sizeof(msg), "Saved a%sreplay of %s to \"%s\"", duration, recording_capture_target.c_str(), focused_window_name.c_str());
-
+                const std::string duration_str = to_duration_string(get_time_passed_in_replay_buffer_seconds());
+                snprintf(msg, sizeof(msg), "Saved a %s replay of %s\nto \"%s\"",
+                    duration_str.c_str(),
+                    capture_target_get_notification_name(recording_capture_target.c_str(), true).c_str(), focused_window_name.c_str());
                 capture_target = recording_capture_target.c_str();
                 break;
             }
@@ -1704,11 +1867,8 @@ namespace gsr {
                 if(!config.screenshot_config.show_screenshot_saved_notifications)
                     return;
 
-                if(is_capture_target_monitor(screenshot_capture_target.c_str()))
-                    snprintf(msg, sizeof(msg), "Saved a screenshot of this monitor to \"%s\"", focused_window_name.c_str());
-                else
-                    snprintf(msg, sizeof(msg), "Saved a screenshot of %s to \"%s\"", screenshot_capture_target.c_str(), focused_window_name.c_str());
-
+                snprintf(msg, sizeof(msg), "Saved a screenshot of %s\nto \"%s\"",
+                    capture_target_get_notification_name(screenshot_capture_target.c_str(), true).c_str(), focused_window_name.c_str());
                 capture_target = screenshot_capture_target.c_str();
                 break;
             }
@@ -1734,17 +1894,12 @@ namespace gsr {
         if(config.replay_config.save_video_in_game_folder) {
             save_video_in_current_game_directory(replay_saved_filepath, NotificationType::REPLAY);
         } else if(config.replay_config.show_replay_saved_notifications) {
-            char duration[32];
-            if(replay_save_duration_min > 0)
-                snprintf(duration, sizeof(duration), " %d minute ", replay_save_duration_min);
-            else
-                snprintf(duration, sizeof(duration), " ");
+            const std::string duration_str = to_duration_string(get_time_passed_in_replay_buffer_seconds());
 
             char msg[512];
-            if(is_capture_target_monitor(recording_capture_target.c_str()))
-                snprintf(msg, sizeof(msg), "Saved a%sreplay of this monitor", duration);
-            else
-                snprintf(msg, sizeof(msg), "Saved a%sreplay of %s", duration, recording_capture_target.c_str());
+            snprintf(msg, sizeof(msg), "Saved a %s replay of %s",
+                duration_str.c_str(),
+                capture_target_get_notification_name(recording_capture_target.c_str(), true).c_str());
             show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY, recording_capture_target.c_str());
         }
     }
@@ -1793,6 +1948,35 @@ namespace gsr {
         }
     }
 
+    void Overlay::on_gsr_process_error(int exit_code, NotificationType notification_type) {
+        fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
+        if(exit_code == 50) {
+            show_notification("Desktop portal capture failed.\nEither you canceled the desktop portal or your Wayland compositor doesn't support desktop portal capture\nor it's incorrectly setup on your system", notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), notification_type);
+        } else if(exit_code == 60) {
+            show_notification("Stopped capture because the user canceled the desktop portal", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), notification_type);
+        } else {
+            const char *prefix = "";
+            switch(notification_type) {
+                case NotificationType::NONE:
+                case NotificationType::SCREENSHOT:
+                    break;
+                case NotificationType::RECORD:
+                    prefix = "Failed to start/save recording";
+                    break;
+                case NotificationType::REPLAY:
+                    prefix = "Replay stopped because of an error";
+                    break;
+                case NotificationType::STREAM:
+                    prefix = "Streaming stopped because of an error";
+                    break;
+            }
+
+            char msg[256];
+            snprintf(msg, sizeof(msg), "%s. Verify if settings are correct", prefix);
+            show_notification(msg, notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), notification_type);
+        }
+    }
+
     void Overlay::update_gsr_process_status() {
         if(gpu_screen_recorder_process <= 0)
             return;
@@ -1819,8 +2003,7 @@ namespace gsr {
                     if(config.replay_config.show_replay_stopped_notifications)
                         show_notification("Replay stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::REPLAY);
                 } else {
-                    fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
-                    show_notification("Replay stopped because of an error. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::REPLAY);
+                    on_gsr_process_error(exit_code, NotificationType::REPLAY);
                 }
                 break;
             }
@@ -1835,8 +2018,7 @@ namespace gsr {
                     if(config.streaming_config.show_streaming_stopped_notifications)
                         show_notification("Streaming has stopped", notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::STREAM);
                 } else {
-                    fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
-                    show_notification("Streaming stopped because of an error. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::STREAM);
+                    on_gsr_process_error(exit_code, NotificationType::STREAM);
                 }
                 break;
             }
@@ -1865,10 +2047,8 @@ namespace gsr {
                 save_video_in_current_game_directory(screenshot_filepath.c_str(), NotificationType::SCREENSHOT);
             } else if(config.screenshot_config.show_screenshot_saved_notifications) {
                 char msg[512];
-                if(is_capture_target_monitor(screenshot_capture_target.c_str()))
-                    snprintf(msg, sizeof(msg), "Saved a screenshot of this monitor");
-                else
-                    snprintf(msg, sizeof(msg), "Saved a screenshot of %s", screenshot_capture_target.c_str());
+                snprintf(msg, sizeof(msg), "Saved a screenshot of %s",
+                    capture_target_get_notification_name(screenshot_capture_target.c_str(), true).c_str());
                 show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::SCREENSHOT, screenshot_capture_target.c_str());
             }
         } else {
@@ -1966,16 +2146,16 @@ namespace gsr {
             if(config.record_config.save_video_in_game_folder) {
                 save_video_in_current_game_directory(video_filepath.c_str(), NotificationType::RECORD);
             } else if(config.record_config.show_video_saved_notifications) {
+                const std::string duration_str = to_duration_string(recording_duration_clock.get_elapsed_time_seconds());
+
                 char msg[512];
-                if(is_capture_target_monitor(recording_capture_target.c_str()))
-                    snprintf(msg, sizeof(msg), "Saved a recording of this monitor");
-                else
-                    snprintf(msg, sizeof(msg), "Saved a recording of %s", recording_capture_target.c_str());
+                snprintf(msg, sizeof(msg), "Saved a %s recording of %s",
+                    duration_str.c_str(),
+                    capture_target_get_notification_name(recording_capture_target.c_str(), true).c_str());
                 show_notification(msg, notification_timeout_seconds, mgl::Color(255, 255, 255), get_color_theme().tint_color, NotificationType::RECORD, recording_capture_target.c_str());
             }
         } else {
-            fprintf(stderr, "Warning: gpu-screen-recorder (%d) exited with exit status %d\n", (int)gpu_screen_recorder_process, exit_code);
-            show_notification("Failed to start/save recording. Verify if settings are correct", notification_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::RECORD);
+            on_gsr_process_error(exit_code, NotificationType::RECORD);
         }
         update_ui_recording_stopped();
         replay_recording = false;
@@ -2099,6 +2279,8 @@ namespace gsr {
 
         for(const AudioTrack &audio_track : audio_tracks) {
             std::string audio_track_merged;
+            int num_app_audio = 0;
+
             for(const std::string &audio_input_name : audio_track.audio_inputs) {
                 std::string new_audio_input_name = audio_input_name;
                 const bool is_app_audio = starts_with(new_audio_input_name, "app:");
@@ -2108,12 +2290,22 @@ namespace gsr {
                 if(is_app_audio && audio_track.application_audio_invert)
                     new_audio_input_name.replace(0, 4, "app-inverse:");
 
+                if(is_app_audio)
+                    ++num_app_audio;
+
                 if(!audio_track_merged.empty())
                     audio_track_merged += "|";
 
                 audio_track_merged += new_audio_input_name;
             }
 
+            if(num_app_audio == 0 && audio_track.application_audio_invert) {
+                if(!audio_track_merged.empty())
+                    audio_track_merged += "|";
+
+                audio_track_merged += "app-inverse:";
+            }
+
             if(!audio_track_merged.empty())
                 result.push_back(std::move(audio_track_merged));
         }
@@ -2163,11 +2355,12 @@ namespace gsr {
     }
 
     static bool validate_capture_target(const std::string &capture_target, const SupportedCaptureOptions &capture_options) {
-        // TODO: Also check x11 window when enabled (check if capture_target is a decminal/hex number)
-        if(capture_target == "region") {
-            return capture_options.region;
+        if(capture_target == "window") {
+            return capture_options.window;
         } else if(capture_target == "focused") {
             return capture_options.focused;
+        } else if(capture_target == "region") {
+            return capture_options.region;
         } else if(capture_target == "portal") {
             return capture_options.portal;
         } else if(capture_target == "focused_monitor") {
@@ -2199,7 +2392,9 @@ namespace gsr {
     }
 
     std::string Overlay::get_capture_target(const std::string &capture_target, const SupportedCaptureOptions &capture_options) {
-        if(capture_target == "focused_monitor") {
+        if(capture_target == "window") {
+            return std::to_string(window_selector.get_selection());
+        } else if(capture_target == "focused_monitor") {
             std::optional<CursorInfo> cursor_info;
             if(cursor_tracker) {
                 cursor_tracker->update();
@@ -2245,6 +2440,9 @@ namespace gsr {
         replay_save_duration_min = 0;
         replay_save_show_notification = true;
         replay_save_clock.restart();
+        replay_saved_duration_sec = replay_duration_clock.get_elapsed_time_seconds();
+        if(replay_restart_on_save)
+            replay_duration_clock.restart();
         kill(gpu_screen_recorder_process, SIGUSR1);
     }
 
@@ -2255,6 +2453,7 @@ namespace gsr {
         replay_save_duration_min = 1;
         replay_save_show_notification = true;
         replay_save_clock.restart();
+        replay_saved_duration_sec = replay_duration_clock.get_elapsed_time_seconds();
         kill(gpu_screen_recorder_process, SIGRTMIN+3);
     }
 
@@ -2265,11 +2464,54 @@ namespace gsr {
         replay_save_duration_min = 10;
         replay_save_show_notification = true;
         replay_save_clock.restart();
+        replay_saved_duration_sec = replay_duration_clock.get_elapsed_time_seconds();
         kill(gpu_screen_recorder_process, SIGRTMIN+5);
     }
 
-    bool Overlay::on_press_start_replay(bool disable_notification, bool finished_region_selection) {
-        if(region_selector.is_started())
+    static const char* switch_video_codec_to_usable_hardware_encoder(const GsrInfo &gsr_info) {
+        if(gsr_info.supported_video_codecs.h264)
+            return "h264";
+        else if(gsr_info.supported_video_codecs.hevc)
+            return "hevc";
+        else if(gsr_info.supported_video_codecs.av1)
+            return "av1";
+        else if(gsr_info.supported_video_codecs.vp8)
+            return "vp8";
+        else if(gsr_info.supported_video_codecs.vp9)
+            return "vp9";
+        return nullptr;
+    }
+
+    static const char* change_container_if_codec_not_supported(const char *video_codec, const char *container) {
+        if(strcmp(video_codec, "vp8") == 0 || strcmp(video_codec, "vp9") == 0) {
+            if(strcmp(container, "webm") != 0 && strcmp(container, "matroska") != 0) {
+                fprintf(stderr, "Warning: container '%s' is not compatible with video codec '%s', using webm container instead\n", container, video_codec);
+                return "webm";
+            }
+        } else if(strcmp(container, "webm") == 0) {
+            fprintf(stderr, "Warning: container webm is not compatible with video codec '%s', using mp4 container instead\n",  video_codec);
+            return "mp4";
+        }
+        return container;
+    }
+
+    static void choose_video_codec_and_container_with_fallback(const GsrInfo &gsr_info, const char **video_codec, const char **container, const char **encoder) {
+        *encoder = "gpu";
+        if(strcmp(*video_codec, "h264_software") == 0) {
+            *video_codec = "h264";
+            *encoder = "cpu";
+        } else if(strcmp(*video_codec, "auto") == 0) {
+            *video_codec = switch_video_codec_to_usable_hardware_encoder(gsr_info);
+            if(!*video_codec) {
+                *video_codec = "h264";
+                *encoder = "cpu";
+            }
+        }
+        *container = change_container_if_codec_not_supported(*video_codec, *container);
+    }
+
+    bool Overlay::on_press_start_replay(bool disable_notification, bool finished_selection) {
+        if(region_selector.is_started() || window_selector.is_started())
             return false;
 
         switch(recording_status) {
@@ -2312,14 +2554,14 @@ namespace gsr {
 
         const SupportedCaptureOptions capture_options = get_supported_capture_options(gsr_info);
         recording_capture_target = get_capture_target(config.replay_config.record_options.record_area_option, capture_options);
-        if(!validate_capture_target(recording_capture_target, capture_options)) {
+        if(!validate_capture_target(config.replay_config.record_options.record_area_option, capture_options)) {
             char err_msg[256];
-            snprintf(err_msg, sizeof(err_msg), "Failed to start replay, capture target \"%s\" is invalid. Please change capture target in settings", recording_capture_target.c_str());
+            snprintf(err_msg, sizeof(err_msg), "Failed to start replay, capture target \"%s\" is invalid.\nPlease change capture target in settings", recording_capture_target.c_str());
             show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::REPLAY);
             return false;
         }
 
-        if(config.replay_config.record_options.record_area_option == "region" && !finished_region_selection) {
+        if(config.replay_config.record_options.record_area_option == "region" && !finished_selection) {
             start_region_capture = true;
             on_region_selected = [disable_notification, this]() {
                 on_press_start_replay(disable_notification, true);
@@ -2327,6 +2569,14 @@ namespace gsr {
             return false;
         }
 
+        if(config.replay_config.record_options.record_area_option == "window" && !finished_selection) {
+            start_window_capture = true;
+            on_window_selected = [disable_notification, this]() {
+                on_press_start_replay(disable_notification, true);
+            };
+            return false;
+        }
+
         // TODO: Validate input, fallback to valid values
         const std::string fps = std::to_string(config.replay_config.record_options.fps);
         const std::string video_bitrate = std::to_string(config.replay_config.record_options.video_bitrate);
@@ -2334,12 +2584,10 @@ namespace gsr {
         const std::vector<std::string> audio_tracks = create_audio_tracks_cli_args(config.replay_config.record_options.audio_tracks_list, gsr_info);
         const std::string framerate_mode = config.replay_config.record_options.framerate_mode == "auto" ? "vfr" : config.replay_config.record_options.framerate_mode;
         const std::string replay_time = std::to_string(config.replay_config.replay_time);
+        const char *container = config.replay_config.container.c_str();
         const char *video_codec = config.replay_config.record_options.video_codec.c_str();
         const char *encoder = "gpu";
-        if(strcmp(video_codec, "h264_software") == 0) {
-            video_codec = "h264";
-            encoder = "cpu";
-        }
+        choose_video_codec_and_container_with_fallback(gsr_info, &video_codec, &container, &encoder);
 
         char size[64];
         size[0] = '\0';
@@ -2351,7 +2599,7 @@ namespace gsr {
 
         std::vector<const char*> args = {
             "gpu-screen-recorder", "-w", recording_capture_target.c_str(),
-            "-c", config.replay_config.container.c_str(),
+            "-c", container,
             "-ac", config.replay_config.record_options.audio_codec.c_str(),
             "-cursor", config.replay_config.record_options.record_cursor ? "yes" : "no",
             "-cr", config.replay_config.record_options.color_range.c_str(),
@@ -2367,6 +2615,9 @@ namespace gsr {
         if(config.replay_config.restart_replay_on_save && gsr_info.system_info.gsr_version >= GsrVersion{5, 0, 3}) {
             args.push_back("-restart-replay-on-save");
             args.push_back("yes");
+            replay_restart_on_save = true;
+        } else {
+            replay_restart_on_save = false;
         }
 
         if(gsr_info.system_info.gsr_version >= GsrVersion{5, 5, 0}) {
@@ -2406,18 +2657,22 @@ namespace gsr {
         // to see when the program has exit.
         if(!disable_notification && config.replay_config.show_replay_started_notifications) {
             char msg[256];
-            if(is_capture_target_monitor(recording_capture_target.c_str()))
-                snprintf(msg, sizeof(msg), "Started replaying this monitor");
-            else
-                snprintf(msg, sizeof(msg), "Started replaying %s", recording_capture_target.c_str());
+            snprintf(msg, sizeof(msg), "Started replaying %s", capture_target_get_notification_name(recording_capture_target.c_str(), false).c_str());
             show_notification(msg, notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::REPLAY, recording_capture_target.c_str());
         }
 
+        if(config.replay_config.record_options.record_area_option == "portal")
+            hide_ui = true;
+
+        // TODO: This will be incorrect if the user uses portal capture, as capture wont start until the user has
+        // selected what to capture and accepted it.
+        replay_duration_clock.restart();
+        replay_buffer_save_duration_sec = config.replay_config.replay_time;
         return true;
     }
 
-    void Overlay::on_press_start_record(bool finished_region_selection) {
-        if(region_selector.is_started())
+    void Overlay::on_press_start_record(bool finished_selection) {
+        if(region_selector.is_started() || window_selector.is_started())
             return;
 
         switch(recording_status) {
@@ -2433,6 +2688,10 @@ namespace gsr {
                         if(config.record_config.show_recording_started_notifications)
                             show_notification("Started recording in the replay session", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
                         update_ui_recording_started();
+
+                        // TODO: This will be incorrect if the user uses portal capture, as capture wont start until the user has
+                        // selected what to capture and accepted it.
+                        recording_duration_clock.restart();
                     }
                     replay_recording = true;
                     kill(gpu_screen_recorder_process, SIGRTMIN);
@@ -2450,6 +2709,10 @@ namespace gsr {
                         if(config.record_config.show_recording_started_notifications)
                             show_notification("Started recording in the streaming session", notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD);
                         update_ui_recording_started();
+
+                        // TODO: This will be incorrect if the user uses portal capture, as capture wont start until the user has
+                        // selected what to capture and accepted it.
+                        recording_duration_clock.restart();
                     }
                     replay_recording = true;
                     kill(gpu_screen_recorder_process, SIGRTMIN);
@@ -2488,12 +2751,12 @@ namespace gsr {
         recording_capture_target = get_capture_target(config.record_config.record_options.record_area_option, capture_options);
         if(!validate_capture_target(config.record_config.record_options.record_area_option, capture_options)) {
             char err_msg[256];
-            snprintf(err_msg, sizeof(err_msg), "Failed to start recording, capture target \"%s\" is invalid. Please change capture target in settings", recording_capture_target.c_str());
+            snprintf(err_msg, sizeof(err_msg), "Failed to start recording, capture target \"%s\" is invalid.\nPlease change capture target in settings", recording_capture_target.c_str());
             show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::RECORD);
             return;
         }
 
-        if(config.record_config.record_options.record_area_option == "region" && !finished_region_selection) {
+        if(config.record_config.record_options.record_area_option == "region" && !finished_selection) {
             start_region_capture = true;
             on_region_selected = [this]() {
                 on_press_start_record(true);
@@ -2501,6 +2764,14 @@ namespace gsr {
             return;
         }
 
+        if(config.record_config.record_options.record_area_option == "window" && !finished_selection) {
+            start_window_capture = true;
+            on_window_selected = [this]() {
+                on_press_start_record(true);
+            };
+            return;
+        }
+
         record_filepath.clear();
 
         // TODO: Validate input, fallback to valid values
@@ -2509,12 +2780,10 @@ namespace gsr {
         const std::string output_file = config.record_config.save_directory + "/Video_" + get_date_str() + "." + container_to_file_extension(config.record_config.container.c_str());
         const std::vector<std::string> audio_tracks = create_audio_tracks_cli_args(config.record_config.record_options.audio_tracks_list, gsr_info);
         const std::string framerate_mode = config.record_config.record_options.framerate_mode == "auto" ? "vfr" : config.record_config.record_options.framerate_mode;
+        const char *container = config.record_config.container.c_str();
         const char *video_codec = config.record_config.record_options.video_codec.c_str();
         const char *encoder = "gpu";
-        if(strcmp(video_codec, "h264_software") == 0) {
-            video_codec = "h264";
-            encoder = "cpu";
-        }
+        choose_video_codec_and_container_with_fallback(gsr_info, &video_codec, &container, &encoder);
 
         char size[64];
         size[0] = '\0';
@@ -2526,7 +2795,7 @@ namespace gsr {
 
         std::vector<const char*> args = {
             "gpu-screen-recorder", "-w", recording_capture_target.c_str(),
-            "-c", config.record_config.container.c_str(),
+            "-c", container,
             "-ac", config.record_config.record_options.audio_codec.c_str(),
             "-cursor", config.record_config.record_options.record_cursor ? "yes" : "no",
             "-cr", config.record_config.record_options.color_range.c_str(),
@@ -2563,12 +2832,16 @@ namespace gsr {
         // 1...
         if(config.record_config.show_recording_started_notifications) {
             char msg[256];
-            if(is_capture_target_monitor(recording_capture_target.c_str()))
-                snprintf(msg, sizeof(msg), "Started recording this monitor");
-            else
-                snprintf(msg, sizeof(msg), "Started recording %s", recording_capture_target.c_str());
+            snprintf(msg, sizeof(msg), "Started recording %s", capture_target_get_notification_name(recording_capture_target.c_str(), false).c_str());
             show_notification(msg, notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::RECORD, recording_capture_target.c_str());
         }
+
+        if(config.record_config.record_options.record_area_option == "portal")
+            hide_ui = true;
+
+        // TODO: This will be incorrect if the user uses portal capture, as capture wont start until the user has
+        // selected what to capture and accepted it.
+        recording_duration_clock.restart();
     }
 
     static std::string streaming_get_url(const Config &config) {
@@ -2579,6 +2852,9 @@ namespace gsr {
         } else if(config.streaming_config.streaming_service == "youtube") {
             url += "rtmp://a.rtmp.youtube.com/live2/";
             url += config.streaming_config.youtube.stream_key;
+        } else if(config.streaming_config.streaming_service == "rumble") {
+            url += "rtmp://rtmp.rumble.com/live/";
+            url += config.streaming_config.rumble.stream_key;
         } else if(config.streaming_config.streaming_service == "custom") {
             url = config.streaming_config.custom.url;
             if(url.size() >= 7 && strncmp(url.c_str(), "rtmp://", 7) == 0)
@@ -2599,12 +2875,17 @@ namespace gsr {
             {}
             else
                 url = "rtmp://" + url;
+
+            if(!url.empty() && url.back() != '/' && url.back() != '=' && !config.streaming_config.custom.key.empty())
+                url += "/";
+
+            url += config.streaming_config.custom.key;
         }
         return url;
     }
 
-    void Overlay::on_press_start_stream(bool finished_region_selection) {
-        if(region_selector.is_started())
+    void Overlay::on_press_start_stream(bool finished_selection) {
+        if(region_selector.is_started() || window_selector.is_started())
             return;
 
         switch(recording_status) {
@@ -2645,12 +2926,12 @@ namespace gsr {
         recording_capture_target = get_capture_target(config.streaming_config.record_options.record_area_option, capture_options);
         if(!validate_capture_target(config.streaming_config.record_options.record_area_option, capture_options)) {
             char err_msg[256];
-            snprintf(err_msg, sizeof(err_msg), "Failed to start streaming, capture target \"%s\" is invalid. Please change capture target in settings", recording_capture_target.c_str());
+            snprintf(err_msg, sizeof(err_msg), "Failed to start streaming, capture target \"%s\" is invalid.\nPlease change capture target in settings", recording_capture_target.c_str());
             show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::STREAM);
             return;
         }
 
-        if(config.streaming_config.record_options.record_area_option == "region" && !finished_region_selection) {
+        if(config.streaming_config.record_options.record_area_option == "region" && !finished_selection) {
             start_region_capture = true;
             on_region_selected = [this]() {
                 on_press_start_stream(true);
@@ -2658,6 +2939,14 @@ namespace gsr {
             return;
         }
 
+        if(config.streaming_config.record_options.record_area_option == "window" && !finished_selection) {
+            start_window_capture = true;
+            on_window_selected = [this]() {
+                on_press_start_stream(true);
+            };
+            return;
+        }
+
         // TODO: Validate input, fallback to valid values
         const std::string fps = std::to_string(config.streaming_config.record_options.fps);
         const std::string video_bitrate = std::to_string(config.streaming_config.record_options.video_bitrate);
@@ -2667,16 +2956,12 @@ namespace gsr {
         if(audio_tracks.size() > 1)
             audio_tracks.resize(1);
         const std::string framerate_mode = config.streaming_config.record_options.framerate_mode == "auto" ? "vfr" : config.streaming_config.record_options.framerate_mode;
+        const char *container = "flv";
+        if(config.streaming_config.streaming_service == "custom")
+            container = config.streaming_config.custom.container.c_str();
         const char *video_codec = config.streaming_config.record_options.video_codec.c_str();
         const char *encoder = "gpu";
-        if(strcmp(video_codec, "h264_software") == 0) {
-            video_codec = "h264";
-            encoder = "cpu";
-        }
-
-        std::string container = "flv";
-        if(config.streaming_config.streaming_service == "custom")
-            container = config.streaming_config.custom.container;
+        choose_video_codec_and_container_with_fallback(gsr_info, &video_codec, &container, &encoder);
 
         const std::string url = streaming_get_url(config);
 
@@ -2690,7 +2975,7 @@ namespace gsr {
 
         std::vector<const char*> args = {
             "gpu-screen-recorder", "-w", recording_capture_target.c_str(),
-            "-c", container.c_str(),
+            "-c", container,
             "-ac", config.streaming_config.record_options.audio_codec.c_str(),
             "-cursor", config.streaming_config.record_options.record_cursor ? "yes" : "no",
             "-cr", config.streaming_config.record_options.color_range.c_str(),
@@ -2733,16 +3018,16 @@ namespace gsr {
         // to see when the program has exit.
         if(config.streaming_config.show_streaming_started_notifications) {
             char msg[256];
-            if(is_capture_target_monitor(recording_capture_target.c_str()))
-                snprintf(msg, sizeof(msg), "Started streaming this monitor");
-            else
-                snprintf(msg, sizeof(msg), "Started streaming %s", recording_capture_target.c_str());
+            snprintf(msg, sizeof(msg), "Started streaming %s", capture_target_get_notification_name(recording_capture_target.c_str(), false).c_str());
             show_notification(msg, notification_timeout_seconds, get_color_theme().tint_color, get_color_theme().tint_color, NotificationType::STREAM, recording_capture_target.c_str());
         }
+
+        if(config.streaming_config.record_options.record_area_option == "portal")
+            hide_ui = true;
     }
 
-    void Overlay::on_press_take_screenshot(bool finished_region_selection, bool force_region_capture) {
-        if(region_selector.is_started())
+    void Overlay::on_press_take_screenshot(bool finished_selection, ScreenshotForceType force_type) {
+        if(region_selector.is_started() || window_selector.is_started())
             return;
 
         if(gpu_screen_recorder_screenshot_process > 0) {
@@ -2750,22 +3035,42 @@ namespace gsr {
             return;
         }
 
-        const bool region_capture = config.screenshot_config.record_area_option == "region" || force_region_capture;
-        const char *record_area_option = region_capture ? "region" : config.screenshot_config.record_area_option.c_str();
+        bool hotkey_window_capture = false;
+        std::string record_area_option;
+        switch(force_type) {
+            case ScreenshotForceType::NONE:
+                record_area_option = config.screenshot_config.record_area_option;
+                break;
+            case ScreenshotForceType::REGION:
+                record_area_option = "region";
+                break;
+            case ScreenshotForceType::WINDOW:
+                record_area_option = gsr_info.system_info.display_server == DisplayServer::X11 ? "window" : "portal";
+                hotkey_window_capture = true;
+                break;
+        }
+
         const SupportedCaptureOptions capture_options = get_supported_capture_options(gsr_info);
         screenshot_capture_target = get_capture_target(record_area_option, capture_options);
         if(!validate_capture_target(record_area_option, capture_options)) {
             char err_msg[256];
-            snprintf(err_msg, sizeof(err_msg), "Failed to take a screenshot, capture target \"%s\" is invalid. Please change capture target in settings", screenshot_capture_target.c_str());
+            snprintf(err_msg, sizeof(err_msg), "Failed to take a screenshot, capture target \"%s\" is invalid.\nPlease change capture target in settings", screenshot_capture_target.c_str());
             show_notification(err_msg, notification_error_timeout_seconds, mgl::Color(255, 0, 0), mgl::Color(255, 0, 0), NotificationType::SCREENSHOT);
             return;
         }
 
-        if(region_capture && !finished_region_selection) {
+        if(record_area_option == "region" && !finished_selection) {
             start_region_capture = true;
-            on_region_selected = [this, force_region_capture]() {
-                usleep(200 * 1000); // Hack: wait 0.2 seconds before taking a screenshot to allow user to move cursor away. TODO: Remove this
-                on_press_take_screenshot(true, force_region_capture);
+            on_region_selected = [this, force_type]() {
+                on_press_take_screenshot(true, force_type);
+            };
+            return;
+        }
+
+        if(record_area_option == "window" && !finished_selection) {
+            start_window_capture = true;
+            on_window_selected = [this, force_type]() {
+                on_press_take_screenshot(true, force_type);
             };
             return;
         }
@@ -2789,13 +3094,22 @@ namespace gsr {
             args.push_back(size);
         }
 
-        if(config.screenshot_config.restore_portal_session) {
+        if(config.screenshot_config.restore_portal_session && !hotkey_window_capture) {
             args.push_back("-restore-portal-session");
             args.push_back("yes");
         }
 
+        const std::string hotkey_window_capture_portal_session_token_filepath = get_config_dir() + "/gpu-screen-recorder/gsr-ui-window-capture-token";
+        if(record_area_option == "portal") {
+            hide_ui = true;
+            if(hotkey_window_capture) {
+                args.push_back("-portal-session-token-filepath");
+                args.push_back(hotkey_window_capture_portal_session_token_filepath.c_str());
+            }
+        }
+
         char region_str[128];
-        if(region_capture)
+        if(record_area_option == "region")
             add_region_command(args, region_str, sizeof(region_str), region_selector);
 
         args.push_back(nullptr);

src/Process.cpp

@@ -176,11 +176,21 @@ namespace gsr {
         }
     }
 
+    static const char *get_basename(const char *path, int size) {
+        for(int i = size - 1; i >= 0; --i) {
+            if(path[i] == '/')
+                return path + i + 1;
+        }
+        return path;
+    }
+
     // |output_buffer| should be at least PATH_MAX in size
     bool read_cmdline_arg0(const char *filepath, char *output_buffer, int output_buffer_size) {
         output_buffer[0] = '\0';
 
+        const char *arg0_start = NULL;
         const char *arg0_end = NULL;
+        int arg0_size = 0;
         int fd = open(filepath, O_RDONLY);
         if(fd == -1)
             return false;
@@ -190,13 +200,16 @@ namespace gsr {
         if(bytes_read == -1)
             goto err;
 
-        arg0_end = (const char*)memchr(buffer, '\0', bytes_read);
+        arg0_start = buffer;
+        arg0_end = (const char*)memchr(arg0_start, '\0', bytes_read);
         if(!arg0_end)
             goto err;
 
-        if((arg0_end - buffer) + 1 <= output_buffer_size) {
-            memcpy(output_buffer, buffer, arg0_end - buffer);
-            output_buffer[arg0_end - buffer] = '\0';
+        arg0_start = get_basename(arg0_start, arg0_end - arg0_start);
+        arg0_size = arg0_end - arg0_start;
+        if(arg0_size + 1 <= output_buffer_size) {
+            memcpy(output_buffer, arg0_start, arg0_size);
+            output_buffer[arg0_size] = '\0';
             close(fd);
             return true;
         }

src/RegionSelector.cpp

@@ -208,7 +208,7 @@ namespace gsr {
         window_attr.background_pixel = is_wayland ? 0 : border_color_x11;
         window_attr.border_pixel = 0;
         window_attr.override_redirect = true;
-        window_attr.event_mask = StructureNotifyMask | PointerMotionMask;
+        window_attr.event_mask = StructureNotifyMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
         window_attr.colormap = region_window_colormap;
 
         Screen *screen = XDefaultScreenOfDisplay(dpy);
@@ -366,10 +366,6 @@ namespace gsr {
         return true;
     }
 
-    bool RegionSelector::is_selected() const {
-        return selected;
-    }
-
     bool RegionSelector::take_selection() {
         const bool result = selected;
         selected = false;

src/Rpc.cpp

@@ -32,7 +32,7 @@ namespace gsr {
             fclose(file);
 
         if(!fifo_filepath.empty())
-            remove(fifo_filepath.c_str());
+            unlink(fifo_filepath.c_str());
     }
 
     bool Rpc::create(const char *name) {
@@ -44,15 +44,16 @@ namespace gsr {
         char fifo_filepath_tmp[PATH_MAX];
         get_runtime_filepath(fifo_filepath_tmp, sizeof(fifo_filepath_tmp), name);
         fifo_filepath = fifo_filepath_tmp;
-        remove(fifo_filepath.c_str());
+        unlink(fifo_filepath.c_str());
 
         if(mkfifo(fifo_filepath.c_str(), 0600) != 0) {
             fprintf(stderr, "Error: mkfifo failed, error: %s, %s\n", strerror(errno), fifo_filepath.c_str());
+            fifo_filepath.clear();
             return false;
         }
 
         if(!open_filepath(fifo_filepath.c_str())) {
-            remove(fifo_filepath.c_str());
+            unlink(fifo_filepath.c_str());
             fifo_filepath.clear();
             return false;
         }

src/Utils.cpp

@@ -32,6 +32,28 @@ namespace gsr {
         return str.size() >= len && memcmp(str.data() + str.size() - len, substr, len) == 0;
     }
 
+    std::string strip(const std::string &str) {
+        int start_index = 0;
+        int str_len = str.size();
+
+        for(int i = 0; i < str_len; ++i) {
+            if(str[i] != ' ') {
+                start_index += i;
+                str_len -= i;
+                break;
+            }
+        }
+
+        for(int i = str_len - 1; i >= 0; --i) {
+            if(str[i] != ' ') {
+                str_len = i + 1;
+                break;
+            }
+        }
+
+        return str.substr(start_index, str_len);
+    }
+
     std::string get_home_dir() {
         const char *home_dir = getenv("HOME");
         if(!home_dir) {

src/WindowSelector.cpp

@@ -0,0 +1,229 @@
+#include "../include/WindowSelector.hpp"
+#include "../include/WindowUtils.hpp"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <X11/extensions/shape.h>
+#include <X11/cursorfont.h>
+#include <X11/keysym.h>
+
+namespace gsr {
+    static const int rectangle_border_size = 2;
+
+    static int max_int(int a, int b) {
+        return a >= b ? a : b;
+    }
+
+    static void set_region_rectangle(Display *dpy, Window window, int x, int y, int width, int height, int border_size) {
+        if(width < 0) {
+            x += width;
+            width = abs(width);
+        }
+
+        if(height < 0) {
+            y += height;
+            height = abs(height);
+        }
+
+        XRectangle rectangles[] = {
+            {
+                (short)max_int(0, x),                              (short)max_int(0, y),
+                (unsigned short)max_int(0, border_size),           (unsigned short)max_int(0, height)
+            }, // Left
+            {
+                (short)max_int(0, x + width - border_size),        (short)max_int(0, y),
+                (unsigned short)max_int(0, border_size),           (unsigned short)max_int(0, height)
+            }, // Right
+            {
+                (short)max_int(0, x + border_size),                (short)max_int(0, y),
+                (unsigned short)max_int(0, width - border_size*2), (unsigned short)max_int(0, border_size)
+            }, // Top
+            {
+                (short)max_int(0, x + border_size),                (short)max_int(0, y + height - border_size),
+                (unsigned short)max_int(0, width - border_size*2), (unsigned short)max_int(0, border_size)
+            }, // Bottom
+        };
+        XShapeCombineRectangles(dpy, window, ShapeBounding, 0, 0, rectangles, 4, ShapeSet, Unsorted);
+        XFlush(dpy);
+    }
+
+    static unsigned long mgl_color_to_x11_color(mgl::Color color) {
+        if(color.a == 0)
+            return 0;
+        return ((uint32_t)color.a << 24) | (((uint32_t)color.r * color.a / 0xFF) << 16) | (((uint32_t)color.g * color.a / 0xFF) << 8) | ((uint32_t)color.b * color.a / 0xFF);
+    }
+
+    static Window get_cursor_window(Display *dpy) {
+        Window root_window = None;
+        Window window = None;
+        int dummy_i;
+        unsigned int dummy_u;
+        mgl::vec2i root_pos;
+        XQueryPointer(dpy, DefaultRootWindow(dpy), &root_window, &window, &root_pos.x, &root_pos.y, &dummy_i, &dummy_i, &dummy_u);
+        return window;
+    }
+
+    static void get_window_geometry(Display *dpy, Window window, mgl::vec2i &pos, mgl::vec2i &size) {
+        Window root_window;
+        int x = 0;
+        int y = 0;
+        unsigned int w = 0;
+        unsigned int h = 0;
+        unsigned int dummy_border, dummy_depth;
+        XGetGeometry(dpy, window, &root_window, &x, &y, &w, &h, &dummy_border, &dummy_depth);
+        pos.x = x;
+        pos.y = y;
+        size.x = w;
+        size.y = h;
+    }
+
+    WindowSelector::WindowSelector() {
+        
+    }
+
+    WindowSelector::~WindowSelector() {
+        stop();
+    }
+
+    bool WindowSelector::start(mgl::Color border_color) {
+        if(dpy)
+            return false;
+
+        const unsigned long border_color_x11 = mgl_color_to_x11_color(border_color);
+        dpy = XOpenDisplay(nullptr);
+        if(!dpy) {
+            fprintf(stderr, "Error: WindowSelector::start: failed to connect to the X11 server\n");
+            return false;
+        }
+
+        const Window cursor_window = get_cursor_window(dpy);
+        mgl::vec2i cursor_window_pos, cursor_window_size;
+        get_window_geometry(dpy, cursor_window, cursor_window_pos, cursor_window_size);
+
+        XVisualInfo vinfo;
+        memset(&vinfo, 0, sizeof(vinfo));
+        XMatchVisualInfo(dpy, DefaultScreen(dpy), 32, TrueColor, &vinfo);
+        border_window_colormap = XCreateColormap(dpy, DefaultRootWindow(dpy), vinfo.visual, AllocNone);
+
+        XSetWindowAttributes window_attr;
+        window_attr.background_pixel = border_color_x11;
+        window_attr.border_pixel = 0;
+        window_attr.override_redirect = true;
+        window_attr.event_mask = StructureNotifyMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask;
+        window_attr.colormap = border_window_colormap;
+
+        Screen *screen = XDefaultScreenOfDisplay(dpy);
+        border_window = XCreateWindow(dpy, DefaultRootWindow(dpy), 0, 0, XWidthOfScreen(screen), XHeightOfScreen(screen), 0,
+            vinfo.depth, InputOutput, vinfo.visual, CWBackPixel | CWBorderPixel | CWOverrideRedirect | CWEventMask | CWColormap, &window_attr);
+        if(!border_window) {
+            fprintf(stderr, "Error: WindowSelector::start: failed to create region window\n");
+            stop();
+            return false;
+        }
+        set_window_size_not_resizable(dpy, border_window, XWidthOfScreen(screen), XHeightOfScreen(screen));
+        if(cursor_window && cursor_window != DefaultRootWindow(dpy))
+            set_region_rectangle(dpy, border_window, cursor_window_pos.x, cursor_window_pos.y, cursor_window_size.x, cursor_window_size.y, rectangle_border_size);
+        else
+            set_region_rectangle(dpy, border_window, 0, 0, 0, 0, 0);
+        make_window_click_through(dpy, border_window);
+        XMapWindow(dpy, border_window);
+
+        crosshair_cursor = XCreateFontCursor(dpy, XC_crosshair);
+        XGrabPointer(dpy, DefaultRootWindow(dpy), True, PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ButtonMotionMask, GrabModeAsync, GrabModeAsync, None, crosshair_cursor, CurrentTime);
+        XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync, GrabModeAsync, CurrentTime);
+        XFlush(dpy);
+
+        selected = false;
+        canceled = false;
+        selected_window = None;
+        return true;
+    }
+
+    void WindowSelector::stop() {
+        if(!dpy)
+            return;
+
+        XUngrabPointer(dpy, CurrentTime);
+        XUngrabKeyboard(dpy, CurrentTime);
+
+        if(border_window_colormap) {
+            XFreeColormap(dpy, border_window_colormap);
+            border_window_colormap = 0;
+        }
+
+        if(border_window) {
+            XDestroyWindow(dpy, border_window);
+            border_window = 0;
+        }
+
+        if(crosshair_cursor) {
+            XFreeCursor(dpy, crosshair_cursor);
+            crosshair_cursor = None;
+        }
+
+        XFlush(dpy);
+        XCloseDisplay(dpy);
+        dpy = nullptr;
+    }
+
+    bool WindowSelector::is_started() const {
+        return dpy != nullptr;
+    }
+
+    bool WindowSelector::failed() const {
+        return !dpy;
+    }
+
+    bool WindowSelector::poll_events() {
+        if(!dpy || selected)
+            return false;
+
+        XEvent xev;
+        while(XPending(dpy)) {
+            XNextEvent(dpy, &xev);
+
+            if(xev.type == MotionNotify) {
+                const Window motion_window = xev.xmotion.subwindow;
+                mgl::vec2i motion_window_pos, motion_window_size;
+                get_window_geometry(dpy, motion_window, motion_window_pos, motion_window_size);
+                if(motion_window && motion_window != DefaultRootWindow(dpy))
+                    set_region_rectangle(dpy, border_window, motion_window_pos.x, motion_window_pos.y, motion_window_size.x, motion_window_size.y, rectangle_border_size);
+                else
+                    set_region_rectangle(dpy, border_window, 0, 0, 0, 0, 0);
+                XFlush(dpy);
+            } else if(xev.type == ButtonRelease && xev.xbutton.button == Button1) {
+                selected_window = xev.xbutton.subwindow;
+                const Window clicked_window_real = window_get_target_window_child(dpy, selected_window);
+                if(clicked_window_real)
+                    selected_window = clicked_window_real;
+                selected = true;
+
+                stop();
+                break;
+            } else if(xev.type == KeyRelease && XKeycodeToKeysym(dpy, xev.xkey.keycode, 0) == XK_Escape) {
+                canceled = true;
+                selected = false;
+                stop();
+                break;
+            }
+        }
+        return true;
+    }
+
+    bool WindowSelector::take_selection() {
+        const bool result = selected;
+        selected = false;
+        return result;
+    }
+
+    bool WindowSelector::take_canceled() {
+        const bool result = canceled;
+        canceled = false;
+        return result;
+    }
+
+    Window WindowSelector::get_selection() const {
+        return selected_window;
+    }
+}

src/WindowUtils.cpp

@@ -1,4 +1,5 @@
 #include "../include/WindowUtils.hpp"
+#include "../include/Utils.hpp"
 
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
@@ -62,7 +63,7 @@ namespace gsr {
         return window_has_atom(dpy, window, net_wm_state_atom) || window_has_atom(dpy, window, wm_state_atom);
     }
 
-    static Window window_get_target_window_child(Display *display, Window window) {
+    Window window_get_target_window_child(Display *display, Window window) {
         if(window == None)
             return None;
 
@@ -212,28 +213,6 @@ namespace gsr {
         return result;
     }
 
-    static std::string strip(const std::string &str) {
-        int start_index = 0;
-        int str_len = str.size();
-
-        for(int i = 0; i < str_len; ++i) {
-            if(str[i] != ' ') {
-                start_index += i;
-                str_len -= i;
-                break;
-            }
-        }
-
-        for(int i = str_len - 1; i >= 0; --i) {
-            if(str[i] != ' ') {
-                str_len = i + 1;
-                break;
-            }
-        }
-
-        return str.substr(start_index, str_len);
-    }
-
     std::string get_focused_window_name(Display *dpy, WindowCaptureType window_capture_type) {
         std::string result;
         const Window focused_window = get_focused_window(dpy, window_capture_type);

src/gui/Entry.cpp

@@ -1,7 +1,6 @@
 #include "../../include/gui/Entry.hpp"
 #include "../../include/gui/Utils.hpp"
 #include "../../include/Theme.hpp"
-#include <mglpp/graphics/Rectangle.hpp>
 #include <mglpp/window/Window.hpp>
 #include <mglpp/window/Event.hpp>
 #include <mglpp/system/FloatRect.hpp>
@@ -16,6 +15,13 @@ namespace gsr {
     static const float border_scale = 0.0015f;
     static const float caret_width_scale = 0.001f;
 
+    static void string_replace_all(std::string &str, char old_char, char new_char) {
+        for(char &c : str) {
+            if(c == old_char)
+                c = new_char;
+        }
+    }
+
     Entry::Entry(mgl::Font *font, const char *text, float max_width) : text("", *font), max_width(max_width) {
         this->text.set_color(get_color_theme().text_color);
         set_text(text);
@@ -26,24 +32,149 @@ namespace gsr {
             return true;
 
         if(event.type == mgl::Event::MouseButtonPressed && event.mouse_button.button == mgl::Mouse::Left) {
-            selected = mgl::FloatRect(position + offset, get_size()).contains({ (float)event.mouse_button.x, (float)event.mouse_button.y });
-        } else if(event.type == mgl::Event::KeyPressed && selected) {
-            if(event.key.code == mgl::Keyboard::Backspace && !text.get_string().empty()) {
-                std::string str = text.get_string();
-                const size_t prev_index = mgl::utf8_get_start_of_codepoint((const unsigned char*)str.c_str(), str.size(), str.size());
-                str.erase(prev_index, std::string::npos);
-                set_text(std::move(str));
-            } else if(event.key.code == mgl::Keyboard::V && event.key.control) {
-                std::string clipboard_text = window.get_clipboard_string();
-                std::string str = text.get_string();
-                str += clipboard_text;
-                set_text(std::move(str));
+            const mgl::vec2f mouse_pos = { (float)event.mouse_button.x, (float)event.mouse_button.y };
+            selected = mgl::FloatRect(position + offset, get_size()).contains(mouse_pos);
+            if(selected) {
+                selecting_text = true;
+
+                const auto caret_index_mouse = find_closest_caret_index_by_position(mouse_pos);
+                caret.byte_index = caret_index_mouse.byte_index;
+                caret.utf8_index = caret_index_mouse.utf8_index;
+                caret.offset_x = caret_index_mouse.pos.x - this->text.get_position().x;
+                selection_start_caret = caret;
+                show_selection = true;
+            } else {
+                selecting_text = false;
+                selecting_with_keyboard = false;
+                show_selection = false;
             }
-        } else if(event.type == mgl::Event::TextEntered && selected && event.text.codepoint >= 32) {
-            std::string str = text.get_string();
-            str.append(event.text.str, event.text.size);
-            set_text(std::move(str));
+        } else if(event.type == mgl::Event::MouseButtonReleased && event.mouse_button.button == mgl::Mouse::Left) {
+            selecting_text = false;
+            if(caret.byte_index == selection_start_caret.byte_index)
+                show_selection = false;
+        } else if(event.type == mgl::Event::MouseMoved && selected) {
+            if(selecting_text) {
+                const auto caret_index_mouse = find_closest_caret_index_by_position(mgl::vec2f(event.mouse_move.x, event.mouse_move.y));
+                caret.byte_index = caret_index_mouse.byte_index;
+                caret.utf8_index = caret_index_mouse.utf8_index;
+                caret.offset_x = caret_index_mouse.pos.x - this->text.get_position().x;
+                return false;
+            }
+        } else if(event.type == mgl::Event::KeyPressed && selected) {
+            int selection_start_byte = caret.byte_index;
+            int selection_end_byte = caret.byte_index;
+            if(show_selection) {
+                selection_start_byte = std::min(caret.byte_index, selection_start_caret.byte_index);
+                selection_end_byte = std::max(caret.byte_index, selection_start_caret.byte_index);
+            }
+
+            if(event.key.code == mgl::Keyboard::Backspace) {
+                if(selection_start_byte == selection_end_byte && caret.byte_index > 0)
+                    selection_start_byte = mgl::utf8_get_start_of_codepoint((const unsigned char*)text.get_string().c_str(), text.get_string().size(), caret.byte_index - 1);
+
+                replace_text(selection_start_byte, selection_end_byte - selection_start_byte, "");
+            } else if(event.key.code == mgl::Keyboard::Delete) {
+                if(selection_start_byte == selection_end_byte && caret.byte_index < (int)text.get_string().size()) {
+                    size_t codepoint_length = 1;
+                    mgl::utf8_get_codepoint_length(((const unsigned char*)text.get_string().c_str())[caret.byte_index], &codepoint_length);
+                    selection_end_byte = selection_start_byte + codepoint_length;
+                }
+
+                replace_text(selection_start_byte, selection_end_byte - selection_start_byte, "");
+            } else if(event.key.code == mgl::Keyboard::C && event.key.control) {
+                const size_t selection_num_bytes = selection_end_byte - selection_start_byte;
+                if(selection_num_bytes > 0)
+                    window.set_clipboard(text.get_string().substr(selection_start_byte, selection_num_bytes));
+            } else if(event.key.code == mgl::Keyboard::V && event.key.control) {
+                std::string clipboard_string = window.get_clipboard_string();
+                string_replace_all(clipboard_string, '\n', ' ');
+                replace_text(selection_start_byte, selection_end_byte - selection_start_byte, std::move(clipboard_string));
+            } else if(event.key.code == mgl::Keyboard::A && event.key.control) {
+                selection_start_caret.byte_index = 0;
+                selection_start_caret.utf8_index = 0;
+                selection_start_caret.offset_x = 0.0f;
+
+                caret.byte_index = text.get_string().size();
+                caret.utf8_index = mgl::utf8_get_character_count((const unsigned char*)text.get_string().data(), text.get_string().size());
+                // TODO: Optimize
+                caret.offset_x = text.find_character_pos(caret.utf8_index).x - this->text.get_position().x;
+
+                show_selection = true;
+            } else if(event.key.code == mgl::Keyboard::Left && caret.byte_index > 0) {
+                if(!selecting_with_keyboard && show_selection) {
+                    show_selection = false;
+                } else {
+                    caret.byte_index = mgl::utf8_get_start_of_codepoint((const unsigned char*)text.get_string().data(), text.get_string().size(), caret.byte_index - 1);
+                    caret.utf8_index -= 1;
+                    // TODO: Move left by one character instead of calculating every character to caret index
+                    caret.offset_x = text.find_character_pos(caret.utf8_index).x - this->text.get_position().x;
+                }
+
+                if(!selecting_with_keyboard) {
+                    selection_start_caret = caret;
+                    show_selection = false;
+                }
+            } else if(event.key.code == mgl::Keyboard::Right) {
+                if(!selecting_with_keyboard && show_selection) {
+                    show_selection = false;
+                } else {
+                    const int caret_byte_index_before = caret.byte_index;
+                    caret.byte_index = mgl::utf8_index_to_byte_index((const unsigned char*)text.get_string().data(), text.get_string().size(), caret.utf8_index + 1);
+                    if(caret.byte_index != caret_byte_index_before)
+                        caret.utf8_index += 1;
+                    // TODO: Move right by one character instead of calculating every character to caret index
+                    caret.offset_x = text.find_character_pos(caret.utf8_index).x - this->text.get_position().x;
+                }
+
+                if(!selecting_with_keyboard) {
+                    selection_start_caret = caret;
+                    show_selection = false;
+                }
+            } else if(event.key.code == mgl::Keyboard::Home) {
+                caret.byte_index = 0;
+                caret.utf8_index = 0;
+                caret.offset_x = 0.0f;
+
+                if(!selecting_with_keyboard) {
+                    selection_start_caret = caret;
+                    show_selection = false;
+                }
+            } else if(event.key.code == mgl::Keyboard::End) {
+                caret.byte_index = text.get_string().size();
+                caret.utf8_index = mgl::utf8_get_character_count((const unsigned char*)text.get_string().data(), text.get_string().size());
+                // TODO: Optimize
+                caret.offset_x = text.find_character_pos(caret.utf8_index).x - this->text.get_position().x;
+
+                if(!selecting_with_keyboard) {
+                    selection_start_caret = caret;
+                    show_selection = false;
+                }
+            } else if(event.key.code == mgl::Keyboard::LShift || event.key.code == mgl::Keyboard::RShift) {
+                if(!show_selection)
+                    selection_start_caret = caret;
+                selecting_with_keyboard = true;
+                show_selection = true;
+            }
+
+            return false;
+        } else if(event.type == mgl::Event::KeyReleased && selected) {
+            if(event.key.code == mgl::Keyboard::LShift || event.key.code == mgl::Keyboard::RShift) {
+                selecting_with_keyboard = false;
+            }
+
+            return false;
+        } else if(event.type == mgl::Event::TextEntered && selected && event.text.codepoint >= 32 && event.text.codepoint != 127) {
+            int selection_start_byte = caret.byte_index;
+            int selection_end_byte = caret.byte_index;
+            if(show_selection) {
+                selection_start_byte = std::min(caret.byte_index, selection_start_caret.byte_index);
+                selection_end_byte = std::max(caret.byte_index, selection_start_caret.byte_index);
+            }
+
+            replace_text(selection_start_byte, selection_end_byte - selection_start_byte, std::string(event.text.str, event.text.size));
+            return false;
         }
+
         return true;
     }
 
@@ -54,26 +185,84 @@ namespace gsr {
         const mgl::vec2f draw_pos = position + offset;
 
         const int padding_top = padding_top_scale * get_theme().window_height;
+        const int padding_bottom = padding_bottom_scale * get_theme().window_height;
         const int padding_left = padding_left_scale * get_theme().window_height;
+        const int padding_right = padding_right_scale * get_theme().window_height;
 
-        mgl::Rectangle background(get_size());
+        background.set_size(get_size());
         background.set_position(draw_pos.floor());
         background.set_color(selected ? mgl::Color(0, 0, 0, 255) : mgl::Color(0, 0, 0, 120));
         window.draw(background);
 
+        const int caret_width = std::max(1.0f, caret_width_scale * get_theme().window_height);
+        const mgl::vec2f caret_size = mgl::vec2f(caret_width, text.get_bounds().size.y).floor();
+
+        const float overflow_left = (caret.offset_x + padding_left) - (padding_left + text_overflow);
+        if(overflow_left < 0.0f)
+            text_overflow += overflow_left;
+
+        const float overflow_right = (caret.offset_x + padding_left) - (background.get_size().x - padding_right);
+        if(overflow_right - text_overflow > 0.0f)
+            text_overflow = overflow_right;
+
+        text.set_position((draw_pos + mgl::vec2f(padding_left, get_size().y * 0.5f - text.get_bounds().size.y * 0.5f) - mgl::vec2f(text_overflow, 0.0f)).floor());
+
+        const auto text_bounds = text.get_bounds();
+        const bool text_larger_than_background = text_bounds.size.x > (background.get_size().x - padding_left - padding_right);
+        const float text_overflow_right = (text_bounds.position.x + text_bounds.size.x) - (background.get_position().x + background.get_size().x - padding_right);
+        if(text_larger_than_background) {
+            if(text_overflow_right < 0.0f) {
+                text_overflow += text_overflow_right;
+                text.set_position(text.get_position() + mgl::vec2f(-text_overflow_right, 0.0f));
+            }
+        } else {
+            text.set_position(text.get_position() + mgl::vec2f(-text_overflow, 0.0f));
+            text_overflow = 0.0f;
+        }
+
         if(selected) {
             const int border_size = std::max(1.0f, border_scale * get_theme().window_height);
             draw_rectangle_outline(window, draw_pos.floor(), get_size().floor(), get_color_theme().tint_color, border_size);
-
-            const int caret_width = std::max(1.0f, caret_width_scale * get_theme().window_height);
-            mgl::Rectangle caret({(float)caret_width, text.get_bounds().size.y});
-            caret.set_position((draw_pos + mgl::vec2f(padding_left + caret_offset_x, padding_top)).floor());
-            caret.set_color(mgl::Color(255, 255, 255));
-            window.draw(caret);
+            draw_caret(window, draw_pos, caret_size);
         }
 
-        text.set_position((draw_pos + mgl::vec2f(padding_left, get_size().y * 0.5f - text.get_bounds().size.y * 0.5f)).floor());
+        const mgl::Scissor parent_scissor = window.get_scissor();
+        const mgl::Scissor scissor = scissor_get_sub_area(parent_scissor,
+            mgl::Scissor{
+                (background.get_position() + mgl::vec2f(padding_left, padding_top)).to_vec2i(),
+                (background.get_size() - mgl::vec2f(padding_left + padding_right, padding_top + padding_bottom)).to_vec2i()
+            });
+        window.set_scissor(scissor);
+
         window.draw(text);
+
+        if(show_selection)
+            draw_caret_selection(window, draw_pos, caret_size);
+
+        window.set_scissor(parent_scissor);
+    }
+
+    void Entry::draw_caret(mgl::Window &window, mgl::vec2f draw_pos, mgl::vec2f caret_size) {
+        const int padding_top = padding_top_scale * get_theme().window_height;
+        const int padding_left = padding_left_scale * get_theme().window_height;
+
+        mgl::Rectangle caret_rect(caret_size);
+        mgl::vec2f caret_draw_pos = draw_pos + mgl::vec2f(padding_left + caret.offset_x - text_overflow, padding_top);
+        caret_rect.set_position(caret_draw_pos.floor());
+        caret_rect.set_color(mgl::Color(255, 255, 255));
+        window.draw(caret_rect);
+    }
+
+    void Entry::draw_caret_selection(mgl::Window &window, mgl::vec2f draw_pos, mgl::vec2f caret_size) {
+        const int padding_top = padding_top_scale * get_theme().window_height;
+        const int padding_left = padding_left_scale * get_theme().window_height;
+
+        mgl::Rectangle caret_selection_rect(mgl::vec2f(std::abs(selection_start_caret.offset_x - caret.offset_x), caret_size.y).floor());
+        caret_selection_rect.set_position((draw_pos + mgl::vec2f(padding_left + std::min(caret.offset_x, selection_start_caret.offset_x) - text_overflow, padding_top)).floor());
+        mgl::Color caret_select_color = get_color_theme().tint_color;
+        caret_select_color.a = 100;
+        caret_selection_rect.set_color(caret_select_color);
+        window.draw(caret_selection_rect);
     }
 
     mgl::vec2f Entry::get_size() {
@@ -85,19 +274,107 @@ namespace gsr {
         return { max_width, text.get_bounds().size.y + padding_top + padding_bottom };
     }
 
-    void Entry::set_text(std::string str) {
-        if(!validate_handler || validate_handler(str)) {
+    EntryValidateHandlerResult Entry::set_text(std::string str) {
+        EntryValidateHandlerResult validate_result = set_text_internal(std::move(str));
+        if(validate_result == EntryValidateHandlerResult::ALLOW) {
+            caret.byte_index = text.get_string().size();
+            caret.utf8_index = mgl::utf8_get_character_count((const unsigned char*)text.get_string().data(), text.get_string().size());
+            // TODO: Optimize
+            caret.offset_x = text.find_character_pos(caret.utf8_index).x - this->text.get_position().x;
+            selection_start_caret = caret;
+
+            selecting_text = false;
+            selecting_with_keyboard = false;
+            show_selection = false;
+        }
+        return validate_result;
+    }
+
+    EntryValidateHandlerResult Entry::set_text_internal(std::string str) {
+        EntryValidateHandlerResult validate_result = EntryValidateHandlerResult::ALLOW;
+        if(validate_handler)
+            validate_result = validate_handler(*this, str);
+
+        if(validate_result == EntryValidateHandlerResult::ALLOW) {
             text.set_string(std::move(str));
-            caret_offset_x = text.find_character_pos(99999).x - this->text.get_position().x;
             if(on_changed)
                 on_changed(text.get_string());
         }
+
+        return validate_result;
     }
 
     const std::string& Entry::get_text() const {
         return text.get_string();
     }
 
+    void Entry::replace_text(size_t index, size_t size, const std::string &replacement) {
+        if(index + size > text.get_string().size())
+            return;
+
+        const auto prev_caret = caret;
+
+        if((int)index >= caret.byte_index) {
+            caret.utf8_index += mgl::utf8_get_character_count((const unsigned char*)replacement.c_str(), replacement.size());
+            caret.byte_index += replacement.size();
+        } else {
+            caret.utf8_index -= mgl::utf8_get_character_count((const unsigned char*)(text.get_string().c_str() + caret.byte_index - size), size);
+            caret.utf8_index += mgl::utf8_get_character_count((const unsigned char*)replacement.c_str(), replacement.size());
+            caret.byte_index = caret.byte_index - size + replacement.size();
+        }
+
+        std::string str = text.get_string();
+        str.replace(index, size, replacement);
+        const EntryValidateHandlerResult validate_result = set_text_internal(std::move(str));
+        if(validate_result == EntryValidateHandlerResult::DENY) {
+            caret = prev_caret;
+            return;
+        } else if(validate_result == EntryValidateHandlerResult::REPLACED) {
+            return;
+        }
+
+        // TODO: Optimize
+        caret.offset_x = text.find_character_pos(caret.utf8_index).x - this->text.get_position().x;
+        selection_start_caret = caret;
+
+        selecting_text = false;
+        selecting_with_keyboard = false;
+        show_selection = false;
+    }
+
+    mgl_index_codepoint_pair Entry::find_closest_caret_index_by_position(mgl::vec2f position) {
+        const std::string &str = text.get_string();
+        mgl::Font *font = text.get_font();
+
+        mgl_index_codepoint_pair result = {0, 0, {text.get_position().x, text.get_position().y}};
+
+        for(; result.byte_index < str.size();) {
+            uint32_t codepoint = ' ';
+            size_t clen = 1;
+            if(!mgl::utf8_decode((const unsigned char*)&str[result.byte_index], str.size() - result.byte_index, &codepoint, &clen))
+                clen = 1;
+
+            float glyph_width = 0.0f;
+            if(codepoint == '\t') {
+                const auto glyph = font->get_glyph(' ');
+                const int tab_width = 4;
+                glyph_width = glyph.advance * tab_width;
+            } else {
+                const auto glyph = font->get_glyph(codepoint);
+                glyph_width = glyph.advance;
+            }
+
+            if(result.pos.x + glyph_width * 0.5f >= position.x)
+                break;
+            
+            result.pos.x += glyph_width;
+            result.byte_index += clen;
+            result.utf8_index += 1;
+        }
+
+        return result;
+    }
+
     static bool is_number(uint8_t c) {
         return c >= '0' && c <= '9';
     }
@@ -114,7 +391,7 @@ namespace gsr {
         int number = 0;
         for(; i < str.size(); ++i) {
             if(!is_number(str[i]))
-                return false;
+                return std::nullopt;
 
             const int new_number = number * 10 + (str[i] - '0');
             if(new_number < number)
@@ -129,19 +406,23 @@ namespace gsr {
     }
 
     EntryValidateHandler create_entry_validator_integer_in_range(int min, int max) {
-        return [min, max](std::string &str) {
+        return [min, max](Entry &entry, const std::string &str) {
             if(str.empty())
-                return true;
+                return EntryValidateHandlerResult::ALLOW;
 
-            std::optional<int> number = to_integer(str);
+            const std::optional<int> number = to_integer(str);
             if(!number)
-                return false;
+                return EntryValidateHandlerResult::DENY;
 
-            if(number.value() < min)
-                str = std::to_string(min);
-            else if(number.value() > max)
-                str = std::to_string(max);
-            return true;
+            if(number.value() < min) {
+                entry.set_text(std::to_string(min));
+                return EntryValidateHandlerResult::REPLACED;
+            } else if(number.value() > max) {
+                entry.set_text(std::to_string(max));
+                return EntryValidateHandlerResult::REPLACED;
+            }
+
+            return EntryValidateHandlerResult::ALLOW;
         };
     }
 }

src/gui/GlobalSettingsPage.cpp

@@ -348,6 +348,27 @@ namespace gsr {
         return list;
     }
 
+    std::unique_ptr<List> GlobalSettingsPage::create_screenshot_window_hotkey_options() {
+        auto list = std::make_unique<List>(List::Orientation::HORIZONTAL, List::Alignment::CENTER);
+
+        char str[128];
+        if(gsr_info->system_info.display_server == DisplayServer::X11)
+            snprintf(str, sizeof(str), "Take a screenshot of a window:");
+        else
+            snprintf(str, sizeof(str), "Take a screenshot with desktop portal:");
+
+        list->add_widget(std::make_unique<Label>(&get_theme().body_font, str, get_color_theme().text_color));
+        auto take_screenshot_window_button = std::make_unique<Button>(&get_theme().body_font, "", mgl::vec2f(0.0f, 0.0f), mgl::Color(0, 0, 0, 120));
+        take_screenshot_window_button_ptr = take_screenshot_window_button.get();
+        list->add_widget(std::move(take_screenshot_window_button));
+
+        take_screenshot_window_button_ptr->on_click = [this] {
+            configure_hotkey_start(ConfigureHotkeyType::TAKE_SCREENSHOT_WINDOW);
+        };
+
+        return list;
+    }
+
     std::unique_ptr<List> GlobalSettingsPage::create_hotkey_control_buttons() {
         auto list = std::make_unique<List>(List::Orientation::HORIZONTAL, List::Alignment::CENTER);
 
@@ -362,6 +383,7 @@ namespace gsr {
             config.replay_config.save_10_min_hotkey = {mgl::Keyboard::Unknown, 0};
             config.screenshot_config.take_screenshot_hotkey = {mgl::Keyboard::Unknown, 0};
             config.screenshot_config.take_screenshot_region_hotkey = {mgl::Keyboard::Unknown, 0};
+            config.screenshot_config.take_screenshot_window_hotkey = {mgl::Keyboard::Unknown, 0};
             config.main_config.show_hide_hotkey = {mgl::Keyboard::Unknown, 0};
             load_hotkeys();
             overlay->rebind_all_keyboard_hotkeys();
@@ -404,6 +426,7 @@ namespace gsr {
         list_ptr->add_widget(create_stream_hotkey_options());
         list_ptr->add_widget(create_screenshot_hotkey_options());
         list_ptr->add_widget(create_screenshot_region_hotkey_options());
+        list_ptr->add_widget(create_screenshot_window_hotkey_options());
         list_ptr->add_widget(create_hotkey_control_buttons());
         return subsection;
     }
@@ -528,6 +551,7 @@ namespace gsr {
 
         take_screenshot_button_ptr->set_text(config.screenshot_config.take_screenshot_hotkey.to_string());
         take_screenshot_region_button_ptr->set_text(config.screenshot_config.take_screenshot_region_hotkey.to_string());
+        take_screenshot_window_button_ptr->set_text(config.screenshot_config.take_screenshot_window_hotkey.to_string());
 
         show_hide_button_ptr->set_text(config.main_config.show_hide_hotkey.to_string());
     }
@@ -611,6 +635,8 @@ namespace gsr {
                 return take_screenshot_button_ptr;
             case ConfigureHotkeyType::TAKE_SCREENSHOT_REGION:
                 return take_screenshot_region_button_ptr;
+            case ConfigureHotkeyType::TAKE_SCREENSHOT_WINDOW:
+                return take_screenshot_window_button_ptr;
             case ConfigureHotkeyType::SHOW_HIDE:
                 return show_hide_button_ptr;
         }
@@ -639,6 +665,8 @@ namespace gsr {
                 return &config.screenshot_config.take_screenshot_hotkey;
             case ConfigureHotkeyType::TAKE_SCREENSHOT_REGION:
                 return &config.screenshot_config.take_screenshot_region_hotkey;
+            case ConfigureHotkeyType::TAKE_SCREENSHOT_WINDOW:
+                return &config.screenshot_config.take_screenshot_window_hotkey;
             case ConfigureHotkeyType::SHOW_HIDE:
                 return &config.main_config.show_hide_hotkey;
         }
@@ -654,6 +682,7 @@ namespace gsr {
             &config.streaming_config.start_stop_hotkey,
             &config.screenshot_config.take_screenshot_hotkey,
             &config.screenshot_config.take_screenshot_region_hotkey,
+            &config.screenshot_config.take_screenshot_window_hotkey,
             &config.main_config.show_hide_hotkey
         };
         for(ConfigHotkey *config_hotkey : config_hotkeys) {
@@ -702,6 +731,13 @@ namespace gsr {
             case ConfigureHotkeyType::TAKE_SCREENSHOT_REGION:
                 hotkey_configure_action_name = "Take a screenshot of a region";
                 break;
+            case ConfigureHotkeyType::TAKE_SCREENSHOT_WINDOW: {
+                if(gsr_info->system_info.display_server == DisplayServer::X11)
+                    hotkey_configure_action_name = "Take a screenshot of a window";
+                else
+                    hotkey_configure_action_name = "Take a screenshot with desktop portal";
+                break;
+            }
             case ConfigureHotkeyType::SHOW_HIDE:
                 hotkey_configure_action_name = "Show/hide UI";
                 break;

src/gui/ScreenshotSettingsPage.cpp

@@ -35,9 +35,8 @@ namespace gsr {
     std::unique_ptr<ComboBox> ScreenshotSettingsPage::create_record_area_box() {
         auto record_area_box = std::make_unique<ComboBox>(&get_theme().body_font);
         // TODO: Show options not supported but disable them
-        // TODO: Enable this
-        //if(capture_options.window)
-        //    record_area_box->add_item("Window", "window");
+        if(capture_options.window)
+            record_area_box->add_item("Window", "window");
         if(capture_options.region)
             record_area_box->add_item("Region", "region");
         if(!capture_options.monitors.empty())
@@ -60,14 +59,6 @@ namespace gsr {
         return record_area_list;
     }
 
-    std::unique_ptr<List> ScreenshotSettingsPage::create_select_window() {
-        auto select_window_list = std::make_unique<List>(List::Orientation::VERTICAL);
-        select_window_list->add_widget(std::make_unique<Label>(&get_theme().body_font, "Select window:", get_color_theme().text_color));
-        select_window_list->add_widget(std::make_unique<Button>(&get_theme().body_font, "Click here to select a window...", mgl::vec2f(0.0f, 0.0f), mgl::Color(0, 0, 0, 120)));
-        select_window_list_ptr = select_window_list.get();
-        return select_window_list;
-    }
-
     std::unique_ptr<Entry> ScreenshotSettingsPage::create_image_width_entry() {
         auto image_width_entry = std::make_unique<Entry>(&get_theme().body_font, "1920", get_theme().body_font.get_character_size() * 3);
         image_width_entry->validate_handler = create_entry_validator_integer_in_range(1, 1 << 15);
@@ -124,13 +115,12 @@ namespace gsr {
 
         auto capture_target_list = std::make_unique<List>(List::Orientation::HORIZONTAL, List::Alignment::CENTER);
         capture_target_list->add_widget(create_record_area());
-        capture_target_list->add_widget(create_select_window());
         capture_target_list->add_widget(create_image_resolution_section());
         capture_target_list->add_widget(create_restore_portal_session_section());
 
         ll->add_widget(std::move(capture_target_list));
         ll->add_widget(create_change_image_resolution_section());
-        return std::make_unique<Subsection>("Record area", std::move(ll), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
+        return std::make_unique<Subsection>("Capture", std::move(ll), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
     }
 
     std::unique_ptr<List> ScreenshotSettingsPage::create_image_quality_section() {
@@ -258,9 +248,7 @@ namespace gsr {
         content_page_ptr->add_widget(create_settings());
 
         record_area_box_ptr->on_selection_changed = [this](const std::string&, const std::string &id) {
-            const bool window_selected = id == "window";
             const bool portal_selected = id == "portal";
-            select_window_list_ptr->set_visible(window_selected);
             image_resolution_list_ptr->set_visible(change_image_resolution_checkbox_ptr->is_checked());
             restore_portal_session_list_ptr->set_visible(portal_selected);
             return true;

src/gui/SettingsPage.cpp

@@ -65,13 +65,12 @@ namespace gsr {
     std::unique_ptr<ComboBox> SettingsPage::create_record_area_box() {
         auto record_area_box = std::make_unique<ComboBox>(&get_theme().body_font);
         // TODO: Show options not supported but disable them
-        // TODO: Enable this
-        //if(capture_options.window)
-        //    record_area_box->add_item("Window", "window");
-        if(capture_options.region)
-            record_area_box->add_item("Region", "region");
+        if(capture_options.window)
+            record_area_box->add_item("Window", "window");
         if(capture_options.focused)
             record_area_box->add_item("Follow focused window", "focused");
+        if(capture_options.region)
+            record_area_box->add_item("Region", "region");
         if(!capture_options.monitors.empty())
             record_area_box->add_item(gsr_info->system_info.display_server == DisplayServer::WAYLAND ? "Focused monitor (Experimental on Wayland)" : "Focused monitor", "focused_monitor");
         for(const auto &monitor : capture_options.monitors) {
@@ -92,14 +91,6 @@ namespace gsr {
         return record_area_list;
     }
 
-    std::unique_ptr<List> SettingsPage::create_select_window() {
-        auto select_window_list = std::make_unique<List>(List::Orientation::VERTICAL);
-        select_window_list->add_widget(std::make_unique<Label>(&get_theme().body_font, "Select window:", get_color_theme().text_color));
-        select_window_list->add_widget(std::make_unique<Button>(&get_theme().body_font, "Click here to select a window...", mgl::vec2f(0.0f, 0.0f), mgl::Color(0, 0, 0, 120)));
-        select_window_list_ptr = select_window_list.get();
-        return select_window_list;
-    }
-
     std::unique_ptr<Entry> SettingsPage::create_area_width_entry() {
         auto area_width_entry = std::make_unique<Entry>(&get_theme().body_font, "1920", get_theme().body_font.get_character_size() * 3);
         area_width_entry->validate_handler = create_entry_validator_integer_in_range(1, 1 << 15);
@@ -186,14 +177,13 @@ namespace gsr {
 
         auto capture_target_list = std::make_unique<List>(List::Orientation::HORIZONTAL, List::Alignment::CENTER);
         capture_target_list->add_widget(create_record_area());
-        capture_target_list->add_widget(create_select_window());
         capture_target_list->add_widget(create_area_size_section());
         capture_target_list->add_widget(create_video_resolution_section());
         capture_target_list->add_widget(create_restore_portal_session_section());
 
         ll->add_widget(std::move(capture_target_list));
         ll->add_widget(create_change_video_resolution_section());
-        return std::make_unique<Subsection>("Record area", std::move(ll), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
+        return std::make_unique<Subsection>("Capture", std::move(ll), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f));
     }
 
     static bool audio_device_is_output(const std::string &audio_device_id) {
@@ -451,13 +441,13 @@ namespace gsr {
 
     std::unique_ptr<List> SettingsPage::create_video_bitrate_entry() {
         auto list = std::make_unique<List>(List::Orientation::HORIZONTAL, List::Alignment::CENTER);
-        auto video_bitrate_entry = std::make_unique<Entry>(&get_theme().body_font, "15000", (int)(get_theme().body_font.get_character_size() * 4.0f));
+        auto video_bitrate_entry = std::make_unique<Entry>(&get_theme().body_font, "8000", (int)(get_theme().body_font.get_character_size() * 4.0f));
         video_bitrate_entry->validate_handler = create_entry_validator_integer_in_range(1, 500000);
         video_bitrate_entry_ptr = video_bitrate_entry.get();
         list->add_widget(std::move(video_bitrate_entry));
 
         if(type == Type::STREAM) {
-            auto size_mb_label = std::make_unique<Label>(&get_theme().body_font, "1.64MB", get_color_theme().text_color);
+            auto size_mb_label = std::make_unique<Label>(&get_theme().body_font, "", get_color_theme().text_color);
             Label *size_mb_label_ptr = size_mb_label.get();
             list->add_widget(std::move(size_mb_label));
 
@@ -634,10 +624,8 @@ namespace gsr {
         content_page_ptr->add_widget(create_settings());
 
         record_area_box_ptr->on_selection_changed = [this](const std::string&, const std::string &id) {
-            const bool window_selected = id == "window";
             const bool focused_selected = id == "focused";
             const bool portal_selected = id == "portal";
-            select_window_list_ptr->set_visible(window_selected);
             area_size_list_ptr->set_visible(focused_selected);
             video_resolution_list_ptr->set_visible(!focused_selected && change_video_resolution_checkbox_ptr->is_checked());
             change_video_resolution_checkbox_ptr->set_visible(!focused_selected);
@@ -964,6 +952,7 @@ namespace gsr {
         auto streaming_service_box = std::make_unique<ComboBox>(&get_theme().body_font);
         streaming_service_box->add_item("Twitch", "twitch");
         streaming_service_box->add_item("YouTube", "youtube");
+        streaming_service_box->add_item("Rumble", "rumble");
         streaming_service_box->add_item("Custom", "custom");
         streaming_service_box_ptr = streaming_service_box.get();
         return streaming_service_box;
@@ -988,18 +977,28 @@ namespace gsr {
         youtube_stream_key_entry_ptr = youtube_stream_key_entry.get();
         stream_key_list->add_widget(std::move(youtube_stream_key_entry));
 
+        auto rumble_stream_key_entry = std::make_unique<Entry>(&get_theme().body_font, "", get_theme().body_font.get_character_size() * 20);
+        rumble_stream_key_entry_ptr = rumble_stream_key_entry.get();
+        stream_key_list->add_widget(std::move(rumble_stream_key_entry));
+
         stream_key_list_ptr = stream_key_list.get();
         return stream_key_list;
     }
 
-    std::unique_ptr<List> SettingsPage::create_stream_url_section() {
+    std::unique_ptr<List> SettingsPage::create_stream_custom_section() {
         auto stream_url_list = std::make_unique<List>(List::Orientation::VERTICAL);
-        stream_url_list->add_widget(std::make_unique<Label>(&get_theme().body_font, "URL:", get_color_theme().text_color));
+        stream_url_list->add_widget(std::make_unique<Label>(&get_theme().body_font, "Stream URL:", get_color_theme().text_color));
 
         auto stream_url_entry = std::make_unique<Entry>(&get_theme().body_font, "", get_theme().body_font.get_character_size() * 20);
         stream_url_entry_ptr = stream_url_entry.get();
         stream_url_list->add_widget(std::move(stream_url_entry));
 
+        stream_url_list->add_widget(std::make_unique<Label>(&get_theme().body_font, "Stream key:", get_color_theme().text_color));
+
+        auto stream_key_entry = std::make_unique<Entry>(&get_theme().body_font, "", get_theme().body_font.get_character_size() * 20);
+        stream_key_entry_ptr = stream_key_entry.get();
+        stream_url_list->add_widget(std::move(stream_key_entry));
+
         stream_url_list_ptr = stream_url_list.get();
         return stream_url_list;
     }
@@ -1026,7 +1025,7 @@ namespace gsr {
         auto streaming_info_list = std::make_unique<List>(List::Orientation::HORIZONTAL);
         streaming_info_list->add_widget(create_streaming_service_section());
         streaming_info_list->add_widget(create_stream_key_section());
-        streaming_info_list->add_widget(create_stream_url_section());
+        streaming_info_list->add_widget(create_stream_custom_section());
         streaming_info_list->add_widget(create_stream_container_section());
         settings_list_ptr->add_widget(std::make_unique<Subsection>("Streaming info", std::move(streaming_info_list), mgl::vec2f(settings_scrollable_page_ptr->get_inner_size().x, 0.0f)));
 
@@ -1049,12 +1048,14 @@ namespace gsr {
         streaming_service_box_ptr->on_selection_changed = [this](const std::string&, const std::string &id) {
             const bool twitch_option = id == "twitch";
             const bool youtube_option = id == "youtube";
+            const bool rumble_option = id == "rumble";
             const bool custom_option = id == "custom";
             stream_key_list_ptr->set_visible(!custom_option);
             stream_url_list_ptr->set_visible(custom_option);
             container_list_ptr->set_visible(custom_option);
             twitch_stream_key_entry_ptr->set_visible(twitch_option);
             youtube_stream_key_entry_ptr->set_visible(youtube_option);
+            rumble_stream_key_entry_ptr->set_visible(rumble_option);
             return true;
         };
         streaming_service_box_ptr->on_selection_changed("Twitch", "twitch");
@@ -1256,7 +1257,9 @@ namespace gsr {
         streaming_service_box_ptr->set_selected_item(config.streaming_config.streaming_service);
         youtube_stream_key_entry_ptr->set_text(config.streaming_config.youtube.stream_key);
         twitch_stream_key_entry_ptr->set_text(config.streaming_config.twitch.stream_key);
+        rumble_stream_key_entry_ptr->set_text(config.streaming_config.rumble.stream_key);
         stream_url_entry_ptr->set_text(config.streaming_config.custom.url);
+        stream_key_entry_ptr->set_text(config.streaming_config.custom.key);
         container_box_ptr->set_selected_item(config.streaming_config.custom.container);
     }
 
@@ -1397,7 +1400,9 @@ namespace gsr {
         config.streaming_config.streaming_service = streaming_service_box_ptr->get_selected_id();
         config.streaming_config.youtube.stream_key = youtube_stream_key_entry_ptr->get_text();
         config.streaming_config.twitch.stream_key = twitch_stream_key_entry_ptr->get_text();
+        config.streaming_config.rumble.stream_key = rumble_stream_key_entry_ptr->get_text();
         config.streaming_config.custom.url = stream_url_entry_ptr->get_text();
+        config.streaming_config.custom.key = stream_key_entry_ptr->get_text();
         config.streaming_config.custom.container = container_box_ptr->get_selected_id();
     }
 }

src/gui/Utils.cpp

@@ -5,6 +5,18 @@
 namespace gsr {
     static double frame_delta_seconds = 1.0;
 
+    static mgl::vec2i min_vec2i(mgl::vec2i a, mgl::vec2i b) {
+        return { std::min(a.x, b.x), std::min(a.y, b.y) };
+    }
+
+    static mgl::vec2i max_vec2i(mgl::vec2i a, mgl::vec2i b) {
+        return { std::max(a.x, b.x), std::max(a.y, b.y) };
+    }
+
+    static mgl::vec2i clamp_vec2i(mgl::vec2i value, mgl::vec2i min, mgl::vec2i max) {
+        return min_vec2i(max, max_vec2i(value, min));
+    }
+
     // TODO: Use vertices to make it one draw call
     void draw_rectangle_outline(mgl::Window &window, mgl::vec2f pos, mgl::vec2f size, mgl::Color color, float border_size) {
         pos = pos.floor();
@@ -74,4 +86,12 @@ namespace gsr {
         else
             return from;
     }
+
+    mgl::Scissor scissor_get_sub_area(mgl::Scissor parent, mgl::Scissor child) {
+        const mgl::vec2i pos = clamp_vec2i(child.position, parent.position, parent.position + parent.size);
+        return mgl::Scissor{
+            pos,
+            min_vec2i(child.size, parent.position + parent.size - pos)
+        };
+    }
 }

src/main.cpp

@@ -4,7 +4,6 @@
 #include "../include/Process.hpp"
 #include "../include/Rpc.hpp"
 
-#include <unistd.h>
 #include <signal.h>
 #include <string.h>
 #include <limits.h>
@@ -14,7 +13,6 @@
 #include <mglpp/system/Clock.hpp>
 
 // TODO: Make keyboard/controller controllable for steam deck (and other controllers).
-// TODO: Keep track of gpu screen recorder run by other programs to not allow recording at the same time, or something.
 // TODO: Add systray by using org.kde.StatusNotifierWatcher/etc dbus directly.
 // TODO: Make sure the overlay always stays on top. Test with starting the overlay and then opening youtube in fullscreen.
 //       This is done in Overlay::force_window_on_top, but it's not called right now. It cant be used because the overlay will be on top of
@@ -97,6 +95,11 @@ static void rpc_add_commands(gsr::Rpc *rpc, gsr::Overlay *overlay) {
         fprintf(stderr, "rpc command executed: %s\n", name.c_str());
         overlay->take_screenshot_region();
     });
+
+    rpc->add_handler("take-screenshot-window", [overlay](const std::string &name) {
+        fprintf(stderr, "rpc command executed: %s\n", name.c_str());
+        overlay->take_screenshot_window();
+    });
 }
 
 static bool is_gsr_ui_virtual_keyboard_running() {
@@ -220,17 +223,17 @@ int main(int argc, char **argv) {
 
     set_display_server_environment_variables();
 
-    // TODO: This is a shitty method to detect if multiple instances of gsr-ui is running but this will work properly even in flatpak
-    // that uses pid sandboxing. Replace this with a better method once we no longer rely on linux global hotkeys on some platform.
-    // TODO: This method doesn't work when disabling hotkeys and the method below with pidof gsr-ui doesn't work in flatpak.
-    // What do? creating a pid file doesn't work in flatpak either.
-    // TODO: This doesn't work in flatpak when disabling hotkeys.
-    if(is_gsr_ui_virtual_keyboard_running() || gsr::pidof("gsr-ui", getpid()) != -1) {
+    auto rpc = std::make_unique<gsr::Rpc>();
+    const bool rpc_created = rpc->create("gsr-ui");
+    if(!rpc_created)
+        fprintf(stderr, "Error: Failed to create rpc\n");
+
+    if(is_gsr_ui_virtual_keyboard_running() || !rpc_created) {
         if(launch_action == LaunchAction::LAUNCH_DAEMON)
             return 1;
 
-        gsr::Rpc rpc;
-        if(rpc.open("gsr-ui") && rpc.write("show_ui\n", 8)) {
+        rpc = std::make_unique<gsr::Rpc>();
+        if(rpc->open("gsr-ui") && rpc->write("show_ui\n", 8)) {
             fprintf(stderr, "Error: another instance of gsr-ui is already running, opening that one instead\n");
         } else {
             fprintf(stderr, "Error: failed to send command to running gsr-ui instance, user will have to open the UI manually with Alt+Z\n");
@@ -240,6 +243,16 @@ int main(int argc, char **argv) {
         return 1;
     }
 
+    if(gsr::pidof("gpu-screen-recorder", -1) != -1) {
+        const char *args[] = { "gsr-notify", "--text", "GPU Screen Recorder is already running in another process.\nPlease close it before using GPU Screen Recorder UI.", "--timeout", "5.0", "--icon-color", "ff0000", "--bg-color", "ff0000", nullptr };
+        gsr::exec_program_daemonized(args);
+    }
+
+    if(mgl_init(MGL_WINDOW_SYSTEM_X11) != 0) {
+        fprintf(stderr, "Error: failed to initialize mgl. Failed to either connect to the X11 server or setup opengl\n");
+        return 1;
+    }
+
     if(is_flatpak())
         install_flatpak_systemd_service();
     else
@@ -283,11 +296,6 @@ int main(int argc, char **argv) {
         disable_prime_run();
     }
 
-    if(mgl_init(MGL_WINDOW_SYSTEM_X11) != 0) {
-        fprintf(stderr, "Error: failed to initialize mgl. Failed to either connect to the X11 server or setup opengl\n");
-        exit(1);
-    }
-
     gsr::SupportedCaptureOptions capture_options = gsr::get_supported_capture_options(gsr_info);
 
     std::string resources_path;
@@ -320,10 +328,6 @@ int main(int argc, char **argv) {
     if(launch_action == LaunchAction::LAUNCH_SHOW)
         overlay->show();
 
-    auto rpc = std::make_unique<gsr::Rpc>();
-    if(!rpc->create("gsr-ui"))
-        fprintf(stderr, "Error: Failed to create rpc, commands won't be received\n");
-
     rpc_add_commands(rpc.get(), overlay.get());
 
     // TODO: Add hotkeys in Overlay when using x11 global hotkeys. The hotkeys in Overlay should duplicate each key that is used for x11 global hotkeys.

tools/gsr-global-hotkeys/main.c

@@ -44,42 +44,42 @@ int main(int argc, char **argv) {
         } else if(strcmp(grab_type_arg, "--virtual") == 0) {
             grab_type = KEYBOARD_GRAB_TYPE_VIRTUAL;
         } else {
-            fprintf(stderr, "Error: expected --all or --virtual, got %s\n", grab_type_arg);
+            fprintf(stderr, "gsr-global-hotkeys error: expected --all or --virtual, got %s\n", grab_type_arg);
             usage();
             return 1;
         }
     } else if(argc != 1) {
-        fprintf(stderr, "Error: expected 0 or 1 arguments, got %d argument(s)\n", argc);
+        fprintf(stderr, "gsr-global-hotkeys error: expected 0 or 1 arguments, got %d argument(s)\n", argc);
         usage();
         return 1;
     }
 
     if(is_gsr_global_hotkeys_already_running()) {
-        fprintf(stderr, "Error: gsr-global-hotkeys is already running\n");
+        fprintf(stderr, "gsr-global-hotkeys error: gsr-global-hotkeys is already running\n");
         return 1;
     }
 
     const uid_t user_id = getuid();
     if(geteuid() != 0) {
         if(setuid(0) == -1) {
-            fprintf(stderr, "Error: failed to change user to root\n");
+            fprintf(stderr, "gsr-global-hotkeys error: failed to change user to root, global hotkeys will not work. Make sure to set the correct capability on gsr-global-hotkeys\n");
             return 1;
         }
     }
 
     keyboard_event keyboard_ev;
     if(!keyboard_event_init(&keyboard_ev, true, grab_type)) {
-        fprintf(stderr, "Error: failed to setup hotplugging and no keyboard input devices were found\n");
+        fprintf(stderr, "gsr-global-hotkeys error: failed to setup hotplugging and no keyboard input devices were found\n");
         setuid(user_id);
         return 1;
     }
 
-    fprintf(stderr, "Info: global hotkeys setup, waiting for hotkeys to be pressed\n");
+    fprintf(stderr, "gsr-global-hotkeys info: global hotkeys setup, waiting for hotkeys to be pressed\n");
 
     for(;;) {
         keyboard_event_poll_events(&keyboard_ev, -1);
         if(keyboard_event_stdin_has_failed(&keyboard_ev)) {
-            fprintf(stderr, "Info: stdin closed (parent process likely closed this process), exiting...\n");
+            fprintf(stderr, "gsr-global-hotkeys info: stdin closed (parent process likely closed this process), exiting...\n");
             break;
         }
     }

tools/gsr-ui-cli/main.c

@@ -64,6 +64,8 @@ static void usage(void) {
     printf("      Take a screenshot.\n");
     printf("  take-screenshot-region\n");
     printf("      Take a screenshot of a region.\n");
+    printf("  take-screenshot-window\n");
+    printf("      Take a screenshot of a window (or desktop portal on Wayland).\n");
     printf("\n");
     printf("EXAMPLES:\n");
     printf("  gsr-ui-cli toggle-show\n");
@@ -83,6 +85,7 @@ static bool is_valid_command(const char *command) {
         "replay-save-10-min",
         "take-screenshot",
         "take-screenshot-region",
+        "take-screenshot-window",
         NULL
     };