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

diff --git a/src/main.cc b/src/main.cc
index b04d4dc..f49f686 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -19,8 +19,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 +28,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 +39,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 +53,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)