File ddccb1f4eb753eee69c80608e38b5ff110f78409.patch of Package xfdesktop

Overview Repositories Revisions Requests Users Attributes Meta

File ddccb1f4eb753eee69c80608e38b5ff110f78409.patch of Package xfdesktop (Revision 17af587d09157ac90fe8b91c8aa03664)

Currently displaying revision 17af587d09157ac90fe8b91c8aa03664 , Show latest

From ddccb1f4eb753eee69c80608e38b5ff110f78409 Mon Sep 17 00:00:00 2001
From: "Brian J. Tarricone" <brian@tarricone.org>
Date: Sun, 6 Oct 2024 23:55:24 -0700
Subject: [PATCH] Use new xfw_window_activate() signature in libwindowing
 4.19.6

diff --git a/common/xfdesktop-common.c b/common/xfdesktop-common.c
index 3bf09f1e..36510283 100644
--- a/common/xfdesktop-common.c
+++ b/common/xfdesktop-common.c
@@ -424,7 +424,33 @@ xfdesktop_object_unref(gpointer data,
     g_object_unref(data);
 }
 
+XfwSeat *
+xfdesktop_find_xfw_seat_for_gdk_seat(XfwScreen *screen, GdkSeat *gdk_seat) {
+    g_return_val_if_fail(XFW_IS_SCREEN(screen), NULL);
+    g_return_val_if_fail(gdk_seat == NULL || GDK_IS_SEAT(gdk_seat), NULL);
 
+    if (gdk_seat == NULL) {
+        gdk_seat = gdk_display_get_default_seat(gdk_display_get_default());
+    }
+    GdkDisplay *display = gdk_seat_get_display(gdk_seat);
+    GList *gseats = gdk_display_list_seats(display);
+    GList *xseats = xfw_screen_get_seats(screen);
+
+    XfwSeat *xseat = NULL;
+
+    if (g_list_length(gseats) == g_list_length(xseats)) {
+        for (GList *gl = gseats, *xl = xseats; gl != NULL && xl != NULL; gl = gl->next, xl = xl->next) {
+            if (gdk_seat == GDK_SEAT(gl->data)) {
+                xseat = XFW_SEAT(xl->data);
+                break;
+            }
+        }
+    }
+
+    g_list_free(gseats);
+
+    return xseat;
+}
 
 #ifdef G_ENABLE_DEBUG
 /* With --enable-debug=full turn on debugging messages from the start */
diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h
index 795716af..91a0b989 100644
--- a/common/xfdesktop-common.h
+++ b/common/xfdesktop-common.h
@@ -219,6 +219,9 @@ void xfdesktop_object_ref(gpointer data,
 void xfdesktop_object_unref(gpointer data,
                             GClosure *closure);
 
+XfwSeat *xfdesktop_find_xfw_seat_for_gdk_seat(XfwScreen *screen,
+                                              GdkSeat *gdk_seat);
+
 #if defined(G_HAVE_ISO_VARARGS)
 
 #define XF_DEBUG(...) xfdesktop_debug (__func__, __FILE__, __LINE__, __VA_ARGS__)
diff --git a/configure.ac b/configure.ac
index 3046b220..5966468d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ m4_define([glib_minimum_version], [2.72.0])
 m4_define([gtk_minimum_version], [3.24.0])
 m4_define([libxfce4util_minimum_version], [4.13.0])
 m4_define([libxfce4ui_minimum_version], [4.18.0])
-m4_define([libxfce4windowing_minimum_version], [4.19.3])
+m4_define([libxfce4windowing_minimum_version], [4.19.6])
 m4_define([garcon_minimum_version], [0.6.0])
 m4_define([exo_minimum_version], [0.11.0])
 m4_define([thunar_minimum_version], [4.17.10])
diff --git a/meson.build b/meson.build
index 0eed7986..03cd840d 100644
--- a/meson.build
+++ b/meson.build
@@ -20,7 +20,7 @@ dependency_versions = {
   'gtk': '>= 3.24.0',
   'libnotify': '>= 0.4.0',
   'libx11': '>= 1.6.7',
-  'libxfce4windowing': '>= 4.19.3',
+  'libxfce4windowing': '>= 4.19.6',
   'libyaml': '>= 0.2.5',
   'xfce4': '>= 4.18.0',
   'gtk-layer-shell': '>= 0.7.0',
diff --git a/src/windowlist.c b/src/windowlist.c
index af4e5373..53eef6d9 100644
--- a/src/windowlist.c
+++ b/src/windowlist.c
@@ -41,8 +41,8 @@
 #include <libxfce4windowing/libxfce4windowing.h>
 #include <libxfce4windowingui/libxfce4windowingui.h>
 
+#include "common/xfdesktop-common.h"
 #include "windowlist.h"
-#include "xfdesktop-common.h"
 
 #define WLIST_MAXLEN 30
 
@@ -117,7 +117,16 @@ activate_window(GtkWidget *w, gpointer user_data)
     if(!xfw_window_is_pinned(xfw_window)) {
         xfw_workspace_activate(xfw_window_get_workspace(xfw_window), NULL);
     }
-    xfw_window_activate(xfw_window, gtk_get_current_event_time(), NULL);
+
+    XfwSeat *seat = NULL;
+    GdkDevice *device = gtk_get_current_event_device();
+    if (device != NULL) {
+        XfwScreen *screen = xfw_window_get_screen(xfw_window);
+        GdkSeat *gdk_seat = gdk_device_get_seat(device);
+        seat = xfdesktop_find_xfw_seat_for_gdk_seat(screen, gdk_seat);
+    }
+
+    xfw_window_activate(xfw_window, seat, gtk_get_current_event_time(), NULL);
 }
 
 static gboolean
diff --git a/src/xfdesktop-window-icon-manager.c b/src/xfdesktop-window-icon-manager.c
index c3ca3115..93e6d2f0 100644
--- a/src/xfdesktop-window-icon-manager.c
+++ b/src/xfdesktop-window-icon-manager.c
@@ -26,6 +26,7 @@
 #include <libxfce4ui/libxfce4ui.h>
 #include <libxfce4windowingui/libxfce4windowingui.h>
 
+#include "common/xfdesktop-common.h"
 #include "common/xfdesktop-keyboard-shortcuts.h"
 #include "xfce-desktop.h"
 #include "xfdesktop-icon-view-holder.h"
@@ -342,7 +343,14 @@ icon_view_icon_activated(XfdesktopIconView *icon_view, MonitorData *mdata) {
     GList *selected = xfdesktop_icon_view_get_selected_items(icon_view);
     XfwWindow *window = window_for_filter_path(mdata->wmanager, mdata, selected != NULL ? selected->data : NULL);
     if (window != NULL) {
-        xfw_window_activate(window, gtk_get_current_event_time(), NULL);
+        XfwSeat *seat = NULL;
+        GdkDevice *device = gtk_get_current_event_device();
+        if (device != NULL) {
+            XfwScreen *screen = xfdesktop_icon_view_manager_get_screen(XFDESKTOP_ICON_VIEW_MANAGER(mdata->wmanager));
+            GdkSeat *gdk_seat = gdk_device_get_seat(device);
+            seat = xfdesktop_find_xfw_seat_for_gdk_seat(screen, gdk_seat);
+        }
+        xfw_window_activate(window, seat, gtk_get_current_event_time(), NULL);
     }
     g_list_free_full(selected, (GDestroyNotify)gtk_tree_path_free);
 }
-- 
GitLab

Places

File ddccb1f4eb753eee69c80608e38b5ff110f78409.patch of Package xfdesktop (Revision 17af587d09157ac90fe8b91c8aa03664)

Places