From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#39808: 28.0.50; toolbar broken Date: Thu, 27 Feb 2020 11:19:53 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="66291"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Markus FFM , 39808@debbugs.gnu.org To: Robert Pluim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Feb 27 17:21:18 2020 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 1j7LuY-000H4H-Ia for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 27 Feb 2020 17:21:18 +0100 Original-Received: from localhost ([::1]:34038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7LuX-00018p-CH for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 27 Feb 2020 11:21:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39087) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7LuJ-00018h-ED for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2020 11:21:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7LuI-00069o-HC for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2020 11:21:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54197) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j7LuI-00069g-Bd for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2020 11:21:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j7LuI-0000Qy-7I for bug-gnu-emacs@gnu.org; Thu, 27 Feb 2020 11:21:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 27 Feb 2020 16:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39808 X-GNU-PR-Package: emacs Original-Received: via spool by 39808-submit@debbugs.gnu.org id=B39808.15828204101572 (code B ref 39808); Thu, 27 Feb 2020 16:21:02 +0000 Original-Received: (at 39808) by debbugs.gnu.org; 27 Feb 2020 16:20:10 +0000 Original-Received: from localhost ([127.0.0.1]:60170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j7LtR-0000PH-Sv for submit@debbugs.gnu.org; Thu, 27 Feb 2020 11:20:10 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]:57930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j7LtP-0000Om-J3 for 39808@debbugs.gnu.org; Thu, 27 Feb 2020 11:20:07 -0500 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 0D2BC100ECB; Thu, 27 Feb 2020 11:20:02 -0500 (EST) Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 2CC54100BF4; Thu, 27 Feb 2020 11:20:00 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1582820400; bh=jJfWCT+HbTpza400A7p9Pu/rmLE7RbIR1DZD86TcBTU=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=J/1x/30Yw9bcGYBFeFs3WmvtVX8Lv/LRyInCq0NQgh5TE995EZwXnLTdrd2E+6700 8tC5KP93o8fc5/8ftOkwIlAHH6MKBoEqbDRcrxcv9GMEBNBrqqcURJSKtwQhMzHQZZ A0uqqiRFtaI7gG48fx2mjnhkDNVYb/jBQkNodCqiDDvp3o3D4ZuCyyX/Uvxs/Yv4Td d/DGWDbH283eJiWFHkAHTDSiIU31bFHfklD/0WqVc8MU2Z+bRpih+iyz/DEA6HFNBi KyFOnKrk79ZhAqnQ5yLXEej3j7nOQM4LfGsu0yk2RnsTNey52CRcEFLW5POb1Nfd7t IBRr0WZ/FbpJA== Original-Received: from alfajor (modemcable157.163-203-24.mc.videotron.ca [24.203.163.157]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id F11641207D6; Thu, 27 Feb 2020 11:19:59 -0500 (EST) In-Reply-To: (Robert Pluim's message of "Thu, 27 Feb 2020 14:23:49 +0100") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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:176533 Archived-At: > I=CA=BCve bisected this down to: > > 3b4bd4be1dfa8717cb6911bd57c4c7d9d13614b4 > > * 3b4bd4be1d (HEAD, refs/bisect/bad) * src/keyboard.c (make_lispy_event): > Generate proper tool-bar events. > | - Stefan Monnier 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 =3D AREF (f->tool_bar_items, idx + TOOL_BAR_ITEM_KEY); XSETFRAME (frame, f); =20 - /* We generate two events here. The first one is to set the prefix - to `(tool_bar)', see keyboard.c. */ - event.kind =3D TOOL_BAR_EVENT; - event.frame_or_window =3D frame; - event.arg =3D frame; - kbd_buffer_store_event (&event); - event.kind =3D TOOL_BAR_EVENT; event.frame_or_window =3D frame; event.arg =3D 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; =20 - /* Send first event (for some reason two needed). */ - theEvent =3D [[self window] currentEvent]; - emacs_event->kind =3D TOOL_BAR_EVENT; - XSETFRAME (emacs_event->arg, emacsframe); - EV_TRAILER (theEvent); - emacs_event->kind =3D TOOL_BAR_EVENT; /* XSETINT (emacs_event->code, 0); */ emacs_event->arg =3D AREF (emacsframe->tool_bar_items,