doWindowSnapping(dx, dy);
if (screen->doOpaqueMove()) {
+ if (screen->doWorkspaceWarping())
+ doWorkspaceWarping(x_root, y_root, dx);
+
configure(dx, dy, frame.rect.width(), frame.rect.height());
} else {
XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
frame.changing.width() - 1,
frame.changing.height() - 1);
+ if (screen->doWorkspaceWarping())
+ doWorkspaceWarping(x_root, y_root, dx);
+
frame.changing.setPos(dx, dy);
XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
frame.changing.height() - 1);
}
- if (screen->doWorkspaceWarping())
- doWorkspaceWarping(x_root, y_root, dx, dy);
-
screen->showPosition(dx, dy);
}
-void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
- int &dx, int dy) {
+void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root, int &dx) {
// workspace warping
bool warp = False;
unsigned int dest = screen->getCurrentWorkspaceID();
if (! warp)
return;
- endMove();
-
bool focus = flags.focused; // had focus while moving?
int dest_x = x_root;
dx -= screen->getRect().width() - 1;
}
- /*
- We grab the X server here so that we dont end up magically grabbing
- a different window dring the warp.
- */
- XGrabServer(blackbox->getXDisplay());
-
if (! flags.stuck)
screen->reassociateWindow(this, dest, False);
screen->changeWorkspaceID(dest);
- configure(dx, dy, frame.rect.width(), frame.rect.height());
+ if (screen->doOpaqueMove())
+ XGrabServer(blackbox->getXDisplay());
+ XUngrabPointer(blackbox->getXDisplay(), CurrentTime);
XWarpPointer(blackbox->getXDisplay(), None,
screen->getRootWindow(), 0, 0, 0, 0,
dest_x, y_root);
+ XGrabPointer(blackbox->getXDisplay(), frame.window, False,
+ PointerMotionMask | ButtonReleaseMask,
+ GrabModeAsync, GrabModeAsync,
+ None, blackbox->getMoveCursor(), CurrentTime);
- XUngrabServer(blackbox->getXDisplay());
+ if (screen->doOpaqueMove())
+ XUngrabServer(blackbox->getXDisplay());
if (focus)
setInputFocus();
- beginMove(dest_x, y_root);
}