summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
183cf03)
fix for leaving !normal windows behind in the window list
bool focus = flags.focused; // had focus while moving?
bool focus = flags.focused; // had focus while moving?
- if (! flags.stuck)
- screen->reassociateWindow(this, dest, False);
- screen->changeWorkspaceID(dest);
- if (focus)
- setInputFocus();
int dest_x = x_root;
if (x_root <= 0) {
int dest_x = x_root;
if (x_root <= 0) {
- We grab the X server here because we are moving the window and then the
- mouse cursor. When one moves, it could end up putting the mouse cursor
- over another window for a moment. This can cause the warp to iniate a
- move on another window.
+ We grab the X server here so that we dont end up magically grabbing
+ a different window dring the warp.
*/
XGrabServer(blackbox->getXDisplay());
*/
XGrabServer(blackbox->getXDisplay());
+ if (! flags.stuck)
+ screen->reassociateWindow(this, dest, False);
+ screen->changeWorkspaceID(dest);
+
configure(dx, dy, frame.rect.width(), frame.rect.height());
configure(dx, dy, frame.rect.width(), frame.rect.height());
XWarpPointer(blackbox->getXDisplay(), None,
screen->getRootWindow(), 0, 0, 0, 0,
dest_x, y_root);
XUngrabServer(blackbox->getXDisplay());
XWarpPointer(blackbox->getXDisplay(), None,
screen->getRootWindow(), 0, 0, 0, 0,
dest_x, y_root);
XUngrabServer(blackbox->getXDisplay());
+ if (focus)
+ setInputFocus();
+
beginMove(dest_x, y_root);
}
beginMove(dest_x, y_root);
}
stackingList.push_front(w);
stackingList.push_front(w);
+ if (! sticky)
+ w->setWorkspace(id);
+
+ if (! w->isNormal()) {
- w->setWorkspace(id);
- w->setWindowNumber(windowList.size());
+ // just give it some number, else bad things happen as it is assumed to
+ // not be on a workspace
+ w->setWindowNumber(0);
+ } else {
+ if (! sticky)
+ w->setWindowNumber(windowList.size());
- } else {
- w->setWorkspace(id);
- // just give it some number, else bad things happen as it is assumed to not
- // be on a workspace
- w->setWindowNumber(0);