aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Möllmann2025-01-25 14:28:11 +0100
committerGerd Möllmann2025-01-25 14:46:05 +0100
commite839b83c828fe09546edcc46dcfc5e09dd39b9fe (patch)
tree65942db6ba831cdd5e1718365a0647cad9b401cb
parent26b144f241c7843b635415f2b68b8c3df0b23e02 (diff)
downloademacs-e839b83c828fe09546edcc46dcfc5e09dd39b9fe.tar.gz
emacs-e839b83c828fe09546edcc46dcfc5e09dd39b9fe.zip
Reapply "Fix tty-frame-at for nested tty child frames"
This reverts commit 9ad28959d6895720865c0718bf60f4b7b0b144f3.
-rw-r--r--src/term.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c
index 00bc94e6e31..7397ee68347 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2603,9 +2603,11 @@ tty_frame_at (int x, int y)
2603 { 2603 {
2604 Lisp_Object frame = Fcar (frames); 2604 Lisp_Object frame = Fcar (frames);
2605 struct frame *f = XFRAME (frame); 2605 struct frame *f = XFRAME (frame);
2606 int fx, fy;
2607 root_xy (f, 0, 0, &fx, &fy);
2606 2608
2607 if (f->left_pos <= x && x < f->left_pos + f->pixel_width && 2609 if (fx <= x && x < fx + f->pixel_width
2608 f->top_pos <= y && y < f->top_pos + f->pixel_height) 2610 && fy <= y && y < fy + f->pixel_height)
2609 return frame; 2611 return frame;
2610 } 2612 }
2611 2613