From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Dave Airlie <airlied@gmail.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [RFC PATCH 10/15] input: mouse: add helpers functions to core
Date: Thu, 28 Nov 2013 15:30:05 +0100 [thread overview]
Message-ID: <1385649010-7034-11-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1385649010-7034-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 12a964c..0d79342 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;
@@ -32,4 +34,16 @@ void qemu_input_event_sync(void);
InputEvent *qemu_input_event_new_key(int keycode, bool down);
void qemu_input_event_send_key(QemuConsole *src, int keycode, 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 284bd1f..fa6d677 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -100,3 +100,74 @@ void qemu_input_event_send_key(QemuConsole *src, int keycode, bool down)
qemu_input_event_sync();
qapi_free_InputEvent(evt);
}
+
+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
next prev parent reply other threads:[~2013-11-28 14:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-28 14:29 [Qemu-devel] [RFC PATCH 00/15] input: rewrite qemu input layer Gerd Hoffmann
2013-11-28 14:29 ` [Qemu-devel] [RFC PATCH 01/15] console: export QemuConsole index, width, height Gerd Hoffmann
2013-11-28 14:29 ` [Qemu-devel] [RFC PATCH 02/15] input: rename file to legacy Gerd Hoffmann
2013-11-28 14:29 ` [Qemu-devel] [RFC PATCH 03/15] input: define event types using qapi Gerd Hoffmann
2013-12-02 19:12 ` Eric Blake
2013-12-03 8:11 ` Gerd Hoffmann
2013-11-28 14:29 ` [Qemu-devel] [RFC PATCH 04/15] input: add core bits of the new input layer Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 05/15] input: keyboard: add helper functions to core Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 06/15] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 07/15] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 08/15] input: keyboard: switch gtk ui " Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 09/15] input: keyboard: switch sdl ui to new core [wip] Gerd Hoffmann
2013-11-28 14:30 ` Gerd Hoffmann [this message]
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 11/15] input: mouse: add graphic_rotate support Gerd Hoffmann
2013-12-02 19:00 ` John Baboval
2013-12-03 8:58 ` Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 12/15] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2013-12-02 19:05 ` John Baboval
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 13/15] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 14/15] input: mouse: switch gtk ui " Gerd Hoffmann
2013-11-28 14:30 ` [Qemu-devel] [RFC PATCH 15/15] input: mouse: switch sdl " 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=1385649010-7034-11-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=airlied@gmail.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).