From: Manuel Giraud <manuel@ledu-giraud.fr>
To: Po Lu <luangruo@yahoo.com>
Cc: 59351@debbugs.gnu.org
Subject: bug#59351: 29.0.50; [PATCH] Fix mouse click position to menu bar entry
Date: Fri, 18 Nov 2022 12:01:15 +0100 [thread overview]
Message-ID: <8735agr0g4.fsf@elite.giraud> (raw)
In-Reply-To: <878rk8ee6d.fsf@yahoo.com> (Po Lu's message of "Fri, 18 Nov 2022 18:43:06 +0800")
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
Po Lu <luangruo@yahoo.com> writes:
[...]
> Judging by the contents of the patch, you sent the wrong one. :(
😅 sorry for this. Here is the good one.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-click-position-to-menu-bar-entry-with-no-toolkit.patch --]
[-- Type: text/x-patch, Size: 2614 bytes --]
From 697cbac26e81457840f187399530b0f91adb1768 Mon Sep 17 00:00:00 2001
From: Manuel Giraud <manuel@ledu-giraud.fr>
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
[-- Attachment #3: Type: text/plain, Size: 18 bytes --]
--
Manuel Giraud
next prev parent reply other threads:[~2022-11-18 11:01 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-18 8:37 bug#59351: 29.0.50; [PATCH] Fix mouse click position to menu bar entry Manuel Giraud
2022-11-18 10:43 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-18 11:01 ` Manuel Giraud [this message]
2022-11-18 11:42 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-18 12:10 ` Manuel Giraud
2022-11-18 13:19 ` Eli Zaretskii
2022-11-18 13:24 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-18 11:58 ` Eli Zaretskii
2022-11-18 12:15 ` Manuel Giraud
2022-11-18 12:29 ` Eli Zaretskii
2022-11-18 12:41 ` Manuel Giraud
2022-11-18 12:51 ` Eli Zaretskii
2022-11-18 13:12 ` Manuel Giraud
2022-11-18 13:23 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-18 13:40 ` Manuel Giraud
2022-11-18 14:08 ` Manuel Giraud
2022-11-18 14:14 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-18 14:31 ` Eli Zaretskii
2022-11-18 13:20 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-18 13:20 ` Manuel Giraud
2022-11-18 14:30 ` Eli Zaretskii
2022-11-18 15:20 ` Manuel Giraud
2022-11-18 15:26 ` Eli Zaretskii
2022-11-18 17:23 ` Manuel Giraud
2022-11-18 18:45 ` Eli Zaretskii
2022-11-21 13:40 ` Manuel Giraud
2022-11-21 14:23 ` Eli Zaretskii
2022-11-21 14:46 ` Manuel Giraud
2022-11-21 18:12 ` Eli Zaretskii
2022-11-22 0:34 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-23 16:43 ` Manuel Giraud
2022-11-23 17:31 ` Eli Zaretskii
2022-11-24 13:49 ` Manuel Giraud
2022-11-25 14:55 ` Manuel Giraud
2022-11-25 15:00 ` Manuel Giraud
2022-11-26 12:49 ` Eli Zaretskii
2022-11-26 17:26 ` Manuel Giraud
2022-11-26 17:38 ` Eli Zaretskii
2022-11-27 0:51 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-27 6:40 ` Eli Zaretskii
2022-11-28 17:07 ` Manuel Giraud
2022-11-29 0:47 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-29 8:00 ` Manuel Giraud
2022-11-29 9:37 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-01 10:30 ` Manuel Giraud
2022-11-29 12:14 ` Eli Zaretskii
2022-11-29 12:19 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-12-01 12:31 ` Eli Zaretskii
2022-12-01 16:23 ` Manuel Giraud
2022-12-01 16:50 ` Eli Zaretskii
2022-11-19 0:22 ` Po Lu via Bug reports for GNU Emacs, the Swiss army knife of text editors
2022-11-19 9:19 ` Manuel Giraud
2022-11-18 11:42 ` Eli Zaretskii
2022-11-18 12:12 ` Manuel Giraud
2022-11-18 12:26 ` Eli Zaretskii
2022-11-18 13:16 ` Manuel Giraud
2022-11-18 14:16 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8735agr0g4.fsf@elite.giraud \
--to=manuel@ledu-giraud.fr \
--cc=59351@debbugs.gnu.org \
--cc=luangruo@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.