diff options
| -rw-r--r-- | qapi/ui.json | 10 | ||||
| -rw-r--r-- | ui/gtk.c | 8 | ||||
| -rw-r--r-- | ui/sdl2.c | 3 | ||||
| -rw-r--r-- | ui/vnc.c | 15 |
4 files changed, 27 insertions, 9 deletions
diff --git a/qapi/ui.json b/qapi/ui.json index 4ca91bb45a..bf9e157d5a 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -1022,12 +1022,20 @@ # GTK display options. # # @grab-on-hover: Grab keyboard input on mouse hover. +# @zoom-to-fit: Zoom guest display to fit into the host window. When +# turned off the host window will be resized instead. +# In case the display device can notify the guest on +# window resizes (virtio-gpu) this will default to "on", +# assuming the guest will resize the display to match +# the window size then. Otherwise it defaults to "off". +# Since 3.1 # # Since: 2.12 # ## { 'struct' : 'DisplayGTK', - 'data' : { '*grab-on-hover' : 'bool' } } + 'data' : { '*grab-on-hover' : 'bool', + '*zoom-to-fit' : 'bool' } } ## # @DisplayGLMode: @@ -2136,6 +2136,8 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, QemuConsole *con, int idx, GSList *group, GtkWidget *view_menu) { + bool zoom_to_fit; + vc->label = qemu_console_get_label(con); vc->s = s; vc->gfx.scale_x = 1.0; @@ -2199,6 +2201,12 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, group = gd_vc_menu_init(s, vc, idx, group, view_menu); if (dpy_ui_info_supported(vc->gfx.dcl.con)) { + zoom_to_fit = true; + } + if (s->opts->u.gtk.has_zoom_to_fit) { + zoom_to_fit = s->opts->u.gtk.zoom_to_fit; + } + if (zoom_to_fit) { gtk_menu_item_activate(GTK_MENU_ITEM(s->zoom_fit_item)); s->free_scale = true; } @@ -806,7 +806,8 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o) for (i = 0; i < sdl2_num_outputs; i++) { QemuConsole *con = qemu_console_lookup_by_index(i); assert(con != NULL); - if (!qemu_console_is_graphic(con)) { + if (!qemu_console_is_graphic(con) && + qemu_console_get_index(con) != 0) { sdl2_console[i].hidden = true; } sdl2_console[i].idx = i; @@ -3821,9 +3821,6 @@ void vnc_display_open(const char *id, Error **errp) bool reverse = false; const char *credid; bool sasl = false; -#ifdef CONFIG_VNC_SASL - int saslErr; -#endif int acl = 0; int lock_key_sync = 1; int key_delay_ms; @@ -3963,10 +3960,14 @@ void vnc_display_open(const char *id, Error **errp) trace_vnc_auth_init(vd, 1, vd->ws_auth, vd->ws_subauth); #ifdef CONFIG_VNC_SASL - if ((saslErr = sasl_server_init(NULL, "qemu")) != SASL_OK) { - error_setg(errp, "Failed to initialize SASL auth: %s", - sasl_errstring(saslErr, NULL, NULL)); - goto fail; + if (sasl) { + int saslErr = sasl_server_init(NULL, "qemu"); + + if (saslErr != SASL_OK) { + error_setg(errp, "Failed to initialize SASL auth: %s", + sasl_errstring(saslErr, NULL, NULL)); + goto fail; + } } #endif vd->lock_key_sync = lock_key_sync; |