diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2016-07-29 07:35:43 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-07-29 07:35:43 -0400 |
| commit | 966127222439620233c27ab835062f6cc69e23ea (patch) | |
| tree | 7e233c68e7063b7c0c7857a73111e95141fb5b44 /include | |
| parent | Merge pull request #802 from acrisci/feature/timestamp-log-messages (diff) | |
| parent | Update IPC JSON responses for HiDPI setups (diff) | |
| download | sway-0.9-rc2.tar.gz sway-0.9-rc2.tar.zst sway-0.9-rc2.zip | |
Merge remote-tracking branch 'origin/hidpi'0.9-rc2
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 1 | ||||
| -rw-r--r-- | include/output.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/config.h b/include/config.h index 87e23187..5e1c123e 100644 --- a/include/config.h +++ b/include/config.h | |||
| @@ -81,6 +81,7 @@ struct output_config { | |||
| 81 | int enabled; | 81 | int enabled; |
| 82 | int width, height; | 82 | int width, height; |
| 83 | int x, y; | 83 | int x, y; |
| 84 | int scale; | ||
| 84 | char *background; | 85 | char *background; |
| 85 | char *background_option; | 86 | char *background_option; |
| 86 | }; | 87 | }; |
diff --git a/include/output.h b/include/output.h index 10c5bb53..e8afd5ed 100644 --- a/include/output.h +++ b/include/output.h | |||
| @@ -19,4 +19,6 @@ void get_absolute_center_position(swayc_t *container, struct wlc_point *point); | |||
| 19 | // stable sort workspaces on this output | 19 | // stable sort workspaces on this output |
| 20 | void sort_workspaces(swayc_t *output); | 20 | void sort_workspaces(swayc_t *output); |
| 21 | 21 | ||
| 22 | void output_get_scaled_size(wlc_handle handle, struct wlc_size *size); | ||
| 23 | |||
| 22 | #endif | 24 | #endif |