summaryrefslogtreecommitdiff
path: root/src/androidterm.c
diff options
context:
space:
mode:
authorManuel Giraud <manuel@ledu-giraud.fr>2023-10-21 14:36:24 +0200
committerPo Lu <luangruo@yahoo.com>2023-10-28 13:28:07 +0800
commit6b229ffc6f32b111bf11242080d98022758b43e0 (patch)
tree18e5381df66ef12287ddc90100dd3f4bab758bf0 /src/androidterm.c
parent1e5760ed786667113d4e144504ca7a981d25cf37 (diff)
downloademacs-6b229ffc6f32b111bf11242080d98022758b43e0.tar.gz
Support for menu bar in window_from_coordinates
* src/window.h: * src/window.c (window_from_coordinates): In the no toolkit build, add support for the menu bar window. Add a new 'menu_bar_p' argument so the function's signature has changed. All callers changed. * src/androidterm.c (handle_one_android_event): * src/haikuterm.c (haiku_read_socket): * src/keyboard.c (make_lispy_position): * src/nsterm.m ([EmacsView mouseDown:]): * src/pgtkterm.c (button_event): * src/w32term.c (w32_read_socket): * src/xdisp.c (note_mouse_highlight): * src/xterm.c (handle_one_xevent): Set menu_bar_p to true.
Diffstat (limited to 'src/androidterm.c')
-rw-r--r--src/androidterm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/androidterm.c b/src/androidterm.c
index e87f7ca2d14..4a479daf452 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -1141,7 +1141,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
Lisp_Object window
= window_from_coordinates (f, event->xmotion.x,
event->xmotion.y, 0,
- false, false);
+ false, false, false);
/* A window will be autoselected only when it is not
selected now and the last mouse movement event was
@@ -1290,7 +1290,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
int x = event->xbutton.x;
int y = event->xbutton.y;
- window = window_from_coordinates (f, x, y, 0, true, true);
+ window = window_from_coordinates (f, x, y, 0, true, true, true);
tab_bar_p = EQ (window, f->tab_bar_window);
if (tab_bar_p)
@@ -1312,7 +1312,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
int x = event->xbutton.x;
int y = event->xbutton.y;
- window = window_from_coordinates (f, x, y, 0, true, true);
+ window = window_from_coordinates (f, x, y, 0, true, true, true);
tool_bar_p = (EQ (window, f->tool_bar_window)
&& ((event->xbutton.type
!= ANDROID_BUTTON_RELEASE)
@@ -1408,7 +1408,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
int y = event->touch.y;
window = window_from_coordinates (any, x, y, 0, true,
- true);
+ true, true);
/* If this touch has started in the tool bar, do not
send it to Lisp. Instead, simulate a tool bar
@@ -1605,7 +1605,7 @@ handle_one_android_event (struct android_display_info *dpyinfo,
/* Figure out how much to scale the deltas by. */
window = window_from_coordinates (any, event->wheel.x,
event->wheel.y, NULL,
- false, false);
+ false, false, false);
if (WINDOWP (window))
scroll_height = XWINDOW (window)->pixel_height;