Subject: bug#64440: 30.0.50; [PATCH] Highlight on non toolkit menu bar items

From: Manuel Giraud <[email-masked]>
Date: Sun, 29 Oct 2023 10:02:51 +0100

Po Lu <[email-masked]> writes:

> Now done, and thanks.

Thanks Po.  But could you also commit this one.  It is the one and only
usage for all those changes.  It is used to set cursor as an arrow.
Thanks.
>>From 9200d69b49fa57269e5357383d138872a372127a Mon Sep 17 00:00:00 2001
From: Manuel Giraud <[email-masked]>
Date: Fri, 6 Oct 2023 14:27:02 +0200
Subject: [PATCH 2/2] Set non-text mouse cursor on menu bar

* src/xdisp.c (note_mouse_highlight): Set non-text mouse cursor on
menu bar.
---
 src/xdisp.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/xdisp.c b/src/xdisp.c
index 7f9e62f05e8..df3076cf499 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -35537,6 +35537,16 @@ note_mouse_highlight (struct frame *f, int x, int y)
   w = XWINDOW (window);
   frame_to_window_pixel_xy (w, &x, &y);
 
+#if defined (HAVE_WINDOW_SYSTEM) && ! defined (HAVE_EXT_MENU_BAR)
+  /* Handle menu-bar window differently since it doesn't display a
+     buffer.  */
+  if (EQ (window, f->menu_bar_window))
+    {
+      cursor = FRAME_OUTPUT_DATA (f)->nontext_cursor;
+      goto set_cursor;
+    }
+#endif
+
 #if defined (HAVE_WINDOW_SYSTEM)
   /* Handle tab-bar window differently since it doesn't display a
      buffer.  */
-- 
2.40.0

-- 
Manuel Giraud