diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch b/meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch index add5d8b02f..b8a9206fee 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-sdl.c-allow-user-to-disable-pointer-grabs.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 273e1af49d3e0a58bb9464369deb2652f243e649 Mon Sep 17 00:00:00 2001 | 1 | From 18fb45c34a473c4ba247bb82bcea94b7c3ba493a Mon Sep 17 00:00:00 2001 |
2 | From: Ross Burton <ross.burton@intel.com> | 2 | From: Ross Burton <ross.burton@intel.com> |
3 | Date: Wed, 18 Sep 2013 14:04:54 +0100 | 3 | Date: Wed, 18 Sep 2013 14:04:54 +0100 |
4 | Subject: [PATCH] sdl.c: allow user to disable pointer grabs | 4 | Subject: [PATCH] sdl.c: allow user to disable pointer grabs |
@@ -22,25 +22,26 @@ Upstream-Status: Pending | |||
22 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 22 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
23 | Signed-off-by: Eric Bénard <eric@eukrea.com> | 23 | Signed-off-by: Eric Bénard <eric@eukrea.com> |
24 | --- | 24 | --- |
25 | ui/sdl.c | 12 ++++++++++-- | 25 | ui/sdl.c | 13 +++++++++++-- |
26 | 1 file changed, 10 insertions(+), 2 deletions(-) | 26 | 1 file changed, 11 insertions(+), 2 deletions(-) |
27 | 27 | ||
28 | diff --git a/ui/sdl.c b/ui/sdl.c | 28 | diff --git a/ui/sdl.c b/ui/sdl.c |
29 | index 7b71a9a..29ce1b9 100644 | 29 | index a5fd503c25..ab8d1b1eb1 100644 |
30 | --- a/ui/sdl.c | 30 | --- a/ui/sdl.c |
31 | +++ b/ui/sdl.c | 31 | +++ b/ui/sdl.c |
32 | @@ -63,6 +63,10 @@ static SDL_PixelFormat host_format; | 32 | @@ -68,6 +68,11 @@ static int idle_counter; |
33 | static int scaling_active = 0; | 33 | static const guint16 *keycode_map; |
34 | static Notifier mouse_mode_notifier; | 34 | static size_t keycode_maplen; |
35 | static int idle_counter; | 35 | |
36 | +#ifndef True | 36 | +#ifndef True |
37 | +#define True 1 | 37 | +#define True 1 |
38 | +#endif | 38 | +#endif |
39 | +static doing_grabs = True; | 39 | +static doing_grabs = True; |
40 | 40 | + | |
41 | #define SDL_REFRESH_INTERVAL_BUSY 10 | 41 | #define SDL_REFRESH_INTERVAL_BUSY 10 |
42 | #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \ | 42 | #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \ |
43 | @@ -431,14 +435,16 @@ static void sdl_grab_start(void) | 43 | / SDL_REFRESH_INTERVAL_BUSY + 1) |
44 | @@ -398,14 +403,16 @@ static void sdl_grab_start(void) | ||
44 | } | 45 | } |
45 | } else | 46 | } else |
46 | sdl_hide_cursor(); | 47 | sdl_hide_cursor(); |
@@ -59,7 +60,7 @@ index 7b71a9a..29ce1b9 100644 | |||
59 | gui_grab = 0; | 60 | gui_grab = 0; |
60 | sdl_show_cursor(); | 61 | sdl_show_cursor(); |
61 | sdl_update_caption(); | 62 | sdl_update_caption(); |
62 | @@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) | 63 | @@ -945,6 +952,8 @@ static void sdl1_display_init(DisplayState *ds, DisplayOptions *o) |
63 | * This requires SDL >= 1.2.14. */ | 64 | * This requires SDL >= 1.2.14. */ |
64 | setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); | 65 | setenv("SDL_DISABLE_LOCK_KEYS", "1", 1); |
65 | 66 | ||