From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LWByJ-0001ip-RH for qemu-devel@nongnu.org; Sun, 08 Feb 2009 10:53:27 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LWByE-0001fA-U8 for qemu-devel@nongnu.org; Sun, 08 Feb 2009 10:53:27 -0500 Received: from [199.232.76.173] (port=38578 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LWByE-0001f7-Pr for qemu-devel@nongnu.org; Sun, 08 Feb 2009 10:53:22 -0500 Received: from savannah.gnu.org ([199.232.41.3]:50051 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LWByE-0004IF-CR for qemu-devel@nongnu.org; Sun, 08 Feb 2009 10:53:22 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LWByD-0001BK-OB for qemu-devel@nongnu.org; Sun, 08 Feb 2009 15:53:21 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LWByD-0001B5-9L for qemu-devel@nongnu.org; Sun, 08 Feb 2009 15:53:21 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Sun, 08 Feb 2009 15:53:21 +0000 Subject: [Qemu-devel] [6559] QEMU Microsoft serial mouse emulation Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6559 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6559 Author: aurel32 Date: 2009-02-08 15:53:20 +0000 (Sun, 08 Feb 2009) Log Message: ----------- QEMU Microsoft serial mouse emulation Adds "msmouse" character device, which emulates a serial mouse. Use it with -serial msmouse. Signed-Off-By: Lubomir Rintel Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/Makefile.target trunk/qemu-char.c trunk/qemu-doc.texi Added Paths: ----------- trunk/hw/msmouse.c trunk/hw/msmouse.h Modified: trunk/Makefile.target =================================================================== --- trunk/Makefile.target 2009-02-08 14:56:04 UTC (rev 6558) +++ trunk/Makefile.target 2009-02-08 15:53:20 UTC (rev 6559) @@ -574,6 +574,9 @@ OBJS += rtl8139.o OBJS += e1000.o +# Serial mouse +OBJS += msmouse.o + ifeq ($(TARGET_BASE_ARCH), i386) # Hardware support OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o Added: trunk/hw/msmouse.c =================================================================== --- trunk/hw/msmouse.c (rev 0) +++ trunk/hw/msmouse.c 2009-02-08 15:53:20 UTC (rev 6559) @@ -0,0 +1,78 @@ +/* + * QEMU Microsoft serial mouse emulation + * + * Copyright (c) 2008 Lubomir Rintel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +#include +#include "../qemu-common.h" +#include "../qemu-char.h" +#include "../console.h" +#include "msmouse.h" + +#define MSMOUSE_LO6(n) ((n) & 0x3f) +#define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) + +static void msmouse_event(void *opaque, + int dx, int dy, int dz, int buttons_state) +{ + CharDriverState *chr = (CharDriverState *)opaque; + + unsigned char bytes[4] = { 0x40, 0x00, 0x00, 0x00 }; + + /* Movement deltas */ + bytes[0] |= (MSMOUSE_HI2(dy) << 2) | MSMOUSE_HI2(dx); + bytes[1] |= MSMOUSE_LO6(dx); + bytes[2] |= MSMOUSE_LO6(dy); + + /* Buttons */ + bytes[0] |= (buttons_state & 0x01 ? 0x20 : 0x00); + bytes[0] |= (buttons_state & 0x02 ? 0x10 : 0x00); + bytes[3] |= (buttons_state & 0x04 ? 0x20 : 0x00); + + /* We always send the packet of, so that we do not have to keep track + of previous state of the middle button. This can potentially confuse + some very old drivers for two button mice though. */ + qemu_chr_read(chr, bytes, 4); +} + +static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int len) +{ + /* Ignore writes to mouse port */ + return len; +} + +static void msmouse_chr_close (struct CharDriverState *chr) +{ + qemu_free (chr); +} + +CharDriverState *qemu_chr_open_msmouse(void) +{ + CharDriverState *chr; + + chr = qemu_mallocz(sizeof(CharDriverState)); + chr->chr_write = msmouse_chr_write; + chr->chr_close = msmouse_chr_close; + + qemu_add_mouse_event_handler(msmouse_event, chr, 0, "QEMU Microsoft Mouse"); + + return chr; +} Added: trunk/hw/msmouse.h =================================================================== --- trunk/hw/msmouse.h (rev 0) +++ trunk/hw/msmouse.h 2009-02-08 15:53:20 UTC (rev 6559) @@ -0,0 +1,2 @@ +/* msmouse.c */ +CharDriverState *qemu_chr_open_msmouse(void); Modified: trunk/qemu-char.c =================================================================== --- trunk/qemu-char.c 2009-02-08 14:56:04 UTC (rev 6558) +++ trunk/qemu-char.c 2009-02-08 15:53:20 UTC (rev 6559) @@ -30,6 +30,7 @@ #include "block.h" #include "hw/usb.h" #include "hw/baum.h" +#include "hw/msmouse.h" #include #include @@ -2105,6 +2106,8 @@ } else { printf("Unable to open driver: %s\n", p); } + } else if (!strcmp(filename, "msmouse")) { + chr = qemu_chr_open_msmouse(); } else #ifndef _WIN32 if (strstart(filename, "unix:", &p)) { Modified: trunk/qemu-doc.texi =================================================================== --- trunk/qemu-doc.texi 2009-02-08 14:56:04 UTC (rev 6558) +++ trunk/qemu-doc.texi 2009-02-08 15:53:20 UTC (rev 6559) @@ -961,6 +961,8 @@ When @var{remote_host} or @var{src_ip} are not specified they default to @code{0.0.0.0}. When not using a specified @var{src_port} a random port is automatically chosen. +@item msmouse +Three button serial mouse. Configure the guest to use Microsoft protocol. If you just want a simple readonly console you can use @code{netcat} or @code{nc}, by starting qemu with: @code{-serial udp::4555} and nc as: