[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 14/38] input: keyboard: switch curses ui to new co
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v4 14/38] input: keyboard: switch curses ui to new core |
Date: |
Wed, 5 Mar 2014 12:53:16 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/curses.c | 47 +++++++++++++++++++++++++----------------------
1 file changed, 25 insertions(+), 22 deletions(-)
diff --git a/ui/curses.c b/ui/curses.c
index dbc3d5e..b044790 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -30,6 +30,7 @@
#include "qemu-common.h"
#include "ui/console.h"
+#include "ui/input.h"
#include "sysemu/sysemu.h"
#define FONT_HEIGHT 16
@@ -274,32 +275,34 @@ static void curses_refresh(DisplayChangeListener *dcl)
if (qemu_console_is_graphic(NULL)) {
/* since terminals don't know about key press and release
* events, we need to emit both for each key received */
- if (keycode & SHIFT)
- kbd_put_keycode(SHIFT_CODE);
- if (keycode & CNTRL)
- kbd_put_keycode(CNTRL_CODE);
- if (keycode & ALT)
- kbd_put_keycode(ALT_CODE);
+ if (keycode & SHIFT) {
+ qemu_input_event_send_key_number(NULL, SHIFT_CODE, true);
+ }
+ if (keycode & CNTRL) {
+ qemu_input_event_send_key_number(NULL, CNTRL_CODE, true);
+ }
+ if (keycode & ALT) {
+ qemu_input_event_send_key_number(NULL, ALT_CODE, true);
+ }
if (keycode & ALTGR) {
- kbd_put_keycode(SCANCODE_EMUL0);
- kbd_put_keycode(ALT_CODE);
+ qemu_input_event_send_key_number(NULL, GREY | ALT_CODE, true);
}
- if (keycode & GREY)
- kbd_put_keycode(GREY_CODE);
- kbd_put_keycode(keycode & KEY_MASK);
- if (keycode & GREY)
- kbd_put_keycode(GREY_CODE);
- kbd_put_keycode((keycode & KEY_MASK) | KEY_RELEASE);
+
+ qemu_input_event_send_key_number(NULL, keycode, true);
+ qemu_input_event_send_key_number(NULL, keycode, false);
+
if (keycode & ALTGR) {
- kbd_put_keycode(SCANCODE_EMUL0);
- kbd_put_keycode(ALT_CODE | KEY_RELEASE);
+ qemu_input_event_send_key_number(NULL, GREY | ALT_CODE, false);
+ }
+ if (keycode & ALT) {
+ qemu_input_event_send_key_number(NULL, ALT_CODE, false);
+ }
+ if (keycode & CNTRL) {
+ qemu_input_event_send_key_number(NULL, CNTRL_CODE, false);
+ }
+ if (keycode & SHIFT) {
+ qemu_input_event_send_key_number(NULL, SHIFT_CODE, false);
}
- if (keycode & ALT)
- kbd_put_keycode(ALT_CODE | KEY_RELEASE);
- if (keycode & CNTRL)
- kbd_put_keycode(CNTRL_CODE | KEY_RELEASE);
- if (keycode & SHIFT)
- kbd_put_keycode(SHIFT_CODE | KEY_RELEASE);
} else {
keysym = curses2qemu[chr];
if (keysym == -1)
--
1.8.3.1
- [Qemu-devel] [PULL v4 00/38] rework input handling, sdl2 support, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 03/38] input: qapi: define event types, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 02/38] input: rename file to legacy, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 05/38] input: qapi: add pause key, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 18/38] input: mouse: switch legacy handlers to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 01/38] console: export QemuConsole index, width, height, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 09/38] input: keyboard: switch qmp_send_key() to new core., Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 35/38] input: remove index_from_keycode (no users), Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 08/38] input: keyboard: switch legacy handlers to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 16/38] input: mouse: add graphic_rotate support, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 14/38] input: keyboard: switch curses ui to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v4 11/38] input: keyboard: switch sdl ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 33/38] input: move qmp_query_mice to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 21/38] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 32/38] input: add input_mouse_mode tracepoint, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 04/38] input: qapi: add unmapped key, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 29/38] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 23/38] input: mouse: switch monitor to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 24/38] input: keyboard: switch cocoa ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 22/38] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 10/38] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2014/03/05