diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:02:29 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-03-30 00:04:04 -0400 |
| commit | f26ecd9f58bb672fe107660ce9b37f4bf0777a8c (patch) | |
| tree | 997658454de40db3f8b76b68d658efaf2b686188 /include/sway/ipc-json.h | |
| parent | Early return from render functions if necessary (diff) | |
| parent | Merge pull request #1654 from acrisci/refactor-2-electric-boogaloo (diff) | |
| download | sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.tar.gz sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.tar.zst sway-f26ecd9f58bb672fe107660ce9b37f4bf0777a8c.zip | |
Merge remote-tracking branch 'origin/wlroots' into swaybar-layers
Diffstat (limited to 'include/sway/ipc-json.h')
| -rw-r--r-- | include/sway/ipc-json.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h index 19c5b5bc..7d87d377 100644 --- a/include/sway/ipc-json.h +++ b/include/sway/ipc-json.h | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | #ifndef _SWAY_IPC_JSON_H | 1 | #ifndef _SWAY_IPC_JSON_H |
| 2 | #define _SWAY_IPC_JSON_H | 2 | #define _SWAY_IPC_JSON_H |
| 3 | #include <json-c/json.h> | 3 | #include <json-c/json.h> |
| 4 | #include "sway/container.h" | 4 | #include "sway/tree/container.h" |
| 5 | #include "sway/input/input-manager.h" | 5 | #include "sway/input/input-manager.h" |
| 6 | 6 | ||
| 7 | json_object *ipc_json_get_version(); | 7 | json_object *ipc_json_get_version(); |
| 8 | 8 | ||
| 9 | json_object *ipc_json_describe_container(swayc_t *c); | 9 | json_object *ipc_json_describe_container(struct sway_container *c); |
| 10 | json_object *ipc_json_describe_container_recursive(swayc_t *c); | 10 | json_object *ipc_json_describe_container_recursive(struct sway_container *c); |
| 11 | json_object *ipc_json_describe_input(struct sway_input_device *device); | 11 | json_object *ipc_json_describe_input(struct sway_input_device *device); |
| 12 | json_object *ipc_json_describe_bar_config(struct bar_config *bar); | 12 | json_object *ipc_json_describe_bar_config(struct bar_config *bar); |
| 13 | 13 | ||