aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-06-30 04:15:55 (GMT)
committermarkt <markt>2007-06-30 04:15:55 (GMT)
commit8e75ace959d2a5d56d30cb6a06ce895f397c1f19 (patch)
tree1558c8dbf46be7f1006dd52e1c093ad1ab752911
parent8fbeaf279e930b2d9c236cba29b923609b910f5c (diff)
downloadfluxbox-8e75ace959d2a5d56d30cb6a06ce895f397c1f19.zip
fluxbox-8e75ace959d2a5d56d30cb6a06ce895f397c1f19.tar.bz2
fixed the groups file for the last time
-rw-r--r--ChangeLog2
-rw-r--r--src/Screen.cc4
-rw-r--r--src/Workspace.cc6
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 83aeb15..0ea1318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3*07/06/30: 3*07/06/30:
4 * Fixed the groups file, even though it's deprecated (Mark)
5 Workspace.cc Screen.cc
4 * Fix _NET_WM_STATE_DEMANDS_ATTENTION with tabbed windows, #1732392 (Mark) 6 * Fix _NET_WM_STATE_DEMANDS_ATTENTION with tabbed windows, #1732392 (Mark)
5 Ewmh.cc/hh 7 Ewmh.cc/hh
6*07/06/29: 8*07/06/29:
diff --git a/src/Screen.cc b/src/Screen.cc
index 99e88d6..1c69eda 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1465,6 +1465,10 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1465 delete win; 1465 delete win;
1466 return 0; 1466 return 0;
1467 } 1467 }
1468
1469 Workspace *workspace = getWorkspace(win->workspaceNumber());
1470 if (workspace && !Fluxbox::instance()->isStartup())
1471 workspace->checkGrouping(*win);
1468 } 1472 }
1469 } 1473 }
1470 1474
diff --git a/src/Workspace.cc b/src/Workspace.cc
index fd81e5e..888c20a 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -326,8 +326,10 @@ bool Workspace::checkGrouping(FluxboxWindow &win) {
326#ifdef DEBUG 326#ifdef DEBUG
327 cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<<endl; 327 cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<<endl;
328#endif // DEBUG 328#endif // DEBUG
329 (*wit)->attachClient(win.winClient()); 329 WinClient &client = win.winClient();
330 (*wit)->raise(); 330 (*wit)->attachClient(client);
331 if (client.screen().focusControl().focusNew())
332 (*wit)->setCurrentClient(client);
331 return true; // grouping done 333 return true; // grouping done
332 334
333 } 335 }