From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Robert Pluim <rpluim@gmail.com>
Cc: Markus FFM <markusffm@fn.de>, 39808@debbugs.gnu.org
Subject: bug#39808: 28.0.50; toolbar broken
Date: Thu, 27 Feb 2020 11:19:53 -0500 [thread overview]
Message-ID: <jwv7e089fk6.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <m2y2so410a.fsf@gmail.com> (Robert Pluim's message of "Thu, 27 Feb 2020 14:23:49 +0100")
> Iʼve bisected this down to:
>
> 3b4bd4be1dfa8717cb6911bd57c4c7d9d13614b4
>
> * 3b4bd4be1d (HEAD, refs/bisect/bad) * src/keyboard.c (make_lispy_event):
> Generate proper tool-bar events.
> | - Stefan Monnier <monnier@iro.umontreal.ca>
Looks like my grep-fu was very weak, indeed.
I installed the patch below, which should hopefully fix the problem for
Gtk and NS builds,
Stefan
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 5e7cf3d211..338c6036c2 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4398,13 +4398,6 @@ xg_tool_bar_callback (GtkWidget *w, gpointer client_data)
key = AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY);
XSETFRAME (frame, f);
- /* We generate two events here. The first one is to set the prefix
- to `(tool_bar)', see keyboard.c. */
- event.kind = TOOL_BAR_EVENT;
- event.frame_or_window = frame;
- event.arg = frame;
- kbd_buffer_store_event (&event);
-
event.kind = TOOL_BAR_EVENT;
event.frame_or_window = frame;
event.arg = key;
diff --git a/src/nsterm.m b/src/nsterm.m
index c0535825ee..aefbb2721e 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -8185,12 +8185,6 @@ - (instancetype)toolbarClicked: (id)item
if (!emacs_event)
return self;
- /* Send first event (for some reason two needed). */
- theEvent = [[self window] currentEvent];
- emacs_event->kind = TOOL_BAR_EVENT;
- XSETFRAME (emacs_event->arg, emacsframe);
- EV_TRAILER (theEvent);
-
emacs_event->kind = TOOL_BAR_EVENT;
/* XSETINT (emacs_event->code, 0); */
emacs_event->arg = AREF (emacsframe->tool_bar_items,
next prev parent reply other threads:[~2020-02-27 16:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-27 12:30 bug#39808: 28.0.50; toolbar broken Markus FFM
2020-02-27 13:23 ` Robert Pluim
2020-02-27 16:19 ` Stefan Monnier [this message]
[not found] ` <20200227163456.GA1187539@INDRA>
2020-02-27 16:40 ` Stefan Monnier
2020-02-27 16:43 ` Robert Pluim
2020-02-27 16:49 ` Robert Pluim
2020-02-27 17:33 ` Stefan Monnier
[not found] ` <20200227184358.GA1206030@INDRA>
2020-02-27 19:12 ` Stefan Monnier
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv7e089fk6.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=39808@debbugs.gnu.org \
--cc=markusffm@fn.de \
--cc=rpluim@gmail.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).