qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PATCH 19/44] input: mouse: add helpers functions to core
Date: Mon, 24 Feb 2014 12:52:26 +0100	[thread overview]
Message-ID: <1393242771-28076-20-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1393242771-28076-1-git-send-email-kraxel@redhat.com>

Likewise a bunch of helper functions to manage mouse button
and movement events, again to make life easier for the ui code.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/ui/input.h | 14 +++++++++++
 ui/input.c         | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/include/ui/input.h b/include/ui/input.h
index 189f131..c6f50c2 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -8,6 +8,8 @@
 #define INPUT_EVENT_MASK_REL   (1<<INPUT_EVENT_KIND_REL)
 #define INPUT_EVENT_MASK_ABS   (1<<INPUT_EVENT_KIND_ABS)
 
+#define INPUT_EVENT_ABS_SIZE   0x8000
+
 typedef struct QemuInputHandler QemuInputHandler;
 typedef struct QemuInputHandlerState QemuInputHandlerState;
 
@@ -34,4 +36,16 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down);
 void qemu_input_event_send_key_number(QemuConsole *src, int num, bool down);
 void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down);
 
+InputEvent *qemu_input_event_new_btn(InputButton btn, bool down);
+void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down);
+void qemu_input_update_buttons(QemuConsole *src, uint32_t *button_map,
+                               uint32_t button_old, uint32_t button_new);
+
+int qemu_input_scale_axis(int value, int size_in, int size_out);
+InputEvent *qemu_input_event_new_move(InputEventKind kind,
+                                      InputAxis axis, int value);
+void qemu_input_queue_rel(QemuConsole *src, InputAxis axis, int value);
+void qemu_input_queue_abs(QemuConsole *src, InputAxis axis,
+                          int value, int size);
+
 #endif /* INPUT_H */
diff --git a/ui/input.c b/ui/input.c
index 61c8089..a02172e 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -116,3 +116,74 @@ void qemu_input_event_send_key_qcode(QemuConsole *src, QKeyCode q, bool down)
     key->qcode = q;
     qemu_input_event_send_key(src, key, down);
 }
+
+InputEvent *qemu_input_event_new_btn(InputButton btn, bool down)
+{
+    InputEvent *evt = g_new0(InputEvent, 1);
+    evt->btn = g_new0(InputBtnEvent, 1);
+    evt->kind = INPUT_EVENT_KIND_BTN;
+    evt->btn->button = btn;
+    evt->btn->down = down;
+    return evt;
+}
+
+void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down)
+{
+    InputEvent *evt;
+    evt = qemu_input_event_new_btn(btn, down);
+    qemu_input_event_send(src, evt);
+    qapi_free_InputEvent(evt);
+}
+
+void qemu_input_update_buttons(QemuConsole *src, uint32_t *button_map,
+                               uint32_t button_old, uint32_t button_new)
+{
+    InputButton btn;
+    uint32_t mask;
+
+    for (btn = 0; btn < INPUT_BUTTON_MAX; btn++) {
+        mask = button_map[btn];
+        if ((button_old & mask) == (button_new & mask)) {
+            continue;
+        }
+        qemu_input_queue_btn(src, btn, button_new & mask);
+    }
+}
+
+int qemu_input_scale_axis(int value, int size_in, int size_out)
+{
+    if (size_in < 2) {
+        return size_out / 2;
+    }
+    return (int64_t)value * (size_out - 1) / (size_in - 1);
+}
+
+InputEvent *qemu_input_event_new_move(InputEventKind kind,
+                                      InputAxis axis, int value)
+{
+    InputEvent *evt = g_new0(InputEvent, 1);
+    InputMoveEvent *move = g_new0(InputMoveEvent, 1);
+
+    evt->kind = kind;
+    evt->data = move;
+    move->axis = axis;
+    move->value = value;
+    return evt;
+}
+
+void qemu_input_queue_rel(QemuConsole *src, InputAxis axis, int value)
+{
+    InputEvent *evt;
+    evt = qemu_input_event_new_move(INPUT_EVENT_KIND_REL, axis, value);
+    qemu_input_event_send(src, evt);
+    qapi_free_InputEvent(evt);
+}
+
+void qemu_input_queue_abs(QemuConsole *src, InputAxis axis, int value, int size)
+{
+    InputEvent *evt;
+    int scaled = qemu_input_scale_axis(value, size, INPUT_EVENT_ABS_SIZE);
+    evt = qemu_input_event_new_move(INPUT_EVENT_KIND_ABS, axis, scaled);
+    qemu_input_event_send(src, evt);
+    qapi_free_InputEvent(evt);
+}
-- 
1.8.3.1

  parent reply	other threads:[~2014-02-24 11:53 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-24 11:52 [Qemu-devel] [PULL v2 00/44] rework input handling, sdl2 support Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 01/44] ui/sdl2 : initial port to SDL 2.0 (v2.0) Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 02/44] sdl2: baum build fix Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 03/44] sdl2: remove text console logic Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 04/44] console: export QemuConsole index, width, height Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 05/44] input: rename file to legacy Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 06/44] input: qapi: define event types Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 07/44] input: qapi: add unmapped key Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 08/44] input: qapi: add pause key Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 09/44] input: add core bits of the new input layer Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 10/44] input: keyboard: add helper functions to core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 11/44] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 12/44] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 13/44] input: keyboard: switch gtk ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 14/44] input: keyboard: switch sdl " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 15/44] sdl2: switch keyboard handling " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 16/44] input: keyboard: switch vnc ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 17/44] input: keyboard: switch spice " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 18/44] input: keyboard: switch curses " Gerd Hoffmann
2014-02-24 11:52 ` Gerd Hoffmann [this message]
2014-02-24 11:52 ` [Qemu-devel] [PATCH 20/44] input: mouse: add graphic_rotate support Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 21/44] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 22/44] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 23/44] input: mouse: switch gtk ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 24/44] input: mouse: switch sdl " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 25/44] sdl2: switch mouse handling " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 26/44] input: mouse: switch vnc ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 27/44] input: mouse: switch spice " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 28/44] input: mouse: switch monitor " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 29/44] input: keyboard: switch cocoa ui " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 30/44] input: mouse: " Gerd Hoffmann
2014-02-24 12:01   ` Andreas Färber
2014-02-24 11:52 ` [Qemu-devel] [PATCH 31/44] input: trace events Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 32/44] input-legacy: remove kbd_put_keycode Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 33/44] input-legacy: remove kbd_mouse_has_absolute Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 34/44] input-legacy: remove kbd_mouse_is_absolute Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 35/44] input-legacy: remove kbd_mouse_event Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 36/44] input: move mouse mode notifier to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 37/44] input: add input_mouse_mode tracepoint Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 38/44] sdl2: simplify keymap handling Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 39/44] sdl2: codestyle fixups Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 40/44] input: move qmp_query_mice to new core Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 41/44] input: move do_mouse_set " Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 42/44] input: remove index_from_keycode (no users) Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 43/44] console: add head to index to qemu consoles Gerd Hoffmann
2014-02-24 11:52 ` [Qemu-devel] [PATCH 44/44] console: add QemuUIInfo Gerd Hoffmann
2014-02-26 20:06 ` [Qemu-devel] [PULL v2 00/44] rework input handling, sdl2 support Peter Maydell
2014-02-27 13:19   ` Gerd Hoffmann
2014-02-27 13:30     ` Peter Maydell
2014-02-27 14:06       ` Gerd Hoffmann
2014-02-27 13:55     ` Eric Blake
2014-02-27 14:04       ` Gerd Hoffmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1393242771-28076-20-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=aliguori@amazon.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).