Merge branch 'master' into scratch/se-matrixscratch/se-matrix

3 files changed, 11 insertions, 12 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index af4e0547af4..3582b9d567d 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3967,6 +3967,8 @@ void check_window_matrix_pointers_for_frame (struct frame *f);
 # else
 INLINE void check_window_matrix_pointers_for_frame (struct frame *f) {}
 # endif
+void frame_pos_abs (struct frame *f, int *x, int *y);
+bool is_frame_ancestor (struct frame *f1, struct frame *f2);
 
 INLINE_HEADER_END
 
diff --git a/src/dispnew.c b/src/dispnew.c
index a35ded7e567..93cf40b0203 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3383,7 +3383,7 @@ rect_intersect (struct rect *r, struct rect r1, struct rect r2)
 
 /* Return the absolute position of frame F in *X and *Y.  */
 
-static void
+void
 frame_pos_abs (struct frame *f, int *x, int *y)
 {
   *x = *y = 0;
@@ -3423,7 +3423,7 @@ max_child_z_order (struct frame *parent)
 
 /* Return true if F1 is an ancestor of F2.  */
 
-static bool
+bool
 is_frame_ancestor (struct frame *f1, struct frame *f2)
 {
   for (struct frame *f = FRAME_PARENT_FRAME (f2); f; f = FRAME_PARENT_FRAME (f))
diff --git a/src/term.c b/src/term.c
index 47fd9297ab5..4774b7a32d0 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2990,19 +2990,16 @@ tty_menu_calc_size (tty_menu *menu, int *width, int *height)
 static void
 mouse_get_xy (int *x, int *y)
 {
-  Lisp_Object lmx = Qnil, lmy = Qnil;
   Lisp_Object mouse = mouse_position (tty_menu_calls_mouse_position_function);
 
-  if (EQ (selected_frame, XCAR (mouse)))
-    {
-      lmx = XCAR (XCDR (mouse));
-      lmy = XCDR (XCDR (mouse));
-    }
-
-  if (!NILP (lmx))
+  struct frame *f = XFRAME (XCAR (mouse));
+  struct frame *sf = SELECTED_FRAME ();
+  if (f == sf || is_frame_ancestor (sf, f))
     {
-      *x = XFIXNUM (lmx);
-      *y = XFIXNUM (lmy);
+      int fx, fy;
+      frame_pos_abs (f, &fx, &fy);
+      *x = fx + XFIXNUM (XCAR (XCDR (mouse)));
+      *y = fy + XFIXNUM (XCDR (XCDR (mouse)));
     }
 }