diff options
author | emersion <contact@emersion.fr> | 2018-06-07 19:26:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-07 19:26:55 +0100 |
commit | 2e289831ee3198f36e2c02bd4542fa4f6646a81b (patch) | |
tree | 7de104885aabb49f17739d7631ef6cd4f628e64a /include | |
parent | 22c1c4beb4baa369f883fb5360c40158513c8e10 (diff) | |
parent | e072fbc6d98784e5610aa88251a15f64e30bbcae (diff) |
Merge pull request #2108 from RedSoxFan/store-outputs
Allow outputs to be re-enabled
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/ipc-json.h | 1 | ||||
-rw-r--r-- | include/sway/output.h | 3 | ||||
-rw-r--r-- | include/sway/tree/layout.h | 2 |
3 files changed, 6 insertions, 0 deletions
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..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; }; @@ -45,4 +47,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..cd131056 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; + struct wl_list outputs; // sway_output::link + struct { struct wl_signal new_container; } events; |