Add notifier for mouse mode changes
Right now, DisplayState clients rely on polling the mouse mode to determine when the device is changed to an absolute device. Use a notification list to add an explicit notification. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
eb2e259d95
commit
7e581fb3b1
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
#include "qemu-char.h"
|
#include "qemu-char.h"
|
||||||
#include "qdict.h"
|
#include "qdict.h"
|
||||||
|
#include "notify.h"
|
||||||
|
|
||||||
/* keyboard/mouse support */
|
/* keyboard/mouse support */
|
||||||
|
|
||||||
|
@ -56,6 +57,8 @@ void kbd_mouse_event(int dx, int dy, int dz, int buttons_state);
|
||||||
|
|
||||||
/* Does the current mouse generate absolute events */
|
/* Does the current mouse generate absolute events */
|
||||||
int kbd_mouse_is_absolute(void);
|
int kbd_mouse_is_absolute(void);
|
||||||
|
void qemu_add_mouse_mode_change_notifier(Notifier *notify);
|
||||||
|
void qemu_remove_mouse_mode_change_notifier(Notifier *notify);
|
||||||
|
|
||||||
/* Of all the mice, is there one that generates absolute events */
|
/* Of all the mice, is there one that generates absolute events */
|
||||||
int kbd_mouse_has_absolute(void);
|
int kbd_mouse_has_absolute(void);
|
||||||
|
|
37
input.c
37
input.c
|
@ -28,12 +28,13 @@
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
#include "qjson.h"
|
#include "qjson.h"
|
||||||
|
|
||||||
|
|
||||||
static QEMUPutKBDEvent *qemu_put_kbd_event;
|
static QEMUPutKBDEvent *qemu_put_kbd_event;
|
||||||
static void *qemu_put_kbd_event_opaque;
|
static void *qemu_put_kbd_event_opaque;
|
||||||
static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers = QTAILQ_HEAD_INITIALIZER(led_handlers);
|
static QTAILQ_HEAD(, QEMUPutLEDEntry) led_handlers = QTAILQ_HEAD_INITIALIZER(led_handlers);
|
||||||
static QTAILQ_HEAD(, QEMUPutMouseEntry) mouse_handlers =
|
static QTAILQ_HEAD(, QEMUPutMouseEntry) mouse_handlers =
|
||||||
QTAILQ_HEAD_INITIALIZER(mouse_handlers);
|
QTAILQ_HEAD_INITIALIZER(mouse_handlers);
|
||||||
|
static NotifierList mouse_mode_notifiers =
|
||||||
|
NOTIFIER_LIST_INITIALIZER(mouse_mode_notifiers);
|
||||||
|
|
||||||
void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)
|
void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)
|
||||||
{
|
{
|
||||||
|
@ -41,6 +42,24 @@ void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)
|
||||||
qemu_put_kbd_event = func;
|
qemu_put_kbd_event = func;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void check_mode_change(void)
|
||||||
|
{
|
||||||
|
static int current_is_absolute, current_has_absolute;
|
||||||
|
int is_absolute;
|
||||||
|
int has_absolute;
|
||||||
|
|
||||||
|
is_absolute = kbd_mouse_is_absolute();
|
||||||
|
has_absolute = kbd_mouse_has_absolute();
|
||||||
|
|
||||||
|
if (is_absolute != current_is_absolute ||
|
||||||
|
has_absolute != current_has_absolute) {
|
||||||
|
notifier_list_notify(&mouse_mode_notifiers);
|
||||||
|
}
|
||||||
|
|
||||||
|
current_is_absolute = is_absolute;
|
||||||
|
current_has_absolute = has_absolute;
|
||||||
|
}
|
||||||
|
|
||||||
QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
|
QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
|
||||||
void *opaque, int absolute,
|
void *opaque, int absolute,
|
||||||
const char *name)
|
const char *name)
|
||||||
|
@ -58,6 +77,8 @@ QEMUPutMouseEntry *qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
|
||||||
|
|
||||||
QTAILQ_INSERT_TAIL(&mouse_handlers, s, node);
|
QTAILQ_INSERT_TAIL(&mouse_handlers, s, node);
|
||||||
|
|
||||||
|
check_mode_change();
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -75,6 +96,8 @@ void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry)
|
||||||
|
|
||||||
qemu_free(entry->qemu_put_mouse_event_name);
|
qemu_free(entry->qemu_put_mouse_event_name);
|
||||||
qemu_free(entry);
|
qemu_free(entry);
|
||||||
|
|
||||||
|
check_mode_change();
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func,
|
QEMUPutLEDEntry *qemu_add_led_event_handler(QEMUPutLEDEvent *func,
|
||||||
|
@ -256,4 +279,16 @@ void do_mouse_set(Monitor *mon, const QDict *qdict)
|
||||||
if (!found) {
|
if (!found) {
|
||||||
monitor_printf(mon, "Mouse at given index not found\n");
|
monitor_printf(mon, "Mouse at given index not found\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
check_mode_change();
|
||||||
|
}
|
||||||
|
|
||||||
|
void qemu_add_mouse_mode_change_notifier(Notifier *notify)
|
||||||
|
{
|
||||||
|
notifier_list_add(&mouse_mode_notifiers, notify);
|
||||||
|
}
|
||||||
|
|
||||||
|
void qemu_remove_mouse_mode_change_notifier(Notifier *notify)
|
||||||
|
{
|
||||||
|
notifier_list_remove(&mouse_mode_notifiers, notify);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue