70 lines
3.1 KiB
Diff
70 lines
3.1 KiB
Diff
From a7eb80016ca13d33872b558cdb00eac353b3cde1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
|
Date: Wed, 19 Apr 2017 22:56:37 +0200
|
|
Subject: [PATCH] Replace gdk_display_get_device_manager() Replace
|
|
gdk_device_manager_get_client_pointer()
|
|
|
|
---
|
|
src/ygtkmenubutton.c | 8 ++++++--
|
|
src/ygtkrichtext.c | 7 +++++--
|
|
src/ygtkwizard.c | 8 ++++++--
|
|
3 files changed, 17 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/ygtkmenubutton.c b/src/ygtkmenubutton.c
|
|
index 147279d..be8b46a 100644
|
|
--- a/src/ygtkmenubutton.c
|
|
+++ b/src/ygtkmenubutton.c
|
|
@@ -101,9 +101,13 @@ void ygtk_popup_window_popup (GtkWidget *widget, gint x, gint y, guint activate_
|
|
gtk_widget_show (widget);
|
|
|
|
GdkWindow *window = gtk_widget_get_window (widget);
|
|
+
|
|
GdkDisplay *display = gdk_window_get_display (window);
|
|
- GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
|
|
- GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
|
|
+
|
|
+ // GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
|
|
+ // GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
|
|
+ GdkSeat *seat = gdk_display_get_default_seat (display);
|
|
+ GdkDevice *pointer = gdk_seat_get_pointer (seat);
|
|
|
|
// grab this with your teeth
|
|
if (gdk_device_grab (pointer, window, GDK_OWNERSHIP_NONE, TRUE,
|
|
diff --git a/src/ygtkrichtext.c b/src/ygtkrichtext.c
|
|
index 299fe91..2e0131c 100644
|
|
--- a/src/ygtkrichtext.c
|
|
+++ b/src/ygtkrichtext.c
|
|
@@ -178,8 +178,11 @@ static void set_cursor_if_appropriate (GtkTextView *view, gint wx, gint wy)
|
|
|
|
GdkWindow *window = gtk_widget_get_window (widget);
|
|
GdkDisplay *display = gdk_window_get_display (window);
|
|
- GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
|
|
- GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
|
|
+
|
|
+ // GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
|
|
+ // GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
|
|
+ GdkSeat *seat = gdk_display_get_default_seat (display);
|
|
+ GdkDevice *pointer = gdk_seat_get_pointer (seat);
|
|
|
|
gdk_window_get_device_position (window, pointer, &wx, &wy, NULL);
|
|
|
|
diff --git a/src/ygtkwizard.c b/src/ygtkwizard.c
|
|
index 34ccc46..6350c86 100644
|
|
--- a/src/ygtkwizard.c
|
|
+++ b/src/ygtkwizard.c
|
|
@@ -515,8 +515,12 @@ static gboolean ygtk_wizard_header_motion_notify_event (GtkWidget *widget, GdkEv
|
|
gdk_window_get_root_origin (event->window, &root_x, &root_y);
|
|
|
|
GdkDisplay *display = gdk_window_get_display (event->window);
|
|
- GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
|
|
- GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
|
|
+
|
|
+ // GdkDeviceManager *device_manager = gdk_display_get_device_manager (display);
|
|
+ // GdkDevice *pointer = gdk_device_manager_get_client_pointer (device_manager);
|
|
+ GdkSeat *seat = gdk_display_get_default_seat (display);
|
|
+ GdkDevice *pointer = gdk_seat_get_pointer (seat);
|
|
+
|
|
gdk_window_get_device_position (event->window, pointer, &pointer_x, &pointer_y, NULL);
|
|
|
|
gint x = pointer_x + root_x - header->press_x;
|