From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Andrey Listopadov Newsgroups: gmane.emacs.bugs Subject: bug#52685: 29.0.50; Horizontal scrolling doesn't work when compiled with pgtk Date: Wed, 22 Dec 2021 08:55:44 +0300 Message-ID: References: <878rwezqzk.fsf@yahoo.com> <20211221.222847.806642445048126400.masm@luna.pink.masm11.me> <8735mlv4h2.fsf@yahoo.com> <87r1a5tphk.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="13647"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Yuuki Harano , 52685@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 22 06:57:46 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mzudG-0003PJ-5k for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 22 Dec 2021 06:57:46 +0100 Original-Received: from localhost ([::1]:46394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzudE-0007oa-Bs for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 22 Dec 2021 00:57:44 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzucY-0007nj-9j for bug-gnu-emacs@gnu.org; Wed, 22 Dec 2021 00:57:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44918) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzucX-0002wN-WA for bug-gnu-emacs@gnu.org; Wed, 22 Dec 2021 00:57:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzucX-0006Rz-N8 for bug-gnu-emacs@gnu.org; Wed, 22 Dec 2021 00:57:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Andrey Listopadov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Dec 2021 05:57:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52685 X-GNU-PR-Package: emacs Original-Received: via spool by 52685-submit@debbugs.gnu.org id=B52685.164015259024750 (code B ref 52685); Wed, 22 Dec 2021 05:57:01 +0000 Original-Received: (at 52685) by debbugs.gnu.org; 22 Dec 2021 05:56:30 +0000 Original-Received: from localhost ([127.0.0.1]:56464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzuc1-0006R7-TI for submit@debbugs.gnu.org; Wed, 22 Dec 2021 00:56:30 -0500 Original-Received: from mail-ed1-f52.google.com ([209.85.208.52]:37506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzubz-0006Qt-6j for 52685@debbugs.gnu.org; Wed, 22 Dec 2021 00:56:28 -0500 Original-Received: by mail-ed1-f52.google.com with SMTP id o6so4197545edc.4 for <52685@debbugs.gnu.org>; Tue, 21 Dec 2021 21:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6TVasOi+ZrVYo9JKoC24mcUPXEWdlAq4JeK4N/v4CyY=; b=fudtbtHCRBoCum2gACe0u3bnnopGKe/mLfmwckOuhCUBBI9BZpfexpXplURxCYL1zc fjXatX/8M8ScHYnM0/gMGBPjczqHUVwoAKFabXmgoBnXa7fvkfi6c1ixuRM2Hjlw/rA3 KDJb+g9Fr777m1viR5Di+YDlFbtRrIsWFMEFUOFhoe0w2hVJHT1OZHNTY9t1wN/hz9gc 7wFBjavuqL9IVTc0i03GqDmD98a67vtZDau+5RrtsOGuRsXsTs92q2XLHc2nze1HEeia cKVNIr1mUhSnycP5z1BrY+3/JTsett8jBjz5FcdqM0nwoIHxU2Aw0HMKarwVZPjgA1l+ wKbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6TVasOi+ZrVYo9JKoC24mcUPXEWdlAq4JeK4N/v4CyY=; b=N2YOe/secD/qOjC5L4KyGglzsyBx5ru592Ct7+ewaVIkDY/Mo/UEYFlTAkHqDhKiwr Fq1S/zD87qaRxgGnnq8QzUWMzA+QlBDwjTgwY4wQGpMo84QJ+ier7zbt4Rp8DxSMUKTv tjJXV7Iq/dVZ4OgP1atH/vQxX2OzYEqBaxzux+EO8zIRLVA2DAQRjvgDWFHUjkYkeJMz 20y0OGj9U0LO1rYknUXQrQQ5Xd017vK1+pmu0NmvZOzf7MmcLlPYLxPU57X2q2o/AeW0 v2hc26vXRVkKqK/kGNdWesa8/YvPISosGUaEyV2MsIHv5sMNbpRsIY+WqPDjPcyBbI3M xL5w== X-Gm-Message-State: AOAM532fA7OA2a6rOVPNfDnwGtElv/KDX4Ez3BfR6gPE1uw8r8puxWYX 64CeYRl+HktT/BdWfKQbTRaXh4MsS5JPnWFCwVU= X-Google-Smtp-Source: ABdhPJwdd2gvXd56qI937herbxTxOAhzwXBE9NDMrAU3rLCJC5LWPTJFm/FwbNRvYM8xq17P+ZcpsRlqjCeoJF66k40= X-Received: by 2002:aa7:cfd5:: with SMTP id r21mr1452337edy.98.1640152581327; Tue, 21 Dec 2021 21:56:21 -0800 (PST) In-Reply-To: <87r1a5tphk.fsf@yahoo.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:222911 Archived-At: On Wed, Dec 22, 2021 at 4:09 AM Po Lu wrote: > > Po Lu writes: > > > Andrey Listopadov writes: > > > >> When `pixel-scroll-precision-mode' is disabled everything works fine. > >> When compiled without `--with-pgtk' but with `--with-xinput2' > >> `pixel-scroll-precision-mode' works as expected. > > > > Thanks, I will look into this now. > > Please try the following patch to see if it resolves your problem. > Thanks. > > diff --git a/src/pgtkterm.c b/src/pgtkterm.c > index bd61c65edd..bea2650584 100644 > --- a/src/pgtkterm.c > +++ b/src/pgtkterm.c > @@ -6133,78 +6133,64 @@ scroll_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data) > } > else if (gdk_event_get_scroll_deltas (event, &delta_x, &delta_y)) > { > - dpyinfo->scroll.acc_x += delta_x; > - dpyinfo->scroll.acc_y += delta_y; > - if (dpyinfo->scroll.acc_y >= dpyinfo->scroll.y_per_line > - || !mwheel_coalesce_scroll_events) > + if (!mwheel_coalesce_scroll_events) > { > - int nlines = dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line; > - inev.ie.kind = WHEEL_EVENT; > - inev.ie.modifiers |= down_modifier; > - inev.ie.arg = list3 (make_fixnum (nlines), > - make_float (-dpyinfo->scroll.acc_x * 100), > - make_float (-dpyinfo->scroll.acc_y * 100)); > - if (!mwheel_coalesce_scroll_events) > - { > - dpyinfo->scroll.acc_y = 0; > - dpyinfo->scroll.acc_x = 0; > - } > - else > + inev.ie.kind = ((fabs (delta_x) > fabs (delta_y)) > + ? HORIZ_WHEEL_EVENT > + : WHEEL_EVENT); > + inev.ie.modifiers = (inev.ie.kind == HORIZ_WHEEL_EVENT > + ? (delta_x >= 0 ? down_modifier : up_modifier) > + : (delta_y >= 0 ? down_modifier : up_modifier)); > + inev.ie.arg = list3 (Qnil, make_float (delta_x), > + make_float (delta_y)); > + } > + else > + { > + dpyinfo->scroll.acc_x += delta_x; > + dpyinfo->scroll.acc_y += delta_y; > + if (dpyinfo->scroll.acc_y >= dpyinfo->scroll.y_per_line) > { > + int nlines = dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line; > + inev.ie.kind = WHEEL_EVENT; > + inev.ie.modifiers |= down_modifier; > + inev.ie.arg = list3 (make_fixnum (nlines), > + make_float (-dpyinfo->scroll.acc_x * 100), > + make_float (-dpyinfo->scroll.acc_y * 100)); > dpyinfo->scroll.acc_y -= dpyinfo->scroll.y_per_line * nlines; > } > - } > - else if (dpyinfo->scroll.acc_y <= -dpyinfo->scroll.y_per_line > - || !mwheel_coalesce_scroll_events) > - { > - int nlines = -dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line; > - inev.ie.kind = WHEEL_EVENT; > - inev.ie.modifiers |= up_modifier; > - inev.ie.arg = list3 (make_fixnum (nlines), > - make_float (-dpyinfo->scroll.acc_x * 100), > - make_float (-dpyinfo->scroll.acc_y * 100)); > - > - if (!mwheel_coalesce_scroll_events) > + else if (dpyinfo->scroll.acc_y <= -dpyinfo->scroll.y_per_line) > { > - dpyinfo->scroll.acc_y = 0; > - dpyinfo->scroll.acc_x = 0; > + int nlines = -dpyinfo->scroll.acc_y / dpyinfo->scroll.y_per_line; > + inev.ie.kind = WHEEL_EVENT; > + inev.ie.modifiers |= up_modifier; > + inev.ie.arg = list3 (make_fixnum (nlines), > + make_float (-dpyinfo->scroll.acc_x * 100), > + make_float (-dpyinfo->scroll.acc_y * 100)); > + > + dpyinfo->scroll.acc_y -= -dpyinfo->scroll.y_per_line * nlines; > } > - else > - dpyinfo->scroll.acc_y -= -dpyinfo->scroll.y_per_line * nlines; > - } > - else if (dpyinfo->scroll.acc_x >= dpyinfo->scroll.x_per_char > - || !mwheel_coalesce_scroll_events) > - { > - int nchars = dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char; > - inev.ie.kind = HORIZ_WHEEL_EVENT; > - inev.ie.modifiers |= up_modifier; > - inev.ie.arg = list3 (make_fixnum (nchars), > - make_float (-dpyinfo->scroll.acc_x * 100), > - make_float (-dpyinfo->scroll.acc_y * 100)); > - > - if (mwheel_coalesce_scroll_events) > - dpyinfo->scroll.acc_x -= dpyinfo->scroll.x_per_char * nchars; > - else > + else if (dpyinfo->scroll.acc_x >= dpyinfo->scroll.x_per_char > + || !mwheel_coalesce_scroll_events) > { > - dpyinfo->scroll.acc_x = 0; > - dpyinfo->scroll.acc_y = 0; > + int nchars = dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char; > + inev.ie.kind = HORIZ_WHEEL_EVENT; > + inev.ie.modifiers |= up_modifier; > + inev.ie.arg = list3 (make_fixnum (nchars), > + make_float (-dpyinfo->scroll.acc_x * 100), > + make_float (-dpyinfo->scroll.acc_y * 100)); > + > + dpyinfo->scroll.acc_x -= dpyinfo->scroll.x_per_char * nchars; > } > - } > - else if (dpyinfo->scroll.acc_x <= -dpyinfo->scroll.x_per_char) > - { > - int nchars = -dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char; > - inev.ie.kind = HORIZ_WHEEL_EVENT; > - inev.ie.modifiers |= down_modifier; > - inev.ie.arg = list3 (make_fixnum (nchars), > - make_float (-dpyinfo->scroll.acc_x * 100), > - make_float (-dpyinfo->scroll.acc_y * 100)); > - > - if (mwheel_coalesce_scroll_events) > - dpyinfo->scroll.acc_x -= -dpyinfo->scroll.x_per_char * nchars; > - else > + else if (dpyinfo->scroll.acc_x <= -dpyinfo->scroll.x_per_char) > { > - dpyinfo->scroll.acc_x = 0; > - dpyinfo->scroll.acc_y = 0; > + int nchars = -dpyinfo->scroll.acc_x / dpyinfo->scroll.x_per_char; > + inev.ie.kind = HORIZ_WHEEL_EVENT; > + inev.ie.modifiers |= down_modifier; > + inev.ie.arg = list3 (make_fixnum (nchars), > + make_float (-dpyinfo->scroll.acc_x * 100), > + make_float (-dpyinfo->scroll.acc_y * 100)); > + > + dpyinfo->scroll.acc_x -= -dpyinfo->scroll.x_per_char * nchars; > } > } > } The patch doesn't apply. -- Andrey Listopadov