frame->resize(win_rect.width + frame_thickness * 2,
win_rect.height + frame_thickness * 2 + titlebar_thickness);
+ win->move(frame_thickness, frame_thickness + titlebar_thickness);
parent->add_child(frame);
}
Rect mouse_rect = {mouse_x, mouse_y, mouse_cursor.get_width(), mouse_cursor.get_height()};
invalidate_region(mouse_rect);
+
+ gfx_update();
}
void WindowManager::add_window(Window *win)
void WindowManager::set_focused_window(Window *win)
{
+ if(win == focused_win) {
+ return;
+ }
+
+ if(focused_win) {
+ // invalidate the frame (if any)
+ Window *parent = focused_win->get_parent();
+ if(parent && parent != root_win) {
+ parent->invalidate();
+ }
+ }
+
if(!win) {
focused_win = 0;
return;
static void display(Window *win)
{
- if(win->get_managed()) {
- fill_rect(win->get_rect(), 255, 211, 5);
- win->draw(win->get_parent()->get_rect());
- }
+ fill_rect(win->get_absolute_rect(), 255, 211, 5);
}
-static int prev_x = -1, prev_y;
+static int prev_x, prev_y;
static void mouse(Window *win, int bn, bool pressed)
{
if(bn == 0) {
if(pressed) {
get_pointer_pos(&prev_x, &prev_y);
+ printf("pressed: %d\n", prev_x);
} else {
- prev_x = -1;
+ printf("released\n");
}
}
}
static void motion(Window *win, int x, int y)
{
int left_bn = get_button(0);
- if(left_bn && prev_x != -1) {
+ if(left_bn) {
int dx = x - prev_x;
int dy = y - prev_y;
- prev_x = x;
- prev_y = y;
+ prev_x = x - dx;
+ prev_y = y - dy;
+ printf("dx: %d dy: %d\n", dx, dy);
Rect rect = win->get_rect();
win->move(rect.x + dx, rect.y + dy);
}