* [Qemu-devel] [PULL 0/9] Ui 20180222 patches
@ 2018-02-22 10:23 Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup Gerd Hoffmann
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
The following changes since commit a6e0344fa0e09413324835ae122c4cadd7890231:
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180220-pull-request' into staging (2018-02-20 14:05:00 +0000)
are available in the git repository at:
git://git.kraxel.org/qemu tags/ui-20180222-pull-request
for you to fetch changes up to abb4f2c9655503f14dc55064f29c4f59b07e96ff:
keymap: consider modifier state when picking a mapping (2018-02-22 10:35:32 +0100)
----------------------------------------------------------------
ui: reverse keymap improvements.
sdl2: hotkey fix.
opengl: dmabuf fixes.
----------------------------------------------------------------
Gerd Hoffmann (9):
sdl2: fix hotkey keyup
console/opengl: split up dpy_gl_cursor ops
egl-headless: cursor_dmabuf: handle NULL cursor
egl-helpers: add alpha channel to texture format
keymap: make struct kbd_layout_t private to ui/keymaps.c
keymap: use glib hash for kbd_layout_t
keymap: numpad keysyms and keycodes are fixed
keymap: record multiple keysym -> keycode mappings
keymap: consider modifier state when picking a mapping
include/ui/console.h | 13 ++--
ui/keymaps.h | 30 +++-------
ui/console.c | 18 ++++--
ui/curses.c | 3 +-
ui/egl-headless.c | 30 ++++++----
ui/egl-helpers.c | 2 +-
ui/keymaps.c | 163 ++++++++++++++++++++++++++-------------------------
ui/sdl.c | 6 +-
ui/sdl2.c | 14 +----
ui/vnc.c | 9 ++-
ui/trace-events | 2 +-
11 files changed, 151 insertions(+), 139 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops Gerd Hoffmann
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
After some hotkey was pressed sdl2 doesn't forward the first modifier
keyup event to the guest, resulting in stuck modifier keys.
Fix the logic in handle_keyup(). Also gui_key_modifier_pressed doesn't
need to be a global variable.
Reported-by: Howard Spoelstra <hsp.cat7@gmail.com>
Tested-by: Howard Spoelstra <hsp.cat7@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180220150444.784-1-kraxel@redhat.com
---
ui/sdl2.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 6e96a4a24c..b5a0fa1d13 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -39,7 +39,6 @@ static int gui_grab; /* if true, all keyboard/mouse events are grabbed */
static int gui_saved_grab;
static int gui_fullscreen;
-static int gui_key_modifier_pressed;
static int gui_keysym;
static int gui_grab_code = KMOD_LALT | KMOD_LCTRL;
static SDL_Cursor *sdl_cursor_normal;
@@ -331,8 +330,7 @@ static void handle_keydown(SDL_Event *ev)
{
int win;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);
-
- gui_key_modifier_pressed = get_mod_state();
+ int gui_key_modifier_pressed = get_mod_state();
if (!scon->ignore_hotkeys && gui_key_modifier_pressed && !ev->key.repeat) {
switch (ev->key.keysym.scancode) {
@@ -413,18 +411,12 @@ static void handle_keydown(SDL_Event *ev)
static void handle_keyup(SDL_Event *ev)
{
- int mod_state;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID);
+ int gui_key_modifier_pressed = get_mod_state();
scon->ignore_hotkeys = false;
- if (!alt_grab) {
- mod_state = (ev->key.keysym.mod & gui_grab_code);
- } else {
- mod_state = (ev->key.keysym.mod & (gui_grab_code | KMOD_LSHIFT));
- }
- if (!mod_state && gui_key_modifier_pressed) {
- gui_key_modifier_pressed = 0;
+ if (!gui_key_modifier_pressed) {
gui_keysym = 0;
}
if (!gui_keysym) {
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor Gerd Hoffmann
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Split the cursor callback into two, one for setting the dmabuf,
one for setting the position. Also add hotspot information.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180220110433.20353-2-kraxel@redhat.com
---
include/ui/console.h | 13 ++++++++-----
ui/console.c | 18 ++++++++++++++----
ui/egl-headless.c | 17 ++++++++++++-----
3 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index e6b1227bef..f29bacd625 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -230,8 +230,10 @@ typedef struct DisplayChangeListenerOps {
void (*dpy_gl_scanout_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf);
void (*dpy_gl_cursor_dmabuf)(DisplayChangeListener *dcl,
- QemuDmaBuf *dmabuf,
- uint32_t pos_x, uint32_t pos_y);
+ QemuDmaBuf *dmabuf, bool have_hot,
+ uint32_t hot_x, uint32_t hot_y);
+ void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl,
+ uint32_t pos_x, uint32_t pos_y);
void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf);
void (*dpy_gl_update)(DisplayChangeListener *dcl,
@@ -304,9 +306,10 @@ void dpy_gl_scanout_texture(QemuConsole *con,
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
void dpy_gl_scanout_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf);
-void dpy_gl_cursor_dmabuf(QemuConsole *con,
- QemuDmaBuf *dmabuf,
- uint32_t pos_x, uint32_t pos_y);
+void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,
+ bool have_hot, uint32_t hot_x, uint32_t hot_y);
+void dpy_gl_cursor_position(QemuConsole *con,
+ uint32_t pos_x, uint32_t pos_y);
void dpy_gl_release_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf);
void dpy_gl_update(QemuConsole *con,
diff --git a/ui/console.c b/ui/console.c
index 36584d039e..e22931a396 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1760,14 +1760,24 @@ void dpy_gl_scanout_dmabuf(QemuConsole *con,
con->gl->ops->dpy_gl_scanout_dmabuf(con->gl, dmabuf);
}
-void dpy_gl_cursor_dmabuf(QemuConsole *con,
- QemuDmaBuf *dmabuf,
- uint32_t pos_x, uint32_t pos_y)
+void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,
+ bool have_hot, uint32_t hot_x, uint32_t hot_y)
{
assert(con->gl);
if (con->gl->ops->dpy_gl_cursor_dmabuf) {
- con->gl->ops->dpy_gl_cursor_dmabuf(con->gl, dmabuf, pos_x, pos_y);
+ con->gl->ops->dpy_gl_cursor_dmabuf(con->gl, dmabuf,
+ have_hot, hot_x, hot_y);
+ }
+}
+
+void dpy_gl_cursor_position(QemuConsole *con,
+ uint32_t pos_x, uint32_t pos_y)
+{
+ assert(con->gl);
+
+ if (con->gl->ops->dpy_gl_cursor_position) {
+ con->gl->ops->dpy_gl_cursor_position(con->gl, pos_x, pos_y);
}
}
diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index 38b3766548..00ff2c036a 100644
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -84,14 +84,11 @@ static void egl_scanout_dmabuf(DisplayChangeListener *dcl,
}
static void egl_cursor_dmabuf(DisplayChangeListener *dcl,
- QemuDmaBuf *dmabuf,
- uint32_t pos_x, uint32_t pos_y)
+ QemuDmaBuf *dmabuf, bool have_hot,
+ uint32_t hot_x, uint32_t hot_y)
{
egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
- edpy->pos_x = pos_x;
- edpy->pos_y = pos_y;
-
egl_dmabuf_import_texture(dmabuf);
if (!dmabuf->texture) {
return;
@@ -101,6 +98,15 @@ static void egl_cursor_dmabuf(DisplayChangeListener *dcl,
dmabuf->texture, false);
}
+static void egl_cursor_position(DisplayChangeListener *dcl,
+ uint32_t pos_x, uint32_t pos_y)
+{
+ egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
+
+ edpy->pos_x = pos_x;
+ edpy->pos_y = pos_y;
+}
+
static void egl_release_dmabuf(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf)
{
@@ -150,6 +156,7 @@ static const DisplayChangeListenerOps egl_ops = {
.dpy_gl_scanout_texture = egl_scanout_texture,
.dpy_gl_scanout_dmabuf = egl_scanout_dmabuf,
.dpy_gl_cursor_dmabuf = egl_cursor_dmabuf,
+ .dpy_gl_cursor_position = egl_cursor_position,
.dpy_gl_release_dmabuf = egl_release_dmabuf,
.dpy_gl_update = egl_scanout_flush,
};
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format Gerd Hoffmann
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
The cursor dmabuf can be NULL, in case no cursor defined by the guest.
Happens for example when linux guests show the framebuffer console.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180220110433.20353-3-kraxel@redhat.com
---
ui/egl-headless.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index 00ff2c036a..b33e0b21fd 100644
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -89,13 +89,16 @@ static void egl_cursor_dmabuf(DisplayChangeListener *dcl,
{
egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
- egl_dmabuf_import_texture(dmabuf);
- if (!dmabuf->texture) {
- return;
+ if (dmabuf) {
+ egl_dmabuf_import_texture(dmabuf);
+ if (!dmabuf->texture) {
+ return;
+ }
+ egl_fb_setup_for_tex(&edpy->cursor_fb, dmabuf->width, dmabuf->height,
+ dmabuf->texture, false);
+ } else {
+ egl_fb_destroy(&edpy->cursor_fb);
}
-
- egl_fb_setup_for_tex(&edpy->cursor_fb, dmabuf->width, dmabuf->height,
- dmabuf->texture, false);
}
static void egl_cursor_position(DisplayChangeListener *dcl,
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (2 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c Gerd Hoffmann
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Needed when rendering cursers which (unlike framebuffers)
actually are transparent.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180220110433.20353-4-kraxel@redhat.com
---
ui/egl-helpers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 5fa60ef4e8..16dc3ded36 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -83,7 +83,7 @@ void egl_fb_setup_new_tex(egl_fb *fb, int width, int height)
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height,
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height,
0, GL_BGRA, GL_UNSIGNED_BYTE, 0);
egl_fb_setup_for_tex(fb, width, height, texture, true);
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (3 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t Gerd Hoffmann
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Also use kbd_layout_t pointers instead of void pointers.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-2-kraxel@redhat.com
---
ui/keymaps.h | 29 ++++++-----------------------
ui/keymaps.c | 32 +++++++++++++++++++++++++-------
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/ui/keymaps.h b/ui/keymaps.h
index 8757465529..17ec03387a 100644
--- a/ui/keymaps.h
+++ b/ui/keymaps.h
@@ -32,25 +32,6 @@ typedef struct {
int keysym;
} name2keysym_t;
-struct key_range {
- int start;
- int end;
- struct key_range *next;
-};
-
-#define MAX_NORMAL_KEYCODE 512
-#define MAX_EXTRA_COUNT 256
-typedef struct {
- uint16_t keysym2keycode[MAX_NORMAL_KEYCODE];
- struct {
- int keysym;
- uint16_t keycode;
- } keysym2keycode_extra[MAX_EXTRA_COUNT];
- int extra_count;
- struct key_range *keypad_range;
- struct key_range *numlock_range;
-} kbd_layout_t;
-
/* scancode without modifiers */
#define SCANCODE_KEYMASK 0xff
/* scancode without grey or up bit */
@@ -69,10 +50,12 @@ typedef struct {
#define SCANCODE_ALT 0x400
#define SCANCODE_ALTGR 0x800
+typedef struct kbd_layout_t kbd_layout_t;
-void *init_keyboard_layout(const name2keysym_t *table, const char *language);
-int keysym2scancode(void *kbd_layout, int keysym);
-int keycode_is_keypad(void *kbd_layout, int keycode);
-int keysym_is_numlock(void *kbd_layout, int keysym);
+kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
+ const char *language);
+int keysym2scancode(kbd_layout_t *k, int keysym);
+int keycode_is_keypad(kbd_layout_t *k, int keycode);
+int keysym_is_numlock(kbd_layout_t *k, int keysym);
#endif /* QEMU_KEYMAPS_H */
diff --git a/ui/keymaps.c b/ui/keymaps.c
index f9762d1497..134958a197 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -28,6 +28,26 @@
#include "trace.h"
#include "qemu/error-report.h"
+#define MAX_NORMAL_KEYCODE 512
+#define MAX_EXTRA_COUNT 256
+
+struct key_range {
+ int start;
+ int end;
+ struct key_range *next;
+};
+
+struct kbd_layout_t {
+ uint16_t keysym2keycode[MAX_NORMAL_KEYCODE];
+ struct {
+ int keysym;
+ uint16_t keycode;
+ } keysym2keycode_extra[MAX_EXTRA_COUNT];
+ int extra_count;
+ struct key_range *keypad_range;
+ struct key_range *numlock_range;
+};
+
static int get_keysym(const name2keysym_t *table,
const char *name)
{
@@ -186,15 +206,15 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
}
-void *init_keyboard_layout(const name2keysym_t *table, const char *language)
+kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
+ const char *language)
{
return parse_keyboard_layout(table, language, NULL);
}
-int keysym2scancode(void *kbd_layout, int keysym)
+int keysym2scancode(kbd_layout_t *k, int keysym)
{
- kbd_layout_t *k = kbd_layout;
if (keysym < MAX_NORMAL_KEYCODE) {
if (k->keysym2keycode[keysym] == 0) {
trace_keymap_unmapped(keysym);
@@ -217,9 +237,8 @@ int keysym2scancode(void *kbd_layout, int keysym)
return 0;
}
-int keycode_is_keypad(void *kbd_layout, int keycode)
+int keycode_is_keypad(kbd_layout_t *k, int keycode)
{
- kbd_layout_t *k = kbd_layout;
struct key_range *kr;
for (kr = k->keypad_range; kr; kr = kr->next) {
@@ -230,9 +249,8 @@ int keycode_is_keypad(void *kbd_layout, int keycode)
return 0;
}
-int keysym_is_numlock(void *kbd_layout, int keysym)
+int keysym_is_numlock(kbd_layout_t *k, int keysym)
{
- kbd_layout_t *k = kbd_layout;
struct key_range *kr;
for (kr = k->numlock_range; kr; kr = kr->next) {
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (4 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed Gerd Hoffmann
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Drop home-grown lookup code, which is a strange mix of a lookup table
and a list. Use standard glib hash instead.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-3-kraxel@redhat.com
---
ui/keymaps.c | 73 ++++++++++++++++++++++++---------------------------------
ui/trace-events | 2 +-
2 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/ui/keymaps.c b/ui/keymaps.c
index 134958a197..449c3dec22 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -28,22 +28,18 @@
#include "trace.h"
#include "qemu/error-report.h"
-#define MAX_NORMAL_KEYCODE 512
-#define MAX_EXTRA_COUNT 256
-
struct key_range {
int start;
int end;
struct key_range *next;
};
+struct keysym2code {
+ uint16_t keycode;
+};
+
struct kbd_layout_t {
- uint16_t keysym2keycode[MAX_NORMAL_KEYCODE];
- struct {
- int keysym;
- uint16_t keycode;
- } keysym2keycode_extra[MAX_EXTRA_COUNT];
- int extra_count;
+ GHashTable *hash;
struct key_range *keypad_range;
struct key_range *numlock_range;
};
@@ -91,23 +87,19 @@ static void add_to_key_range(struct key_range **krp, int code) {
}
}
-static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k) {
- if (keysym < MAX_NORMAL_KEYCODE) {
- trace_keymap_add("normal", keysym, keycode, line);
- k->keysym2keycode[keysym] = keycode;
- } else {
- if (k->extra_count >= MAX_EXTRA_COUNT) {
- warn_report("Could not assign keysym %s (0x%x)"
- " because of memory constraints.", line, keysym);
- } else {
- trace_keymap_add("extra", keysym, keycode, line);
- k->keysym2keycode_extra[k->extra_count].
- keysym = keysym;
- k->keysym2keycode_extra[k->extra_count].
- keycode = keycode;
- k->extra_count++;
- }
+static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k)
+{
+ struct keysym2code *keysym2code;
+
+ keysym2code = g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym));
+ if (keysym2code) {
+ return;
}
+
+ keysym2code = g_new0(struct keysym2code, 1);
+ keysym2code->keycode = keycode;
+ g_hash_table_replace(k->hash, GINT_TO_POINTER(keysym), keysym2code);
+ trace_keymap_add(keysym, keycode, line);
}
static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
@@ -131,6 +123,7 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
if (!k) {
k = g_new0(kbd_layout_t, 1);
+ k->hash = g_hash_table_new(NULL, NULL);
}
for(;;) {
@@ -215,26 +208,22 @@ kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
int keysym2scancode(kbd_layout_t *k, int keysym)
{
- if (keysym < MAX_NORMAL_KEYCODE) {
- if (k->keysym2keycode[keysym] == 0) {
- trace_keymap_unmapped(keysym);
- warn_report("no scancode found for keysym %d", keysym);
- }
- return k->keysym2keycode[keysym];
- } else {
- int i;
+ struct keysym2code *keysym2code;
+
#ifdef XK_ISO_Left_Tab
- if (keysym == XK_ISO_Left_Tab) {
- keysym = XK_Tab;
- }
+ if (keysym == XK_ISO_Left_Tab) {
+ keysym = XK_Tab;
+ }
#endif
- for (i = 0; i < k->extra_count; i++) {
- if (k->keysym2keycode_extra[i].keysym == keysym) {
- return k->keysym2keycode_extra[i].keycode;
- }
- }
+
+ keysym2code = g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym));
+ if (!keysym2code) {
+ trace_keymap_unmapped(keysym);
+ warn_report("no scancode found for keysym %d", keysym);
+ return 0;
}
- return 0;
+
+ return keysym2code->keycode;
}
int keycode_is_keypad(kbd_layout_t *k, int keycode)
diff --git a/ui/trace-events b/ui/trace-events
index 34229e6747..861b68a305 100644
--- a/ui/trace-events
+++ b/ui/trace-events
@@ -78,7 +78,7 @@ qemu_spice_create_update(uint32_t left, uint32_t right, uint32_t top, uint32_t b
# ui/keymaps.c
keymap_parse(const char *file) "file %s"
-keymap_add(const char *type, int sym, int code, const char *line) "%-6s sym=0x%04x code=0x%04x (line: %s)"
+keymap_add(int sym, int code, const char *line) "sym=0x%04x code=0x%04x (line: %s)"
keymap_unmapped(int sym) "sym=0x%04x"
# ui/x_keymap.c
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (5 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings Gerd Hoffmann
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
No need to figure them at runtime from the keymap.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-4-kraxel@redhat.com
---
ui/keymaps.c | 61 +++++++++---------------------------------------------------
1 file changed, 9 insertions(+), 52 deletions(-)
diff --git a/ui/keymaps.c b/ui/keymaps.c
index 449c3dec22..cbdd65c767 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -28,20 +28,12 @@
#include "trace.h"
#include "qemu/error-report.h"
-struct key_range {
- int start;
- int end;
- struct key_range *next;
-};
-
struct keysym2code {
uint16_t keycode;
};
struct kbd_layout_t {
GHashTable *hash;
- struct key_range *keypad_range;
- struct key_range *numlock_range;
};
static int get_keysym(const name2keysym_t *table,
@@ -64,29 +56,6 @@ static int get_keysym(const name2keysym_t *table,
}
-static void add_to_key_range(struct key_range **krp, int code) {
- struct key_range *kr;
- for (kr = *krp; kr; kr = kr->next) {
- if (code >= kr->start && code <= kr->end) {
- break;
- }
- if (code == kr->start - 1) {
- kr->start--;
- break;
- }
- if (code == kr->end + 1) {
- kr->end++;
- break;
- }
- }
- if (kr == NULL) {
- kr = g_malloc0(sizeof(*kr));
- kr->start = kr->end = code;
- kr->next = *krp;
- *krp = kr;
- }
-}
-
static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k)
{
struct keysym2code *keysym2code;
@@ -160,13 +129,6 @@ static kbd_layout_t *parse_keyboard_layout(const name2keysym_t *table,
const char *rest = line + offset + 1;
int keycode = strtol(rest, NULL, 0);
- if (strstr(rest, "numlock")) {
- add_to_key_range(&k->keypad_range, keycode);
- add_to_key_range(&k->numlock_range, keysym);
- /* fprintf(stderr, "keypad keysym %04x keycode %d\n",
- keysym, keycode); */
- }
-
if (strstr(rest, "shift")) {
keycode |= SCANCODE_SHIFT;
}
@@ -228,24 +190,19 @@ int keysym2scancode(kbd_layout_t *k, int keysym)
int keycode_is_keypad(kbd_layout_t *k, int keycode)
{
- struct key_range *kr;
-
- for (kr = k->keypad_range; kr; kr = kr->next) {
- if (keycode >= kr->start && keycode <= kr->end) {
- return 1;
- }
+ if (keycode >= 0x47 && keycode <= 0x53) {
+ return true;
}
- return 0;
+ return false;
}
int keysym_is_numlock(kbd_layout_t *k, int keysym)
{
- struct key_range *kr;
-
- for (kr = k->numlock_range; kr; kr = kr->next) {
- if (keysym >= kr->start && keysym <= kr->end) {
- return 1;
- }
+ switch (keysym) {
+ case 0xffb0 ... 0xffb9: /* KP_0 .. KP_9 */
+ case 0xffac: /* KP_Separator */
+ case 0xffae: /* KP_Decimal */
+ return true;
}
- return 0;
+ return false;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (6 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping Gerd Hoffmann
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Sometimes the same keysym can be created using different key
combinations. Record them all in the reverse keymap, not only
the first one.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-5-kraxel@redhat.com
---
ui/keymaps.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/ui/keymaps.c b/ui/keymaps.c
index cbdd65c767..1eba6d7057 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -29,7 +29,8 @@
#include "qemu/error-report.h"
struct keysym2code {
- uint16_t keycode;
+ uint32_t count;
+ uint16_t keycodes[4];
};
struct kbd_layout_t {
@@ -62,11 +63,18 @@ static void add_keysym(char *line, int keysym, int keycode, kbd_layout_t *k)
keysym2code = g_hash_table_lookup(k->hash, GINT_TO_POINTER(keysym));
if (keysym2code) {
+ if (keysym2code->count < ARRAY_SIZE(keysym2code->keycodes)) {
+ keysym2code->keycodes[keysym2code->count++] = keycode;
+ } else {
+ warn_report("more than %zd keycodes for keysym %d",
+ ARRAY_SIZE(keysym2code->keycodes), keysym);
+ }
return;
}
keysym2code = g_new0(struct keysym2code, 1);
- keysym2code->keycode = keycode;
+ keysym2code->keycodes[0] = keycode;
+ keysym2code->count = 1;
g_hash_table_replace(k->hash, GINT_TO_POINTER(keysym), keysym2code);
trace_keymap_add(keysym, keycode, line);
}
@@ -185,7 +193,7 @@ int keysym2scancode(kbd_layout_t *k, int keysym)
return 0;
}
- return keysym2code->keycode;
+ return keysym2code->keycodes[0];
}
int keycode_is_keypad(kbd_layout_t *k, int keycode)
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (7 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings Gerd Hoffmann
@ 2018-02-22 10:23 ` Gerd Hoffmann
2018-02-22 15:41 ` [Qemu-devel] [PULL 0/9] Ui 20180222 patches Peter Maydell
2018-02-24 14:10 ` no-reply
10 siblings, 0 replies; 12+ messages in thread
From: Gerd Hoffmann @ 2018-02-22 10:23 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Pass the modifier state to the keymap lookup function. In case multiple
keysym -> keycode mappings exist look at the modifier state and prefer
the mapping where the modifier state matches.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20180222070513.8740-6-kraxel@redhat.com
---
ui/keymaps.h | 3 ++-
ui/curses.c | 3 ++-
ui/keymaps.c | 33 ++++++++++++++++++++++++++++++++-
ui/sdl.c | 6 +++++-
ui/vnc.c | 9 +++++++--
5 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/ui/keymaps.h b/ui/keymaps.h
index 17ec03387a..0693588225 100644
--- a/ui/keymaps.h
+++ b/ui/keymaps.h
@@ -54,7 +54,8 @@ typedef struct kbd_layout_t kbd_layout_t;
kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
const char *language);
-int keysym2scancode(kbd_layout_t *k, int keysym);
+int keysym2scancode(kbd_layout_t *k, int keysym,
+ bool shift, bool altgr, bool ctrl);
int keycode_is_keypad(kbd_layout_t *k, int keycode);
int keysym_is_numlock(kbd_layout_t *k, int keysym);
diff --git a/ui/curses.c b/ui/curses.c
index 479b77bd03..597e47fd4a 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -271,7 +271,8 @@ static void curses_refresh(DisplayChangeListener *dcl)
keysym = chr;
}
- keycode = keysym2scancode(kbd_layout, keysym & KEYSYM_MASK);
+ keycode = keysym2scancode(kbd_layout, keysym & KEYSYM_MASK,
+ false, false, false);
if (keycode == 0)
continue;
diff --git a/ui/keymaps.c b/ui/keymaps.c
index 1eba6d7057..43fe604724 100644
--- a/ui/keymaps.c
+++ b/ui/keymaps.c
@@ -176,8 +176,12 @@ kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
}
-int keysym2scancode(kbd_layout_t *k, int keysym)
+int keysym2scancode(kbd_layout_t *k, int keysym,
+ bool shift, bool altgr, bool ctrl)
{
+ static const uint32_t mask =
+ SCANCODE_SHIFT | SCANCODE_ALTGR | SCANCODE_CTRL;
+ uint32_t mods, i;
struct keysym2code *keysym2code;
#ifdef XK_ISO_Left_Tab
@@ -193,6 +197,33 @@ int keysym2scancode(kbd_layout_t *k, int keysym)
return 0;
}
+ if (keysym2code->count == 1) {
+ return keysym2code->keycodes[0];
+ }
+
+ /*
+ * We have multiple keysym -> keycode mappings.
+ *
+ * Check whenever we find one mapping where the modifier state of
+ * the mapping matches the current user interface modifier state.
+ * If so, prefer that one.
+ */
+ mods = 0;
+ if (shift) {
+ mods |= SCANCODE_SHIFT;
+ }
+ if (altgr) {
+ mods |= SCANCODE_ALTGR;
+ }
+ if (ctrl) {
+ mods |= SCANCODE_CTRL;
+ }
+
+ for (i = 0; i < keysym2code->count; i++) {
+ if ((keysym2code->keycodes[i] & mask) == mods) {
+ return keysym2code->keycodes[i];
+ }
+ }
return keysym2code->keycodes[0];
}
diff --git a/ui/sdl.c b/ui/sdl.c
index 963cdf77a7..c4ae7ab05d 100644
--- a/ui/sdl.c
+++ b/ui/sdl.c
@@ -201,6 +201,9 @@ static kbd_layout_t *kbd_layout = NULL;
static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev)
{
+ bool shift = modifiers_state[0x2a] || modifiers_state[0x36];
+ bool altgr = modifiers_state[0xb8];
+ bool ctrl = modifiers_state[0x1d] || modifiers_state[0x9d];
int keysym;
/* workaround for X11+SDL bug with AltGR */
keysym = ev->keysym.sym;
@@ -210,7 +213,8 @@ static uint8_t sdl_keyevent_to_keycode_generic(const SDL_KeyboardEvent *ev)
if (keysym == 92 && ev->keysym.scancode == 133) {
keysym = 0xa5;
}
- return keysym2scancode(kbd_layout, keysym) & SCANCODE_KEYMASK;
+ return keysym2scancode(kbd_layout, keysym,
+ shift, altgr, ctrl) & SCANCODE_KEYMASK;
}
diff --git a/ui/vnc.c b/ui/vnc.c
index a77b568b57..d19f86c7f4 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -1734,7 +1734,8 @@ static void reset_keys(VncState *vs)
static void press_key(VncState *vs, int keysym)
{
- int keycode = keysym2scancode(vs->vd->kbd_layout, keysym) & SCANCODE_KEYMASK;
+ int keycode = keysym2scancode(vs->vd->kbd_layout, keysym,
+ false, false, false) & SCANCODE_KEYMASK;
qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, true);
qemu_input_event_send_key_delay(vs->vd->key_delay_ms);
qemu_input_event_send_key_number(vs->vd->dcl.con, keycode, false);
@@ -1993,6 +1994,9 @@ static const char *code2name(int keycode)
static void key_event(VncState *vs, int down, uint32_t sym)
{
+ bool shift = vs->modifiers_state[0x2a] || vs->modifiers_state[0x36];
+ bool altgr = vs->modifiers_state[0xb8];
+ bool ctrl = vs->modifiers_state[0x1d] || vs->modifiers_state[0x9d];
int keycode;
int lsym = sym;
@@ -2000,7 +2004,8 @@ static void key_event(VncState *vs, int down, uint32_t sym)
lsym = lsym - 'A' + 'a';
}
- keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF) & SCANCODE_KEYMASK;
+ keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF,
+ shift, altgr, ctrl) & SCANCODE_KEYMASK;
trace_vnc_key_event_map(down, sym, keycode, code2name(keycode));
do_key_event(vs, down, keycode, sym);
}
--
2.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/9] Ui 20180222 patches
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (8 preceding siblings ...)
2018-02-22 10:23 ` [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping Gerd Hoffmann
@ 2018-02-22 15:41 ` Peter Maydell
2018-02-24 14:10 ` no-reply
10 siblings, 0 replies; 12+ messages in thread
From: Peter Maydell @ 2018-02-22 15:41 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 22 February 2018 at 10:23, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit a6e0344fa0e09413324835ae122c4cadd7890231:
>
> Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180220-pull-request' into staging (2018-02-20 14:05:00 +0000)
>
> are available in the git repository at:
>
> git://git.kraxel.org/qemu tags/ui-20180222-pull-request
>
> for you to fetch changes up to abb4f2c9655503f14dc55064f29c4f59b07e96ff:
>
> keymap: consider modifier state when picking a mapping (2018-02-22 10:35:32 +0100)
>
> ----------------------------------------------------------------
> ui: reverse keymap improvements.
> sdl2: hotkey fix.
> opengl: dmabuf fixes.
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [Qemu-devel] [PULL 0/9] Ui 20180222 patches
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
` (9 preceding siblings ...)
2018-02-22 15:41 ` [Qemu-devel] [PULL 0/9] Ui 20180222 patches Peter Maydell
@ 2018-02-24 14:10 ` no-reply
10 siblings, 0 replies; 12+ messages in thread
From: no-reply @ 2018-02-24 14:10 UTC (permalink / raw)
To: kraxel; +Cc: famz, qemu-devel
Hi,
This series failed build test on s390x host. Please find the details below.
N/A. Internal error while reading log file
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-02-24 15:56 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-22 10:23 [Qemu-devel] [PULL 0/9] Ui 20180222 patches Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 1/9] sdl2: fix hotkey keyup Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 2/9] console/opengl: split up dpy_gl_cursor ops Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 3/9] egl-headless: cursor_dmabuf: handle NULL cursor Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 4/9] egl-helpers: add alpha channel to texture format Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 5/9] keymap: make struct kbd_layout_t private to ui/keymaps.c Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 6/9] keymap: use glib hash for kbd_layout_t Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 7/9] keymap: numpad keysyms and keycodes are fixed Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 8/9] keymap: record multiple keysym -> keycode mappings Gerd Hoffmann
2018-02-22 10:23 ` [Qemu-devel] [PULL 9/9] keymap: consider modifier state when picking a mapping Gerd Hoffmann
2018-02-22 15:41 ` [Qemu-devel] [PULL 0/9] Ui 20180222 patches Peter Maydell
2018-02-24 14:10 ` no-reply
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.