diff options
| author |  Tony Crisci <tony@dubstepdish.com> | 2017-12-18 11:01:11 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-12-18 11:01:11 -0500 |
| commit | a949d7de5a7df2a3eaf51f4993ea94cf0dbc4a9a (patch) | |
| tree | 2278e3db6ca185c2f4789c65f4b42e96a44e3664 /include/sway | |
| parent | Merge branch 'feature/input' of github.com:acrisci/sway into feature/input (diff) | |
| parent | Merge pull request #1526 from emersion/fractional-output-scale (diff) | |
| download | sway-a949d7de5a7df2a3eaf51f4993ea94cf0dbc4a9a.tar.gz sway-a949d7de5a7df2a3eaf51f4993ea94cf0dbc4a9a.tar.zst sway-a949d7de5a7df2a3eaf51f4993ea94cf0dbc4a9a.zip | |
Merge branch 'wlroots' into feature/input
Diffstat (limited to 'include/sway')
| -rw-r--r-- | include/sway/config.h | 2 | ||||
| -rw-r--r-- | include/sway/ipc-json.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/sway/config.h b/include/sway/config.h index fdfbbedb..83ded720 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
| @@ -105,7 +105,7 @@ struct output_config { | |||
| 105 | int width, height; | 105 | int width, height; |
| 106 | float refresh_rate; | 106 | float refresh_rate; |
| 107 | int x, y; | 107 | int x, y; |
| 108 | int scale; | 108 | float scale; |
| 109 | int32_t transform; | 109 | int32_t transform; |
| 110 | 110 | ||
| 111 | char *background; | 111 | char *background; |
diff --git a/include/sway/ipc-json.h b/include/sway/ipc-json.h index 9986c399..9435b664 100644 --- a/include/sway/ipc-json.h +++ b/include/sway/ipc-json.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | json_object *ipc_json_get_version(); | 6 | json_object *ipc_json_get_version(); |
| 7 | 7 | ||
| 8 | json_object *ipc_json_describe_container(swayc_t *c); | ||
| 8 | json_object *ipc_json_describe_container_recursive(swayc_t *c); | 9 | json_object *ipc_json_describe_container_recursive(swayc_t *c); |
| 9 | 10 | ||
| 10 | #endif | 11 | #endif |