sdl2: fix copypaste issues
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:
		
							parent
							
								
									54d208ffda
								
							
						
					
					
						commit
						48db08cf16
					
				@ -424,7 +424,7 @@ static void handle_keyup(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;
 | 
			
		||||
 | 
			
		||||
    if (qemu_console_is_graphic(con)) {
 | 
			
		||||
@ -436,7 +436,7 @@ static void handle_textinput(SDL_Event *ev)
 | 
			
		||||
static void handle_mousemotion(SDL_Event *ev)
 | 
			
		||||
{
 | 
			
		||||
    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)) {
 | 
			
		||||
        return;
 | 
			
		||||
@ -468,7 +468,7 @@ static void handle_mousebutton(SDL_Event *ev)
 | 
			
		||||
{
 | 
			
		||||
    int buttonstate = SDL_GetMouseState(NULL, NULL);
 | 
			
		||||
    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)) {
 | 
			
		||||
        return;
 | 
			
		||||
@ -492,7 +492,7 @@ static void handle_mousebutton(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;
 | 
			
		||||
    InputButton btn;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user