From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Po Lu via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#52685: 29.0.50; Horizontal scrolling doesn't work when compiled with pgtk Date: Wed, 22 Dec 2021 09:09:11 +0800 Message-ID: <87r1a5tphk.fsf@yahoo.com> References: <878rwezqzk.fsf@yahoo.com> <20211221.222847.806642445048126400.masm@luna.pink.masm11.me> <8735mlv4h2.fsf@yahoo.com> Reply-To: Po Lu Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23061"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.60 (gnu/linux) Cc: Yuuki Harano , 52685@debbugs.gnu.org To: Andrey Listopadov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 22 02:10:32 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 1mzq9H-0005ru-Oa for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 22 Dec 2021 02:10:31 +0100 Original-Received: from localhost ([::1]:43268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzq9G-0002IG-GE for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 21 Dec 2021 20:10:30 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:36110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzq8o-0002I2-Qv for bug-gnu-emacs@gnu.org; Tue, 21 Dec 2021 20:10:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzq8o-0002ql-Gz for bug-gnu-emacs@gnu.org; Tue, 21 Dec 2021 20:10:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzq8o-0007bs-Cg for bug-gnu-emacs@gnu.org; Tue, 21 Dec 2021 20:10:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Po Lu Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 22 Dec 2021 01:10:02 +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.164013536829207 (code B ref 52685); Wed, 22 Dec 2021 01:10:02 +0000 Original-Received: (at 52685) by debbugs.gnu.org; 22 Dec 2021 01:09:28 +0000 Original-Received: from localhost ([127.0.0.1]:56260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzq8G-0007b1-79 for submit@debbugs.gnu.org; Tue, 21 Dec 2021 20:09:28 -0500 Original-Received: from sonic308-10.consmr.mail.ne1.yahoo.com ([66.163.187.33]:42028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzq8E-0007ao-3P for 52685@debbugs.gnu.org; Tue, 21 Dec 2021 20:09:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1640135427; bh=bqiDAG/hWGAGyPPQf4vcDg90PVMvZ4Gft7jMopzHjRA=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:Subject:Reply-To; b=tJpgCpBHgb1M5SVkFoBJGhhEMznrvILNzzlUE0K252Z5xByiT5bhPEuOAs1+bKiDAj/mQ0Wm9edV9cBdO/w7CRpuuvvNF9s0bR/9c5XCUl1jI9eAwYNt2zc5iF/dwtKMuEbVIrHJeLt4nZNTJNpxgs7oZ+4BPbDJaDfs7Am/csS+4RUnvU+yHjMKqBjD6SOi1sNCVN2m9HLKSgfxHAF3CH5WlAjVTHDnmhH481U5JqY+tBTByyr7Kqx7BfaNYcJVyivpkF6B9/O4A9xUhAbumRALVBp7cKuSC6q5OaxtaSUnwpuIPZejYljSARzVh21rd+T6e1yqAjwVDjsdWYv5nQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1640135427; bh=yak66wIGui2HctgLxgRO3hBkujKGVALjeNSEL39auo8=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=ZNdUp9jLMmVMCs9t4VlInuLnW/Tb5WGkycqqzgP6VBupVkSVv4Ep70SJn23/EDJrU8RWhXV5X8tfBnZ/EhotL6lCvm0eI01hgxMTafPl8ktBYD1jWsifG/xELvbiZpVA/yerhnufKKew93EmY63WOdQ8LpNMy4XMmp7PFwnVPNse0TlmnTMdxTLb9TnjFIGipD/ISV2UC2tKBYpKWB31Pb/+yHzqX8XfGXrPLFh/VgmWsPYH6e9hsdp9nge2q/M+ulwoEUFtiG7RT4nQ+6I//wnh/upSjX36A/twi2fSxg1QQW200AbO/nCcFBEl/96d4bxSV0n2y01TDmOhXX6B6w== X-YMail-OSG: CDw8lbgVM1l0AjiQIgpmqzOwszm7X7brOLa0JS7qb49Jg0lE59sy8RahJMI0HRO 6ELKGEtMbvUUHTwpadGF2JDf_W.kIAq.n1HOpNHf98fduqVMWo9buzaXOesrA8DQepFe2VMXMabe 1HidjltT1CI32iUn.vq_IJgRyqj.s.17IBjkXixSpNx3JNI7Fs_NpRdAsBEndhCAL4vlPpcOTGfR siiLAhn9yHpvsjp_ZSIQ00nUlWgpj6C5OeOVOCqUt4yta2ueQ53UMR6YOKtA3wxHvV9dL2.ODidK V1ZawSc3w7uvq3gPtuOk.xJr6G9pIxze_KPTKTtfFoAz1vPKAKjVArlVVEIGJgIbD.HOgYtrlvPg Lu2Kp_NpeLFo.qRx71YBnfV1DOGUy8dLPKicNM7OS2ecmV.RiD3CLY6zh3a4R5S0H6o4vlxrhQTJ PSnMrHmWynCSuC5zqXAfuX9hprFuvX_jt3pypfCXLwyzHjjrp2CrcvV0ZvkFP_FL4d4m_NkPRBHn s6MKu967y.wVOvybT1GLGeZLKX0SQclHb5MyEs.RIIVz2Sz.hjDMb8EbjVyhSXG05otPYDHKdctb sk8hAzVeTsHdHR7h827pNx1_M7s.5AxThLlGhSPFs5FHKvdJ_ozc7rFMnSv4W.hHcS8NUOnGCpm8 gc3FjX1e6CWAwRcb8wAVFI6WxIgXm5.Hhy00abBi03orNLuyKhxSiKgJuDgajWtBwikH_WfCXp6M 7c99EdxeW.OQU0_1ZFQuWyyaD385i3bQ.8NcC8S2tZCvxTC3qdqcfMz2GOsq8umB4DmZ52OP5o8Q tW.ldu8IDP0aEXWdbFUPiNXX.1ldyLZGmeqpLYuswi X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.ne1.yahoo.com with HTTP; Wed, 22 Dec 2021 01:10:27 +0000 Original-Received: by kubenode518.mail-prod1.omega.sg3.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 6c17fa234622f31c834614d662a74871; Wed, 22 Dec 2021 01:09:16 +0000 (UTC) In-Reply-To: <8735mlv4h2.fsf@yahoo.com> (Po Lu's message of "Wed, 22 Dec 2021 09:00:09 +0800") X-Mailer: WebService/1.1.19498 mail.backend.jedi.jws.acl:role.jedi.acl.token.atz.jws.hermes.yahoo 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:222905 Archived-At: 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; } } }