X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.cc;h=3c1c50480c17a0c2bed57815f96a618bd4de0a91;hb=9261ecb0ad85bdf8b21e17b7309ddaeb76a57d96;hp=15245b0c110c1e4a5a752357d4519bbf694529e4;hpb=f634e2d68f3f5b4ba5645891b2c8110f48e80129;p=winnie
diff --git a/src/main.cc b/src/main.cc
index 15245b0..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 .
+
+Author: Eleni Maria Stea
+*/
+
#include
#include
#include
@@ -19,8 +40,8 @@ int main()
atexit(cleanup);
Window *win1 = new Window;
- win1->set_title("title1");
- 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("title2");
- 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 = "title1";
- const char *t2 = "title2";
-
- 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)