* [Qemu-devel] [PULL 0/2] Ui 20190822 patches
@ 2019-08-22 4:42 Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 1/2] curses: assert get_wch return value is okay Gerd Hoffmann
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 4:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Markus Armbruster
The following changes since commit 17dc57990320edaad52ac9ea808be9719c91cea6:
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-20' into staging (2019-08-20 14:14:20 +0100)
are available in the Git repository at:
git://git.kraxel.org/qemu tags/ui-20190822-pull-request
for you to fetch changes up to a923b471fc59389e49575f38f4db3cd622619bf5:
input-linux: add shift+shift as a grab toggle (2019-08-21 12:25:46 +0200)
----------------------------------------------------------------
curses: assert get_wch return value is okay
input-linux: add shift+shift as a grab toggle
----------------------------------------------------------------
Niklas Haas (1):
input-linux: add shift+shift as a grab toggle
Paolo Bonzini (1):
curses: assert get_wch return value is okay
ui/curses.c | 2 ++
ui/input-linux.c | 4 ++++
qapi/ui.json | 3 ++-
3 files changed, 8 insertions(+), 1 deletion(-)
--
2.18.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL 1/2] curses: assert get_wch return value is okay
2019-08-22 4:42 [Qemu-devel] [PULL 0/2] Ui 20190822 patches Gerd Hoffmann
@ 2019-08-22 4:42 ` Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 2/2] input-linux: add shift+shift as a grab toggle Gerd Hoffmann
2019-08-22 14:10 ` [Qemu-devel] [PULL 0/2] Ui 20190822 patches Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 4:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Gerd Hoffmann, Markus Armbruster
From: Paolo Bonzini <pbonzini@redhat.com>
This prevents the compiler from reporting a possible uninitialized use
of maybe_keycode in function curses_refresh.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1563451264-46176-1-git-send-email-pbonzini@redhat.com
[ kraxel: whitespace fixup ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/curses.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ui/curses.c b/ui/curses.c
index a6e260eb964d..ec281125acbd 100644
--- a/ui/curses.c
+++ b/ui/curses.c
@@ -225,6 +225,8 @@ static wint_t console_getch(enum maybe_keycode *maybe_keycode)
case ERR:
ret = -1;
break;
+ default:
+ abort();
}
return ret;
}
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Qemu-devel] [PULL 2/2] input-linux: add shift+shift as a grab toggle
2019-08-22 4:42 [Qemu-devel] [PULL 0/2] Ui 20190822 patches Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 1/2] curses: assert get_wch return value is okay Gerd Hoffmann
@ 2019-08-22 4:42 ` Gerd Hoffmann
2019-08-22 14:10 ` [Qemu-devel] [PULL 0/2] Ui 20190822 patches Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 4:42 UTC (permalink / raw)
To: qemu-devel; +Cc: Niklas Haas, Gerd Hoffmann, Markus Armbruster
From: Niklas Haas <git@haasn.xyz>
We have ctrl-ctrl and alt-alt; why not shift-shift? That's my preferred
grab binding, personally.
Signed-off-by: Niklas Haas <git@haasn.xyz>
Message-id: 20190818105038.19520-1-qemu@haasn.xyz
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/input-linux.c | 4 ++++
qapi/ui.json | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 59456fe7658b..a7b280b25b98 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -113,6 +113,10 @@ static bool input_linux_check_toggle(InputLinux *il)
return il->keydown[KEY_LEFTALT] &&
il->keydown[KEY_RIGHTALT];
+ case GRAB_TOGGLE_KEYS_SHIFT_SHIFT:
+ return il->keydown[KEY_LEFTSHIFT] &&
+ il->keydown[KEY_RIGHTSHIFT];
+
case GRAB_TOGGLE_KEYS_META_META:
return il->keydown[KEY_LEFTMETA] &&
il->keydown[KEY_RIGHTMETA];
diff --git a/qapi/ui.json b/qapi/ui.json
index 59e412139adc..e04525d8b44b 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1025,7 +1025,8 @@
#
##
{ 'enum': 'GrabToggleKeys',
- 'data': [ 'ctrl-ctrl', 'alt-alt', 'meta-meta', 'scrolllock', 'ctrl-scrolllock' ] }
+ 'data': [ 'ctrl-ctrl', 'alt-alt', 'shift-shift','meta-meta', 'scrolllock',
+ 'ctrl-scrolllock' ] }
##
# @DisplayGTK:
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] Ui 20190822 patches
2019-08-22 4:42 [Qemu-devel] [PULL 0/2] Ui 20190822 patches Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 1/2] curses: assert get_wch return value is okay Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 2/2] input-linux: add shift+shift as a grab toggle Gerd Hoffmann
@ 2019-08-22 14:10 ` Peter Maydell
2 siblings, 0 replies; 4+ messages in thread
From: Peter Maydell @ 2019-08-22 14:10 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers, Markus Armbruster
On Thu, 22 Aug 2019 at 05:43, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 17dc57990320edaad52ac9ea808be9719c91cea6:
>
> Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-20' into staging (2019-08-20 14:14:20 +0100)
>
> are available in the Git repository at:
>
> git://git.kraxel.org/qemu tags/ui-20190822-pull-request
>
> for you to fetch changes up to a923b471fc59389e49575f38f4db3cd622619bf5:
>
> input-linux: add shift+shift as a grab toggle (2019-08-21 12:25:46 +0200)
>
> ----------------------------------------------------------------
> curses: assert get_wch return value is okay
> input-linux: add shift+shift as a grab toggle
>
> ----------------------------------------------------------------
>
> Niklas Haas (1):
> input-linux: add shift+shift as a grab toggle
>
> Paolo Bonzini (1):
> curses: assert get_wch return value is okay
>
> ui/curses.c | 2 ++
> ui/input-linux.c | 4 ++++
> qapi/ui.json | 3 ++-
> 3 files changed, 8 insertions(+), 1 deletion(-)
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-22 14:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-22 4:42 [Qemu-devel] [PULL 0/2] Ui 20190822 patches Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 1/2] curses: assert get_wch return value is okay Gerd Hoffmann
2019-08-22 4:42 ` [Qemu-devel] [PULL 2/2] input-linux: add shift+shift as a grab toggle Gerd Hoffmann
2019-08-22 14:10 ` [Qemu-devel] [PULL 0/2] Ui 20190822 patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).