From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c060n-0004vs-PE for qemu-devel@nongnu.org; Fri, 28 Oct 2016 08:11:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c060j-0005TH-IT for qemu-devel@nongnu.org; Fri, 28 Oct 2016 08:11:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c060j-0005S5-Dc for qemu-devel@nongnu.org; Fri, 28 Oct 2016 08:11:49 -0400 From: Gerd Hoffmann Date: Fri, 28 Oct 2016 14:11:35 +0200 Message-Id: <1477656698-13569-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1477656698-13569-1-git-send-email-kraxel@redhat.com> References: <1477656698-13569-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 3/6] gtk: fix compilation warning with gtk 3.22.2 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alberto Garcia , Gerd Hoffmann From: Alberto Garcia gdk_screen_get_width() is deprecated since gtk 3.22.2, use gdk_monitor_get_geometry() instead if it's available. Signed-off-by: Alberto Garcia Message-id: 20161026152108.12364-1-berto@igalia.com Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 25e6d99..dd13982 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -912,9 +912,28 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, if (!qemu_input_is_absolute() && s->ptr_owner == vc) { GdkScreen *screen = gtk_widget_get_screen(vc->gfx.drawing_area); + int screen_width, screen_height; + int x = (int)motion->x_root; int y = (int)motion->y_root; +#if GTK_CHECK_VERSION(3, 22, 0) + { + GdkDisplay *dpy = gtk_widget_get_display(widget); + GdkWindow *win = gtk_widget_get_window(widget); + GdkMonitor *monitor = gdk_display_get_monitor_at_window(dpy, win); + GdkRectangle geometry; + gdk_monitor_get_geometry(monitor, &geometry); + screen_width = geometry.width; + screen_height = geometry.height; + } +#else + { + screen_width = gdk_screen_get_width(screen); + screen_height = gdk_screen_get_height(screen); + } +#endif + /* In relative mode check to see if client pointer hit * one of the screen edges, and if so move it back by * 200 pixels. This is important because the pointer @@ -928,10 +947,10 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion, if (y == 0) { y += 200; } - if (x == (gdk_screen_get_width(screen) - 1)) { + if (x == (screen_width - 1)) { x -= 200; } - if (y == (gdk_screen_get_height(screen) - 1)) { + if (y == (screen_height - 1)) { y -= 200; } -- 1.8.3.1