Simplify damage tracking functions, use them in layer shell

3 files changed, 7 insertions, 12 deletions

diff --git a/include/sway/desktop.h b/include/sway/desktop.h
index 96bdc94c..f1ad759a 100644
--- a/include/sway/desktop.h
+++ b/include/sway/desktop.h
@@ -1,7 +1,4 @@
 #include <wlr/types/wlr_surface.h>
 
-void desktop_damage_whole_surface(struct wlr_surface *surface, double lx,
-        double ly);
-
-void desktop_damage_from_surface(struct wlr_surface *surface, double lx,
-        double ly);
+void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
+        bool whole);
diff --git a/include/sway/output.h b/include/sway/output.h
index 4bffa2b7..56571548 100644
--- a/include/sway/output.h
+++ b/include/sway/output.h
@@ -34,11 +34,11 @@ struct sway_output {
 
 void output_damage_whole(struct sway_output *output);
 
-void output_damage_whole_surface(struct sway_output *output,
-        double ox, double oy, struct wlr_surface *surface);
+void output_damage_surface(struct sway_output *output, double ox, double oy,
+        struct wlr_surface *surface, bool whole);
 
-void output_damage_whole_view(struct sway_output *output,
-        struct sway_view *view);
+void output_damage_view(struct sway_output *output, struct sway_view *view,
+        bool whole);
 
 void output_damage_whole_container(struct sway_output *output,
         struct sway_container *con);
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 611c4f0b..b51c54b5 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -157,9 +157,7 @@ void view_set_activated(struct sway_view *view, bool activated);
 
 void view_close(struct sway_view *view);
 
-void view_damage_whole(struct sway_view *view);
-
-void view_damage_from(struct sway_view *view);
+void view_damage(struct sway_view *view, bool whole);
 
 void view_for_each_surface(struct sway_view *view,
         wlr_surface_iterator_func_t iterator, void *user_data);