aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2022-06-23 21:03:32 +0200
committerLibravatar Kirill Primak <vyivel@eclair.cafe>2022-07-04 21:58:24 +0300
commitb69d637f7a34e239e48a4267ae94a5e7087b5834 (patch)
tree63e33a9a15a08c5ebe9bf68183a10bad86997ce7 /include
parentconfig.in: switch to `output power` (diff)
downloadsway-b69d637f7a34e239e48a4267ae94a5e7087b5834.tar.gz
sway-b69d637f7a34e239e48a4267ae94a5e7087b5834.tar.zst
sway-b69d637f7a34e239e48a4267ae94a5e7087b5834.zip
Remove internal references to DPMS
While at it, use an int for the config field, just like we do for all other fields.
Diffstat (limited to 'include')
-rw-r--r--include/sway/config.h8
-rw-r--r--include/sway/output.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/include/sway/config.h b/include/sway/config.h
index 2b4aa972..68c06846 100644
--- a/include/sway/config.h
+++ b/include/sway/config.h
@@ -247,12 +247,6 @@ struct seat_config {
247 } xcursor_theme; 247 } xcursor_theme;
248}; 248};
249 249
250enum config_dpms {
251 DPMS_IGNORE,
252 DPMS_ON,
253 DPMS_OFF,
254};
255
256enum scale_filter_mode { 250enum scale_filter_mode {
257 SCALE_FILTER_DEFAULT, // the default is currently smart 251 SCALE_FILTER_DEFAULT, // the default is currently smart
258 SCALE_FILTER_LINEAR, 252 SCALE_FILTER_LINEAR,
@@ -274,6 +268,7 @@ enum render_bit_depth {
274struct output_config { 268struct output_config {
275 char *name; 269 char *name;
276 int enabled; 270 int enabled;
271 int power;
277 int width, height; 272 int width, height;
278 float refresh_rate; 273 float refresh_rate;
279 int custom_mode; 274 int custom_mode;
@@ -290,7 +285,6 @@ struct output_config {
290 char *background; 285 char *background;
291 char *background_option; 286 char *background_option;
292 char *background_fallback; 287 char *background_fallback;
293 enum config_dpms dpms_state;
294}; 288};
295 289
296/** 290/**
diff --git a/include/sway/output.h b/include/sway/output.h
index 26b9709f..6d8319bf 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -32,7 +32,7 @@ struct sway_output {
32 int width, height; // transformed buffer size 32 int width, height; // transformed buffer size
33 enum wl_output_subpixel detected_subpixel; 33 enum wl_output_subpixel detected_subpixel;
34 enum scale_filter_mode scale_filter; 34 enum scale_filter_mode scale_filter;
35 // last applied mode when the output is DPMS'ed 35 // last applied mode when the output is powered off
36 struct wlr_output_mode *current_mode; 36 struct wlr_output_mode *current_mode;
37 37
38 bool enabling, enabled; 38 bool enabling, enabled;