From patchwork Tue May 4 16:56:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Jorsch X-Patchwork-Id: 51652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E376DB7D2F for ; Wed, 5 May 2010 15:32:48 +1000 (EST) Received: from localhost ([127.0.0.1]:51193 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9XDw-0004Df-UX for incoming@patchwork.ozlabs.org; Wed, 05 May 2010 01:32:44 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9LQg-0003Nm-Rm for qemu-devel@nongnu.org; Tue, 04 May 2010 12:57:06 -0400 Received: from [140.186.70.92] (port=47879 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9LQf-0003N2-9u for qemu-devel@nongnu.org; Tue, 04 May 2010 12:57:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9LQY-0005eJ-OW for qemu-devel@nongnu.org; Tue, 04 May 2010 12:57:00 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:33452) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9LQY-0005dY-LT for qemu-devel@nongnu.org; Tue, 04 May 2010 12:56:58 -0400 X-Authority-Analysis: v=1.1 cv=OMZqYO3L41gFG4eI735GctFZkIqa2t9YKv4cWfI71LE= c=1 sm=0 a=zxEma9ohhksA:10 a=KM8nfJeeGFAA:10 a=sFBlSW20FPk1v4aQxZ+5uA==:17 a=FP58Ms26AAAA:8 a=_pUsaAGPH4obi_1jP8wA:9 a=ekVHK-IhVede6WnYwFgA:7 a=bMjoG4SeQ-BusZTmgnlx3-YsuNQA:4 a=sFBlSW20FPk1v4aQxZ+5uA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 66.26.236.130 Received: from [66.26.236.130] ([66.26.236.130:37494] helo=anomie.yi.org) by hrndva-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id CC/88-03354-5D150EB4; Tue, 04 May 2010 16:56:53 +0000 Received: from [10.230.46.10] (helo=ataxia) by anomie.yi.org with esmtp (Exim 4.71) (envelope-from ) id 1O9LQS-0002vQ-QF for qemu-devel@nongnu.org; Tue, 04 May 2010 12:56:52 -0400 Received: from brad by ataxia with local (Exim 4.71) (envelope-from ) id 1O9LQI-00070y-RE for qemu-devel@nongnu.org; Tue, 04 May 2010 12:56:42 -0400 From: Brad Jorsch To: qemu-devel@nongnu.org Date: Tue, 4 May 2010 12:56:38 -0400 Message-Id: <1272992201-26911-3-git-send-email-anomie@users.sourceforge.net> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1272992201-26911-1-git-send-email-anomie@users.sourceforge.net> References: <1272992201-26911-1-git-send-email-anomie@users.sourceforge.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 2/5] Add hwheel to monitor mouse_move X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Adds a parameter to the monitor's mouse_move command to specify the hwheel delta. Signed-off-by: Brad Jorsch --- monitor.c | 8 ++++++-- qemu-monitor.hx | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index 520d48d..baff2cf 100644 --- a/monitor.c +++ b/monitor.c @@ -1832,16 +1832,20 @@ static int mouse_button_state; static void do_mouse_move(Monitor *mon, const QDict *qdict) { - int dx, dy, dz; + int dx, dy, dz, dw; const char *dx_str = qdict_get_str(qdict, "dx_str"); const char *dy_str = qdict_get_str(qdict, "dy_str"); const char *dz_str = qdict_get_try_str(qdict, "dz_str"); + const char *dw_str = qdict_get_try_str(qdict, "dw_str"); dx = strtol(dx_str, NULL, 0); dy = strtol(dy_str, NULL, 0); dz = 0; + dw = 0; if (dz_str) dz = strtol(dz_str, NULL, 0); - kbd_mouse_event(dx, dy, dz, 0, mouse_button_state); + if (dw_str) + dw = strtol(dw_str, NULL, 0); + kbd_mouse_event(dx, dy, dz, dw, mouse_button_state); } static void do_mouse_button(Monitor *mon, const QDict *qdict) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 5ea5748..00067ba 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -616,8 +616,8 @@ ETEXI { .name = "mouse_move", - .args_type = "dx_str:s,dy_str:s,dz_str:s?", - .params = "dx dy [dz]", + .args_type = "dx_str:s,dy_str:s,dz_str:s?,dw_str:s?", + .params = "dx dy [dz [dw]]", .help = "send mouse move events", .mhandler.cmd = do_mouse_move, },