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 17/42] input: keyboard: switch spice ui to new core
Date: Mon, 16 Dec 2013 11:48:53 +0100 [thread overview]
Message-ID: <1387190958-19470-18-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1387190958-19470-1-git-send-email-kraxel@redhat.com>
---
ui/spice-input.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/ui/spice-input.c b/ui/spice-input.c
index 3beb8de..c9df699 100644
--- a/ui/spice-input.c
+++ b/ui/spice-input.c
@@ -26,12 +26,15 @@
#include "qemu-common.h"
#include "ui/qemu-spice.h"
#include "ui/console.h"
+#include "ui/keymaps.h"
+#include "ui/input.h"
/* keyboard bits */
typedef struct QemuSpiceKbd {
SpiceKbdInstance sin;
int ledstate;
+ bool emul0;
} QemuSpiceKbd;
static void kbd_push_key(SpiceKbdInstance *sin, uint8_t frag);
@@ -47,9 +50,24 @@ static const SpiceKbdInterface kbd_interface = {
.get_leds = kbd_get_leds,
};
-static void kbd_push_key(SpiceKbdInstance *sin, uint8_t frag)
+static void kbd_push_key(SpiceKbdInstance *sin, uint8_t scancode)
{
- kbd_put_keycode(frag);
+ QemuSpiceKbd *kbd = container_of(sin, QemuSpiceKbd, sin);
+ int keycode;
+ bool up;
+
+ if (scancode == SCANCODE_EMUL0) {
+ kbd->emul0 = true;
+ return;
+ }
+ keycode = scancode & ~SCANCODE_UP;
+ up = scancode & SCANCODE_UP;
+ if (kbd->emul0) {
+ kbd->emul0 = false;
+ keycode |= SCANCODE_GREY;
+ }
+
+ qemu_input_event_send_key_number(NULL, keycode, !up);
}
static uint8_t kbd_get_leds(SpiceKbdInstance *sin)
--
1.8.3.1
next prev parent reply other threads:[~2013-12-16 10:50 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-16 10:48 [Qemu-devel] [PATCH 00/42] rework input handling, sdl2 support Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 01/42] ui/sdl2 : initial port to SDL 2.0 (v2.0) Gerd Hoffmann
2013-12-16 22:12 ` Stefan Weil
2013-12-16 22:18 ` Dave Airlie
2013-12-17 11:16 ` Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 02/42] sdl2: baum build fix Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 03/42] sdl2: remove text console logic Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 04/42] console: export QemuConsole index, width, height Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 05/42] input: rename file to legacy Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 06/42] input: qapi: define event types Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 07/42] input: qapi: add unmapped key Gerd Hoffmann
2013-12-17 21:06 ` Eric Blake
2013-12-16 10:48 ` [Qemu-devel] [PATCH 08/42] input: qapi: add pause key Gerd Hoffmann
2013-12-17 21:06 ` Eric Blake
2013-12-16 10:48 ` [Qemu-devel] [PATCH 09/42] input: add core bits of the new input layer Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 10/42] input: keyboard: add helper functions to core Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 11/42] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 12/42] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 13/42] input: keyboard: switch gtk ui " Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 14/42] input: keyboard: switch sdl " Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 15/42] sdl2: switch keyboard handling " Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 16/42] input: keyboard: switch vnc ui " Gerd Hoffmann
2013-12-16 10:48 ` Gerd Hoffmann [this message]
2013-12-16 10:48 ` [Qemu-devel] [PATCH 18/42] input: keyboard: switch curses " Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 19/42] input: mouse: add helpers functions to core Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 20/42] input: mouse: add graphic_rotate support Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 21/42] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 22/42] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2013-12-16 10:48 ` [Qemu-devel] [PATCH 23/42] input: mouse: switch gtk ui " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 24/42] input: mouse: switch sdl " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 25/42] sdl2: switch mouse handling " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 26/42] input: mouse: switch vnc ui " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 27/42] input: mouse: switch spice " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 28/42] input: mouse: switch monitor " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 29/42] input: keyboard: switch cocoa ui to new core [untested] Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 30/42] input: mouse: " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 31/42] input: trace events Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 32/42] input-legacy: remove kbd_put_keycode Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 33/42] input-legacy: remove kbd_mouse_has_absolute Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 34/42] input-legacy: remove kbd_mouse_is_absolute Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 35/42] input-legacy: remove kbd_mouse_event Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 36/42] input: move mouse mode notifier to new core Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 37/42] input: add input_mouse_mode tracepoint Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 38/42] sdl2: simplify keymap handling Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 39/42] sdl2: codestyle fixups Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 40/42] input: move qmp_query_mice to new core Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 41/42] input: move do_mouse_set " Gerd Hoffmann
2013-12-16 10:49 ` [Qemu-devel] [PATCH 42/42] input: remove index_from_keycode (no users) Gerd Hoffmann
-- strict thread matches above, loose matches on Subject: below --
2014-01-28 9:56 [Qemu-devel] [PULL 00/42] rework input handling, sdl2 support Gerd Hoffmann
2014-01-28 9:57 ` [Qemu-devel] [PATCH 17/42] input: keyboard: switch spice ui to new core 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=1387190958-19470-18-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).