ui: Remove deprecated parameters of the "-display sdl" option
Dropping these deprecated parameters simplifies further refactoring (e.g. QAPIfication is easier without underscores in the name). Message-Id: <20220519155625.1414365-2-thuth@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
55c269829d
commit
a743d60bca
|
@ -81,22 +81,6 @@ the process listing. This is replaced by the new ``password-secret``
|
||||||
option which lets the password be securely provided on the command
|
option which lets the password be securely provided on the command
|
||||||
line using a ``secret`` object instance.
|
line using a ``secret`` object instance.
|
||||||
|
|
||||||
``-display sdl,window_close=...`` (since 6.1)
|
|
||||||
'''''''''''''''''''''''''''''''''''''''''''''
|
|
||||||
|
|
||||||
Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of
|
|
||||||
an underscore between "window" and "close").
|
|
||||||
|
|
||||||
``-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.
|
|
||||||
|
|
||||||
``-sdl`` (since 6.2)
|
``-sdl`` (since 6.2)
|
||||||
''''''''''''''''''''
|
''''''''''''''''''''
|
||||||
|
|
||||||
|
|
|
@ -370,6 +370,23 @@ The ``opened=on`` option in the command line or QMP ``object-add`` either had
|
||||||
no effect (if ``opened`` was the last option) or caused errors. The property
|
no effect (if ``opened`` was the last option) or caused errors. The property
|
||||||
is therefore useless and should simply be removed.
|
is therefore useless and should simply be removed.
|
||||||
|
|
||||||
|
``-display sdl,window_close=...`` (removed in 7.1)
|
||||||
|
''''''''''''''''''''''''''''''''''''''''''''''''''
|
||||||
|
|
||||||
|
Use ``-display sdl,window-close=...`` instead (i.e. with a minus instead of
|
||||||
|
an underscore between "window" and "close").
|
||||||
|
|
||||||
|
``-alt-grab`` and ``-display sdl,alt_grab=on`` (removed in 7.1)
|
||||||
|
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
|
||||||
|
|
||||||
|
Use ``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
|
||||||
|
|
||||||
|
``-ctrl-grab`` and ``-display sdl,ctrl_grab=on`` (removed in 7.1)
|
||||||
|
'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
|
||||||
|
|
||||||
|
Use ``-display sdl,grab-mod=rctrl`` instead.
|
||||||
|
|
||||||
|
|
||||||
QEMU Machine Protocol (QMP) commands
|
QEMU Machine Protocol (QMP) commands
|
||||||
------------------------------------
|
------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -1938,8 +1938,8 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
|
||||||
"-display spice-app[,gl=on|off]\n"
|
"-display spice-app[,gl=on|off]\n"
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_SDL)
|
#if defined(CONFIG_SDL)
|
||||||
"-display sdl[,alt_grab=on|off][,ctrl_grab=on|off][,gl=on|core|es|off]\n"
|
"-display sdl[,gl=on|core|es|off][,grab-mod=<mod>][,show-cursor=on|off]\n"
|
||||||
" [,grab-mod=<mod>][,show-cursor=on|off][,window-close=on|off]\n"
|
" [,window-close=on|off]\n"
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_GTK)
|
#if defined(CONFIG_GTK)
|
||||||
"-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n"
|
"-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n"
|
||||||
|
@ -2012,12 +2012,6 @@ SRST
|
||||||
the mouse grabbing in conjunction with the "g" key. ``<mods>`` can be
|
the mouse grabbing in conjunction with the "g" key. ``<mods>`` can be
|
||||||
either ``lshift-lctrl-lalt`` or ``rctrl``.
|
either ``lshift-lctrl-lalt`` or ``rctrl``.
|
||||||
|
|
||||||
``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.
|
|
||||||
This parameter is deprecated - use ``grab-mod`` instead.
|
|
||||||
|
|
||||||
``gl=on|off|core|es`` : Use OpenGL for displaying
|
``gl=on|off|core|es`` : Use OpenGL for displaying
|
||||||
|
|
||||||
``show-cursor=on|off`` : Force showing the mouse cursor
|
``show-cursor=on|off`` : Force showing the mouse cursor
|
||||||
|
@ -2103,28 +2097,6 @@ SRST
|
||||||
is displayed in graphical mode.
|
is displayed in graphical mode.
|
||||||
ERST
|
ERST
|
||||||
|
|
||||||
DEF("alt-grab", 0, QEMU_OPTION_alt_grab,
|
|
||||||
"-alt-grab use Ctrl-Alt-Shift to grab mouse (instead of Ctrl-Alt)\n",
|
|
||||||
QEMU_ARCH_ALL)
|
|
||||||
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). This option is deprecated - please use
|
|
||||||
``-display sdl,grab-mod=lshift-lctrl-lalt`` instead.
|
|
||||||
ERST
|
|
||||||
|
|
||||||
DEF("ctrl-grab", 0, QEMU_OPTION_ctrl_grab,
|
|
||||||
"-ctrl-grab use Right-Ctrl to grab mouse (instead of Ctrl-Alt)\n",
|
|
||||||
QEMU_ARCH_ALL)
|
|
||||||
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). This option is deprecated - please use
|
|
||||||
``-display sdl,grab-mod=rctrl`` instead.
|
|
||||||
ERST
|
|
||||||
|
|
||||||
DEF("sdl", 0, QEMU_OPTION_sdl,
|
DEF("sdl", 0, QEMU_OPTION_sdl,
|
||||||
"-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL)
|
"-sdl shorthand for -display sdl\n", QEMU_ARCH_ALL)
|
||||||
SRST
|
SRST
|
||||||
|
|
41
softmmu/vl.c
41
softmmu/vl.c
|
@ -1079,32 +1079,7 @@ static void parse_display(const char *p)
|
||||||
} else {
|
} else {
|
||||||
goto invalid_sdl_args;
|
goto invalid_sdl_args;
|
||||||
}
|
}
|
||||||
} else if (strstart(opts, ",alt_grab=", &nextopt)) {
|
} else if (strstart(opts, ",window-close=", &nextopt)) {
|
||||||
opts = nextopt;
|
|
||||||
if (strstart(opts, "on", &nextopt)) {
|
|
||||||
alt_grab = 1;
|
|
||||||
} else if (strstart(opts, "off", &nextopt)) {
|
|
||||||
alt_grab = 0;
|
|
||||||
} 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)) {
|
|
||||||
ctrl_grab = 1;
|
|
||||||
} else if (strstart(opts, "off", &nextopt)) {
|
|
||||||
ctrl_grab = 0;
|
|
||||||
} 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)) {
|
|
||||||
warn_report("window_close with an underscore is deprecated,"
|
|
||||||
" please use window-close instead.");
|
|
||||||
}
|
|
||||||
opts = nextopt;
|
opts = nextopt;
|
||||||
dpy.has_window_close = true;
|
dpy.has_window_close = true;
|
||||||
if (strstart(opts, "on", &nextopt)) {
|
if (strstart(opts, "on", &nextopt)) {
|
||||||
|
@ -1962,10 +1937,6 @@ static void qemu_create_early_backends(void)
|
||||||
const bool use_gtk = false;
|
const bool use_gtk = false;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((alt_grab || ctrl_grab) && !use_sdl) {
|
|
||||||
error_report("-alt-grab and -ctrl-grab are only valid "
|
|
||||||
"for SDL, ignoring option");
|
|
||||||
}
|
|
||||||
if (dpy.has_window_close && !use_gtk && !use_sdl) {
|
if (dpy.has_window_close && !use_gtk && !use_sdl) {
|
||||||
error_report("window-close is only valid for GTK and SDL, "
|
error_report("window-close is only valid for GTK and SDL, "
|
||||||
"ignoring option");
|
"ignoring option");
|
||||||
|
@ -3273,16 +3244,6 @@ void qemu_init(int argc, char **argv, char **envp)
|
||||||
dpy.has_full_screen = true;
|
dpy.has_full_screen = true;
|
||||||
dpy.full_screen = true;
|
dpy.full_screen = true;
|
||||||
break;
|
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_sdl:
|
case QEMU_OPTION_sdl:
|
||||||
warn_report("-sdl is deprecated, use -display sdl instead.");
|
warn_report("-sdl is deprecated, use -display sdl instead.");
|
||||||
#ifdef CONFIG_SDL
|
#ifdef CONFIG_SDL
|
||||||
|
|
Loading…
Reference in New Issue