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

diff --git a/src/main.cc b/src/main.cc
index 8b36449..b04d4dc 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,25 +1,43 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "winnie.h"
 
 static void display(Window *win);
 static void keyboard(Window *win, int key, bool pressed);
+static void button(Window *win, int bn, bool pressed, int x, int y);
+static void motion(Window *win, int x, int y);
 static void cleanup();
 
 int main()
 {
-	winnie_init();
+	if(!winnie_init()) {
+		exit(1);
+	}
+
 	atexit(cleanup);
 
 	Window *win1 = new Window;
-	win1->set_title("title1");
+	win1->set_title("red");
 	win1->move(5, 10);
 	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("green");
+	win2->move(150, 10);
+	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);
 
 	while(1) {
 		process_events();
@@ -28,13 +46,16 @@ int main()
 
 static void display(Window *win)
 {
-	if(wm->get_focused_window() != win) {
-		fill_rect(win->get_rect(), 106, 106, 250);
-		printf("drawing unfocused\n");
+	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);
 	}
-	else {
-		fill_rect(win->get_rect(), 0, 0, 255);
-		printf("drawing FOCUSED\n");
+
+	if(!strcmp(win_title, t2)) {
+		fill_rect(win->get_absolute_rect(), 0, 255, 0);
 	}
 }
 
@@ -46,6 +67,16 @@ static void keyboard(Window *win, int key, bool pressed)
 	}
 }
 
+static void button(Window *win, int bn, bool pressed, int x, int y)
+{
+	printf("WINDOW(%p) button %d %s\n", (void*)win, bn, pressed ? "press" : "release");
+}
+
+static void motion(Window *win, int x, int y)
+{
+	printf("WINDOW(%p) motion %d %d\n", (void*)win, x, y);
+}
+
 static void cleanup()
 {
 	winnie_shutdown();