mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-30 17:06:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix refresh rate scale of output

Browse source 
When applying config, value mode->refresh is mHz; convert it to Hz before
assigning it to the temporary output config. oc->refresh_rate will
be converted back to mHz in set_mode function.

Fix debug log printing GHz instead of Hz.
This commit is contained in:
Danilo Spinella 2019-10-20 23:10:39 +02:00 committed by Simon Ser
parent 3ee3a9ef60
commit a5b6f40937
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/config/output.c
View file

@ -260,7 +260,7 @@ bool apply_output_config(struct output_config *oc, struct sway_output *output) {
bool modeset_success; bool modeset_success;
if (oc && oc->width > 0 && oc->height > 0) { if (oc && oc->width > 0 && oc->height > 0) {
sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width, sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f Hz)", oc->name, oc->width,
oc->height, oc->refresh_rate); oc->height, oc->refresh_rate);
modeset_success = modeset_success =
set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
@ -329,7 +329,7 @@ static void default_output_config(struct output_config *oc,
wl_container_of(wlr_output->modes.prev, mode, link); wl_container_of(wlr_output->modes.prev, mode, link);
oc->width = mode->width; oc->width = mode->width;
oc->height = mode->height; oc->height = mode->height;
oc->refresh_rate = mode->refresh; oc->refresh_rate = mode->refresh / 1000.f;
} }
oc->x = oc->y = -1; oc->x = oc->y = -1;
oc->scale = 1; oc->scale = 1;

2
sway/desktop/output.c
View file

@ -856,7 +856,7 @@ void handle_output_manager_apply(struct wl_listener *listener, void *data) {
struct wlr_output_mode *mode = config_head->state.mode; struct wlr_output_mode *mode = config_head->state.mode;
oc->width = mode->width; oc->width = mode->width;
oc->height = mode->height; oc->height = mode->height;
oc->refresh_rate = mode->refresh; oc->refresh_rate = mode->refresh / 1000.f;
} else { } else {
oc->width = config_head->state.custom_mode.width; oc->width = config_head->state.custom_mode.width;
oc->height = config_head->state.custom_mode.height; oc->height = config_head->state.custom_mode.height;