[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/12] vl: Add DT_COCOA DisplayType value
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 01/12] vl: Add DT_COCOA DisplayType value |
Date: |
Wed, 11 Nov 2015 17:09:05 -0200 |
Instead of reusing DT_SDL for Cocoa, use DT_COCOA to indicate
that a Cocoa display was requested.
configure already ensures CONFIG_COCOA and CONFIG_SDL are never
set at the same time. The only case where DT_SDL is used outside
a #ifdef CONFIG_SDL block is in the no_frame/alt_grab/ctrl_grab
check. That means the only user-visible change is that we will
start printing a warning if the SDL-specific options are used in
Cocoa mode. This is a bugfix, because no_frame/alt_grab/ctrl_grab
are not used by Cocoa code.
Cc: Andreas Färber <address@hidden>
Cc: Peter Maydell <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/sysemu/sysemu.h | 1 +
vl.c | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index f992494..0f4e520 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -137,6 +137,7 @@ typedef enum DisplayType
DT_DEFAULT,
DT_CURSES,
DT_SDL,
+ DT_COCOA,
DT_GTK,
DT_NOGRAPHIC,
DT_NONE,
diff --git a/vl.c b/vl.c
index 7d993a5..bba1b0a 100644
--- a/vl.c
+++ b/vl.c
@@ -4247,8 +4247,10 @@ int main(int argc, char **argv, char **envp)
if (display_type == DT_DEFAULT && !display_remote) {
#if defined(CONFIG_GTK)
display_type = DT_GTK;
-#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
+#elif defined(CONFIG_SDL)
display_type = DT_SDL;
+#elif defined(CONFIG_COCOA)
+ display_type = DT_COCOA;
#elif defined(CONFIG_VNC)
vnc_parse("localhost:0,to=99,id=default", &error_abort);
show_vnc_port = 1;
@@ -4588,7 +4590,7 @@ int main(int argc, char **argv, char **envp)
sdl_display_init(ds, full_screen, no_frame);
break;
#elif defined(CONFIG_COCOA)
- case DT_SDL:
+ case DT_COCOA:
cocoa_display_init(ds, full_screen);
break;
#endif
--
2.1.0
- [Qemu-devel] [PATCH 00/12] vl: graphics stubs + #ifdef cleanup, eliminate some global vars, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 01/12] vl: Add DT_COCOA DisplayType value,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 03/12] stubs: curses_display_init() stub, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 02/12] stubs: Add VNC initialization stubs, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 04/12] stubs: SDL initialization stubs, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 06/12] stubs: gtk_display_init() stub, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 07/12] stubs: spice initialization stubs, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 05/12] stubs: cocoa_display_init() stub, Eduardo Habkost, 2015/11/11
- [Qemu-devel] [PATCH 09/12] vl: Replace DT_NOGRAPHIC with MachineState field, Eduardo Habkost, 2015/11/11