X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fmain.cc;h=46a412b90f2761579caee89185e43cdb97fb00f5;hb=59cd3a77c4517e387f4c2e21e8b62a9017370116;hp=b4f5f3a1fb8fc4a5cf4fbfda5ed988eed198a336;hpb=0860ce537422597075fbc63ddcc9a73303362a93;p=winnie

diff --git a/src/main.cc b/src/main.cc
index b4f5f3a..46a412b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,41 +1,73 @@
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "gfx.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()
 {
-	if(!init_gfx()) {
-		return 1;
+	if(!winnie_init()) {
+		exit(1);
 	}
 
-	set_cursor_visibility(false);
-
-	unsigned char* fb = get_framebuffer();
-	Rect scrn_sz = get_screen_size();
-
-	for(int i=0; i<scrn_sz.height; i++) {
-		for(int j=0; j<scrn_sz.width; j++) {
-			unsigned char color0[3] = {255, 0, 0};
-			unsigned char color1[3] = {0, 0, 255};
-			unsigned char* color;
-
-			//red blue chessboard 16 pxls size
-			if(((j >> 4) & 1) == ((i >> 4) & 1)) {
-				color = color0;
-			}
-			else {
-				color = color1;
-			}
-
-			*fb++ = color[0];
-			*fb++ = color[1];
-			*fb++ = color[2];
-			fb++;
-		}
+	atexit(cleanup);
+
+	Window *win1 = new Window;
+	win1->set_title("red klqljljljljljjkaHDJKAHKSHDjkahHSKHDKJSHKAHSJKHAKSHCJHSKFHJKSDHJKSHDJKH");
+	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("yellow");
+	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);
+
+	while(1) {
+		process_events();
 	}
+}
 
-	getchar();
-	clear_screen(0, 0, 0);
+static void display(Window *win)
+{
+	fill_rect(win->get_absolute_rect(), 128, 128, 128);
+}
 
-	destroy_gfx();
+static void keyboard(Window *win, int key, bool pressed)
+{
+	switch(key) {
+	case 'q':
+		exit(0);
+	}
+}
+
+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();
 }