xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2025-01-27 15:02:04 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

sdl2: fix copypaste issues

Browse Source 
This patch fixes text and mouse event processing. These functions used
'key' field of the event instead of appropriate 'text', 'motion', 'button',
or 'wheel'.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Signed-off-by: Maria Klimushenkova <maria.klimushenkova@ispras.ru>
Message-id: 20180626064017.17031.47954.stgit@pasha-VirtualBox
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Pavel Dovgalyuk 2018-06-26 09:40:17 +03:00 committed by Gerd Hoffmann
parent 54d208ffda
commit 48db08cf16
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/sdl2.c
View File

@ -424,7 +424,7 @@ static void handle_keyup(SDL_Event *ev)
static void handle_textinput(SDL_Event *ev) static void handle_textinput(SDL_Event *ev)
{ {
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); struct sdl2_console *scon = get_scon_from_window(ev->text.windowID);
QemuConsole *con = scon ? scon->dcl.con : NULL; QemuConsole *con = scon ? scon->dcl.con : NULL;
if (qemu_console_is_graphic(con)) { if (qemu_console_is_graphic(con)) {
@ -436,7 +436,7 @@ static void handle_textinput(SDL_Event *ev)
static void handle_mousemotion(SDL_Event *ev) static void handle_mousemotion(SDL_Event *ev)
{ {
int max_x, max_y; int max_x, max_y;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); struct sdl2_console *scon = get_scon_from_window(ev->motion.windowID);
if (!qemu_console_is_graphic(scon->dcl.con)) { if (!qemu_console_is_graphic(scon->dcl.con)) {
return; return;
@ -468,7 +468,7 @@ static void handle_mousebutton(SDL_Event *ev)
{ {
int buttonstate = SDL_GetMouseState(NULL, NULL); int buttonstate = SDL_GetMouseState(NULL, NULL);
SDL_MouseButtonEvent *bev; SDL_MouseButtonEvent *bev;
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); struct sdl2_console *scon = get_scon_from_window(ev->button.windowID);
if (!qemu_console_is_graphic(scon->dcl.con)) { if (!qemu_console_is_graphic(scon->dcl.con)) {
return; return;
@ -492,7 +492,7 @@ static void handle_mousebutton(SDL_Event *ev)
static void handle_mousewheel(SDL_Event *ev) static void handle_mousewheel(SDL_Event *ev)
{ {
struct sdl2_console *scon = get_scon_from_window(ev->key.windowID); struct sdl2_console *scon = get_scon_from_window(ev->wheel.windowID);
SDL_MouseWheelEvent *wev = &ev->wheel; SDL_MouseWheelEvent *wev = &ev->wheel;
InputButton btn; InputButton btn;