[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] gtk: make default UI
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 6/6] gtk: make default UI |
Date: |
Sun, 19 Feb 2012 17:45:04 -0600 |
A user can still enable SDL with '-sdl' or '-display sdl' but start making the
default display GTK by default.
I'd also like to deprecate the SDL display and remove it in a few releases.
Signed-off-by: Anthony Liguori <address@hidden>
---
vl.c | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/vl.c b/vl.c
index d8a521a..ad0b726 100644
--- a/vl.c
+++ b/vl.c
@@ -3220,6 +3220,25 @@ int main(int argc, char **argv, char **envp)
add_device_config(DEV_VIRTCON, "vc:80Cx24C");
}
+ if (display_type == DT_DEFAULT) {
+#if defined(CONFIG_GTK)
+ display_type = DT_GTK;
+#elif defined(CONFIG_SDL) || defined(CONFIG_COCOA)
+ display_type = DT_SDL;
+#elif defined(CONFIG_VNC)
+ vnc_display = "localhost:0,to=99";
+ show_vnc_port = 1;
+#else
+ display_type = DT_NONE;
+#endif
+ }
+
+#if defined(CONFIG_GTK)
+ if (display_type == DT_GTK) {
+ early_gtk_display_init();
+ }
+#endif
+
socket_init();
if (qemu_opts_foreach(qemu_find_opts("chardev"), chardev_init_func, NULL,
1) != 0)
@@ -3418,20 +3437,6 @@ int main(int argc, char **argv, char **envp)
/* just use the first displaystate for the moment */
ds = get_displaystate();
- if (using_spice)
- display_remote++;
- if (display_type == DT_DEFAULT && !display_remote) {
-#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
- display_type = DT_SDL;
-#elif defined(CONFIG_VNC)
- vnc_display = "localhost:0,to=99";
- show_vnc_port = 1;
-#else
- display_type = DT_NONE;
-#endif
- }
-
-
/* init local displays */
switch (display_type) {
case DT_NOGRAPHIC:
@@ -3450,6 +3455,11 @@ int main(int argc, char **argv, char **envp)
cocoa_display_init(ds, full_screen);
break;
#endif
+#if defined(CONFIG_GTK)
+ case DT_GTK:
+ gtk_display_init(ds);
+ break;
+#endif
default:
break;
}
--
1.7.4.1
- Re: [Qemu-devel] [PATCH 2/6] ui: add basic GTK gui, (continued)
- [Qemu-devel] [PATCH 3/6] gtk: add virtual console support, Anthony Liguori, 2012/02/19
- [Qemu-devel] [PATCH 4/6] gtk: add support for input grabbing, Anthony Liguori, 2012/02/19
- [Qemu-devel] [PATCH 5/6] gtk: add support for screen scaling and full screen, Anthony Liguori, 2012/02/19
- [Qemu-devel] [PATCH 6/6] gtk: make default UI,
Anthony Liguori <=
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Roy Tam, 2012/02/19
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Brad Smith, 2012/02/19
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Anthony Liguori, 2012/02/19
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Roy Tam, 2012/02/19
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Brad Smith, 2012/02/19
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Anthony Liguori, 2012/02/19
- Re: [Qemu-devel] [PATCH 6/6] gtk: make default UI, Stefano Stabellini, 2012/02/20