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#59351: 29.0.50; [PATCH] Fix mouse click position to menu bar entry Date: Sat, 19 Nov 2022 08:22:28 +0800 Message-ID: <87zgcnbxob.fsf@yahoo.com> References: <87tu2wlku7.fsf@elite.giraud> <878rk8ee6d.fsf@yahoo.com> <8735agr0g4.fsf@elite.giraud> <83o7t4bhk4.fsf@gnu.org> <87zgcov1ps.fsf@elite.giraud> <8335agbai5.fsf@gnu.org> <875yfcuw5r.fsf@elite.giraud> <83r0y09td6.fsf@gnu.org> <87zgcotbw9.fsf@elite.giraud> 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="34406"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Eli Zaretskii , 59351@debbugs.gnu.org To: Manuel Giraud Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Nov 19 01:23:14 2022 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 1owBda-0008hS-6n for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 19 Nov 2022 01:23:14 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owBdQ-0002Nb-15; Fri, 18 Nov 2022 19:23:04 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owBdO-0002NT-RR for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 19:23:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owBdO-0006kq-J9 for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 19:23:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owBdO-0004H0-Eb for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 19:23: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: Sat, 19 Nov 2022 00:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59351 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59351-submit@debbugs.gnu.org id=B59351.166881736516390 (code B ref 59351); Sat, 19 Nov 2022 00:23:02 +0000 Original-Received: (at 59351) by debbugs.gnu.org; 19 Nov 2022 00:22:45 +0000 Original-Received: from localhost ([127.0.0.1]:38524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owBd6-0004GI-QZ for submit@debbugs.gnu.org; Fri, 18 Nov 2022 19:22:45 -0500 Original-Received: from sonic316-21.consmr.mail.ne1.yahoo.com ([66.163.187.147]:40437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owBd3-0004G4-KH for 59351@debbugs.gnu.org; Fri, 18 Nov 2022 19:22:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1668817355; bh=wUgOVonJluTjuaRwpX2cJ5JLIK9jrI/vxALmszoD3Tw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From:Subject:Reply-To; b=dsEiTFVug6RRYMhJH9nCd0TFqUlSKB7XOJDMhk4pxuutIbZ51fTEVhkmDSSZL1EvGgh2Iqtx6XExi4TRpCEeEfdRt0e215PwBdteVDEkDinqe4Qrn2t264IAt5fSpu3FypMiGqVDlJaAf9SouA9ranmKmHZ4tYBe3g5LgTh7X7wFHsqiXdGsmSOJ6EDhE8Ncq5Rds14hrLgWfpMAxk3ONpfWy6G58fifxUkzzdBPbixSgYe0eEGwBv/elngLSQbTW9X5j9GpSVNpb3cB3EMAxb0wFrUwEJA09jLVQZohyIQXOIB68YNpdm5Gm/YJD/C7Ns7EmNe4yg5PVwL5ZtA8RQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1668817355; bh=JekPD4kuUwZhBwj9tJHVqvv5ZaetBoNaxdsQ4X+W1FE=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=RUZN90BP6I1VDSHHji6Dd7ZE647OfD2dUjpldAce2c0+tnq5fAseW4utHHsz5tXy4Ssk5iK6K3UmRDPI66S+zeovPu+AJoj8ioZqovSBKoy7BDpOJE4YT08ulNiPF7qm8Rapw+1tt0cvOjqQ5VhLqOY7e+hhdnV+Y6e/DLyBGQfGkfCRhiA0E8umuOrU7RiLrwiCKI9AMLJ78ycm7jTeRQZxpxqYlZwoO8LmvZ2CrxpbTnK2VYnP0dkLMJiHk1TzYDPq30vi9vg2JTuKsNIjV0Y37Gylrhf9JFYyDs2FxfWk+jUDVxMAT1loKr0Q6QHcfKB+wA1DEr9C8wDVI48aMg== X-YMail-OSG: YxjP4DcVM1nCYb0_TZr.skV1cahqJjs.b3Sb4Nl0ytP6PLYfMpLcZdfF7ql4BrW fXx6K4PBT1tlZfmx16Wj8zbRsrqAQaoeCbjyOef8V4vzEAUirjl7391_pk2D2QUTZUsP8HhvqRoR SaxRd44B80eaL1qyMROF9IIs7A3IyJCW7H67m7UuCKz5xPMIW3o5_e32FX94QSGzW_hndC6jctGU B4.CnHwcG_OGgViFNZcr58qmFXYD408MlrCAExz2EffnVxvZWwnrAqFv9cB5xPAg_rJjvco39JN3 Fzy3VJ6RydpIp.QKXR.bOC_7bDCQwUc7TbLq0axLvT.A5bke_1fvLXUj0P6IXI7r00JYJ7o.RxQH W5xbD7PKbVYQIe6CCMKJybOW72McRrhOYCyXAqE1FEMFSEfd5fdRazr6g_VW_3LfC1fpUOiPDYdN cZuwFThuy3JdsPDF9HC.33pwlGXXwS60jKPPiccLRO.jOC0jCUYLaYaZLyoCBJAoDjTka934DQoO poW8jnXVc_Dsu7uZXImBmEaF3gkmUoHzQNZSHABKeDFspdlw169xybjNsVs_8Mw5LcAvv5LHx7Js V.OXxbz1THXhapA0Q4z2_9XM_zP7FcdREu.13aDOQZs3ggvtnkXQZJz8YszpbQUla6XAOAg9ZMjS SRXlfLyT5MH6EJBNDwsrK0FM.eo8._pNkHdAg8g7bKi.5E.31TV3Isakzze7.3I37agfVNHk4i0w bGZXKLJLZlMbyoEPfsUuZCqWOUtEawB_LaqMEjAffbZk0Dp8hO7DL1P112ZCaPROY_vUqQEDzaqN W.s4Ib7.0hu.fhrSvV295OCUJdgHdujchKxQUkZ3RH X-Sonic-MF: Original-Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.ne1.yahoo.com with HTTP; Sat, 19 Nov 2022 00:22:35 +0000 Original-Received: by hermes--production-sg3-6c8895b545-26lc9 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID a317b7750a6637f048e86d523c29c86f; Sat, 19 Nov 2022 00:22:32 +0000 (UTC) In-Reply-To: <87zgcotbw9.fsf@elite.giraud> (Manuel Giraud's message of "Fri, 18 Nov 2022 18:23:18 +0100") X-Mailer: WebService/1.1.20863 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:248285 Archived-At: Manuel Giraud writes: > Eli Zaretskii writes: > >> I thought you said XWINDOW (f->menu_bar_window) doesn't compile in the >> "--without-x" build? I think you need the HAVE_WINDOW_SYSTEM >> condition as well. > > This new one does compile "--without-x". > > About the height of the menu bar, you were right. I've tested and > display_menu_bar is called quite often and is called after a > (set-face-font 'menu "Iosevka-18"). So maybe it is the last call to > compute_line_metrics that does not do the required job. > > From 6fc191dcfa85ac98a482a7e373a4221499f86825 Mon Sep 17 00:00:00 2001 > From: Manuel Giraud > Date: Fri, 18 Nov 2022 09:24:55 +0100 > Subject: [PATCH] Fix click position to menu bar entry with no-toolkit > > * src/keyboard.c (make_lispy_event): Use x_y_to_hpos_vpos to > compute correct menu bar position should the menu face change. > * src/xdisp.c (x_y_to_hpos_vpos): Not static anymore. > * src/dispextern.h: Export x_y_to_hpos_vpos. > --- > src/dispextern.h | 3 ++- > src/keyboard.c | 18 ++++++++++++++++-- > src/xdisp.c | 2 +- > 3 files changed, 19 insertions(+), 4 deletions(-) > > diff --git a/src/dispextern.h b/src/dispextern.h > index 2f5f4335fe..2afbdeabaa 100644 > --- a/src/dispextern.h > +++ b/src/dispextern.h > @@ -3495,7 +3495,8 @@ #define TTY_CAP_STRIKE_THROUGH 0x20 > extern void tty_draw_row_with_mouse_face (struct window *, struct glyph_row *, > int, int, enum draw_glyphs_face); > extern void display_tty_menu_item (const char *, int, int, int, int, bool); > - > +extern struct glyph *x_y_to_hpos_vpos (struct window *, int, int, int *, int *, > + int *, int *, int *); > /* Flags passed to try_window. */ > #define TRY_WINDOW_CHECK_MARGINS (1 << 0) > #define TRY_WINDOW_IGNORE_FONTS_CHANGE (1 << 1) > diff --git a/src/keyboard.c b/src/keyboard.c > index 069cf0627b..6ce6ce17f2 100644 > --- a/src/keyboard.c > +++ b/src/keyboard.c > @@ -5974,8 +5974,22 @@ make_lispy_event (struct input_event *event) > in a menu (non-toolkit version). */ > if (!toolkit_menubar_in_use (f)) > { > - pixel_to_glyph_coords (f, XFIXNUM (event->x), XFIXNUM (event->y), > - &column, &row, NULL, 1); > +#if defined HAVE_WINDOW_SYSTEM > + if (FRAME_WINDOW_P (f)) > + { > + struct window *menu_w = XWINDOW (f->menu_bar_window); > + int x, y, dummy; > + > + x = FRAME_TO_WINDOW_PIXEL_X (menu_w, XFIXNUM (event->x)); > + y = FRAME_TO_WINDOW_PIXEL_Y (menu_w, XFIXNUM (event->y)); > + > + x_y_to_hpos_vpos (XWINDOW (f->menu_bar_window), x, y, &column, &row, > + NULL, NULL, &dummy); > + } > + else > +#endif > + pixel_to_glyph_coords (f, XFIXNUM (event->x), XFIXNUM (event->y), > + &column, &row, NULL, 1); > > /* In the non-toolkit version, clicks on the menu bar > are ordinary button events in the event buffer. > diff --git a/src/xdisp.c b/src/xdisp.c > index f6a279636a..0c073c0fb5 100644 > --- a/src/xdisp.c > +++ b/src/xdisp.c > @@ -2330,7 +2330,7 @@ pixel_to_glyph_coords (struct frame *f, int pix_x, int pix_y, int *x, int *y, > text, or we can't tell because W's current matrix is not up to > date. */ > > -static struct glyph * > +struct glyph * > x_y_to_hpos_vpos (struct window *w, int x, int y, int *hpos, int *vpos, > int *dx, int *dy, int *area) > { > -- > 2.38.1 LGTM. I installed this and am closing this bug. Thanks for working on Emacs.