diff options
-rw-r--r-- | include/sway/output.h | 7 | ||||
-rw-r--r-- | sway/desktop/desktop.c | 5 | ||||
-rw-r--r-- | sway/desktop/output.c | 10 | ||||
-rw-r--r-- | sway/tree/container.c | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/include/sway/output.h b/include/sway/output.h index 8945dde4..4bffa2b7 100644 --- a/include/sway/output.h +++ b/include/sway/output.h | |||
@@ -34,11 +34,14 @@ struct sway_output { | |||
34 | 34 | ||
35 | void output_damage_whole(struct sway_output *output); | 35 | void output_damage_whole(struct sway_output *output); |
36 | 36 | ||
37 | void output_damage_whole_surface(struct sway_output *output, | ||
38 | double ox, double oy, struct wlr_surface *surface); | ||
39 | |||
37 | void output_damage_whole_view(struct sway_output *output, | 40 | void output_damage_whole_view(struct sway_output *output, |
38 | struct sway_view *view); | 41 | struct sway_view *view); |
39 | 42 | ||
40 | void output_damage_whole_rect(struct sway_output *output, double ox, double oy, | 43 | void output_damage_whole_container(struct sway_output *output, |
41 | int width, int height); | 44 | struct sway_container *con); |
42 | 45 | ||
43 | struct sway_container *output_by_name(const char *name); | 46 | struct sway_container *output_by_name(const char *name); |
44 | 47 | ||
diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c index c23d988c..3a13191f 100644 --- a/sway/desktop/desktop.c +++ b/sway/desktop/desktop.c | |||
@@ -7,9 +7,8 @@ void desktop_damage_whole_surface(struct wlr_surface *surface, double lx, | |||
7 | for (int i = 0; i < root_container.children->length; ++i) { | 7 | for (int i = 0; i < root_container.children->length; ++i) { |
8 | struct sway_container *cont = root_container.children->items[i]; | 8 | struct sway_container *cont = root_container.children->items[i]; |
9 | if (cont->type == C_OUTPUT) { | 9 | if (cont->type == C_OUTPUT) { |
10 | output_damage_whole_rect(cont->sway_output, | 10 | output_damage_whole_surface(cont->sway_output, |
11 | lx - cont->x, ly - cont->y, | 11 | lx - cont->x, ly - cont->y, surface); |
12 | surface->current->width, surface->current->height); | ||
13 | } | 12 | } |
14 | } | 13 | } |
15 | } | 14 | } |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 09244460..a7f40ef8 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -335,14 +335,20 @@ void output_damage_whole(struct sway_output *output) { | |||
335 | wlr_output_damage_add_whole(output->damage); | 335 | wlr_output_damage_add_whole(output->damage); |
336 | } | 336 | } |
337 | 337 | ||
338 | void output_damage_whole_surface(struct sway_output *output, | ||
339 | double ox, double oy, struct wlr_surface *surface) { | ||
340 | // TODO | ||
341 | output_damage_whole(output); | ||
342 | } | ||
343 | |||
338 | void output_damage_whole_view(struct sway_output *output, | 344 | void output_damage_whole_view(struct sway_output *output, |
339 | struct sway_view *view) { | 345 | struct sway_view *view) { |
340 | // TODO | 346 | // TODO |
341 | output_damage_whole(output); | 347 | output_damage_whole(output); |
342 | } | 348 | } |
343 | 349 | ||
344 | void output_damage_whole_rect(struct sway_output *output, | 350 | void output_damage_whole_container(struct sway_output *output, |
345 | double ox, double oy, int width, int height) { | 351 | struct sway_container *con) { |
346 | // TODO | 352 | // TODO |
347 | output_damage_whole(output); | 353 | output_damage_whole(output); |
348 | } | 354 | } |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 1450db6d..404d413f 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -523,7 +523,5 @@ void container_damage_whole(struct sway_container *con) { | |||
523 | if (output->type != C_OUTPUT) { | 523 | if (output->type != C_OUTPUT) { |
524 | output = container_parent(output, C_OUTPUT); | 524 | output = container_parent(output, C_OUTPUT); |
525 | } | 525 | } |
526 | 526 | output_damage_whole_container(output->sway_output, con); | |
527 | output_damage_whole_rect(output->sway_output, con->x, con->y, con->width, | ||
528 | con->height); | ||
529 | } | 527 | } |