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

TTY menus: handle saved state referencing dead frames

Browse source 
* src/term.c (restore_desired_matrix): If a tty menu saves a current
matrix that contains glyphs from a child frame, handle the case that
that child frame dies before the saved state is restored.
This commit is contained in:
Gerd Möllmann 2024-11-05 10:26:36 +01:00
parent 56708ea676
commit 56efab930b
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/term.c
View file

@ -3121,9 +3121,7 @@ save_and_enable_current_matrix (struct frame *f)
static void
restore_desired_matrix (struct frame *f, struct glyph_matrix *saved)
{
int i;
for (i = 0; i < saved->nrows; ++i)
for (int i = 0; i < saved->nrows; ++i)
{
struct glyph_row *from = saved->rows + i;
struct glyph_row *to = f->desired_matrix->rows + i;
@ -3133,7 +3131,23 @@ restore_desired_matrix (struct frame *f, struct glyph_matrix *saved)
memcpy (to->glyphs[TEXT_AREA], from->glyphs[TEXT_AREA], nbytes);
to->used[TEXT_AREA] = from->used[TEXT_AREA];
to->enabled_p = from->enabled_p;
to->hash = from->hash;
bool need_new_hash = false;
for (int x = 0; x < f->desired_matrix->matrix_w; ++x)
{
struct glyph *glyph = to->glyphs[0] + x;
if (!FRAME_LIVE_P (glyph->frame))
{
glyph->frame = f;
glyph->face_id = DEFAULT_FACE_ID;
need_new_hash = true;
}
}
if (need_new_hash)
to->hash = row_hash (to);
else
to->hash = from->hash;
}
}