summary refs log tree commit diff stats
path: root/include
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-02 15:18:39 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-02 15:18:39 +0000
commitbaa3f63827877c3632a3f7570eb772f3da4658bd (patch)
tree34a6cf4ab93fb2b7baa2df64fd44660a2d902aac /include
parent958e3693607901f4c2bca607651382dc48689654 (diff)
parent56bdd4b69aa10bec274b1e812685bcf44dcb0c72 (diff)
downloadfocaccia-qemu-baa3f63827877c3632a3f7570eb772f3da4658bd.tar.gz
focaccia-qemu-baa3f63827877c3632a3f7570eb772f3da4658bd.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160202-1' into staging
ui: gtk vc fix, adaptive sdl refresh.

# gpg: Signature made Tue 02 Feb 2016 13:06:07 GMT using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-ui-20160202-1:
  sdl: shorten the GUI refresh interval when mouse or keyboard is active
  gtk: use qemu_chr_alloc() to allocate CharDriverState

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
-rw-r--r--include/ui/sdl2.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index b7ac38f198..3f0b57bb16 100644
--- a/include/ui/sdl2.h
+++ b/include/ui/sdl2.h
@@ -19,6 +19,7 @@ struct sdl2_console {
     int hidden;
     int opengl;
     int updates;
+    int idle_counter;
     SDL_GLContext winctx;
 #ifdef CONFIG_OPENGL
     ConsoleGLState *gls;