aboutsummaryrefslogtreecommitdiff
path: root/include/sway
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-01-18 08:23:25 -0500
committerGitHub <noreply@github.com>2019-01-18 08:23:25 -0500
commit978d6cd854c6340690387d07e159675b6406565d (patch)
tree7c40fbaebce93738d1f44d32f2d6f059a073e85e /include/sway
parentdc1eac0cf12593fa20122142f087bbb3bc8e7589 (diff)
parenta737d7ecc4d7f4825ca7879e3449522bc87049be (diff)
Merge pull request #3455 from emersion/output-no-crtc
Better handle outputs without CRTC
Diffstat (limited to 'include/sway')
-rw-r--r--include/sway/config.h2
-rw-r--r--include/sway/output.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 978606a6..8215ff59 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -568,7 +568,7 @@ struct output_config *new_output_config(const char *name);
void merge_output_config(struct output_config *dst, struct output_config *src);
-void apply_output_config(struct output_config *oc, struct sway_output *output);
+bool apply_output_config(struct output_config *oc, struct sway_output *output);
struct output_config *store_output_config(struct output_config *oc);
diff --git a/include/sway/output.h b/include/sway/output.h
index 7279187d..9ebdb6c1 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -31,7 +31,7 @@ struct sway_output {
int lx, ly;
int width, height;
- bool enabled;
+ bool enabled, configured;
list_t *workspaces;
struct sway_output_state current;