From a1b5b93d299bfe129f2b3409a7f642049fcce1d6 Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Tue, 5 Jun 2018 17:56:32 -0400 Subject: Store sway_outputs so that they can be reenabled --- include/sway/ipc-json.h | 1 + include/sway/output.h | 1 + include/sway/tree/layout.h | 2 ++ 3 files changed, 4 insertions(+) (limited to 'include') diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h index 440e3a24..eaaa2164 100644 --- a/include/sway/ipc-json.h +++ b/include/sway/ipc-json.h @@ -6,6 +6,7 @@ json_object *ipc_json_get_version(); +json_object *ipc_json_describe_disabled_output(struct sway_output *o); json_object *ipc_json_describe_container(struct sway_container *c); json_object *ipc_json_describe_container_recursive(struct sway_container *c); json_object *ipc_json_describe_input(struct sway_input_device *device); diff --git a/include/sway/output.h b/include/sway/output.h index be19d7b2..22c84039 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -45,4 +45,5 @@ void output_damage_whole_container(struct sway_output *output, struct sway_container *output_by_name(const char *name); +void output_enable(struct sway_output *output); #endif diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index 2e0f2abf..069a02cc 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h @@ -31,6 +31,8 @@ struct sway_root { struct wlr_texture *debug_tree; + list_t *outputs; + struct { struct wl_signal new_container; } events; -- cgit v1.2.3 From e072fbc6d98784e5610aa88251a15f64e30bbcae Mon Sep 17 00:00:00 2001 From: Brian Ashworth Date: Wed, 6 Jun 2018 20:10:42 -0400 Subject: Switch output storing from list_t to wl_list --- include/sway/output.h | 2 ++ include/sway/tree/layout.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/sway/output.h b/include/sway/output.h index 22c84039..70f746dc 100644 --- a/include/sway/output.h +++ b/include/sway/output.h @@ -29,6 +29,8 @@ struct sway_output { struct wl_listener damage_destroy; struct wl_listener damage_frame; + struct wl_list link; + pid_t bg_pid; }; diff --git a/include/sway/tree/layout.h b/include/sway/tree/layout.h index 069a02cc..cd131056 100644 --- a/include/sway/tree/layout.h +++ b/include/sway/tree/layout.h @@ -31,7 +31,7 @@ struct sway_root { struct wlr_texture *debug_tree; - list_t *outputs; + struct wl_list outputs; // sway_output::link struct { struct wl_signal new_container; -- cgit v1.2.3