summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-06-05 17:56:32 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-06-06 20:11:24 -0400
commita1b5b93d299bfe129f2b3409a7f642049fcce1d6 (patch)
tree4d87f5ab8f0f18ada1fc12a4eb4ba3b5d0350527 /include
parentMerge pull request #2116 from RedSoxFan/fix-2113 (diff)
downloadsway-a1b5b93d299bfe129f2b3409a7f642049fcce1d6.tar.gz
sway-a1b5b93d299bfe129f2b3409a7f642049fcce1d6.tar.zst
sway-a1b5b93d299bfe129f2b3409a7f642049fcce1d6.zip
Store sway_outputs so that they can be reenabled
Diffstat (limited to 'include')
-rw-r--r--include/sway/ipc-json.h1
-rw-r--r--include/sway/output.h1
-rw-r--r--include/sway/tree/layout.h2
3 files changed, 4 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 @@
6 6
7json_object *ipc_json_get_version(); 7json_object *ipc_json_get_version();
8 8
9json_object *ipc_json_describe_disabled_output(struct sway_output *o);
9json_object *ipc_json_describe_container(struct sway_container *c); 10json_object *ipc_json_describe_container(struct sway_container *c);
10json_object *ipc_json_describe_container_recursive(struct sway_container *c); 11json_object *ipc_json_describe_container_recursive(struct sway_container *c);
11json_object *ipc_json_describe_input(struct sway_input_device *device); 12json_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,
45 45
46struct sway_container *output_by_name(const char *name); 46struct sway_container *output_by_name(const char *name);
47 47
48void output_enable(struct sway_output *output);
48#endif 49#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 {
31 31
32 struct wlr_texture *debug_tree; 32 struct wlr_texture *debug_tree;
33 33
34 list_t *outputs;
35
34 struct { 36 struct {
35 struct wl_signal new_container; 37 struct wl_signal new_container;
36 } events; 38 } events;