X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Fmain.cc;h=3c1c50480c17a0c2bed57815f96a618bd4de0a91;hp=f87b011559856e035e5d1af181e7be5bc0c57eeb;hb=e2626c41c841dbbfb64ddf6341b4e23089036299;hpb=026158b5ee6ffac95c3efc6eee4c155497cd8594

diff --git a/src/main.cc b/src/main.cc
index f87b011..3c1c504 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,5 +1,27 @@
+/*
+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 <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "winnie.h"
 
@@ -11,19 +33,39 @@ static void cleanup();
 
 int main()
 {
-	winnie_init();
+	if(!winnie_init()) {
+		exit(1);
+	}
+
 	atexit(cleanup);
 
 	Window *win1 = new Window;
-	win1->set_title("title1");
-	win1->move(5, 10);
+	win1->set_title("Clipping the win title");
+	win1->move(200, 100);
 	win1->resize(200, 300);
 	win1->set_display_callback(display);
 	win1->set_keyboard_callback(keyboard);
 	win1->set_mouse_button_callback(button);
 	win1->set_mouse_motion_callback(motion);
 
+	Window *win2 = new Window;
+	win2->set_title("window 2");
+	win2->move(300, 100);
+	win2->resize(200, 300);
+	win2->set_display_callback(display);
+	win2->set_keyboard_callback(keyboard);
+	win2->set_mouse_button_callback(button);
+	win2->set_mouse_motion_callback(motion);
+
 	wm->add_window(win1);
+	wm->add_window(win2);
+
+	Pixmap bg;
+	if(!(bg.load("data/bg.ppm"))) {
+		fprintf(stderr, "failed to load pixmap\n");
+	}
+
+	wm->set_background(&bg);
 
 	while(1) {
 		process_events();
@@ -32,12 +74,7 @@ int main()
 
 static void display(Window *win)
 {
-	if(wm->get_focused_window() != win) {
-		fill_rect(win->get_absolute_rect(), 106, 106, 250);
-	}
-	else {
-		fill_rect(win->get_absolute_rect(), 0, 0, 255);
-	}
+	fill_rect(win->get_absolute_rect(), 128, 128, 128);
 }
 
 static void keyboard(Window *win, int key, bool pressed)