ioctl doesn't work for my intel

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index 89b709f..4547e1d 100644 (file)
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -12,7 +12,7 @@ WindowManager *wm;
 static WindowManager wminst;
 
 static void display(Window *win);
-static void mouse(Window *win, int bn, bool pressed);
+static void mouse(Window *win, int bn, bool pressed, int x, int y);
 static void motion(Window *win, int x, int y);
 
 void WindowManager::create_frame(Window *win)
@@ -30,11 +30,12 @@ void WindowManager::create_frame(Window *win)
        windows.push_back(frame);
 
        Rect win_rect = win->get_rect();
-       frame->move(win_rect.x - frame_thickness, 
+       frame->move(win_rect.x - frame_thickness,
                        win_rect.y - frame_thickness - titlebar_thickness);
-       frame->resize(win_rect.width + frame_thickness * 2, 
+       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);
 }
 
@@ -116,6 +117,8 @@ void WindowManager::process_windows()
        }
        dirty_rects.clear();
 
+       wait_vsync();
+
        fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
 
        root_win->draw_children(uni);
@@ -225,18 +228,17 @@ Window *WindowManager::get_window_at_pos(int pointer_x, int pointer_y)
 
 static void display(Window *win)
 {
-       fill_rect(win->get_rect(), 255, 211, 5);
+       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)
+static void mouse(Window *win, int bn, bool pressed, int x, int y)
 {
        if(bn == 0) {
                if(pressed) {
-                       get_pointer_pos(&prev_x, &prev_y);
-               } else {
-                       prev_x = -1;
+                       prev_x = x;
+                       prev_y = y;
                }
        }
 }
@@ -244,11 +246,11 @@ static void mouse(Window *win, int bn, bool pressed)
 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;
 
                Rect rect = win->get_rect();
                win->move(rect.x + dx, rect.y + dy);