From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYYt5-0006hW-6A for qemu-devel@nongnu.org; Fri, 11 Apr 2014 06:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYYsw-0006Ab-SA for qemu-devel@nongnu.org; Fri, 11 Apr 2014 06:40:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63218) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYYsw-0006AI-Jo for qemu-devel@nongnu.org; Fri, 11 Apr 2014 06:40:38 -0400 From: Gerd Hoffmann Date: Fri, 11 Apr 2014 12:40:15 +0200 Message-Id: <1397212816-19891-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1397212816-19891-1-git-send-email-kraxel@redhat.com> References: <1397212816-19891-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/2] input: sdl2: Fix guest_cursor logic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori , Cole Robinson From: Cole Robinson Unbreaks relative mouse mode with sdl2, just like was done with sdl.c in c3aa84b6. Signed-off-by: Cole Robinson Signed-off-by: Gerd Hoffmann --- ui/sdl2.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/ui/sdl2.c b/ui/sdl2.c index f1532e9..e4cb9fb 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -403,13 +403,17 @@ static void sdl_send_mouse_event(struct sdl2_state *scon, int dx, int dy, } qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_X, off_x + x, max_w); qemu_input_queue_abs(scon->dcl.con, INPUT_AXIS_Y, off_y + y, max_h); - } else if (guest_cursor) { - x -= guest_x; - y -= guest_y; - guest_x += x; - guest_y += y; - qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_X, x); - qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_Y, y); + } else { + if (guest_cursor) { + x -= guest_x; + y -= guest_y; + guest_x += x; + guest_y += y; + dx = x; + dy = y; + } + qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_X, dx); + qemu_input_queue_rel(scon->dcl.con, INPUT_AXIS_Y, dy); } qemu_input_event_sync(); } -- 1.8.3.1