[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e839b83c828 3/6: Reapply "Fix tty-frame-at for nested tty child f
From: |
Gerd Moellmann |
Subject: |
master e839b83c828 3/6: Reapply "Fix tty-frame-at for nested tty child frames" |
Date: |
Sat, 25 Jan 2025 08:46:23 -0500 (EST) |
branch: master
commit e839b83c828fe09546edcc46dcfc5e09dd39b9fe
Author: Gerd Möllmann <gerd@gnu.org>
Commit: Gerd Möllmann <gerd@gnu.org>
Reapply "Fix tty-frame-at for nested tty child frames"
This reverts commit 9ad28959d6895720865c0718bf60f4b7b0b144f3.
---
src/term.c | 6 ++++--
1 file 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)
{
Lisp_Object frame = Fcar (frames);
struct frame *f = XFRAME (frame);
+ int fx, fy;
+ root_xy (f, 0, 0, &fx, &fy);
- if (f->left_pos <= x && x < f->left_pos + f->pixel_width &&
- f->top_pos <= y && y < f->top_pos + f->pixel_height)
+ if (fx <= x && x < fx + f->pixel_width
+ && fy <= y && y < fy + f->pixel_height)
return frame;
}
- master updated (d4220a17c4e -> 1d086441166), Gerd Moellmann, 2025/01/25
- master e839b83c828 3/6: Reapply "Fix tty-frame-at for nested tty child frames",
Gerd Moellmann <=
- master ccf3f8d21e3 4/6: Reapply "Fix mouse position handling for nested tty child frames", Gerd Moellmann, 2025/01/25
- master 26b144f241c 2/6: Reapply "Fix cursor positioning of nested tty child frames", Gerd Moellmann, 2025/01/25
- master 1d086441166 6/6: Fix the mistake that led to the reverts, Gerd Moellmann, 2025/01/25
- master 945ed044cd8 1/6: Reapply "Simplify absolute (x, y) computation on ttys", Gerd Moellmann, 2025/01/25
- master 20f26723774 5/6: Reapply "Multi-tty: selected frame can be a GUI frame", Gerd Moellmann, 2025/01/25