diff options
| author | Peter Maydell | 2014-03-17 16:51:57 +0100 |
|---|---|---|
| committer | Peter Maydell | 2014-03-17 16:51:57 +0100 |
| commit | 87f639629334c4592c3ba1011af0f691db1e7ed1 (patch) | |
| tree | 2951a1db38c8c68e4d123138eeac21666b7450aa /include | |
| parent | Merge remote-tracking branch 'remotes/bonzini/fixes-for-2.0' into staging (diff) | |
| parent | gtk: Don't warp absolute pointer (diff) | |
| download | qemu-87f639629334c4592c3ba1011af0f691db1e7ed1.tar.gz qemu-87f639629334c4592c3ba1011af0f691db1e7ed1.tar.xz qemu-87f639629334c4592c3ba1011af0f691db1e7ed1.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-3' into staging
gtk: warp bugfixes.
gtk: Allow to activate grab-on-hover from the command line
# gpg: Signature made Mon 17 Mar 2014 13:35:35 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-gtk-3:
gtk: Don't warp absolute pointer
gtk: Fix mouse warping with gtk3
gtk: Allow to activate grab-on-hover from the command line
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 08a38eab13..8a866176db 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -345,6 +345,6 @@ int index_from_key(const char *key); /* gtk.c */ void early_gtk_display_init(void); -void gtk_display_init(DisplayState *ds, bool full_screen); +void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover); #endif |