| Message ID | 20180202111022.19269-3-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | rework display initialization, part one | expand |
On 02/02/2018 05:10 AM, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > vl.c | 8 ++++++++ > qemu-doc.texi | 6 ++++++ > 2 files changed, 14 insertions(+) > > case QEMU_OPTION_ctrl_grab: > + g_printerr("The -ctrl-grab switch is deprecated, and will be\n" > + "removed in a future release.\n"); > ctrl_grab = 1; > break; > case QEMU_OPTION_no_quit: > diff --git a/qemu-doc.texi b/qemu-doc.texi > index aa7180a3d9..5961c7a211 100644 > --- a/qemu-doc.texi > +++ b/qemu-doc.texi > @@ -2756,6 +2756,12 @@ support for frameless windows, and the other user interfaces never > implemented this in the first place. So this will be removed together > with SDL 1.2 support. > > +@subsection -alt-grab and -ctrl-grab (since 2.12.0) > + > +The ``-alt-grab'' and ``-ctrl-grab'' arguments are deprecated. They > +work with SDL only. They will eventually replaced with a new way to > +configure hotkeys which works consistently across all user interfaces. Should the error message printed to the user document the new interface to be used instead? But that implies that we shouldn't deprecate this until the new interface for configuring hotkeys has been finalized...
Hi, > > +@subsection -alt-grab and -ctrl-grab (since 2.12.0) > > + > > +The ``-alt-grab'' and ``-ctrl-grab'' arguments are deprecated. They > > +work with SDL only. They will eventually replaced with a new way to > > +configure hotkeys which works consistently across all user interfaces. > > Should the error message printed to the user document the new interface > to be used instead? But that implies that we shouldn't deprecate this > until the new interface for configuring hotkeys has been finalized... Supporting two ways of specifying hotkeys at the same time isn't going to fly. So my plan is to deprecate the old way now, and then some day in the future drop the old args and support the new ones. cheers, Gerd
diff --git a/vl.c b/vl.c index ac0efca708..fa19a61500 100644 --- a/vl.c +++ b/vl.c @@ -2115,6 +2115,8 @@ static DisplayType select_display(const char *p) goto invalid_sdl_args; } } else if (strstart(opts, ",alt_grab=", &nextopt)) { + g_printerr("The alt_grab= sdl option is deprecated, and will be\n" + "removed in a future release.\n"); opts = nextopt; if (strstart(opts, "on", &nextopt)) { alt_grab = 1; @@ -2124,6 +2126,8 @@ static DisplayType select_display(const char *p) goto invalid_sdl_args; } } else if (strstart(opts, ",ctrl_grab=", &nextopt)) { + g_printerr("The ctrl_grab= sdl option is deprecated, and will be\n" + "removed in a future release.\n"); opts = nextopt; if (strstart(opts, "on", &nextopt)) { ctrl_grab = 1; @@ -3649,9 +3653,13 @@ int main(int argc, char **argv, char **envp) no_frame = 1; break; case QEMU_OPTION_alt_grab: + g_printerr("The -alt-grab switch is deprecated, and will be\n" + "removed in a future release.\n"); alt_grab = 1; break; case QEMU_OPTION_ctrl_grab: + g_printerr("The -ctrl-grab switch is deprecated, and will be\n" + "removed in a future release.\n"); ctrl_grab = 1; break; case QEMU_OPTION_no_quit: diff --git a/qemu-doc.texi b/qemu-doc.texi index aa7180a3d9..5961c7a211 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -2756,6 +2756,12 @@ support for frameless windows, and the other user interfaces never implemented this in the first place. So this will be removed together with SDL 1.2 support. +@subsection -alt-grab and -ctrl-grab (since 2.12.0) + +The ``-alt-grab'' and ``-ctrl-grab'' arguments are deprecated. They +work with SDL only. They will eventually replaced with a new way to +configure hotkeys which works consistently across all user interfaces. + @section qemu-img command line arguments @subsection convert -s (since 2.0.0)
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- vl.c | 8 ++++++++ qemu-doc.texi | 6 ++++++ 2 files changed, 14 insertions(+)