From 84961407a50bb02d34ab9cca7a21cdb4ff7c25fe Mon Sep 17 00:00:00 2001 From: Chen Fan Date: Tue, 2 Sep 2014 14:33:59 +0800 Subject: [PATCH 1/2] gtk.c: Fix memory leak in gd_set_keycode_type() this memory leak is introduced by the original commit 3158a3482b0093e41f2b2596fba50774ea31ae08 valgrind out showing: ==14553== 21,459 (72 direct, 21,387 indirect) bytes in 1 blocks are definitely lost in loss record 8,055 of 8,082 ==14553== at 0x4A06BC3: calloc (vg_replace_malloc.c:618) ==14553== by 0x80DBFBC: XkbGetKeyboardByName (in /usr/lib64/libX11.so.6.3.0) ==14553== by 0x40C704: gtk_display_init (gtk.c:1798) ==14553== by 0x1AEDC1: main (vl.c:4480) Signed-off-by: Chen Fan Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index 2345d7e3a3..cdd2567fa0 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1810,6 +1810,13 @@ static void gd_set_keycode_type(GtkDisplayState *s) fprintf(stderr, "unknown keycodes `%s', please report to " "qemu-devel@nongnu.org\n", keycodes); } + + if (desc) { + XkbFreeKeyboard(desc, XkbGBN_AllComponentsMask, True); + } + if (keycodes) { + XFree(keycodes); + } } #endif } From 5c960521b8101230bd0d0f5b879e5fd1efdb878b Mon Sep 17 00:00:00 2001 From: Martin Decky Date: Tue, 16 Sep 2014 16:04:40 +0200 Subject: [PATCH 2/2] gtk: add support for the Pause key Special handing of the Pause key. Implemented in a similar way as in ui/sdl.c. Signed-off-by: Martin Decky Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ui/gtk.c b/ui/gtk.c index cdd2567fa0..8e055da0dc 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -931,6 +931,12 @@ static gboolean gd_key_event(GtkWidget *widget, GdkEventKey *key, void *opaque) int qemu_keycode; int i; + if (key->keyval == GDK_KEY_Pause) { + qemu_input_event_send_key_qcode(vc->gfx.dcl.con, Q_KEY_CODE_PAUSE, + key->type == GDK_KEY_PRESS); + return TRUE; + } + qemu_keycode = gd_map_keycode(s, gtk_widget_get_display(widget), gdk_keycode);