From a187271ca4ba491c7614de540c4490e0f6fa118d Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 7 Feb 2022 10:38:30 +0100 Subject: render: resize: finalize selection before reflowing the grid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a crash caused by the selection’s pivot point not being translated during reflow. While we could simply reflow the pivot point as well, testing shows irregular behavior with ongoing selections across window resizes, with different compositors behaving differently. For now, we simply finalize the selection, instead of trying to handle ongoing selections. Closes #922 --- render.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'render.c') diff --git a/render.c b/render.c index 024d0954..e189e1a0 100644 --- a/render.c +++ b/render.c @@ -3681,6 +3681,16 @@ maybe_resize(struct terminal *term, int width, int height, bool force) if (term->grid == &term->alt) selection_cancel(term); + else { + /* + * Don’t cancel, but make sure there aren’t any ongoing + * selections after the resize. + */ + tll_foreach(term->wl->seats, it) { + if (it->item.kbd_focus == term) + selection_finalize(&it->item, term, it->item.pointer.serial); + } + } struct coord *const tracking_points[] = { &term->selection.start, -- cgit v1.3 From 003ea4904d79dfce530d77adc29030f9fcd1e6b8 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Mon, 7 Feb 2022 10:42:32 +0100 Subject: render: resize: add TODO: translate pivot coords --- render.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'render.c') diff --git a/render.c b/render.c index e189e1a0..953ec4da 100644 --- a/render.c +++ b/render.c @@ -3692,6 +3692,12 @@ maybe_resize(struct terminal *term, int width, int height, bool force) } } + /* + * TODO: if we remove the selection_finalize() call above (i.e. if + * we start allowing selections to be ongoing across resizes), the + * selection’s pivot point coordinates *must* be added to the + * tracking points list. + */ struct coord *const tracking_points[] = { &term->selection.start, &term->selection.end, -- cgit v1.3