[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/12] cocoa: use DisplayOptions
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 08/12] cocoa: use DisplayOptions |
Date: |
Tue, 20 Feb 2018 14:47:19 +0100 |
Switch cocoa ui to use qapi DisplayOptions for configuration.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 4 ++--
vl.c | 3 ++-
qapi/ui.json | 6 ++++--
ui/cocoa.m | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index 65ed6ddca6..e6b1227bef 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -450,9 +450,9 @@ static inline void sdl_display_init(DisplayState *ds,
DisplayOptions *opts)
/* cocoa.m */
#ifdef CONFIG_COCOA
-void cocoa_display_init(DisplayState *ds, int full_screen);
+void cocoa_display_init(DisplayState *ds, DisplayOptions *opts);
#else
-static inline void cocoa_display_init(DisplayState *ds, int full_screen)
+static inline void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
{
/* This must never be called if CONFIG_COCOA is disabled */
error_report("Cocoa support is disabled");
diff --git a/vl.c b/vl.c
index 3752ebec49..2dd00e00d9 100644
--- a/vl.c
+++ b/vl.c
@@ -4344,6 +4344,7 @@ int main(int argc, char **argv, char **envp)
dpy.type = DISPLAY_TYPE_SDL;
#elif defined(CONFIG_COCOA)
display_type = DT_COCOA;
+ dpy.type = DISPLAY_TYPE_COCOA;
#elif defined(CONFIG_VNC)
vnc_parse("localhost:0,to=99,id=default", &error_abort);
#else
@@ -4705,7 +4706,7 @@ int main(int argc, char **argv, char **envp)
sdl_display_init(ds, &dpy);
break;
case DT_COCOA:
- cocoa_display_init(ds, full_screen);
+ cocoa_display_init(ds, &dpy);
break;
case DT_GTK:
gtk_display_init(ds, &dpy);
diff --git a/qapi/ui.json b/qapi/ui.json
index 11aad8b496..398baa9698 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1020,7 +1020,8 @@
#
##
{ 'enum' : 'DisplayType',
- 'data' : [ 'none', 'gtk', 'sdl', 'egl-headless', 'curses' ] }
+ 'data' : [ 'none', 'gtk', 'sdl',
+ 'egl-headless', 'curses', 'cocoa' ] }
##
# @DisplayOptions:
@@ -1045,4 +1046,5 @@
'gtk' : 'DisplayGTK',
'sdl' : 'DisplayNoOpts',
'egl-headless' : 'DisplayNoOpts',
- 'curses' : 'DisplayNoOpts' } }
+ 'curses' : 'DisplayNoOpts',
+ 'cocoa' : 'DisplayNoOpts' } }
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 51db47cd71..90d9aa57ea 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -1683,12 +1683,12 @@ static void addRemovableDevicesMenuItems(void)
qapi_free_BlockInfoList(pointerToFree);
}
-void cocoa_display_init(DisplayState *ds, int full_screen)
+void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
{
COCOA_DEBUG("qemu_cocoa: cocoa_display_init\n");
/* if fullscreen mode is to be used */
- if (full_screen == true) {
+ if (opts->has_full_screen && opts->full_screen) {
[NSApp activateIgnoringOtherApps: YES];
[(QemuCocoaAppController *)[[NSApplication sharedApplication]
delegate] toggleFullScreen: nil];
}
--
2.9.3
- [Qemu-devel] [PULL 00/12] Ui 20180220 patches, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 05/12] vl: drop no_quit variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 08/12] cocoa: use DisplayOptions,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 09/12] vl: drop full_screen variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 02/12] vl: rename DisplayType to LegacyDisplayType, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 12/12] ui: Reorder vte terminal packing to avoid gtk3 warnings, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 03/12] gtk: add and use DisplayOptions + DisplayGTK, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 07/12] curses: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 11/12] vl: drop display_type variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 06/12] egl-headless: use DisplayOptions, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 10/12] vl: drop request_opengl variable, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 01/12] vl: deprecate -no-frame, Gerd Hoffmann, 2018/02/20
- [Qemu-devel] [PULL 04/12] sdl: use DisplayOptions, Gerd Hoffmann, 2018/02/20