[v2,2/3] softmmu/vl: Deprecate the old grab options

The alt_grab and ctrl_grab parameter of the -display sdl option prevent
the QAPIfication of the "sdl" part of the -display option, so we should
eventually remove them. And since this feature is also rather niche anyway,
we should not clutter the top-level option list with these, so let's
also deprecate the "-alt-grab" and the "-ctrl-grab" options while we're
at it.

Once the deprecation period of "alt_grab" and "ctrl_grab" is over, we
then can finally switch the -display sdl option to use QAPI internally,
too.

Acked-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 docs/about/deprecated.rst | 10 ++++++++++
 qemu-options.hx           | 12 ++++++++----
 softmmu/vl.c              |  6 ++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

No objections at all here, though. :)

Paolo

Il mer 25 ago 2021, 11:20 Thomas Huth <thuth@redhat.com> ha scritto:

> The alt_grab and ctrl_grab parameter of the -display sdl option prevent
> the QAPIfication of the "sdl" part of the -display option, so we should
> eventually remove them. And since this feature is also rather niche anyway,
> we should not clutter the top-level option list with these, so let's
> also deprecate the "-alt-grab" and the "-ctrl-grab" options while we're
> at it.
>
> Once the deprecation period of "alt_grab" and "ctrl_grab" is over, we
> then can finally switch the -display sdl option to use QAPI internally,
> too.
>
> Acked-by: Peter Krempa <pkrempa@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  docs/about/deprecated.rst | 10 ++++++++++
>  qemu-options.hx           | 12 ++++++++----
>  softmmu/vl.c              |  6 ++++++
>  3 files changed, 24 insertions(+), 4 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 6d438f1c8d..868eca0dd4 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -138,6 +138,16 @@ an underscore between "window" and "close").
>  The ``-no-quit`` is a synonym for ``-display ...,window-close=off`` which
>  should be used instead.
>
> +``-alt-grab`` and ``-display sdl,alt_grab=on`` (since 6.2)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Use ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
> +
> +``-ctrl-grab`` and ``-display sdl,ctrl_grab=on`` (since 6.2)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +Use ``-display sdl,grab-mod=rctrl`` instead.
> +
>
>  QEMU Machine Protocol (QMP) commands
>  ------------------------------------
> diff --git a/qemu-options.hx b/qemu-options.hx
> index 0bff756ded..4f46233527 100644
> --- a/qemu-options.hx
> +++ b/qemu-options.hx
> @@ -1884,9 +1884,11 @@ SRST
>          the mouse grabbing in conjunction with the "g" key. `<mods>` can
> be
>          either `lshift-lctrl-lalt` or `rctrl`.
>
> -        ``alt_grab=on|off`` : Use Control+Alt+Shift-g to toggle mouse
> grabbing
> +        ``alt_grab=on|off`` : Use Control+Alt+Shift-g to toggle mouse
> grabbing.
> +        This parameter is deprecated - use ``grab-mod`` instead.
>
> -        ``ctrl_grab=on|off`` : Use Right-Control-g to toggle mouse
> grabbing
> +        ``ctrl_grab=on|off`` : Use Right-Control-g to toggle mouse
> grabbing.
> +        This parameter is deprecated - use ``grab-mod`` instead.
>
>          ``gl=on|off|core|es`` : Use OpenGL for displaying
>
> @@ -1971,7 +1973,8 @@ SRST
>  ``-alt-grab``
>      Use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt). Note that
>      this also affects the special keys (for fullscreen, monitor-mode
> -    switching, etc).
> +    switching, etc). This option is deprecated - please use
> +    ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
>  ERST
>
>  DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
> @@ -1981,7 +1984,8 @@ SRST
>  ``-ctrl-grab``
>      Use Right-Ctrl to grab mouse (instead of Ctrl-Alt). Note that this
>      also affects the special keys (for fullscreen, monitor-mode
> -    switching, etc).
> +    switching, etc). This option is deprecated - please use
> +    ``-display sdl,grab-mod=rctrl`` instead.
>  ERST
>
>  DEF("no-quit", 0, QEMU_OPTION_no_quit,
> diff --git a/softmmu/vl.c b/softmmu/vl.c
> index 294990debf..613948ab46 100644
> --- a/softmmu/vl.c
> +++ b/softmmu/vl.c
> @@ -1043,6 +1043,7 @@ static void parse_display(const char *p)
>                  } else {
>                      goto invalid_sdl_args;
>                  }
> +                warn_report("alt_grab is deprecated, use grab-mod
> instead.");
>              } else if (strstart(opts, ",ctrl_grab=", &nextopt)) {
>                  opts = nextopt;
>                  if (strstart(opts, "on", &nextopt)) {
> @@ -1052,6 +1053,7 @@ static void parse_display(const char *p)
>                  } else {
>                      goto invalid_sdl_args;
>                  }
> +                warn_report("ctrl_grab is deprecated, use grab-mod
> instead.");
>              } else if (strstart(opts, ",window_close=", &nextopt) ||
>                         strstart(opts, ",window-close=", &nextopt)) {
>                  if (strstart(opts, ",window_close=", NULL)) {
> @@ -3253,9 +3255,13 @@ void qemu_init(int argc, char **argv, char **envp)
>                  break;
>              case QEMU_OPTION_alt_grab:
>                  alt_grab = 1;
> +                warn_report("-alt-grab is deprecated, please use "
> +                            "-display sdl,grab-mod=lshift-lctrl-lalt
> instead.");
>                  break;
>              case QEMU_OPTION_ctrl_grab:
>                  ctrl_grab = 1;
> +                warn_report("-ctrl-grab is deprecated, please use "
> +                            "-display sdl,grab-mod=rctrl instead.");
>                  break;
>              case QEMU_OPTION_no_quit:
>                  dpy.has_window_close = true;
> --
> 2.27.0
>
>