clock_*(): New functions

And create and draw the clock on the screen.

1 files changed, 17 insertions, 1 deletions

diff --git a/src/screen.c b/src/screen.c
index a8b8b26..f705701 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -25,8 +25,11 @@
 #include <curses.h>
 #include <stdlib.h>
 
+#include "clock.h"
+
 struct screen {
-	WINDOW *win;
+	WINDOW       *win;
+	struct clock *clock;
 };
 
 struct screen *
@@ -46,12 +49,23 @@ screen_new(void)
 	}
 	curs_set(0);  /* Ignore errors.  */
 
+	screen->clock = clock_new(screen->win);
+	if (screen->clock == NULL) {
+		free(screen);
+		return NULL;
+	}
+
 	return screen;
 }
 
 void
 screen_draw(struct screen *screen)
 {
+	assert(screen);
+
+	clock_draw(screen->clock);
+
+	refresh();
 }
 
 struct screen *
@@ -66,6 +80,8 @@ screen_destroy(struct screen **screen_p)
 	delwin(screen->win);
 	endwin();
 
+	clock_destroy(&screen->clock);
+
 	free(screen);
 	return screen = NULL;
 }