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

send transient windows along with sendtoworkspace

Browse source
This commit is contained in:
markt 2007-06-03 20:27:52 +00:00
parent f9c5bfec07
commit 226ec5d371
3 changed files with 33 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,6 +1,9 @@
(Format: Year/Month/Day)
Changes for 1.0.0:
*07/06/03:
* Also send transient windows when sending a window to another workspace, bug
#1716900 (Mark)
Screen.cc
* Only change layer to normal when removing _NET_WM_STATE_{ABOVE,BELOW} if
the window is actually above/below the normal layer (thanks Jim Ramsay)
Ewmh.cc

46
src/Screen.cc
View file

@ -1199,31 +1199,41 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
FbTk::App::instance()->sync(false);
if (win && &win->screen() == this &&
(! win->isStuck())) {
if (!win || &win->screen() != this || win->isStuck())
return;
// if iconified, deiconify it before we send it somewhere
if (win->isIconic())
win->deiconify();
// if iconified, deiconify it before we send it somewhere
if (win->isIconic())
win->deiconify();
// if the window isn't on current workspace, hide it
if (id != currentWorkspace()->workspaceID())
win->withdraw(true);
// if the window isn't on current workspace, hide it
if (id != currentWorkspace()->workspaceID())
win->withdraw(true);
windowMenu().hide();
windowMenu().hide();
reassociateWindow(win, id, true);
reassociateWindow(win, id, true);
// if the window is on current workspace, show it.
if (id == currentWorkspace()->workspaceID())
win->deiconify(false, false);
// if the window is on current workspace, show it.
if (id == currentWorkspace()->workspaceID())
win->deiconify(false, false);
// change workspace ?
if (changeWS && id != currentWorkspace()->workspaceID()) {
changeWorkspaceID(id);
win->setInputFocus();
// change workspace ?
if (changeWS && id != currentWorkspace()->workspaceID()) {
changeWorkspaceID(id);
win->setInputFocus();
}
// send all the transients too
FluxboxWindow::ClientList::iterator client_it = win->clientList().begin();
FluxboxWindow::ClientList::iterator client_it_end = win->clientList().end();
for (; client_it != client_it_end; ++client_it) {
WinClient::TransientList::const_iterator it = (*client_it)->transientList().begin();
WinClient::TransientList::const_iterator it_end = (*client_it)->transientList().end();
for (; it != it_end; ++it) {
if ((*it)->fbwindow())
sendToWorkspace(id, (*it)->fbwindow(), false);
}
}
}

3
src/fluxbox.cc
View file

@ -916,7 +916,8 @@ void Fluxbox::handleEvent(XEvent * const e) {
#ifdef DEBUG
cerr<<__FILE__<<"("<<__FUNCTION__<<") Focus out is not a FluxboxWindow !!"<<endl;
#endif // DEBUG
} else if (winclient && winclient == FocusControl::focusedWindow() &&
} else if (winclient && (winclient == FocusControl::focusedWindow() ||
FocusControl::focusedWindow() == 0) &&
(winclient->fbwindow() == 0
|| !winclient->fbwindow()->isMoving())) {
// we don't unfocus a moving window