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 | |
| parent | a87960711a9587ed2f484c2ba8a5cb9e18d1d641 (diff) | |
| parent | eb4f66f7857d3e7cd8ac14a7fb43502fbc70de98 (diff) | |
Merge branch 'wlroots' into feature/input
Diffstat (limited to 'include')
| -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 { int width, height; float refresh_rate; int x, y; - int scale; + float scale; int32_t transform; 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 @@ json_object *ipc_json_get_version(); +json_object *ipc_json_describe_container(swayc_t *c); json_object *ipc_json_describe_container_recursive(swayc_t *c); #endif |