Revision 6fef28ee hw/usb-hid.c

b/hw/usb-hid.c
511 511
    USBMouseState *s = &hs->ptr;
512 512

  
513 513
    if (!s->mouse_grabbed) {
514
	s->eh_entry = qemu_add_mouse_event_handler(usb_mouse_event, hs,
515
                                                  0, "QEMU USB Mouse");
514
        qemu_activate_mouse_event_handler(s->eh_entry);
516 515
	s->mouse_grabbed = 1;
517 516
    }
518 517

  
......
553 552
    USBMouseState *s = &hs->ptr;
554 553

  
555 554
    if (!s->mouse_grabbed) {
556
	s->eh_entry = qemu_add_mouse_event_handler(usb_tablet_event, hs,
557
                                                  1, "QEMU USB Tablet");
555
        qemu_activate_mouse_event_handler(s->eh_entry);
558 556
	s->mouse_grabbed = 1;
559 557
    }
560 558

  
......
866 864
    USBHIDState *s = DO_UPCAST(USBHIDState, dev, dev);
867 865
    s->dev.speed = USB_SPEED_FULL;
868 866
    s->kind = kind;
867

  
868
    if (s->kind == USB_MOUSE) {
869
        s->ptr.eh_entry = qemu_add_mouse_event_handler(usb_mouse_event, s,
870
                                                       0, "QEMU USB Mouse");
871
    } else if (s->kind == USB_TABLET) {
872
        s->ptr.eh_entry = qemu_add_mouse_event_handler(usb_tablet_event, s,
873
                                                       1, "QEMU USB Tablet");
874
    }
875
        
869 876
    /* Force poll routine to be run and grab input the first time.  */
870 877
    s->changed = 1;
871 878
    return 0;

Also available in: Unified diff