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

move fullscreen windows to normal layer when they lose focus

Browse source
This commit is contained in:
markt 2007-10-31 19:34:07 +00:00
parent a092d3fc1b
commit 88f580ec0c
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 1.0.1: Changes for 1.0.1:
*07/10/31:
* Move fullscreen windows to normal layer when they lose focus (Mark)
Window.cc FocusControl.cc
*07/10/24: *07/10/24:
* Fixed some gcc 2.96 compile issues ( Henrik ) * Fixed some gcc 2.96 compile issues ( Henrik )
Layer.hh, MinOverlapPlacement.cc, Workspace.cc Layer.hh, MinOverlapPlacement.cc, Workspace.cc

4
src/FocusControl.cc
View file

@ -156,9 +156,7 @@ void FocusControl::cycleFocus(const Focusables &window_list,
} }
} }
if (isCycling()) if (!isCycling())
fbwin->tempRaise();
else
fbwin->raise(); fbwin->raise();
m_cycling_window = it; m_cycling_window = it;

21
src/Window.cc
View file

@ -127,7 +127,7 @@ static Bool queueScanner(Display *, XEvent *e, char *args) {
/// returns the deepest transientFor, asserting against a close loop /// returns the deepest transientFor, asserting against a close loop
WinClient *getRootTransientFor(WinClient *client) { WinClient *getRootTransientFor(WinClient *client) {
while (client->transientFor()) { while (client && client->transientFor()) {
assert(client != client->transientFor()); assert(client != client->transientFor());
client = client->transientFor(); client = client->transientFor();
} }
@ -1317,12 +1317,6 @@ bool FluxboxWindow::focus() {
screen().changeWorkspaceID(workspaceNumber()); screen().changeWorkspaceID(workspaceNumber());
} }
FluxboxWindow *cur = FocusControl::focusedFbWindow();
WinClient *client = FocusControl::focusedWindow();
if (cur && client && cur != this && cur->isFullscreen() &&
getRootTransientFor(m_client) != getRootTransientFor(client))
return false;
if (isIconic()) { if (isIconic()) {
deiconify(); deiconify();
m_focused = true; // signal to mapNotifyEvent to set focus when mapped m_focused = true; // signal to mapNotifyEvent to set focus when mapped
@ -1893,7 +1887,7 @@ void FluxboxWindow::moveToLayer(int layernum, bool force) {
if (!m_initialized) if (!m_initialized)
m_layernum = layernum; m_layernum = layernum;
if (m_layernum == layernum && !force) if (m_layernum == layernum && !force || !m_client)
return; return;
// get root window // get root window
@ -1942,6 +1936,8 @@ void FluxboxWindow::setIconHidden(bool value) {
// window has actually RECEIVED focus (got a FocusIn event) // window has actually RECEIVED focus (got a FocusIn event)
// so now we make it a focused frame etc // so now we make it a focused frame etc
void FluxboxWindow::setFocusFlag(bool focus) { void FluxboxWindow::setFocusFlag(bool focus) {
if (!m_client) return;
bool was_focused = isFocused(); bool was_focused = isFocused();
m_focused = focus; m_focused = focus;
#ifdef DEBUG #ifdef DEBUG
@ -1950,10 +1946,17 @@ void FluxboxWindow::setFocusFlag(bool focus) {
installColormap(focus); installColormap(focus);
if (fullscreen && !focus)
moveToLayer(m_old_layernum);
if (fullscreen && focus)
moveToLayer(::Layer::ABOVE_DOCK);
if (focus != frame().focused()) if (focus != frame().focused())
frame().setFocus(focus); frame().setFocus(focus);
if (screen().doAutoRaise() && !screen().focusControl().isCycling()) { if (screen().focusControl().isCycling())
tempRaise();
else if (screen().doAutoRaise()) {
if (m_focused) if (m_focused)
m_timer.start(); m_timer.start();
else else