From nobody Mon Feb 9 03:12:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1640213958; cv=none; d=zohomail.com; s=zohoarc; b=WS1ZBfRb+dUNkoqzRDLJdQK8oveJmuI8X9do4H1B4BQ1RcSBgfA4lal7wLtpOPER9ALJK/BQHonZBcyDBDkBVSLOUtL0eZrcLPSvZ+Wrtx+sVIcl4k2vKz3Uy83F7QM2hD5oaFUwgsuAwWFNXTm6YlW8MqWVab8L4atXxuH4bDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640213958; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5kdp0snb3SFSbv62l+V5oc1HsNnrPydAEd/264gvRo4=; b=bKhSHCBJzwBKrIttmUJmT0O7UvziQtRPrE8DDVInz+c3iY54Xv1Rz9lLZPc28UNFvchEBwQpcGRCSJ2Z+Y/N2FhOKT0XLJkX5QE0ALv8DiozS+JVDx/M6MIjSng14FYRLdoIRKOtic3WAjikNNfgKtoQ7HQQjg++e2ndjDZLyfQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1640213958942321.74999735856886; Wed, 22 Dec 2021 14:59:18 -0800 (PST) Received: from localhost ([::1]:60210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0AZp-0004Or-49 for importer@patchew.org; Wed, 22 Dec 2021 17:59:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38438) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0AWv-0002Hw-N6 for qemu-devel@nongnu.org; Wed, 22 Dec 2021 17:56:19 -0500 Received: from [2a00:1450:4864:20::530] (port=41678 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0AWr-0002Q6-Gj for qemu-devel@nongnu.org; Wed, 22 Dec 2021 17:56:15 -0500 Received: by mail-ed1-x530.google.com with SMTP id b13so14187775edd.8 for ; Wed, 22 Dec 2021 14:56:11 -0800 (PST) Received: from owl.kpn ([2a02:a467:f77d:1:deba:f393:276b:fad2]) by smtp.gmail.com with ESMTPSA id gv11sm1097226ejc.135.2021.12.22.14.56.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 14:56:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5kdp0snb3SFSbv62l+V5oc1HsNnrPydAEd/264gvRo4=; b=NxZ15at1KMKLRjpl25D72e5iV1QvciryiNPRySCo5c/+7i+wgd54NEmrIoNIlY387P o0NjISgoADJBr5Fq4+mkSvjGCdj1vvjRZ6frauCmwt+TDkM7oB1ofSyF2HGza6z3ftHu C4n/ixxhTQmTAoujaP5ikZvIfP5b7nglHQl0P6ji/hcMAFnBx8WkWMgMLie3umpfTgy2 Y/TIsHrpbsHGDIB9AVXZxJLiJMrLo70G+3JleHfhR3YJ4kKeWkEZc4+7VOdzcEbH7VU/ khU6cniMpdLJTb5hBFy/1MlEUEP2eNp4bTWx7aEl4Et4TrbpLfE1pC2Fcwggat5Encsy goBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5kdp0snb3SFSbv62l+V5oc1HsNnrPydAEd/264gvRo4=; b=SN+rWjbB7O4wQIo2Lw7CuSG4g+xwH/VdcwnXdoGoSSW6nOK+Pd/t7fynhyRo5pjSeq RhcyqYwE5Ctd4wcg6UaN7iZHxBaMtLG2Q5Ykv51ymB6jff5fOP9Lj/knsInk0BQu4Fki zlWcpmXRTdpxpoapsh7PcpGO/nA0SAhMZYN/XL3tA9+LXUZHXOUy7nxfwOJzzFeu7l2o JW+PFG7mf3iENWrr3ffdRC83u+Xgo+NJmSpW180xdB2Wr/kDfohdxs5F6kMe+QJnKO6o CwMrQKg1Bxe8yxKaC9AYHRr4lkItLBix4K9D8D8qkfaCEpieZ03OhMiQdqMiDjt0jz5W M24g== X-Gm-Message-State: AOAM530wxj0G/tfDns/bCL50ssi8SpEXJz5lczRHTcPwp1Ryvp13zpv0 f+Ys64C8cuoFMPsFut/9d3vaHFWVs5g= X-Google-Smtp-Source: ABdhPJz4Zm5jV6b+fzU7YP5S4O9UI5zWTBGv+1zo/Uuo/TY9t8j6ZrS+2j/tVprTu43yeRgqCNINZA== X-Received: by 2002:a05:6402:16cd:: with SMTP id r13mr4668816edx.264.1640213769815; Wed, 22 Dec 2021 14:56:09 -0800 (PST) From: Dmitry Petrov To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] ui/gtk: pass horizontal scroll information to the device code Date: Wed, 22 Dec 2021 23:56:04 +0100 Message-Id: <20211222225606.1359162-4-dpetroff@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211222225606.1359162-1-dpetroff@gmail.com> References: <20211222225606.1359162-1-dpetroff@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::530 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::530; envelope-from=dpetroff@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Dmitry Petrov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1640213960677100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Dmitry Petrov --- ui/gtk.c | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 12 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 6a1f65d518..a8567b9ddc 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -968,33 +968,63 @@ static gboolean gd_scroll_event(GtkWidget *widget, Gd= kEventScroll *scroll, void *opaque) { VirtualConsole *vc =3D opaque; - InputButton btn; + InputButton btn_vertical; + InputButton btn_horizontal; + bool has_vertical =3D false; + bool has_horizontal =3D false; =20 if (scroll->direction =3D=3D GDK_SCROLL_UP) { - btn =3D INPUT_BUTTON_WHEEL_UP; + btn_vertical =3D INPUT_BUTTON_WHEEL_UP; + has_vertical =3D true; } else if (scroll->direction =3D=3D GDK_SCROLL_DOWN) { - btn =3D INPUT_BUTTON_WHEEL_DOWN; + btn_vertical =3D INPUT_BUTTON_WHEEL_DOWN; + has_vertical =3D true; + } else if (scroll->direction =3D=3D GDK_SCROLL_LEFT) { + btn_horizontal =3D INPUT_BUTTON_WHEEL_LEFT; + has_horizontal =3D true; + } else if (scroll->direction =3D=3D GDK_SCROLL_RIGHT) { + btn_horizontal =3D INPUT_BUTTON_WHEEL_RIGHT; + has_horizontal =3D true; } else if (scroll->direction =3D=3D GDK_SCROLL_SMOOTH) { gdouble delta_x, delta_y; if (!gdk_event_get_scroll_deltas((GdkEvent *)scroll, &delta_x, &delta_y)) { return TRUE; } - if (delta_y =3D=3D 0) { - return TRUE; - } else if (delta_y > 0) { - btn =3D INPUT_BUTTON_WHEEL_DOWN; + + if (delta_y > 0) { + btn_vertical =3D INPUT_BUTTON_WHEEL_DOWN; + has_vertical =3D true; + } else if (delta_y < 0) { + btn_vertical =3D INPUT_BUTTON_WHEEL_UP; + has_vertical =3D true; + } else if (delta_x > 0) { + btn_horizontal =3D INPUT_BUTTON_WHEEL_RIGHT; + has_horizontal =3D true; + } else if (delta_x < 0) { + btn_horizontal =3D INPUT_BUTTON_WHEEL_LEFT; + has_horizontal =3D true; } else { - btn =3D INPUT_BUTTON_WHEEL_UP; + return TRUE; } } else { return TRUE; } =20 - qemu_input_queue_btn(vc->gfx.dcl.con, btn, true); - qemu_input_event_sync(); - qemu_input_queue_btn(vc->gfx.dcl.con, btn, false); - qemu_input_event_sync(); + if (has_vertical) { + qemu_input_queue_btn(vc->gfx.dcl.con, btn_vertical, true); + qemu_input_event_sync(); + qemu_input_queue_btn(vc->gfx.dcl.con, btn_vertical, false); + qemu_input_event_sync(); + } + + if (has_horizontal) { + qemu_input_queue_btn(vc->gfx.dcl.con, btn_horizontal, true); + qemu_input_event_sync(); + qemu_input_queue_btn(vc->gfx.dcl.con, btn_horizontal, false); + qemu_input_event_sync(); + } + return TRUE; } =20 --=20 2.32.0