From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 Date: Tue, 4 May 2010 12:56:38 -0400 Message-Id: <1272992201-26911-3-git-send-email-anomie@users.sourceforge.net> In-Reply-To: <1272992201-26911-1-git-send-email-anomie@users.sourceforge.net> References: <1272992201-26911-1-git-send-email-anomie@users.sourceforge.net> Subject: [Qemu-devel] [PATCH 2/5] Add hwheel to monitor mouse_move List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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, }, -- 1.7.1