GTK4: GdkDeviceManager removed from GTK4

GTK4 migration
- gdk_display_get_device_manager() replaced by
gdk_display_get_default_seat()
- gdk_device_manager_get_client_pointer() replaced by
gdk_seat_get_pointer()

diff --git a/src/bar.c b/src/bar.c
index 3005994..01e9718 100644 (file)
--- a/src/bar.c
+++ b/src/bar.c
@@ -302,12 +302,12 @@ static void bar_expander_height_cb(GtkWidget *UNUSED(widget), gpointer data)
        gint x, y;
        gint w, h;
        GdkDisplay *display;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        display = gdk_display_get_default();
-       device_manager = gdk_display_get_device_manager(display);
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(display);
+       device = gdk_seat_get_pointer(seat);
        gdk_device_get_position(device, NULL, &x, &y);
 
        list = gtk_container_get_children(GTK_CONTAINER(expander));

diff --git a/src/collect-table.c b/src/collect-table.c
index 4e1dda7..f2bb9d1 100644 (file)
--- a/src/collect-table.c
+++ b/src/collect-table.c
@@ -568,14 +568,13 @@ static void tip_show(CollectTable *ct)
        GtkWidget *label;
        gint x, y;
        GdkDisplay *display;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        if (ct->tip_window) return;
 
-       device_manager = gdk_display_get_device_manager(gdk_window_get_display(
-                                                               gtk_widget_get_window(ct->listview)));
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(gdk_window_get_display(gtk_widget_get_window(ct->listview)));
+       device = gdk_seat_get_pointer(seat);
        gdk_window_get_device_position(gtk_widget_get_window(ct->listview),
                                                                device, &x, &y, NULL);
 
@@ -593,8 +592,8 @@ static void tip_show(CollectTable *ct)
        gtk_widget_show(label);
 
        display = gdk_display_get_default();
-       device_manager = gdk_display_get_device_manager(display);
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(display);
+       device = gdk_seat_get_pointer(seat);
        gdk_device_get_position(device, NULL, &x, &y);
 
        if (!gtk_widget_get_realized(ct->tip_window)) gtk_widget_realize(ct->tip_window);
@@ -647,8 +646,8 @@ static void tip_unschedule(CollectTable *ct)
 static void tip_update(CollectTable *ct, CollectInfo *info)
 {
        GdkDisplay *display = gdk_display_get_default();
-       GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
-       GdkDevice *device = gdk_device_manager_get_client_pointer(device_manager);
+       GdkSeat *seat = gdk_display_get_default_seat(display);
+       GdkDevice *device = gdk_seat_get_pointer(seat);
 
        tip_schedule(ct);
 
@@ -1395,16 +1394,15 @@ static CollectInfo *collection_table_insert_find(CollectTable *ct, CollectInfo *
        GtkTreeIter iter;
        GtkTreePath *tpath;
        GtkTreeViewColumn *column;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        store = gtk_tree_view_get_model(GTK_TREE_VIEW(ct->listview));
 
        if (!use_coord)
                {
-               device_manager = gdk_display_get_device_manager(gdk_window_get_display(
-                                                                       gtk_widget_get_window(ct->listview)));
-               device = gdk_device_manager_get_client_pointer(device_manager);
+               seat = gdk_display_get_default_seat(gdk_window_get_display(gtk_widget_get_window(ct->listview)));
+               device = gdk_seat_get_pointer(seat);
                gdk_window_get_device_position(gtk_widget_get_window(ct->listview),
                                                                        device, &x, &y, NULL);
                }
@@ -1617,14 +1615,14 @@ static gboolean collection_table_auto_scroll_idle_cb(gpointer data)
        GdkWindow *window;
        gint x, y;
        gint w, h;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        if (!ct->drop_idle_id) return FALSE;
 
        window = gtk_widget_get_window(ct->listview);
-       device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(gdk_window_get_display(window));
+       device = gdk_seat_get_pointer(seat);
        gdk_window_get_device_position(window, device, &x, &y, NULL);
 
        w = gdk_window_get_width(window);

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index 97efde8..4e7346f 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -2034,14 +2034,15 @@ static gboolean pr_mouse_motion_cb(GtkWidget *widget, GdkEventMotion *event, gpo
 {
        PixbufRenderer *pr;
        gint accel;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        /* This is a hack, but work far the best, at least for single pointer systems.
         * See https://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
        gint x, y;
-       device_manager = gdk_display_get_device_manager(gdk_window_get_display(event->window));
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(gdk_window_get_display(event->window));
+       device = gdk_seat_get_pointer(seat);
+
        gdk_window_get_device_position(event->window, device, &x, &y, NULL);
 
        event->x = x;

diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index f2f7472..9ceff57 100644 (file)
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -507,7 +507,7 @@ static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpoi
        GdkModifierType mask;
        gint x, y;
        GtkAllocation allocation;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        gtk_widget_get_allocation(button, &allocation);
@@ -515,8 +515,8 @@ static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpoi
        pixbuf = gdk_pixbuf_get_from_window(gtk_widget_get_window(button),
                                            allocation.x, allocation.y,
                                            allocation.width, allocation.height);
-       device_manager = gdk_display_get_device_manager(gdk_window_get_display(gtk_widget_get_window(button)));
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(gdk_window_get_display(gtk_widget_get_window(button)));
+       device = gdk_seat_get_pointer(seat);
        gdk_window_get_device_position(gtk_widget_get_window(button), device, &x, &y, &mask);
 
        gtk_drag_set_icon_pixbuf(context, pixbuf,

diff --git a/src/ui_tree_edit.c b/src/ui_tree_edit.c
index f45b707..8f3369d 100644 (file)
--- a/src/ui_tree_edit.c
+++ b/src/ui_tree_edit.c
@@ -570,7 +570,7 @@ static gboolean widget_auto_scroll_cb(gpointer data)
        gint x, y;
        gint w, h;
        gint amt = 0;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        if (sd->max_step < sd->region_size)
@@ -579,8 +579,8 @@ static gboolean widget_auto_scroll_cb(gpointer data)
                }
 
        window = gtk_widget_get_window(sd->widget);
-       device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(gdk_window_get_display(window));
+       device = gdk_seat_get_pointer(seat);
        gdk_window_get_device_position(window, device, &x, &y, NULL);
 
        w = gdk_window_get_width(window);

diff --git a/src/view_dir.c b/src/view_dir.c
index 28c3ad8..1041d66 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -966,7 +966,7 @@ void vd_dnd_drop_scroll_cancel(ViewDir *vd)
 static gboolean vd_auto_scroll_idle_cb(gpointer data)
 {
        ViewDir *vd = data;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        if (vd->drop_fd)
@@ -976,8 +976,8 @@ static gboolean vd_auto_scroll_idle_cb(gpointer data)
                gint w, h;
 
                window = gtk_widget_get_window(vd->view);
-               device_manager = gdk_display_get_device_manager(gdk_window_get_display(window));
-               device = gdk_device_manager_get_client_pointer(device_manager);
+               seat = gdk_display_get_default_seat(gdk_window_get_display(window));
+               device = gdk_seat_get_pointer(seat);
                gdk_window_get_device_position(window, device, &x, &y, NULL);
 
                w = gdk_window_get_width(window);

diff --git a/src/view_file/view_file_icon.c b/src/view_file/view_file_icon.c
index 42b2f63..fa00156 100644 (file)
--- a/src/view_file/view_file_icon.c
+++ b/src/view_file/view_file_icon.c
@@ -345,14 +345,13 @@ static void tip_show(ViewFile *vf)
        GtkWidget *label;
        gint x, y;
        GdkDisplay *display;
-       GdkDeviceManager *device_manager;
+       GdkSeat *seat;
        GdkDevice *device;
 
        if (VFICON(vf)->tip_window) return;
 
-       device_manager = gdk_display_get_device_manager(gdk_window_get_display(
-                                               gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview))));
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(gdk_window_get_display(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview))));
+       device = gdk_seat_get_pointer(seat);
        gdk_window_get_device_position(gtk_tree_view_get_bin_window(GTK_TREE_VIEW(vf->listview)),
                                                device, &x, &y, NULL);
 
@@ -370,8 +369,8 @@ static void tip_show(ViewFile *vf)
        gtk_widget_show(label);
 
        display = gdk_display_get_default();
-       device_manager = gdk_display_get_device_manager(display);
-       device = gdk_device_manager_get_client_pointer(device_manager);
+       seat = gdk_display_get_default_seat(display);
+       device = gdk_seat_get_pointer(seat);
        gdk_device_get_position(device, NULL, &x, &y);
 
        if (!gtk_widget_get_realized(VFICON(vf)->tip_window)) gtk_widget_realize(VFICON(vf)->tip_window);
@@ -434,8 +433,8 @@ static void tip_unschedule(ViewFile *vf)
 static void tip_update(ViewFile *vf, FileData *fd)
 {
        GdkDisplay *display = gdk_display_get_default();
-       GdkDeviceManager *device_manager = gdk_display_get_device_manager(display);
-       GdkDevice *device = gdk_device_manager_get_client_pointer(device_manager);
+       GdkSeat *seat = gdk_display_get_default_seat(display);
+       GdkDevice *device = gdk_seat_get_pointer(seat);
 
        if (VFICON(vf)->tip_window)
                {