aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc33
1 files changed, 17 insertions, 16 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 10921e0..dee150b 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1220,9 +1220,9 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1220 else 1220 else
1221 focused_list.push_back(&win->winClient()); 1221 focused_list.push_back(&win->winClient());
1222 1222
1223 if (new_win) { 1223// if (new_win) {
1224 Fluxbox::instance()->attachSignals(*win); 1224// Fluxbox::instance()->attachSignals(*win);
1225 } 1225// }
1226 1226
1227 // we also need to check if another window expects this window to the left 1227 // we also need to check if another window expects this window to the left
1228 // and if so, then join it. 1228 // and if so, then join it.
@@ -1240,27 +1240,28 @@ FluxboxWindow *BScreen::createWindow(Window client) {
1240 1240
1241 1241
1242FluxboxWindow *BScreen::createWindow(WinClient &client) { 1242FluxboxWindow *BScreen::createWindow(WinClient &client) {
1243
1244 if (isKdeDockapp(client.window()) && addKdeDockapp(client.window())) {
1245 // we need to save old handler and readd it later
1246// I think rearranging the logic negates the need for this - sb 04jan2005
1247// FbTk::EventManager *evm = FbTk::EventManager::instance();
1248// FbTk::EventHandler *evh = evm->find(client.window());
1249// evm->add(*evh, client.window());
1250 return 0;
1251 }
1252
1243 FluxboxWindow *win = new FluxboxWindow(client, 1253 FluxboxWindow *win = new FluxboxWindow(client,
1244 winFrameTheme(), 1254 winFrameTheme(),
1245 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer())); 1255 *layerManager().getLayer(Fluxbox::instance()->getNormalLayer()));
1246 1256
1247 if (isKdeDockapp(client.window())) { 1257// Why not KDE? - sb 04jan2005
1248 if (addKdeDockapp(client.window())) { 1258// if (!isKdeDockapp(client.window())) {
1249 // we need to save old handler and readd it later
1250 FbTk::EventManager *evm = FbTk::EventManager::instance();
1251 FbTk::EventHandler *evh = evm->find(client.window());
1252 delete win;
1253 evm->add(*evh, client.window());
1254 return 0;
1255 }
1256 } else {
1257
1258#ifdef SLIT 1259#ifdef SLIT
1259 if (win->initialState() == WithdrawnState && slit() != 0) { 1260 if (win->initialState() == WithdrawnState && slit() != 0) {
1260 slit()->addClient(win->clientWindow()); 1261 slit()->addClient(win->clientWindow());
1261 } 1262 }
1262#endif // SLIT 1263#endif // SLIT
1263 } 1264// }
1264 1265
1265 1266
1266 if (!win->isManaged()) { 1267 if (!win->isManaged()) {
@@ -1270,7 +1271,7 @@ FluxboxWindow *BScreen::createWindow(WinClient &client) {
1270 // don't add to focused_list, as it should already be in there (since the 1271 // don't add to focused_list, as it should already be in there (since the
1271 // WinClient already exists). 1272 // WinClient already exists).
1272 1273
1273 Fluxbox::instance()->attachSignals(*win); 1274// Fluxbox::instance()->attachSignals(*win);
1274 1275
1275 m_clientlist_sig.notify(); 1276 m_clientlist_sig.notify();
1276 1277