From: Po Lu <luangruo@yahoo.com>
Date: Wed, 2 Mar 2022 11:10:00 +0000 (+0000)
Subject: Fix menu bar position reporting on Haiku as well
X-Git-Tag: emacs-29.0.90~2050
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=596d36f8cfd2c24df33668349cafbbf8a5ba1396;p=emacs.git

Fix menu bar position reporting on Haiku as well

* src/haikuterm.c (haiku_toolkit_position): New function.
(haiku_create_terminal): Register new hook.
---

diff --git a/src/haikuterm.c b/src/haikuterm.c
index a765eb715df..bdba6403aca 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -100,6 +100,15 @@ haiku_coords_from_parent (struct frame *f, int *x, int *y)
     }
 }
 
+static void
+haiku_toolkit_position (struct frame *f, int x, int y,
+			bool *menu_bar_p, bool *tool_bar_p)
+{
+  if (FRAME_OUTPUT_DATA (f)->menubar)
+    *menu_bar_p = (x >= 0 && x < FRAME_PIXEL_WIDTH (f)
+		   && y >= 0 && y < FRAME_MENU_BAR_HEIGHT (f));
+}
+
 static void
 haiku_delete_terminal (struct terminal *terminal)
 {
@@ -3728,6 +3737,7 @@ haiku_create_terminal (struct haiku_display_info *dpyinfo)
   terminal->menu_show_hook = haiku_menu_show;
   terminal->toggle_invisible_pointer_hook = haiku_toggle_invisible_pointer;
   terminal->fullscreen_hook = haiku_fullscreen;
+  terminal->toolkit_position_hook = haiku_toolkit_position;
 
   return terminal;
 }