nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

making warping work.. hopefully.

Browse source 
fix for leaving !normal windows behind in the window list
This commit is contained in:
Dana Jansens 2002-08-21 07:47:52 +00:00
parent 183cf03a4f
commit a9bfdcaa06
2 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Window.cc
View file

@ -3119,12 +3119,8 @@ void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
return;
endMove();
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) {
@ -3136,20 +3132,26 @@ void BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
}
/*
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());
if (! flags.stuck)
screen->reassociateWindow(this, dest, False);
screen->changeWorkspaceID(dest);
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());
if (focus)
setInputFocus();
beginMove(dest_x, y_root);
}

18
src/Workspace.cc
View file

@ -85,11 +85,18 @@ void Workspace::addWindow(BlackboxWindow *w, bool place, bool sticky) {
stackingList.push_front(w);
if (w->isNormal()) {
if (! sticky)
w->setWorkspace(id);
if (! w->isNormal()) {
if (! sticky) {
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());
windowList.push_back(w);
@ -110,11 +117,6 @@ void Workspace::addWindow(BlackboxWindow *w, bool place, bool sticky) {
lastfocus = w;
}
}
} 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);
}
if (! w->isDesktop())