From da79bd65de159730b1468e466b2c31d46fcc0238 Mon Sep 17 00:00:00 2001 From: taiyu Date: Thu, 27 Aug 2015 20:32:56 -0700 Subject: use previous outputs --- include/container.h | 1 + sway/container.c | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/include/container.h b/include/container.h index 6c0de104..29f75f45 100644 --- a/include/container.h +++ b/include/container.h @@ -94,6 +94,7 @@ swayc_t *swayc_focus_by_layout(swayc_t *container, enum swayc_layouts); swayc_t *swayc_by_handle(wlc_handle handle); +swayc_t *swayc_by_name(const char *name); swayc_t *swayc_active_output(void); swayc_t *swayc_active_workspace(void); swayc_t *swayc_active_workspace_for(swayc_t *view); diff --git a/sway/container.c b/sway/container.c index abbd5504..416b8db8 100644 --- a/sway/container.c +++ b/sway/container.c @@ -57,6 +57,19 @@ static void free_swayc(swayc_t *cont) { swayc_t *new_output(wlc_handle handle) { const struct wlc_size *size = wlc_output_get_resolution(handle); const char *name = wlc_output_get_name(handle); + // Find current outputs to see if this already exists + { + int i, len = root_container.children->length; + for (i = 0; i < len; ++i) { + swayc_t *op = root_container.children->items[i]; + const char *op_name = op->name; + if (op_name && name && strcmp(op_name, name) == 0) { + sway_log(L_DEBUG, "restoring output %lu:%s", handle, op_name); + return op; + } + } + } + sway_log(L_DEBUG, "Added output %lu:%s", handle, name); struct output_config *oc = NULL; @@ -329,7 +342,7 @@ swayc_t *destroy_workspace(swayc_t *workspace) { // Do not destroy if there are children if (workspace->children->length == 0 && workspace->floating->length == 0) { - sway_log(L_DEBUG, "'%s'", workspace->name); + sway_log(L_DEBUG, "destroying '%s'", workspace->name); swayc_t *parent = workspace->parent; free_swayc(workspace); return parent; @@ -396,6 +409,17 @@ swayc_t *swayc_by_test(swayc_t *container, bool (*test)(swayc_t *view, void *dat return NULL; } +static bool test_name(swayc_t *view, void *data) { + if (!view && !view->name) { + return false; + } + return strcmp(view->name, data) == 0; +} + +swayc_t *swayc_by_name(const char *name) { + return swayc_by_test(&root_container, test_name, (void *)name); +} + swayc_t *swayc_parent_by_type(swayc_t *container, enum swayc_types type) { if (!ASSERT_NONNULL(container)) { return NULL; -- cgit v1.2.3-54-g00ecf