From 445bbe3469b057c8b518f7c787527128f724cc1b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 30 Oct 2019 20:02:06 +0100 Subject: wayland: track multiple terminals The wayland 'term' member is gone and replaced by a list, 'terms'. This list contains all currently running terminal (windows). --- main.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index b09b5e3b..ebc35a20 100644 --- a/main.c +++ b/main.c @@ -146,20 +146,22 @@ main(int argc, char *const *argv) if ((term = term_init(&conf, fdm, wayl, argc, argv)) == NULL) goto out; - while (true) { - wl_display_flush(term->wl->display); /* TODO: figure out how to get rid of this */ + while (tll_length(wayl->terms) > 0) { + wl_display_flush(wayl->display); /* TODO: figure out how to get rid of this */ if (!fdm_poll(fdm)) break; } - if (term->quit) - ret = EXIT_SUCCESS; + ret = tll_length(wayl->terms) == 0 ? EXIT_SUCCESS : EXIT_FAILURE; out: shm_fini(); - int child_ret = term_destroy(term); + int child_ret = EXIT_SUCCESS; + tll_foreach(wayl->terms, it) + child_ret = term_destroy(it->item); + wayl_destroy(wayl); fdm_destroy(fdm); config_free(conf); -- cgit v1.3