From nobody Tue Nov 4 15:26:26 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530021892421542.8373063842706; Tue, 26 Jun 2018 07:04:52 -0700 (PDT) Received: from localhost ([::1]:52920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXoaP-0007dH-Hj for importer@patchew.org; Tue, 26 Jun 2018 10:04:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fXoSM-0000Ez-FX for qemu-devel@nongnu.org; Tue, 26 Jun 2018 09:56:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fXoSJ-0000sO-8U for qemu-devel@nongnu.org; Tue, 26 Jun 2018 09:56:30 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38766 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fXoSJ-0000rb-4a for qemu-devel@nongnu.org; Tue, 26 Jun 2018 09:56:27 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 164C0808255B; Tue, 26 Jun 2018 13:56:26 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-216.ams2.redhat.com [10.36.116.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id C327F2026D6C; Tue, 26 Jun 2018 13:56:25 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3BB7A980DD; Tue, 26 Jun 2018 15:56:25 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 26 Jun 2018 15:56:24 +0200 Message-Id: <20180626135625.7078-3-kraxel@redhat.com> In-Reply-To: <20180626135625.7078-1-kraxel@redhat.com> References: <20180626135625.7078-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 26 Jun 2018 13:56:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Tue, 26 Jun 2018 13:56:26 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 2/3] sdl2: fix copypaste issues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maria Klimushenkova , Gerd Hoffmann , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Pavel Dovgalyuk 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 Signed-off-by: Maria Klimushenkova Message-id: 20180626064017.17031.47954.stgit@pasha-VirtualBox Signed-off-by: Gerd Hoffmann --- ui/sdl2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/sdl2.c b/ui/sdl2.c index 3ae4719c32..3fff9f5b63 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -424,7 +424,7 @@ static void handle_keyup(SDL_Event *ev) =20 static void handle_textinput(SDL_Event *ev) { - struct sdl2_console *scon =3D get_scon_from_window(ev->key.windowID); + struct sdl2_console *scon =3D get_scon_from_window(ev->text.windowID); QemuConsole *con =3D scon ? scon->dcl.con : NULL; =20 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 =3D get_scon_from_window(ev->key.windowID); + struct sdl2_console *scon =3D get_scon_from_window(ev->motion.windowID= ); =20 if (!qemu_console_is_graphic(scon->dcl.con)) { return; @@ -468,7 +468,7 @@ static void handle_mousebutton(SDL_Event *ev) { int buttonstate =3D SDL_GetMouseState(NULL, NULL); SDL_MouseButtonEvent *bev; - struct sdl2_console *scon =3D get_scon_from_window(ev->key.windowID); + struct sdl2_console *scon =3D get_scon_from_window(ev->button.windowID= ); =20 if (!qemu_console_is_graphic(scon->dcl.con)) { return; @@ -492,7 +492,7 @@ static void handle_mousebutton(SDL_Event *ev) =20 static void handle_mousewheel(SDL_Event *ev) { - struct sdl2_console *scon =3D get_scon_from_window(ev->key.windowID); + struct sdl2_console *scon =3D get_scon_from_window(ev->wheel.windowID); SDL_MouseWheelEvent *wev =3D &ev->wheel; InputButton btn; =20 --=20 2.9.3