[gtk+] mir: fix GdkSeat-related deprecations
- From: William Hua <williamhua src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] mir: fix GdkSeat-related deprecations
- Date: Wed, 24 Feb 2016 18:29:23 +0000 (UTC)
commit 594ba3071bec162a46d5c1b7d340b2674e3eff5a
Author: William Hua <william hua canonical com>
Date: Wed Feb 24 13:23:18 2016 -0500
mir: fix GdkSeat-related deprecations
gdk/mir/gdkmireventsource.c | 19 +++++++++++++++++--
gdk/mir/gdkmirwindowimpl.c | 10 +++++++++-
2 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/gdk/mir/gdkmireventsource.c b/gdk/mir/gdkmireventsource.c
index 9275e6a..8671ddd 100644
--- a/gdk/mir/gdkmireventsource.c
+++ b/gdk/mir/gdkmireventsource.c
@@ -125,6 +125,9 @@ static void
generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint keyval, guint16 keycode,
gboolean is_modifier, guint32 event_time)
{
GdkEvent *event;
+ GdkDisplay *display;
+ GdkSeat *seat;
+ GdkDevice *keyboard;
event = gdk_event_new (type);
event->key.state = state;
@@ -134,13 +137,25 @@ generate_key_event (GdkWindow *window, GdkEventType type, guint state, guint key
event->key.time = event_time;
set_key_event_string (&event->key);
- send_event (window, _gdk_mir_device_manager_get_keyboard (gdk_display_get_device_manager
(gdk_window_get_display (window))), event);
+ display = gdk_window_get_display (window);
+ seat = gdk_display_get_default_seat (display);
+ keyboard = gdk_seat_get_keyboard (seat);
+
+ send_event (window, keyboard, event);
}
static GdkDevice *
get_pointer (GdkWindow *window)
{
- return gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdk_window_get_display
(window)));
+ GdkDisplay *display;
+ GdkSeat *seat;
+ GdkDevice *pointer;
+
+ display = gdk_window_get_display (window);
+ seat = gdk_display_get_default_seat (display);
+ pointer = gdk_seat_get_pointer (seat);
+
+ return pointer;
}
static void
diff --git a/gdk/mir/gdkmirwindowimpl.c b/gdk/mir/gdkmirwindowimpl.c
index 8455f36..6272690 100644
--- a/gdk/mir/gdkmirwindowimpl.c
+++ b/gdk/mir/gdkmirwindowimpl.c
@@ -271,7 +271,15 @@ create_mir_surface (GdkDisplay *display,
static GdkDevice *
get_pointer (GdkWindow *window)
{
- return gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdk_window_get_display
(window)));
+ GdkDisplay *display;
+ GdkSeat *seat;
+ GdkDevice *pointer;
+
+ display = gdk_window_get_display (window);
+ seat = gdk_display_get_default_seat (display);
+ pointer = gdk_seat_get_pointer (seat);
+
+ return pointer;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]