Rename dbus from com.dec05eba.gsr_kwin_helper to com.dec05eba.gpu_screen_recorder.gsr_kwin_helper for flatpak access

This reverts commit ec98533f1b.

include/gui/SettingsPage.hpp

@@ -247,5 +247,7 @@ namespace gsr {
 
         std::optional<GsrCamera> selected_camera;
         std::optional<GsrCameraSetup> selected_camera_setup;
+
+        bool supports_window_title = false;
     };
 }

meson.build

@@ -1,4 +1,4 @@
-project('gsr-ui', ['c', 'cpp'], version : '1.10.3', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
+project('gsr-ui', ['c', 'cpp'], version : '1.10.4', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
 
 add_project_arguments('-D_FILE_OFFSET_BITS=64', language : ['c', 'cpp'])
 
@@ -70,7 +70,7 @@ gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui')
 icons_path = join_paths(prefix, datadir, 'icons')
 
 add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp'])
-add_project_arguments('-DGSR_FLATPAK_VERSION="5.12.0"', language: ['c', 'cpp'])
+add_project_arguments('-DGSR_FLATPAK_VERSION="5.12.1"', language: ['c', 'cpp'])
 
 add_project_arguments('-DKWIN_HELPER_SCRIPT_PATH="' + gsr_ui_resources_path + '/gsrkwinhelper.js"', language: ['c', 'cpp'])
 

project.conf

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

src/Overlay.cpp

@@ -1063,8 +1063,9 @@ 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 Window x11_focused_window = get_focused_window(display, WindowCaptureType::FOCUSED, false);
         const bool prevent_game_minimizing = gsr_info.system_info.display_server != DisplayServer::WAYLAND
-            || (x11_cursor_window && is_window_fullscreen_on_monitor(display, x11_cursor_window, *focused_monitor) && get_focused_window(display, WindowCaptureType::FOCUSED, false) == x11_cursor_window)
+            || (x11_focused_window && is_window_fullscreen_on_monitor(display, x11_focused_window, *focused_monitor))
             || is_wlroots
             || is_hyprland;
 

src/gui/SettingsPage.cpp

@@ -10,8 +10,13 @@
 #include "../../include/Theme.hpp"
 #include "../../include/GsrInfo.hpp"
 #include "../../include/Utils.hpp"
-#include "mglpp/window/Window.hpp"
-#include "mglpp/window/Event.hpp"
+#include "../../include/WindowUtils.hpp"
+
+#include <mglpp/window/Window.hpp>
+#include <mglpp/window/Event.hpp>
+extern "C" {
+#include <mgl/mgl.h>
+}
 
 #include <algorithm>
 #include <cmath>
@@ -46,6 +51,14 @@ namespace gsr {
         application_audio = get_application_audio();
         capture_options = get_supported_capture_options(*gsr_info);
 
+        mgl_context *context = mgl_get_context();
+        Display *display = (Display*)context->connection;
+
+        const std::string wm_name = get_window_manager_name(display);
+        const bool is_hyprland = wm_name.find("Hyprland") != std::string::npos;
+        const bool is_kwin = wm_name == "KWin";
+        supports_window_title = gsr_info->system_info.display_server == DisplayServer::X11 || is_hyprland || is_kwin;
+
         auto content_page = std::make_unique<GsrPage>(settings_page_type_to_title_text(type), "Settings");
         content_page->add_button("Back", "back", get_color_theme().page_bg_color);
         content_page->on_click = [page_stack](const std::string &id) {
@@ -1113,6 +1126,7 @@ namespace gsr {
     }
 
     std::unique_ptr<RadioButton> SettingsPage::create_start_replay_automatically() {
+        // TODO: Support kde plasma wayland and hyprland (same ones that support getting window title)
         char fullscreen_text[256];
         snprintf(fullscreen_text, sizeof(fullscreen_text), "Turn on replay when starting a fullscreen application%s", gsr_info->system_info.display_server == DisplayServer::X11 ? "" : " (X11 applications only)");
 
@@ -1127,7 +1141,7 @@ namespace gsr {
 
     std::unique_ptr<CheckBox> SettingsPage::create_save_replay_in_game_folder() {
         char text[256];
-        snprintf(text, sizeof(text), "Save video in a folder with the name of the game%s", gsr_info->system_info.display_server == DisplayServer::X11 ? "" : " (X11 applications only)");
+        snprintf(text, sizeof(text), "Save video in a folder with the name of the game%s", supports_window_title ? "" : " (X11 applications only)");
         auto checkbox = std::make_unique<CheckBox>(&get_theme().body_font, text);
         save_replay_in_game_folder_ptr = checkbox.get();
         return checkbox;
@@ -1280,7 +1294,7 @@ namespace gsr {
 
     std::unique_ptr<CheckBox> SettingsPage::create_save_recording_in_game_folder() {
         char text[256];
-        snprintf(text, sizeof(text), "Save video in a folder with the name of the game%s", gsr_info->system_info.display_server == DisplayServer::X11 ? "" : " (X11 applications only)");
+        snprintf(text, sizeof(text), "Save video in a folder with the name of the game%s", supports_window_title ? "" : " (X11 applications only)");
         auto checkbox = std::make_unique<CheckBox>(&get_theme().body_font, text);
         save_recording_in_game_folder_ptr = checkbox.get();
         return checkbox;

tools/gsr-kwin-helper/gsrkwinhelper.js

@@ -1,4 +1,4 @@
-const DAEMON_DBUS_NAME = "com.dec05eba.gsr_kwin_helper";
+const DAEMON_DBUS_NAME = "com.dec05eba.gpu_screen_recorder.gsr_kwin_helper";
 
 // utils
 function sendNewActiveWindowTitle(title) {

tools/gsr-kwin-helper/main.cpp

@@ -7,7 +7,7 @@ static const char* INTROSPECTION_XML =
     "<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
     "\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
     "<node>\n"
-    "  <interface name='com.dec05eba.gsr_kwin_helper'>\n"
+    "  <interface name='com.dec05eba.gpu_screen_recorder.gsr_kwin_helper'>\n"
     "    <method name='setActiveWindowTitle'>\n"
     "      <arg type='s' name='title' direction='in'/>\n"
     "    </method>\n"
@@ -41,7 +41,7 @@ public:
             return false;
         }
 
-        int ret = dbus_bus_request_name(connection, "com.dec05eba.gsr_kwin_helper",
+        int ret = dbus_bus_request_name(connection, "com.dec05eba.gpu_screen_recorder.gsr_kwin_helper",
                                        DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
         if (dbus_error_is_set(&err)) {
             std::cerr << "Error: gsr-kwin-helper: failed to request name: " << err.message << "\n";
@@ -54,7 +54,7 @@ public:
             return false;
         }
 
-        std::cerr << "Info: gsr-kwin-helper: DBus server initialized on com.dec05eba.gsr_kwin_helper\n";
+        std::cerr << "Info: gsr-kwin-helper: DBus server initialized on com.dec05eba.gpu_screen_recorder.gsr_kwin_helper\n";
 
         const bool inside_flatpak = access("/app/manifest.json", F_OK) == 0;
 
@@ -83,7 +83,7 @@ public:
 
             if (dbus_message_is_method_call(msg, "org.freedesktop.DBus.Introspectable", "Introspect")) {
                 handle_introspect(msg);
-            } else if (dbus_message_is_method_call(msg, "com.dec05eba.gsr_kwin_helper", "setActiveWindowTitle")) {
+            } else if (dbus_message_is_method_call(msg, "com.dec05eba.gpu_screen_recorder.gsr_kwin_helper", "setActiveWindowTitle")) {
                 handle_set_title(msg);
             }
 
@@ -144,7 +144,7 @@ public:
     }
 
     void send_error_reply(DBusMessage* msg, const char* error_msg) {
-        DBusMessage* reply = dbus_message_new_error(msg, "com.dec05eba.gsr_kwin_helper.Error", error_msg);
+        DBusMessage* reply = dbus_message_new_error(msg, "com.dec05eba.gpu_screen_recorder.gsr_kwin_helper.Error", error_msg);
         if (reply) {
             dbus_connection_send(connection, reply, nullptr);
             dbus_connection_flush(connection);
@@ -214,7 +214,7 @@ public:
 
     ~GsrKwinHelper() {
         if (connection) {
-            dbus_bus_release_name(connection, "com.dec05eba.gsr_kwin_helper", nullptr);
+            dbus_bus_release_name(connection, "com.dec05eba.gpu_screen_recorder.gsr_kwin_helper", nullptr);
             dbus_connection_unref(connection);
         }
     }