OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

msmouse: add MouseState, unregister handler on close 

Add struct to track serial mouse state.  Store mouse event handler
there.  Unregister properly on chardev close.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1467625375-31774-2-git-send-email-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2016-07-04 11:42:52 +02:00
parent f1ef557866
commit cde8dcbc92
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backends/msmouse.c
View File

@ -29,6 +29,11 @@
#define MSMOUSE_LO6(n) ((n) & 0x3f) #define MSMOUSE_LO6(n) ((n) & 0x3f)
#define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6) #define MSMOUSE_HI2(n) (((n) & 0xc0) >> 6)
typedef struct {
CharDriverState *chr;
QEMUPutMouseEntry *entry;
} MouseState;
static void msmouse_event(void *opaque, static void msmouse_event(void *opaque,
int dx, int dy, int dz, int buttons_state) int dx, int dy, int dz, int buttons_state)
{ {
@ -60,7 +65,11 @@ static int msmouse_chr_write (struct CharDriverState *s, const uint8_t *buf, int
static void msmouse_chr_close (struct CharDriverState *chr) static void msmouse_chr_close (struct CharDriverState *chr)
{ {
g_free (chr); MouseState *mouse = chr->opaque;
qemu_remove_mouse_event_handler(mouse->entry);
g_free(mouse);
g_free(chr);
} }
static CharDriverState *qemu_chr_open_msmouse(const char *id, static CharDriverState *qemu_chr_open_msmouse(const char *id,
@ -69,17 +78,20 @@ static CharDriverState *qemu_chr_open_msmouse(const char *id,
Error **errp) Error **errp)
{ {
ChardevCommon *common = backend->u.msmouse.data; ChardevCommon *common = backend->u.msmouse.data;
MouseState *mouse;
CharDriverState *chr; CharDriverState *chr;
chr = qemu_chr_alloc(common, errp); chr = qemu_chr_alloc(common, errp);
if (!chr) {
return NULL;
}
chr->chr_write = msmouse_chr_write; chr->chr_write = msmouse_chr_write;
chr->chr_close = msmouse_chr_close; chr->chr_close = msmouse_chr_close;
chr->explicit_be_open = true; chr->explicit_be_open = true;
qemu_add_mouse_event_handler(msmouse_event, chr, 0, "QEMU Microsoft Mouse"); mouse = g_new0(MouseState, 1);
mouse->entry = qemu_add_mouse_event_handler(msmouse_event, chr, 0,
"QEMU Microsoft Mouse");
mouse->chr = chr;
chr->opaque = mouse;
return chr; return chr;
} }