procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace is_frame_ancestor with frame_ancestor_p

Browse source 
* src/dispnew.c (is_frame_ancestor): Removed.
(frame_z_order_cmp): Use frame_ancestor_p.
(copy_child_glyphs): Ditto.
* src/dispextern.h: Declaration removed.
* src/term.c (mouse_get_xy): Use frame_ancestor_p.
This commit is contained in:
Gerd Möllmann 2025-01-25 19:42:52 +01:00
parent 63df216490
commit 85aec497c7
3 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dispextern.h
View file

@ -3960,7 +3960,6 @@ void tty_raise_lower_frame (struct frame *f, bool raise);
int max_child_z_order (struct frame *parent);
void root_xy (struct frame *f, int x, int y, int *rx, int *ry);
void child_xy (struct frame *f, int x, int y, int *cx, int *cy);
bool is_frame_ancestor (struct frame *f1, struct frame *f2);
INLINE_HEADER_END

17
src/dispnew.c
View file

@ -3366,17 +3366,6 @@ max_child_z_order (struct frame *parent)
return z_order;
}
/* Return true if F1 is an ancestor of F2. */
bool
is_frame_ancestor (struct frame *f1, struct frame *f2)
{
for (struct frame *f = FRAME_PARENT_FRAME (f2); f; f = FRAME_PARENT_FRAME (f))
if (f == f1)
return true;
return false;
}
/* Return a list of all frames having root frame ROOT.
If VISIBLE_ONLY is true, return only visible frames. */
@ -3420,9 +3409,9 @@ frame_z_order_cmp (struct frame *f1, struct frame *f2)
{
if (f1 == f2)
return 0;
if (is_frame_ancestor (f1, f2))
if (frame_ancestor_p (f1, f2))
return -1;
if (is_frame_ancestor (f2, f1))
if (frame_ancestor_p (f2, f1))
return 1;
return f1->z_order - f2->z_order;
}
@ -3704,7 +3693,7 @@ static void
copy_child_glyphs (struct frame *root, struct frame *child)
{
eassert (!FRAME_PARENT_FRAME (root));
eassert (is_frame_ancestor (root, child));
eassert (frame_ancestor_p (root, child));
/* Determine the intersection of the child frame rectangle with the
root frame. This is basically clipping the child frame to the

2
src/term.c
View file

@ -3004,7 +3004,7 @@ mouse_get_xy (int *x, int *y)
struct frame *f = XFRAME (XCAR (mouse));
struct frame *sf = SELECTED_FRAME ();
if (f == sf || is_frame_ancestor (sf, f))
if (f == sf || frame_ancestor_p (sf, f))
{
int mx = XFIXNUM (XCAR (XCDR (mouse)));
int my = XFIXNUM (XCDR (XCDR (mouse)));