* [Qemu-devel] [PULL 0/2] sdl patch queue
@ 2014-09-16 6:31 Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 1/2] sdl2: drop sdl_zoom.h Gerd Hoffmann
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2014-09-16 6:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann
Hi,
Two minor sdl2 fixes.
please pull,
Gerd
The following changes since commit cc35a44cf7b522b1fd0b786562b7de4b881c41b0:
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-09-15 19:44:34 +0100)
are available in the git repository at:
git://git.kraxel.org/qemu tags/pull-sdl-20140916-1
for you to fetch changes up to 0d61f7dcc6c04e7e825417c74e50362d990330bf:
sdl2: keymap fixups (2014-09-16 08:07:05 +0200)
----------------------------------------------------------------
Two minor sdl2 fixes.
----------------------------------------------------------------
Gerd Hoffmann (2):
sdl2: drop sdl_zoom.h
sdl2: keymap fixups
ui/sdl2-keymap.h | 7 ++++---
ui/sdl2.c | 1 -
2 files changed, 4 insertions(+), 4 deletions(-)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PULL 1/2] sdl2: drop sdl_zoom.h
2014-09-16 6:31 [Qemu-devel] [PULL 0/2] sdl patch queue Gerd Hoffmann
@ 2014-09-16 6:31 ` Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 2/2] sdl2: keymap fixups Gerd Hoffmann
2014-09-16 18:38 ` [Qemu-devel] [PULL 0/2] sdl patch queue Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2014-09-16 6:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Anthony Liguori
It isn't used.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/sdl2.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/ui/sdl2.c b/ui/sdl2.c
index fcac87b..1ad74ba 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -35,7 +35,6 @@
#include "ui/console.h"
#include "ui/input.h"
#include "sysemu/sysemu.h"
-#include "sdl_zoom.h"
#include "sdl2-keymap.h"
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PULL 2/2] sdl2: keymap fixups
2014-09-16 6:31 [Qemu-devel] [PULL 0/2] sdl patch queue Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 1/2] sdl2: drop sdl_zoom.h Gerd Hoffmann
@ 2014-09-16 6:31 ` Gerd Hoffmann
2014-09-16 18:38 ` [Qemu-devel] [PULL 0/2] sdl patch queue Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2014-09-16 6:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Anthony Liguori
Make a few keys works correctly in SDL2.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/sdl2-keymap.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ui/sdl2-keymap.h b/ui/sdl2-keymap.h
index 5a12f45..cbedaa4 100644
--- a/ui/sdl2-keymap.h
+++ b/ui/sdl2-keymap.h
@@ -105,9 +105,10 @@ static const int sdl2_scancode_to_qcode[SDL_NUM_SCANCODES] = {
[SDL_SCANCODE_KP_9] = Q_KEY_CODE_KP_9,
[SDL_SCANCODE_KP_0] = Q_KEY_CODE_KP_0,
[SDL_SCANCODE_KP_PERIOD] = Q_KEY_CODE_KP_DECIMAL,
+
+ [SDL_SCANCODE_NONUSBACKSLASH] = Q_KEY_CODE_LESS,
+ [SDL_SCANCODE_APPLICATION] = Q_KEY_CODE_MENU,
#if 0
- [SDL_SCANCODE_NONUSBACKSLASH] = Q_KEY_CODE_NONUSBACKSLASH,
- [SDL_SCANCODE_APPLICATION] = Q_KEY_CODE_APPLICATION,
[SDL_SCANCODE_POWER] = Q_KEY_CODE_POWER,
[SDL_SCANCODE_KP_EQUALS] = Q_KEY_CODE_KP_EQUALS,
@@ -231,7 +232,7 @@ static const int sdl2_scancode_to_qcode[SDL_NUM_SCANCODES] = {
[SDL_SCANCODE_LGUI] = Q_KEY_CODE_META_L,
[SDL_SCANCODE_RCTRL] = Q_KEY_CODE_CTRL_R,
[SDL_SCANCODE_RSHIFT] = Q_KEY_CODE_SHIFT_R,
- [SDL_SCANCODE_RALT] = Q_KEY_CODE_ALTGR,
+ [SDL_SCANCODE_RALT] = Q_KEY_CODE_ALT_R,
[SDL_SCANCODE_RGUI] = Q_KEY_CODE_META_R,
#if 0
[SDL_SCANCODE_MODE] = Q_KEY_CODE_MODE,
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] sdl patch queue
2014-09-16 6:31 [Qemu-devel] [PULL 0/2] sdl patch queue Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 1/2] sdl2: drop sdl_zoom.h Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 2/2] sdl2: keymap fixups Gerd Hoffmann
@ 2014-09-16 18:38 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2014-09-16 18:38 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 15 September 2014 23:31, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Hi,
>
> Two minor sdl2 fixes.
>
> please pull,
> Gerd
>
> The following changes since commit cc35a44cf7b522b1fd0b786562b7de4b881c41b0:
>
> Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (2014-09-15 19:44:34 +0100)
>
> are available in the git repository at:
>
>
> git://git.kraxel.org/qemu tags/pull-sdl-20140916-1
>
> for you to fetch changes up to 0d61f7dcc6c04e7e825417c74e50362d990330bf:
>
> sdl2: keymap fixups (2014-09-16 08:07:05 +0200)
>
> ----------------------------------------------------------------
> Two minor sdl2 fixes.
>
> ----------------------------------------------------------------
> Gerd Hoffmann (2):
> sdl2: drop sdl_zoom.h
> sdl2: keymap fixups
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PULL 0/2] sdl patch queue
[not found] <1398766732-32106-1-git-send-email-kraxel@redhat.com>
@ 2014-05-01 13:13 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2014-05-01 13:13 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU Developers
On 29 April 2014 11:18, Gerd Hoffmann <kraxel@redhat.com> wrote:
> Hi,
>
> Two small improvements for SDL2: mouse wheel support and
> ui config notification.
>
> please pull,
> Gerd
>
> The following changes since commit e2da502c003b9a91b4aea7684959192bd07c1f1d:
>
> Merge remote-tracking branch 'remotes/otubo/seccomp' into staging (2014-04-28 14:14:35 +0100)
>
> are available in the git repository at:
>
>
> git://git.kraxel.org/qemu tags/pull-sdl-2
>
> for you to fetch changes up to 3f2fde2a0002e6a3c83d61b7976436fbaf39750c:
>
> sdl2: Support mouse wheel (2014-04-29 10:46:33 +0200)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-16 18:38 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-16 6:31 [Qemu-devel] [PULL 0/2] sdl patch queue Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 1/2] sdl2: drop sdl_zoom.h Gerd Hoffmann
2014-09-16 6:31 ` [Qemu-devel] [PULL 2/2] sdl2: keymap fixups Gerd Hoffmann
2014-09-16 18:38 ` [Qemu-devel] [PULL 0/2] sdl patch queue Peter Maydell
[not found] <1398766732-32106-1-git-send-email-kraxel@redhat.com>
2014-05-01 13:13 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.