bug #1 from click placement fixed. was catching more motionNotify events than i wanted to with the new/modified move grabs. now i drop any left-over extras when the move completes so they dont come in too late
Dana Jansens danakj@orodu.net
2 files changed,
12 insertions(+),
4 deletions(-)
M
src/Window.cc
→
src/Window.cc
@@ -2208,6 +2208,7 @@ }
void OpenboxWindow::mapRequestEvent(XMapRequestEvent *re) { + cout << "MAP REQUEST " << client.window << " " << client.title << endl; if (re->window == client.window) { #ifdef DEBUG fprintf(stderr, i18n->getMessage(WindowSet, WindowMapRequest,@@ -2785,6 +2786,7 @@ frame.resize_w - 1, frame.resize_h - 1);
} frame.grab_x = x - frame.x - frame.border_w; frame.grab_y = y - frame.y - frame.border_w; + cout << "START MOVE " << client.window << " " << client.title << endl; }@@ -2874,6 +2876,11 @@ configure(frame.x, frame.y, frame.width, frame.height);
} screen->hideGeometry(); XUngrabPointer(display, CurrentTime); + // if there are any left over motions from the move, drop them now cuz they + // cause problems + XEvent e; + while (XCheckTypedWindowEvent(display, frame.window, MotionNotify, &e)); + cout << "END MOVE " << client.window << " " << client.title << endl; }@@ -2887,11 +2894,12 @@ startMove(me->x_root, me->y_root);
else if (functions.resize && (((me->state & Button1Mask) && (me->window == frame.right_grip || me->window == frame.left_grip)) || - (me->state & (Mod1Mask | Button3Mask) && + (me->state == (Mod1Mask | Button3Mask) && me->window == frame.window))) { Bool left = resize_zone & ZoneLeft; if (! flags.resizing) { + cout << "START RESIZE " << client.window << " " << client.title << endl; Cursor cursor; if (resize_zone & ZoneTop) cursor = (resize_zone & ZoneLeft) ?@@ -2965,7 +2973,8 @@ frame.resize_w - 1, frame.resize_h - 1);
screen->showGeometry(gx, gy); } - } + } else + cout << "MOTION " << client.window << " " << client.title << endl; }
M
src/openbox.cc
→
src/openbox.cc
@@ -283,11 +283,10 @@ }
void Openbox::process_event(XEvent *e) { - if ((masked == e->xany.window) && masked_window && + if ((masked == e->xany.window && masked_window) && (e->type == MotionNotify)) { last_time = e->xmotion.time; masked_window->motionNotifyEvent(&e->xmotion); - return; }