Gerd Hoffmann <kra...@redhat.com> writes:
> This allows to set the option on the command line, i.e. "-display
> gtk,zoom-to-fit={on,off}", overriding the default choosen by qemu.
chosen
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
> ---
> ui/gtk.c | 8 ++++++++
> qapi/ui.json | 6 +++++-
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/ui/gtk.c b/ui/gtk.c
> index 5cce6ed42d..3ddb5fe162 100644
> --- a/ui/gtk.c
> +++ b/ui/gtk.c
> @@ -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;
> }
> diff --git a/qapi/ui.json b/qapi/ui.json
> index 4ca91bb45a..4d2387ce7b 100644
> --- a/qapi/ui.json
> +++ b/qapi/ui.json
> @@ -1022,12 +1022,16 @@
> # 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
> +# (since 3.1).
What's the default?
The cover letter says its chosen by QEMU. Matches my reading of the
patch. Please document it.
> #
> # Since: 2.12
> #
> ##
> { 'struct' : 'DisplayGTK',
> - 'data' : { '*grab-on-hover' : 'bool' } }
> + 'data' : { '*grab-on-hover' : 'bool',
> + '*zoom-to-fit' : 'bool' } }
>
> ##
> # @DisplayGLMode:
With a suitable doc fix
Reviewed-by: Markus Armbruster <arm...@redhat.com>
