diff options
author | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 22:32:51 +0100 |
---|---|---|
committer | Dominique Martinet <asmadeus@codewreck.org> | 2018-01-05 23:39:46 +0100 |
commit | 67985e903188a464e602d04f9ed218bd397f5ab1 (patch) | |
tree | 3589175749c9a2ed746b0cc280ab3ccfb33125e9 /sway/config/output.c | |
parent | Merge pull request #1554 from martinetd/cmd_set (diff) | |
download | sway-67985e903188a464e602d04f9ed218bd397f5ab1.tar.gz sway-67985e903188a464e602d04f9ed218bd397f5ab1.tar.zst sway-67985e903188a464e602d04f9ed218bd397f5ab1.zip |
sway: change all sway_log to wlr_log
Diffstat (limited to 'sway/config/output.c')
-rw-r--r-- | sway/config/output.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sway/config/output.c b/sway/config/output.c index e798a20e..69e883f1 100644 --- a/sway/config/output.c +++ b/sway/config/output.c | |||
@@ -84,7 +84,7 @@ static void set_mode(struct wlr_output *output, int width, int height, | |||
84 | float refresh_rate) { | 84 | float refresh_rate) { |
85 | int mhz = (int)(refresh_rate * 1000); | 85 | int mhz = (int)(refresh_rate * 1000); |
86 | if (wl_list_empty(&output->modes)) { | 86 | if (wl_list_empty(&output->modes)) { |
87 | sway_log(L_DEBUG, "Assigning custom mode to %s", output->name); | 87 | wlr_log(L_DEBUG, "Assigning custom mode to %s", output->name); |
88 | wlr_output_set_custom_mode(output, width, height, mhz); | 88 | wlr_output_set_custom_mode(output, width, height, mhz); |
89 | return; | 89 | return; |
90 | } | 90 | } |
@@ -100,9 +100,9 @@ static void set_mode(struct wlr_output *output, int width, int height, | |||
100 | } | 100 | } |
101 | } | 101 | } |
102 | if (!best) { | 102 | if (!best) { |
103 | sway_log(L_ERROR, "Configured mode for %s not available", output->name); | 103 | wlr_log(L_ERROR, "Configured mode for %s not available", output->name); |
104 | } else { | 104 | } else { |
105 | sway_log(L_DEBUG, "Assigning configured mode to %s", output->name); | 105 | wlr_log(L_DEBUG, "Assigning configured mode to %s", output->name); |
106 | wlr_output_set_mode(output, best); | 106 | wlr_output_set_mode(output, best); |
107 | } | 107 | } |
108 | } | 108 | } |
@@ -119,22 +119,22 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { | |||
119 | } | 119 | } |
120 | 120 | ||
121 | if (oc && oc->width > 0 && oc->height > 0) { | 121 | if (oc && oc->width > 0 && oc->height > 0) { |
122 | sway_log(L_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width, | 122 | wlr_log(L_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width, |
123 | oc->height, oc->refresh_rate); | 123 | oc->height, oc->refresh_rate); |
124 | set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); | 124 | set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate); |
125 | } | 125 | } |
126 | if (oc && oc->scale > 0) { | 126 | if (oc && oc->scale > 0) { |
127 | sway_log(L_DEBUG, "Set %s scale to %f", oc->name, oc->scale); | 127 | wlr_log(L_DEBUG, "Set %s scale to %f", oc->name, oc->scale); |
128 | wlr_output_set_scale(wlr_output, oc->scale); | 128 | wlr_output_set_scale(wlr_output, oc->scale); |
129 | } | 129 | } |
130 | if (oc && oc->transform >= 0) { | 130 | if (oc && oc->transform >= 0) { |
131 | sway_log(L_DEBUG, "Set %s transform to %d", oc->name, oc->transform); | 131 | wlr_log(L_DEBUG, "Set %s transform to %d", oc->name, oc->transform); |
132 | wlr_output_set_transform(wlr_output, oc->transform); | 132 | wlr_output_set_transform(wlr_output, oc->transform); |
133 | } | 133 | } |
134 | 134 | ||
135 | // Find position for it | 135 | // Find position for it |
136 | if (oc && (oc->x != -1 || oc->y != -1)) { | 136 | if (oc && (oc->x != -1 || oc->y != -1)) { |
137 | sway_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y); | 137 | wlr_log(L_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y); |
138 | wlr_output_layout_add(root_container.sway_root->output_layout, | 138 | wlr_output_layout_add(root_container.sway_root->output_layout, |
139 | wlr_output, oc->x, oc->y); | 139 | wlr_output, oc->x, oc->y); |
140 | } else { | 140 | } else { |
@@ -165,7 +165,7 @@ void apply_output_config(struct output_config *oc, swayc_t *output) { | |||
165 | terminate_swaybg(output->bg_pid); | 165 | terminate_swaybg(output->bg_pid); |
166 | } | 166 | } |
167 | 167 | ||
168 | sway_log(L_DEBUG, "Setting background for output %d to %s", output_i, oc->background); | 168 | wlr_log(L_DEBUG, "Setting background for output %d to %s", output_i, oc->background); |
169 | 169 | ||
170 | size_t bufsize = 12; | 170 | size_t bufsize = 12; |
171 | char output_id[bufsize]; | 171 | char output_id[bufsize]; |