1 files changed, 12 insertions, 19 deletions

diff --git a/src/term.c b/src/term.c
index e13089af2bb..7397ee68347 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2595,7 +2595,7 @@ tty_draw_row_with_mouse_face (struct window *w, struct glyph_row *row,
 #endif
 
 static Lisp_Object
-tty_frame_at (int x, int y, int *cx, int *cy)
+tty_frame_at (int x, int y)
 {
   for (Lisp_Object frames = Ftty_frame_list_z_order (Qnil);
        !NILP (frames);
@@ -2606,33 +2606,24 @@ tty_frame_at (int x, int y, int *cx, int *cy)
       int fx, fy;
       root_xy (f, 0, 0, &fx, &fy);
 
-      if ((fx <= x && x < fx + f->pixel_width)
-          && (fy <= y && y < fy + f->pixel_height))
-        {
-          child_xy (XFRAME (frame), x, y, cx, cy);
-          return frame;
-        }
+      if (fx <= x && x < fx + f->pixel_width
+          && fy <= y && y < fy + f->pixel_height)
+        return frame;
     }
 
   return Qnil;
 }
 
-DEFUN ("tty-frame-at", Ftty_frame_at, Stty_frame_at, 2, 2, 0,
-       doc : /* Return tty frame containing absolute pixel position (X, Y).
-Value is nil if no frame found.  Otherwise it is a list (FRAME CX CY),
-where FRAME is the frame containing (X, Y) and CX and CY are X and Y
-relative to FRAME.  */)
+DEFUN ("tty-frame-at", Ftty_frame_at, Stty_frame_at,
+       2, 2, 0,
+       doc: /* Return tty frame containing pixel position X, Y.  */)
   (Lisp_Object x, Lisp_Object y)
 {
   if (! FIXNUMP (x) || ! FIXNUMP (y))
     /* Coordinates this big can not correspond to any frame.  */
     return Qnil;
 
-  int cx, cy;
-  Lisp_Object frame = tty_frame_at (XFIXNUM (x), XFIXNUM (y), &cx, &cy);
-  if (NILP (frame))
-    return Qnil;
-  return list3 (frame, make_fixnum (cx), make_fixnum (cy));
+  return tty_frame_at (XFIXNUM (x), XFIXNUM (y));
 }
 
 #ifdef HAVE_GPM
@@ -2765,9 +2756,11 @@ term_mouse_click (struct input_event *result, Gpm_Event *event,
 int
 handle_one_term_event (struct tty_display_info *tty, const Gpm_Event *event_in)
 {
-  Gpm_Event event = *event_in;
-  Lisp_Object frame = tty_frame_at (event_in->x, event_in->y, &event.x, &event.y);
+  Lisp_Object frame = tty_frame_at (event_in->x, event_in->y);
   struct frame *f = decode_live_frame (frame);
+  Gpm_Event event = *event_in;
+  event.x -= f->left_pos;
+  event.y -= f->top_pos;
 
   struct input_event ie;
   int count = 0;