[PATCH v2 0/2] Update description for input grab key

[PATCH v2 0/2] Update description for input grab key

[Tianlan Zhou]

Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.

v2:
- Update help message in system/vl.c

v1:
- Initial patch

Tianlan Zhou (2):
  docs/system: Update description for input grab key
  system/vl: Update description for input grab key

 docs/system/keys.rst.inc | 2 +-
 system/vl.c              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.38.1.windows.1

[PATCH v2 1/2] docs/system: Update description for input grab key

[Tianlan Zhou]

Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.

Signed-off-by: Tianlan Zhou <bobby825@126.com>
---
 docs/system/keys.rst.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/system/keys.rst.inc b/docs/system/keys.rst.inc
index 2e2c97aa23..59966a3fe7 100644
--- a/docs/system/keys.rst.inc
+++ b/docs/system/keys.rst.inc
@@ -29,7 +29,7 @@ Ctrl-Alt-n
    *3*
       Serial port
 
-Ctrl-Alt
+Ctrl-Alt-g
    Toggle mouse and keyboard grab.
 
 In the virtual consoles, you can use Ctrl-Up, Ctrl-Down, Ctrl-PageUp and
-- 
2.38.1.windows.1

Re: [PATCH v2 1/2] docs/system: Update description for input grab key

[Thomas Huth]

On 21/02/2024 20.52, Tianlan Zhou wrote:
> Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.
> 
> Signed-off-by: Tianlan Zhou <bobby825@126.com>
> ---
>   docs/system/keys.rst.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/docs/system/keys.rst.inc b/docs/system/keys.rst.inc
> index 2e2c97aa23..59966a3fe7 100644
> --- a/docs/system/keys.rst.inc
> +++ b/docs/system/keys.rst.inc
> @@ -29,7 +29,7 @@ Ctrl-Alt-n
>      *3*
>         Serial port
>   
> -Ctrl-Alt
> +Ctrl-Alt-g
>      Toggle mouse and keyboard grab.
>   
>   In the virtual consoles, you can use Ctrl-Up, Ctrl-Down, Ctrl-PageUp and

Fixes: f8d2c9369b ("sdl: use ctrl-alt-g as grab hotkey")

Reviewed-by: Thomas Huth <thuth@redhat.com>

[PATCH v2 2/2] system/vl: Update description for input grab key

[Tianlan Zhou]

Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.

Signed-off-by: Tianlan Zhou <bobby825@126.com>
---
 system/vl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/vl.c b/system/vl.c
index a82555ae15..b8469d9965 100644
--- a/system/vl.c
+++ b/system/vl.c
@@ -891,7 +891,7 @@ static void help(int exitcode)
     printf("\nDuring emulation, the following keys are useful:\n"
            "ctrl-alt-f      toggle full screen\n"
            "ctrl-alt-n      switch to virtual console 'n'\n"
-           "ctrl-alt        toggle mouse and keyboard grab\n"
+           "ctrl-alt-g      toggle mouse and keyboard grab\n"
            "\n"
            "When using -nographic, press 'ctrl-a h' to get some help.\n"
            "\n"
-- 
2.38.1.windows.1

Re: [PATCH v2 2/2] system/vl: Update description for input grab key

[Thomas Huth]

On 21/02/2024 20.52, Tianlan Zhou wrote:
> Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.
> 
> Signed-off-by: Tianlan Zhou <bobby825@126.com>
> ---
>   system/vl.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/system/vl.c b/system/vl.c
> index a82555ae15..b8469d9965 100644
> --- a/system/vl.c
> +++ b/system/vl.c
> @@ -891,7 +891,7 @@ static void help(int exitcode)
>       printf("\nDuring emulation, the following keys are useful:\n"
>              "ctrl-alt-f      toggle full screen\n"
>              "ctrl-alt-n      switch to virtual console 'n'\n"
> -           "ctrl-alt        toggle mouse and keyboard grab\n"
> +           "ctrl-alt-g      toggle mouse and keyboard grab\n"
>              "\n"
>              "When using -nographic, press 'ctrl-a h' to get some help.\n"
>              "\n"

Fixes: f8d2c9369b ("sdl: use ctrl-alt-g as grab hotkey")

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH v2 2/2] system/vl: Update description for input grab key

[Tianlan Zhou]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

Cc qemu-stable, as this will fix the `qemu-system-xxx -h` help message.


On 2024/2/22 3:52, Tianlan Zhou wrote:
> Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.
> 
> Signed-off-by: Tianlan Zhou <bobby825@126.com>
> ---
>  system/vl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/system/vl.c b/system/vl.c
> index a82555ae15..b8469d9965 100644
> --- a/system/vl.c
> +++ b/system/vl.c
> @@ -891,7 +891,7 @@ static void help(int exitcode)
>      printf("\nDuring emulation, the following keys are useful:\n"
>             "ctrl-alt-f      toggle full screen\n"
>             "ctrl-alt-n      switch to virtual console 'n'\n"
> -           "ctrl-alt        toggle mouse and keyboard grab\n"
> +           "ctrl-alt-g      toggle mouse and keyboard grab\n"
>             "\n"
>             "When using -nographic, press 'ctrl-a h' to get some help.\n"
>             "\n"
> -- 
> 2.38.1.windows.1

[-- Attachment #2: Type: text/html, Size: 2256 bytes --]

Re: [PATCH v2 2/2] system/vl: Update description for input grab key

[Michael Tokarev]

22.02.2024 15:50, Tianlan Zhou wrote:
> Cc qemu-stable, as this will fix the `qemu-system-xxx -h` help message.

Yes, I already picked up both of them.

/mjt

Re: [PATCH v2 0/2] Update description for input grab key

[Michael Tokarev]

21.02.2024 22:52, Tianlan Zhou :
> Input grab key should be Ctrl-Alt-g, not just Ctrl-Alt.
> 
> v2:
> - Update help message in system/vl.c
> 
> v1:
> - Initial patch
> 
> Tianlan Zhou (2):
>    docs/system: Update description for input grab key
>    system/vl: Update description for input grab key
> 
>   docs/system/keys.rst.inc | 2 +-
>   system/vl.c              | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

Applied to trivial-patches, thanks!

/mjt