X-Git-Url: https://eleni.mutantstargoat.com/git/?p=winnie;a=blobdiff_plain;f=winnie%2Fsrc%2Fmain.cc;h=c6ad6f53b83db4a30b28f5b47e34460c47f50ddf;hp=3c1c50480c17a0c2bed57815f96a618bd4de0a91;hb=87255f9ad8bb7f8aea8b8c073e869b9a53c07322;hpb=7b5d2df884abb7084d71f17cc29a618c0b6f47ef diff --git a/winnie/src/main.cc b/winnie/src/main.cc index 3c1c504..c6ad6f5 100644 --- a/winnie/src/main.cc +++ b/winnie/src/main.cc @@ -25,10 +25,6 @@ Author: Eleni Maria Stea #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() @@ -39,27 +35,6 @@ int main() atexit(cleanup); - Window *win1 = new Window; - 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"); @@ -72,29 +47,6 @@ int main() } } -static void display(Window *win) -{ - fill_rect(win->get_absolute_rect(), 128, 128, 128); -} - -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();