diff mbox

[PULL,v4,28/38] input-legacy: remove kbd_mouse_has_absolute

Message ID 1394020420-17576-29-git-send-email-kraxel@redhat.com
State New
Headers show

Commit Message

Gerd Hoffmann March 5, 2014, 11:53 a.m. UTC
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/ui/console.h |  3 ---
 ui/input-legacy.c    | 21 ++-------------------
 2 files changed, 2 insertions(+), 22 deletions(-)
diff mbox

Patch

diff --git a/include/ui/console.h b/include/ui/console.h
index c7f4e4f..53e956d 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -54,9 +54,6 @@  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 */
-int kbd_mouse_has_absolute(void);
-
 struct MouseTransformInfo {
     /* Touchscreen resolution */
     int x;
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 3ac30e2..22796fa 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -366,20 +366,16 @@  void qemu_remove_kbd_event_handler(QEMUPutKbdEntry *entry)
 
 static void check_mode_change(void)
 {
-    static int current_is_absolute, current_has_absolute;
+    static int current_is_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) {
+    if (is_absolute != current_is_absolute) {
         notifier_list_notify(&mouse_mode_notifiers, NULL);
     }
 
     current_is_absolute = is_absolute;
-    current_has_absolute = has_absolute;
 }
 
 static void legacy_mouse_event(DeviceState *dev, QemuConsole *src,
@@ -567,19 +563,6 @@  int kbd_mouse_is_absolute(void)
     return QTAILQ_FIRST(&mouse_handlers)->qemu_put_mouse_event_absolute;
 }
 
-int kbd_mouse_has_absolute(void)
-{
-    QEMUPutMouseEntry *entry;
-
-    QTAILQ_FOREACH(entry, &mouse_handlers, node) {
-        if (entry->qemu_put_mouse_event_absolute) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 MouseInfoList *qmp_query_mice(Error **errp)
 {
     MouseInfoList *mice_list = NULL;