summary refs log tree commit diff stats
path: root/ui/input.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-01-12 16:41:24 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-01-12 16:41:24 +0000
commitc7947342d7dda87eeeb4a04b6e467f81385014ce (patch)
treed9ee6f9136f72764fb959e6ad532317bf8cdef39 /ui/input.c
parent7398166ddf7c6dbbc9cae6ac69bb2feda14b40ac (diff)
parent849bbe60356caf3d320202d45f1ddffeefae06c7 (diff)
downloadfocaccia-qemu-c7947342d7dda87eeeb4a04b6e467f81385014ce.tar.gz
focaccia-qemu-c7947342d7dda87eeeb4a04b6e467f81385014ce.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180112-pull-request' into staging
sdl2: bugfixes.
spice: cleanups.
input: mem leak fix.
gtk: deprecate 2.x support.

# gpg: Signature made Fri 12 Jan 2018 14:52:39 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20180112-pull-request:
  sdl2: Ignore UI hotkeys after a focus change when GUI modifier is held
  sdl2 uses surface relative coordinates
  sdl2: Do not hide the cursor on auxilliary windows
  spice: remove unused timer list
  spice: remove only written event_mask field
  spice: remove unused watch list
  spice: remove QXLWorker interface field
  ui: deprecate use of GTK 2.x in favour of 3.x series
  input: fix memory leak

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input.c')
-rw-r--r--ui/input.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/input.c b/ui/input.c
index 3e2d324278..e5b78aae9e 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -421,6 +421,8 @@ void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down)
     } else if (queue_count < queue_limit) {
         qemu_input_queue_event(&kbd_queue, src, evt);
         qemu_input_queue_sync(&kbd_queue);
+    } else {
+        qapi_free_InputEvent(evt);
     }
 }