X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Fwinnie.cc;h=604a5e1ea8f34eb1b9b8b072f4c4e8bc6cceefa0;hp=4ec10b1f5e0bc638c3388c7b5d453ad3021fa8c2;hb=e2626c41c841dbbfb64ddf6341b4e23089036299;hpb=97b3c3c7c9dfa16c335646e17ebb43a688856a0c

diff --git a/src/winnie.cc b/src/winnie.cc
index 4ec10b1..604a5e1 100644
--- a/src/winnie.cc
+++ b/src/winnie.cc
@@ -1,13 +1,45 @@
-#include "winnie.h"
+/*
+winnie - an experimental window system
+
+Copyright (C) 2013 Eleni Maria Stea
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Author: Eleni Maria Stea <elene.mst@gmail.com>
+*/
+
+#include <sys/time.h>
+
 #include "keyboard.h"
 #include "mouse.h"
+#include "shalloc.h"
+#include "winnie.h"
 
 bool winnie_init()
 {
+	if(!init_shared_memory()) {
+		return false;
+	}
+
 	if(!init_gfx()) {
 		return false;
 	}
 
+	if(!init_window_manager()) {
+		return false;
+	}
+
 	if(!init_keyboard()) {
 		return false;
 	}
@@ -16,6 +48,10 @@ bool winnie_init()
 		return false;
 	}
 
+	if(!init_text()) {
+		return false;
+	}
+
 	wm->invalidate_region(get_screen_size());
 	return true;
 }
@@ -25,4 +61,22 @@ void winnie_shutdown()
 	destroy_gfx();
 	destroy_keyboard();
 	destroy_mouse();
+	destroy_text();
+
+	destroy_shared_memory();
+}
+
+long winnie_get_time()
+{
+	static struct timeval init_tv;
+	struct timeval tv;
+
+	gettimeofday(&tv, 0);
+
+	if(!tv.tv_sec && !tv.tv_usec) {
+		init_tv = tv;
+		return 0;
+	}
+
+	return (tv.tv_usec - init_tv.tv_usec) / 1000 + (tv.tv_sec - init_tv.tv_sec) * 1000;
 }