From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Haxby Subject: [PATCH 2/2] Move the xenfb pointer handler to the connected method Date: Wed, 7 Jul 2010 14:40:02 +0100 Message-ID: <1278510002-20735-3-git-send-email-john.haxby@oracle.com> References: <1278510002-20735-1-git-send-email-john.haxby@oracle.com> Return-path: In-Reply-To: <1278510002-20735-1-git-send-email-john.haxby@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: John Haxby List-Id: xen-devel@lists.xenproject.org Ensure that we read "request-abs-pointer" after the frontend has written it. This means that we will correctly set up an ansolute or relative pointer handler correctly. Signed-off-by: John Haxby --- hw/xenfb.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index c96cfe6..29a873f 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -366,19 +366,27 @@ static int input_initialise(struct XenDevice *xendev) struct XenInput *in = container_of(xendev, struct XenInput, c.xendev); int rc; - if (xenstore_read_fe_int(xendev, "request-abs-pointer", - &in->abs_pointer_wanted) == -1) - in->abs_pointer_wanted = 0; - rc = common_bind(&in->c); if (rc != 0) return rc; qemu_add_kbd_event_handler(xenfb_key_event, in); + return 0; +} + +static void input_connected(struct XenDevice *xendev) +{ + struct XenInput *in = container_of(xendev, struct XenInput, c.xendev); + + if (xenstore_read_fe_int(xendev, "request-abs-pointer", + &in->abs_pointer_wanted) == -1) + in->abs_pointer_wanted = 0; + + if (in->qmouse) + qemu_remove_mouse_event_handler(in->qmouse); in->qmouse = qemu_add_mouse_event_handler(xenfb_mouse_event, in, in->abs_pointer_wanted, "Xen PVFB Mouse"); - return 0; } static void input_disconnect(struct XenDevice *xendev) @@ -958,6 +966,7 @@ struct XenDevOps xen_kbdmouse_ops = { .size = sizeof(struct XenInput), .init = input_init, .initialise = input_initialise, + .connected = input_connected, .disconnect = input_disconnect, .event = input_event, }; -- 1.7.1