From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#59351: 29.0.50; [PATCH] Fix mouse click position to menu bar entry Date: Fri, 18 Nov 2022 16:30:42 +0200 Message-ID: <8335agbai5.fsf@gnu.org> References: <87tu2wlku7.fsf@elite.giraud> <878rk8ee6d.fsf@yahoo.com> <8735agr0g4.fsf@elite.giraud> <83o7t4bhk4.fsf@gnu.org> <87zgcov1ps.fsf@elite.giraud> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="10071"; mail-complaints-to="usenet@ciao.gmane.io" Cc: luangruo@yahoo.com, 59351@debbugs.gnu.org To: Manuel Giraud Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Nov 18 15:31:23 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 1ow2Op-0002P2-Eb for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 18 Nov 2022 15:31:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ow2OY-0002bT-Oc; Fri, 18 Nov 2022 09:31:06 -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 1ow2OU-0002b1-8i for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 09:31: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 1ow2OU-0002wC-0L for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 09:31:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ow2OT-00018o-Kk for bug-gnu-emacs@gnu.org; Fri, 18 Nov 2022 09:31:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 18 Nov 2022 14:31:01 +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.16687818464363 (code B ref 59351); Fri, 18 Nov 2022 14:31:01 +0000 Original-Received: (at 59351) by debbugs.gnu.org; 18 Nov 2022 14:30:46 +0000 Original-Received: from localhost ([127.0.0.1]:35949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ow2OE-00018I-2x for submit@debbugs.gnu.org; Fri, 18 Nov 2022 09:30:46 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:45280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ow2OC-000187-QV for 59351@debbugs.gnu.org; Fri, 18 Nov 2022 09:30:45 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow2O7-0002us-Ak; Fri, 18 Nov 2022 09:30:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=ZCMYUrC4V9rfavJ6uFrTrka13Y1UfcLrzGO0ON4BfMs=; b=MDuHQnhQeF/L fw5AHZDHGJYjqWL7kqjrvPnU8cjJDkSPOcoyJhZ0upsU6vIDtib9qhhrFgpa4lbhrEzVnc5NmDaCf bWinmflMjdIjm5RqD5PLiKj+DyqxK5BsmFKvp5GCym3T86zcsUKR9ieYouFCSluyst2uVsyBNyBgL zLrcEAIAR4RIhjiOASjB3A2RWesqL0Z13N047g9k7v3/dubbSzMPusxZ4Gg2UT2me4IKpgtoJcefM a51SEv6xQN47ArmfjOvYhBfSmZGECYajBqyZo9fRaZQMgvdzIj6k/yeaYTARyfIlZ8AuyDimwodyW Aavtka88lyA04TWxktds1w==; Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ow2O6-0005dK-4A; Fri, 18 Nov 2022 09:30:39 -0500 In-Reply-To: <87zgcov1ps.fsf@elite.giraud> (message from Manuel Giraud on Fri, 18 Nov 2022 14:20:15 +0100) 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:248244 Archived-At: > From: Manuel Giraud > Cc: luangruo@yahoo.com, 59351@debbugs.gnu.org > Date: Fri, 18 Nov 2022 14:20:15 +0100 > > > Did you test the results on a TTY frame that has a mouse? > > It doesn't even compile --without-x. So here is a new version of this > patch. I even remove the comment as suggested by Po. > > --- 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)) > { > +#if defined HAVE_WINDOW_SYSTEM > + int dummy; > + > + x_y_to_hpos_vpos (XWINDOW (f->menu_bar_window), > + XFIXNUM (event->x), XFIXNUM (event->y), > + &column, &row, > + NULL, NULL, &dummy); > +#else > pixel_to_glyph_coords (f, XFIXNUM (event->x), XFIXNUM (event->y), > &column, &row, NULL, 1); > +#endif This cannot be a compile-time condition, because Emacs compiled with X support can still have TTY frames. So you need to test for FRAME_WINDOW_P, and only call x_y_to_hpos_vpos if FRAME_WINDOW_P returns non-zero; otherwise call pixel_to_glyph_coords even in a build where HAVE_WINDOW_SYSTEM is defined.