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

diff --git a/src/main.cc b/src/main.cc
index b04d4dc..3c1c504 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,3 +1,24 @@
+/*
+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>
@@ -19,8 +40,8 @@ int main()
 	atexit(cleanup);
 
 	Window *win1 = new Window;
-	win1->set_title("red");
-	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);
@@ -28,8 +49,8 @@ int main()
 	win1->set_mouse_motion_callback(motion);
 
 	Window *win2 = new Window;
-	win2->set_title("green");
-	win2->move(150, 10);
+	win2->set_title("window 2");
+	win2->move(300, 100);
 	win2->resize(200, 300);
 	win2->set_display_callback(display);
 	win2->set_keyboard_callback(keyboard);
@@ -39,6 +60,13 @@ int main()
 	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();
 	}
@@ -46,17 +74,7 @@ int main()
 
 static void display(Window *win)
 {
-	const char *win_title = win->get_title();
-	const char *t1 = "red";
-	const char *t2 = "green";
-
-	if(!strcmp(win_title, t1)) {
-		fill_rect(win->get_absolute_rect(), 255, 0, 0);
-	}
-
-	if(!strcmp(win_title, t2)) {
-		fill_rect(win->get_absolute_rect(), 0, 255, 0);
-	}
+	fill_rect(win->get_absolute_rect(), 128, 128, 128);
 }
 
 static void keyboard(Window *win, int key, bool pressed)