diff options
| author | Philipp Stephani | 2017-08-27 13:53:36 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2017-08-27 13:53:36 +0200 |
| commit | 7cb3d3bba149ec69fc03bf261556cfe92a9d2b40 (patch) | |
| tree | 9c45db8cd14f0061856c47de953f43451db068af | |
| parent | 982ec0398cea6e41bcfc022c333b6f695fc03241 (diff) | |
| download | emacs-7cb3d3bba149ec69fc03bf261556cfe92a9d2b40.tar.gz emacs-7cb3d3bba149ec69fc03bf261556cfe92a9d2b40.zip | |
Use GdkSeat in new GDK versions
* src/gtkutil.c (xg_event_is_for_scrollbar): Use GdkSeat instead of
GdkDeviceManager in GDK 3.20+
| -rw-r--r-- | src/gtkutil.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 0c8395efe9b..2675cd51586 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -4138,8 +4138,13 @@ xg_event_is_for_scrollbar (struct frame *f, const XEvent *event) | |||
| 4138 | GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); | 4138 | GdkDisplay *gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f)); |
| 4139 | GdkWindow *gwin; | 4139 | GdkWindow *gwin; |
| 4140 | #ifdef HAVE_GTK3 | 4140 | #ifdef HAVE_GTK3 |
| 4141 | #if GTK_CHECK_VERSION (3, 20, 0) | ||
| 4142 | GdkDevice *gdev | ||
| 4143 | = gdk_seat_get_pointer (gdk_display_get_default_seat (gdpy)); | ||
| 4144 | #else | ||
| 4141 | GdkDevice *gdev = gdk_device_manager_get_client_pointer | 4145 | GdkDevice *gdev = gdk_device_manager_get_client_pointer |
| 4142 | (gdk_display_get_device_manager (gdpy)); | 4146 | (gdk_display_get_device_manager (gdpy)); |
| 4147 | #endif | ||
| 4143 | gwin = gdk_device_get_window_at_position (gdev, NULL, NULL); | 4148 | gwin = gdk_device_get_window_at_position (gdev, NULL, NULL); |
| 4144 | #else | 4149 | #else |
| 4145 | gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL); | 4150 | gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL); |