diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-12-10 14:05:51 +1000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-03-05 09:52:05 +0100 |
| commit | 47c03744b37c72b8f633b03380d5a323615b9ac4 (patch) | |
| tree | b621cf997e504e4fff6a0d5221884bdd793a4e86 /backends/baum.c | |
| parent | 6f90f3d786ec1ddae31535bb4be4a1120fd5dfe0 (diff) | |
| download | qemu-47c03744b37c72b8f633b03380d5a323615b9ac4.zip qemu-47c03744b37c72b8f633b03380d5a323615b9ac4.tar.gz qemu-47c03744b37c72b8f633b03380d5a323615b9ac4.tar.bz2 | |
ui/sdl2 : initial port to SDL 2.0 (v2.0)
I've ported the SDL1.2 code over, and rewritten it to use the SDL2 interface.
The biggest changes were in the input handling, where SDL2 has done a major
overhaul, and I've had to include a generated translation file to get from
SDL2 codes back to qemu compatible ones. I'm still not sure how the keyboard
layout code works in qemu, so there may be further work if someone can point
me a test case that works with SDL1.2 and doesn't with SDL2.
Some SDL env vars we used to set are no longer used by SDL2,
Windows, OSX support is untested,
I don't think we can link to SDL1.2 and SDL2 at the same time, so I felt
using --with-sdlabi=2.0 to select the new code should be fine, like how
gtk does it.
v1.1: fix keys in text console
v1.2: fix shutdown, cleanups a bit of code, support ARGB cursor
v2.0: merge the SDL multihead patch into this, g_new the number of consoles
needed, wrap DCL inside per-console structure.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Fixes & improvements by kraxel:
* baum build fix
* remove text console logic
* adapt to new input core
* codestyle fixups
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'backends/baum.c')
| -rw-r--r-- | backends/baum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/backends/baum.c b/backends/baum.c index 1132899..665107f 100644 --- a/backends/baum.c +++ b/backends/baum.c @@ -566,7 +566,7 @@ CharDriverState *chr_baum_init(void) BaumDriverState *baum; CharDriverState *chr; brlapi_handle_t *handle; -#ifdef CONFIG_SDL +#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) SDL_SysWMinfo info; #endif int tty; @@ -595,7 +595,7 @@ CharDriverState *chr_baum_init(void) goto fail; } -#ifdef CONFIG_SDL +#if defined(CONFIG_SDL) && SDL_COMPILEDVERSION < SDL_VERSIONNUM(2, 0, 0) memset(&info, 0, sizeof(info)); SDL_VERSION(&info.version); if (SDL_GetWMInfo(&info)) |