diff options
author | Simon Ser <contact@emersion.fr> | 2019-10-26 22:36:49 +0200 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2019-11-04 19:40:47 -0500 |
commit | 38b37247ff26b7c0926a8d31c1a91f818d1f5d84 (patch) | |
tree | 6589cc37ee6374ceca8cd2d42d1b95d26e82c1a8 /sway/config/output.c | |
parent | seatop_default: handle focus for xwayland_unmanaged views (diff) | |
download | sway-38b37247ff26b7c0926a8d31c1a91f818d1f5d84.tar.gz sway-38b37247ff26b7c0926a8d31c1a91f818d1f5d84.tar.zst sway-38b37247ff26b7c0926a8d31c1a91f818d1f5d84.zip |
Add --custom to `output mode` command
This forces to set the mode as a custom mode.
Diffstat (limited to 'sway/config/output.c')
-rw-r--r-- | sway/config/output.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index 42deec67..1d21e52f 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -42,6 +42,7 @@ struct output_config *new_output_config(const char *name) { | |||
42 | oc->enabled = -1; | 42 | oc->enabled = -1; |
43 | oc->width = oc->height = -1; | 43 | oc->width = oc->height = -1; |
44 | oc->refresh_rate = -1; | 44 | oc->refresh_rate = -1; |
45 | oc->custom_mode = -1; | ||
45 | oc->x = oc->y = -1; | 46 | oc->x = oc->y = -1; |
46 | oc->scale = -1; | 47 | oc->scale = -1; |
47 | oc->transform = -1; | 48 | oc->transform = -1; |
@@ -74,6 +75,9 @@ void merge_output_config(struct output_config *dst, struct output_config *src) { | |||
74 | if (src->refresh_rate != -1) { | 75 | if (src->refresh_rate != -1) { |
75 | dst->refresh_rate = src->refresh_rate; | 76 | dst->refresh_rate = src->refresh_rate; |
76 | } | 77 | } |
78 | if (src->custom_mode != -1) { | ||
79 | dst->custom_mode = src->custom_mode; | ||
80 | } | ||
77 | if (src->transform != -1) { | 81 | if (src->transform != -1) { |
78 | dst->transform = src->transform; | 82 | dst->transform = src->transform; |
79 | } | 83 | } |
@@ -202,11 +206,13 @@ struct output_config *store_output_config(struct output_config *oc) { | |||
202 | } | 206 | } |
203 | 207 | ||
204 | static bool set_mode(struct wlr_output *output, int width, int height, | 208 | static bool set_mode(struct wlr_output *output, int width, int height, |
205 | float refresh_rate) { | 209 | float refresh_rate, bool custom) { |
206 | int mhz = (int)(refresh_rate * 1000); | 210 | int mhz = (int)(refresh_rate * 1000); |
207 | if (wl_list_empty(&output->modes)) { | 211 | |
212 | if (wl_list_empty(&output->modes) || custom) { | ||
208 | sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name); | 213 | sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name); |
209 | return wlr_output_set_custom_mode(output, width, height, mhz); | 214 | return wlr_output_set_custom_mode(output, width, height, |
215 | refresh_rate > 0 ? mhz : 0); | ||
210 | } | 216 | } |
211 | 217 | ||
212 | struct wlr_output_mode *mode, *best = NULL; | 218 | struct wlr_output_mode *mode, *best = NULL; |
@@ -261,8 +267,8 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) { | |||
261 | if (oc && oc->width > 0 && oc->height > 0) { | 267 | if (oc && oc->width > 0 && oc->height > 0) { |
262 | sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)", oc->name, oc->width, | 268 | sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)", oc->name, oc->width, |
263 | oc->height, oc->refresh_rate); | 269 | oc->height, oc->refresh_rate); |
264 | modeset_success = | 270 | modeset_success = set_mode(wlr_output, oc->width, oc->height, |
265 | set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); | 271 | oc->refresh_rate, oc->custom_mode == 1); |
266 | } else if (!wl_list_empty(&wlr_output->modes)) { | 272 | } else if (!wl_list_empty(&wlr_output->modes)) { |
267 | struct wlr_output_mode *mode = | 273 | struct wlr_output_mode *mode = |
268 | wl_container_of(wlr_output->modes.prev, mode, link); | 274 | wl_container_of(wlr_output->modes.prev, mode, link); |