From: Takashi Iwai Date: Fri, 4 Apr 2014 10:41:21 +0000 (+0200) Subject: gtk: Use gtk generic event signal instead of motion-notify-event X-Git-Tag: qemu-xen-4.5.0-rc1~48^2~3 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0d0e044dee0ed59628bb093a5be03528d6bde445;p=qemu-upstream-4.5-testing.git gtk: Use gtk generic event signal instead of motion-notify-event The GDK motion-notify-event isn't generated when the pointer goes out of the target window even if the pointer is grabbed, which essentially means to lose the pointer tracking in gtk-ui. Meanwhile the generic "event" signal is sent when the pointer is grabbed, so we can use this and pick the motion notify events manually there instead. Reference: https://bugzilla.novell.com/show_bug.cgi?id=849587 Tested-by: Cole Robinson Reviewed-by: Cole Robinson Tested-by: Michael S. Tsirkin Signed-off-by: Takashi Iwai Signed-off-by: Gerd Hoffmann --- diff --git a/ui/gtk.c b/ui/gtk.c index f056e4034..c9f6d24ee 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -765,6 +765,14 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) return TRUE; } +static gboolean gd_event(GtkWidget *widget, GdkEvent *event, void *opaque) +{ + if (event->type == GDK_MOTION_NOTIFY) { + return gd_motion_event(widget, &event->motion, opaque); + } + return FALSE; +} + /** Window Menu Actions **/ static void gd_menu_pause(GtkMenuItem *item, void *opaque) @@ -1267,8 +1275,8 @@ static void gd_connect_signals(GtkDisplayState *s) g_signal_connect(s->drawing_area, "expose-event", G_CALLBACK(gd_expose_event), s); #endif - g_signal_connect(s->drawing_area, "motion-notify-event", - G_CALLBACK(gd_motion_event), s); + g_signal_connect(s->drawing_area, "event", + G_CALLBACK(gd_event), s); g_signal_connect(s->drawing_area, "button-press-event", G_CALLBACK(gd_button_event), s); g_signal_connect(s->drawing_area, "button-release-event",