mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gtk: Fix the relative pointer tracking mode

Browse Source 
The relative pointer tracking mode was still buggy even after the
previous fix of the motion-notify-event since the events are filtered
out when the pointer moves outside the drawing window due to the
boundary check for the absolute mode.

This patch fixes the issue by moving the unnecessary boundary check
into the if block of absolute mode, and keep the coordinate in the
relative mode even if it's outside the drawing area.  But this makes
the coordinate (last_x, last_y) possibly pointing to (-1,-1),
introduce a new flag to indicate the last coordinate has been
updated.

Reference: https://bugzilla.novell.com/show_bug.cgi?id=849587
Tested-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
Tested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Takashi Iwai 2014-04-04 12:41:22 +02:00 committed by Gerd Hoffmann
parent 0d0e044dee
commit e61031cdd8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/gtk.c
View File

@ -156,6 +156,7 @@ typedef struct GtkDisplayState
DisplayChangeListener dcl; DisplayChangeListener dcl;
DisplaySurface *ds; DisplaySurface *ds;
int button_mask; int button_mask;
gboolean last_set;
int last_x; int last_x;
int last_y; int last_y;
@ -616,25 +617,25 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion,
x = (motion->x - mx) / s->scale_x; x = (motion->x - mx) / s->scale_x;
y = (motion->y - my) / s->scale_y; y = (motion->y - my) / s->scale_y;
if (x < 0 || y < 0 ||
x >= surface_width(s->ds) ||
y >= surface_height(s->ds)) {
return TRUE;
}
if (qemu_input_is_absolute()) { if (qemu_input_is_absolute()) {
if (x < 0 || y < 0 ||
x >= surface_width(s->ds) ||
y >= surface_height(s->ds)) {
return TRUE;
}
qemu_input_queue_abs(s->dcl.con, INPUT_AXIS_X, x, qemu_input_queue_abs(s->dcl.con, INPUT_AXIS_X, x,
surface_width(s->ds)); surface_width(s->ds));
qemu_input_queue_abs(s->dcl.con, INPUT_AXIS_Y, y, qemu_input_queue_abs(s->dcl.con, INPUT_AXIS_Y, y,
surface_height(s->ds)); surface_height(s->ds));
qemu_input_event_sync(); qemu_input_event_sync();
} else if (s->last_x != -1 && s->last_y != -1 && gd_is_grab_active(s)) { } else if (s->last_set && gd_is_grab_active(s)) {
qemu_input_queue_rel(s->dcl.con, INPUT_AXIS_X, x - s->last_x); qemu_input_queue_rel(s->dcl.con, INPUT_AXIS_X, x - s->last_x);
qemu_input_queue_rel(s->dcl.con, INPUT_AXIS_Y, y - s->last_y); qemu_input_queue_rel(s->dcl.con, INPUT_AXIS_Y, y - s->last_y);
qemu_input_event_sync(); qemu_input_event_sync();
} }
s->last_x = x; s->last_x = x;
s->last_y = y; s->last_y = y;
s->last_set = TRUE;
if (!qemu_input_is_absolute() && gd_is_grab_active(s)) { if (!qemu_input_is_absolute() && gd_is_grab_active(s)) {
GdkScreen *screen = gtk_widget_get_screen(s->drawing_area); GdkScreen *screen = gtk_widget_get_screen(s->drawing_area);
@ -669,8 +670,7 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion,
GdkDisplay *display = gtk_widget_get_display(widget); GdkDisplay *display = gtk_widget_get_display(widget);
gdk_display_warp_pointer(display, screen, x, y); gdk_display_warp_pointer(display, screen, x, y);
#endif #endif
s->last_x = -1; s->last_set = FALSE;
s->last_y = -1;
return FALSE; return FALSE;
} }
} }