From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 6/8] input-linux: factor out input_linux_handle_mouse
Date: Tue, 12 Jul 2016 10:21:41 +0200 [thread overview]
Message-ID: <1468311703-27209-7-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1468311703-27209-1-git-send-email-kraxel@redhat.com>
No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1466067800-25434-2-git-send-email-kraxel@redhat.com
---
ui/input-linux.c | 102 +++++++++++++++++++++++++++++--------------------------
1 file changed, 53 insertions(+), 49 deletions(-)
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 1d33b5c..a932290 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -265,6 +265,58 @@ static void input_linux_event_mouse_button(int button)
qemu_input_event_sync();
}
+static void input_linux_handle_mouse(InputLinux *il, struct input_event *event)
+{
+ if (!il->grab_active) {
+ return;
+ }
+
+ switch (event->type) {
+ case EV_KEY:
+ switch (event->code) {
+ case BTN_LEFT:
+ qemu_input_queue_btn(NULL, INPUT_BUTTON_LEFT, event->value);
+ break;
+ case BTN_RIGHT:
+ qemu_input_queue_btn(NULL, INPUT_BUTTON_RIGHT, event->value);
+ break;
+ case BTN_MIDDLE:
+ qemu_input_queue_btn(NULL, INPUT_BUTTON_MIDDLE, event->value);
+ break;
+ case BTN_GEAR_UP:
+ qemu_input_queue_btn(NULL, INPUT_BUTTON_WHEEL_UP, event->value);
+ break;
+ case BTN_GEAR_DOWN:
+ qemu_input_queue_btn(NULL, INPUT_BUTTON_WHEEL_DOWN,
+ event->value);
+ break;
+ };
+ break;
+ case EV_REL:
+ switch (event->code) {
+ case REL_X:
+ qemu_input_queue_rel(NULL, INPUT_AXIS_X, event->value);
+ break;
+ case REL_Y:
+ qemu_input_queue_rel(NULL, INPUT_AXIS_Y, event->value);
+ break;
+ case REL_WHEEL:
+ il->wheel = event->value;
+ break;
+ }
+ break;
+ case EV_SYN:
+ qemu_input_event_sync();
+ if (il->wheel != 0) {
+ input_linux_event_mouse_button((il->wheel > 0)
+ ? INPUT_BUTTON_WHEEL_UP
+ : INPUT_BUTTON_WHEEL_DOWN);
+ il->wheel = 0;
+ }
+ break;
+ }
+}
+
static void input_linux_event_mouse(void *opaque)
{
InputLinux *il = opaque;
@@ -282,55 +334,7 @@ static void input_linux_event_mouse(void *opaque)
break;
}
- /* only send event to guest when grab is active */
- if (!il->grab_active) {
- continue;
- }
-
- switch (event.type) {
- case EV_KEY:
- switch (event.code) {
- case BTN_LEFT:
- qemu_input_queue_btn(NULL, INPUT_BUTTON_LEFT, event.value);
- break;
- case BTN_RIGHT:
- qemu_input_queue_btn(NULL, INPUT_BUTTON_RIGHT, event.value);
- break;
- case BTN_MIDDLE:
- qemu_input_queue_btn(NULL, INPUT_BUTTON_MIDDLE, event.value);
- break;
- case BTN_GEAR_UP:
- qemu_input_queue_btn(NULL, INPUT_BUTTON_WHEEL_UP, event.value);
- break;
- case BTN_GEAR_DOWN:
- qemu_input_queue_btn(NULL, INPUT_BUTTON_WHEEL_DOWN,
- event.value);
- break;
- };
- break;
- case EV_REL:
- switch (event.code) {
- case REL_X:
- qemu_input_queue_rel(NULL, INPUT_AXIS_X, event.value);
- break;
- case REL_Y:
- qemu_input_queue_rel(NULL, INPUT_AXIS_Y, event.value);
- break;
- case REL_WHEEL:
- il->wheel = event.value;
- break;
- }
- break;
- case EV_SYN:
- qemu_input_event_sync();
- if (il->wheel != 0) {
- input_linux_event_mouse_button((il->wheel > 0)
- ? INPUT_BUTTON_WHEEL_UP
- : INPUT_BUTTON_WHEEL_DOWN);
- il->wheel = 0;
- }
- break;
- }
+ input_linux_handle_mouse(il, &event);
}
}
--
1.8.3.1
next prev parent reply other threads:[~2016-07-12 8:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-12 8:21 [Qemu-devel] [PULL 0/8] input patch queue Gerd Hoffmann
2016-07-12 8:21 ` [Qemu-devel] [PULL 1/8] msmouse: add MouseState, unregister handler on close Gerd Hoffmann
2016-07-12 8:21 ` [Qemu-devel] [PULL 2/8] msmouse: fix buffer handling Gerd Hoffmann
2016-07-12 8:21 ` [Qemu-devel] [PULL 3/8] msmouse: switch to new input interface Gerd Hoffmann
2016-07-12 8:21 ` [Qemu-devel] [PULL 4/8] msmouse: send short messages if possible Gerd Hoffmann
2016-07-12 8:21 ` [Qemu-devel] [PULL 5/8] input: add trace events for full queues Gerd Hoffmann
2016-07-12 8:21 ` Gerd Hoffmann [this message]
2016-07-12 8:21 ` [Qemu-devel] [PULL 7/8] input-linux: factor out input_linux_handle_keyboard Gerd Hoffmann
2016-07-12 8:21 ` [Qemu-devel] [PULL 8/8] input-linux: better capability checks, merge input_linux_event_{mouse, keyboard} Gerd Hoffmann
2016-07-12 11:03 ` [Qemu-devel] [PULL 0/8] input patch queue Peter Maydell
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=1468311703-27209-7-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.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).