From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud Newsgroups: gmane.emacs.bugs Subject: bug#59351: 29.0.50; [PATCH] Fix mouse click position to menu bar entry Date: Fri, 18 Nov 2022 12:01:15 +0100 Message-ID: <8735agr0g4.fsf@elite.giraud> References: <87tu2wlku7.fsf@elite.giraud> <878rk8ee6d.fsf@yahoo.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="31664"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 59351@debbugs.gnu.org To: Po Lu Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 18 12:02:17 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 1ovz8T-00083a-Eb for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 18 Nov 2022 12:02:17 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovz8J-0004LZ-7P; Fri, 18 Nov 2022 06:02:07 -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 1ovz8F-0004JM-2Q for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 06:02:05 -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 1ovz8E-00066L-HI for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 06:02:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ovz8E-00014l-43 for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 06:02:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 18 Nov 2022 11:02: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.16687692844086 (code B ref 59351); Fri, 18 Nov 2022 11:02:02 +0000 Original-Received: (at 59351) by debbugs.gnu.org; 18 Nov 2022 11:01:24 +0000 Original-Received: from localhost ([127.0.0.1]:35393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovz7c-00013p-0z for submit@debbugs.gnu.org; Fri, 18 Nov 2022 06:01:24 -0500 Original-Received: from ledu-giraud.fr ([51.159.28.247]:47085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ovz7W-00013e-V5 for 59351@debbugs.gnu.org; Fri, 18 Nov 2022 06:01:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=kDpzFp84mlKERKkc /UYMbKWAqf32OwIjfj+NzyyIB1w=; h=date:references:in-reply-to:subject: cc:to:from; d=ledu-giraud.fr; b=d/T9ErsC1a4fJZWHfICQYL6dniOAypK9tpa21v IId5qe818fKyjzDp+OeiN8+uAHkhv3Uouiy0VK9HbpeosPsK6Q1RCuGA2qLl9xW6aBs77n bnf463JJlOqYQnvPFEGEkXxZKIHaeRiiPPANSJcrtFsNIMyRgqXl1vBca1DBVF/VqINml8 3dfYAVmu+augGofmLuJqHYy9b4EF/6APhKs8DPKaPK/bILNTD5VZAFwZAUIM/jPcFPB0gZ PcmGBuHw7JP71HcrYl6Y4yhDh4REmOwZOe8CdgEFZ/JdlzO5mqavFXhoozkQuZLybBhKbD TGRaXea9xr8lYzhYOxawpzLA== Original-Received: from elite.giraud ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id 5cdb0c21 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 18 Nov 2022 12:01:16 +0100 (CET) In-Reply-To: <878rk8ee6d.fsf@yahoo.com> (Po Lu's message of "Fri, 18 Nov 2022 18:43:06 +0800") 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:248198 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Po Lu writes: [...] > Judging by the contents of the patch, you sent the wrong one. :( =F0=9F=98=85 sorry for this. Here is the good one. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Fix-click-position-to-menu-bar-entry-with-no-toolkit.patch >From 697cbac26e81457840f187399530b0f91adb1768 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 | 2 ++ src/keyboard.c | 13 +++++++++++-- src/xdisp.c | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/dispextern.h b/src/dispextern.h index 2f5f4335fe..c59f594f9e 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3376,6 +3376,8 @@ #define TTY_CAP_STRIKE_THROUGH 0x20 struct glyph_row *row_containing_pos (struct window *, ptrdiff_t, struct glyph_row *, struct glyph_row *, int); +struct glyph *x_y_to_hpos_vpos (struct window *, int, int, int *, int *, + int *, int *, int *); int line_bottom_y (struct it *); int default_line_pixel_height (struct window *); bool display_prop_intangible_p (Lisp_Object, Lisp_Object, ptrdiff_t, ptrdiff_t); diff --git a/src/keyboard.c b/src/keyboard.c index 069cf0627b..5cc7209846 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -5974,8 +5974,17 @@ 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); + int dummy; + + /* I guess this works because the menu bar is always + at position (0, 0) in a frame. Should this changed + and we need a way to calculate the correct position + into the menu bar from the position of the event in + the frame. */ + x_y_to_hpos_vpos (XWINDOW (f->menu_bar_window), + XFIXNUM (event->x), XFIXNUM (event->y), + &column, &row, + NULL, NULL, &dummy); /* 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 --=-=-= Content-Type: text/plain -- Manuel Giraud --=-=-=--