Commit 455204eb authored by Thiemo Seufer's avatar Thiemo Seufer
Browse files

Dynamic handling of guest mice, by Lonnie Mendez. 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2290 c046a42c-6fe2-441c-8c8c-71466251a162
parent 6f30fa85

hw/adb.c

+1 −1
Original line number Diff line number Diff line
@@ -406,5 +406,5 @@ void adb_mouse_init(ADBBusState *bus) 
    d = adb_register_device(bus, ADB_MOUSE, adb_mouse_request,

                            adb_mouse_reset, s);

    adb_mouse_reset(d);

    qemu_add_mouse_event_handler(adb_mouse_event, d, 0);

    qemu_add_mouse_event_handler(adb_mouse_event, d, 0, "QEMU ADB Mouse");

}

hw/ps2.c

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg) 
    s->common.update_arg = update_arg;

    ps2_reset(&s->common);

    register_savevm("ps2mouse", 0, 2, ps2_mouse_save, ps2_mouse_load, s);

    qemu_add_mouse_event_handler(ps2_mouse_event, s, 0);

    qemu_add_mouse_event_handler(ps2_mouse_event, s, 0, "QEMU PS/2 Mouse");

    qemu_register_reset(ps2_reset, &s->common);

    return s;

}

hw/slavio_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ void slavio_serial_ms_kbd_init(int base, int irq) 
    slavio_serial_io_memory = cpu_register_io_memory(0, slavio_serial_mem_read, slavio_serial_mem_write, s);

    cpu_register_physical_memory(base, SERIAL_MAXADDR, slavio_serial_io_memory);



    qemu_add_mouse_event_handler(sunmouse_event, &s->chn[0], 0);

    qemu_add_mouse_event_handler(sunmouse_event, &s->chn[0], 0, "QEMU Sun Mouse");

    qemu_add_kbd_event_handler(sunkbd_event, &s->chn[1]);

    qemu_register_reset(slavio_serial_reset, s);

    slavio_serial_reset(s);

hw/usb-hid.c

+6 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ typedef struct USBMouseState { 
    int x, y;

    int kind;

    int mouse_grabbed;

    QEMUPutMouseEntry *eh_entry;

} USBMouseState;



/* mostly the same values as the Bochs USB Mouse device */
@@ -259,7 +260,8 @@ static int usb_mouse_poll(USBMouseState *s, uint8_t *buf, int len) 
    int dx, dy, dz, b, l;



    if (!s->mouse_grabbed) {

	qemu_add_mouse_event_handler(usb_mouse_event, s, 0);

	s->eh_entry = qemu_add_mouse_event_handler(usb_mouse_event, s,

                                                  0, "QEMU USB Mouse");

	s->mouse_grabbed = 1;

    }
@@ -295,7 +297,8 @@ static int usb_tablet_poll(USBMouseState *s, uint8_t *buf, int len) 
    int dz, b, l;



    if (!s->mouse_grabbed) {

	qemu_add_mouse_event_handler(usb_tablet_event, s, 1);

	s->eh_entry = qemu_add_mouse_event_handler(usb_tablet_event, s,

                                                  1, "QEMU USB Tablet");

	s->mouse_grabbed = 1;

    }
@@ -503,7 +506,7 @@ static void usb_mouse_handle_destroy(USBDevice *dev) 
{

    USBMouseState *s = (USBMouseState *)dev;



    qemu_add_mouse_event_handler(NULL, NULL, 0);

    qemu_remove_mouse_event_handler(s->eh_entry);

    qemu_free(s);

}

monitor.c

+4 −0
Original line number Diff line number Diff line
@@ -1241,6 +1241,8 @@ static term_cmd_t term_cmds[] = { 
      "dx dy [dz]", "send mouse move events" },

    { "mouse_button", "i", do_mouse_button, 

      "state", "change mouse button state (1=L, 2=M, 4=R)" },

    { "mouse_set", "i", do_mouse_set,

      "index", "set which mouse device receives events" },

#ifdef HAS_AUDIO

    { "wavcapture", "si?i?i?", do_wav_capture,

      "path [frequency bits channels]",
@@ -1292,6 +1294,8 @@ static term_cmd_t info_cmds[] = { 
      "", "show capture information" },

    { "snapshots", "", do_info_snapshots,

      "", "show the currently saved VM snapshots" },

    { "mice", "", do_info_mice,

      "", "show which guest mouse is receiving events" },

    { NULL, NULL, },

};