From 03a34f2de89648e8b30afcce27ac17f56f12bae0 Mon Sep 17 00:00:00 2001
From: Leon Henrik Plickat <leonhenrik.plickat@stud.uni-goettingen.de>
Date: Mon, 13 Dec 2021 19:54:46 +0100
Subject: Minor code cleanup

---
 src/surface.c | 13 -------------
 src/surface.h |  1 -
 src/wlclock.c | 15 ++++++++++++---
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/surface.c b/src/surface.c
index 79c8b6b..e3b16cb 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -202,16 +202,3 @@ void destroy_surface (struct Wlclock_surface *surface)
 	free(surface);
 }
 
-void update_all_hands (void)
-{
-	clocklog(1, "[surface] Updating all hands.\n");
-	struct Wlclock_output *op, *tmp;
-	wl_list_for_each_safe(op, tmp, &context.outputs, link)
-		if ( op->surface != NULL )
-		{
-			render_hands_frame(op->surface);
-			wl_surface_commit(op->surface->hands_surface);
-			wl_surface_commit(op->surface->background_surface);
-		}
-}
-
diff --git a/src/surface.h b/src/surface.h
index 50e29b8..cf4ebc5 100644
--- a/src/surface.h
+++ b/src/surface.h
@@ -29,6 +29,5 @@ struct Wlclock_surface
 
 bool create_surface (struct Wlclock_output *output);
 void destroy_surface (struct Wlclock_surface *surface);
-void update_all_hands (void);
 
 #endif
diff --git a/src/wlclock.c b/src/wlclock.c
index a5f1b54..fefc480 100644
--- a/src/wlclock.c
+++ b/src/wlclock.c
@@ -23,11 +23,12 @@
 #include"xdg-output-unstable-v1-protocol.h"
 #include"xdg-shell-protocol.h"
 
-#include"wlclock.h"
+#include"colour.h"
 #include"misc.h"
 #include"output.h"
+#include"render.h"
 #include"surface.h"
-#include"colour.h"
+#include"wlclock.h"
 
 struct Wlclock_context context = {0};
 
@@ -608,7 +609,15 @@ static void clock_run ()
 
 		if ( ret == 0 ) /* Timeout -> update clock hands. */
 		{
-			update_all_hands();
+			clocklog(1, "[surface] Updating all hands.\n");
+			struct Wlclock_output *op, *tmp;
+			wl_list_for_each_safe(op, tmp, &context.outputs, link)
+				if ( op->surface != NULL )
+				{
+					render_hands_frame(op->surface);
+					wl_surface_commit(op->surface->hands_surface);
+					wl_surface_commit(op->surface->background_surface);
+				}
 			continue;
 		}
 		else if ( ret < 0 )
-- 
cgit v1.2.3