aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2004-06-21 15:23:42 (GMT)
committerrathnor <rathnor>2004-06-21 15:23:42 (GMT)
commit965086f39d807fc83b6b2605b7858a9baa9ee2f0 (patch)
treec19745edf475b209b2c5c06b04812062276e4269
parent6a51cefb2f67c041f19cbb3842adb81ff54b4771 (diff)
downloadfluxbox-965086f39d807fc83b6b2605b7858a9baa9ee2f0.zip
fluxbox-965086f39d807fc83b6b2605b7858a9baa9ee2f0.tar.bz2
tidying up initialisation with dockapps
-rw-r--r--ChangeLog3
-rw-r--r--src/Screen.cc24
-rw-r--r--src/Screen.hh3
-rw-r--r--src/Toolbar.cc5
-rw-r--r--src/fluxbox.cc8
5 files changed, 11 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a187a6..7f516fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.10: 2Changes for 0.9.10:
3*04/06/21: 3*04/06/21:
4 * Fix and tidy KDE dockapps on [re]start (Simon)
5 - and don't listen to screen reconfigure sig anymore in toolbar
6 Screen.hh/cc Toolbar.cc fluxbox.cc
4 * Fix autogrouping issue where windows wouldn't show (Simon) 7 * Fix autogrouping issue where windows wouldn't show (Simon)
5 Workspace.cc 8 Workspace.cc
6*04/06/20: 9*04/06/20:
diff --git a/src/Screen.cc b/src/Screen.cc
index f90b3dc..14a701f 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.282 2004/06/19 15:04:27 rathnor Exp $ 25// $Id: Screen.cc,v 1.283 2004/06/21 15:23:41 rathnor Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -1098,28 +1098,6 @@ bool BScreen::addKdeDockapp(Window client) {
1098 return true; 1098 return true;
1099} 1099}
1100 1100
1101void BScreen::setupKdeDockapps() {
1102#ifdef SLIT
1103 if (slit() == 0)
1104 return;
1105 // kde dockapps end up in the slit at start
1106 Slit::SlitClients::iterator it = slit()->clients().begin();
1107 Slit::SlitClients::iterator it_end = slit()->clients().end();
1108 std::list<Window> winlist;
1109 for (; it != it_end; ++it) {
1110 if (isKdeDockapp((*it)->window())) {
1111 winlist.push_back((*it)->window());
1112 slit()->removeClient((*it)->window());
1113 }
1114 }
1115 std::list<Window>::iterator win_it = winlist.begin();
1116 std::list<Window>::iterator win_it_end = winlist.end();
1117 for (; win_it != win_it_end; ++win_it) {
1118 createWindow(*win_it);
1119 }
1120#endif // SLIT
1121}
1122
1123FluxboxWindow *BScreen::createWindow(Window client) { 1101FluxboxWindow *BScreen::createWindow(Window client) {
1124 FbTk::App::instance()->sync(false); 1102 FbTk::App::instance()->sync(false);
1125 1103
diff --git a/src/Screen.hh b/src/Screen.hh
index 8c74e44..26938df 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.hh,v 1.141 2004/05/02 21:10:30 fluxgen Exp $ 25// $Id: Screen.hh,v 1.142 2004/06/21 15:23:42 rathnor Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -145,7 +145,6 @@ public:
145 bool isKdeDockapp(Window win) const; 145 bool isKdeDockapp(Window win) const;
146 /// @return true if dock app was added, else false 146 /// @return true if dock app was added, else false
147 bool addKdeDockapp(Window win); 147 bool addKdeDockapp(Window win);
148 void setupKdeDockapps();
149 148
150 inline unsigned int width() const { return rootWindow().width(); } 149 inline unsigned int width() const { return rootWindow().width(); }
151 inline unsigned int height() const { return rootWindow().height(); } 150 inline unsigned int height() const { return rootWindow().height(); }
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index c72e54c..2a39ec0 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.145 2004/06/20 10:29:51 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.146 2004/06/21 15:23:42 rathnor Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -230,7 +230,6 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
230 m_theme.reconfigSig().attach(this); 230 m_theme.reconfigSig().attach(this);
231 // listen to screen size changes 231 // listen to screen size changes
232 screen().resizeSig().attach(this); 232 screen().resizeSig().attach(this);
233 screen().reconfigureSig().attach(this); // if alpha value changes
234 233
235 moveToLayer((*m_rc_layernum).getNum()); 234 moveToLayer((*m_rc_layernum).getNum());
236 235
@@ -267,7 +266,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
267 // setup to listen to child events 266 // setup to listen to child events
268 FbTk::EventManager::instance()->addParent(*this, window()); 267 FbTk::EventManager::instance()->addParent(*this, window());
269 // get everything together 268 // get everything together
270 //reconfigure(); 269 reconfigure();
271 // this gets done by the screen later as it loads 270 // this gets done by the screen later as it loads
272 271
273} 272}
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 37b06e0..3a93962 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.244 2004/06/13 11:01:47 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.245 2004/06/21 15:23:42 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -540,7 +540,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
540 540
541 // now we can create menus (which needs this screen to be in screen_list) 541 // now we can create menus (which needs this screen to be in screen_list)
542 screen->initMenus(); 542 screen->initMenus();
543 screen->initWindows();
544 543
545#ifdef HAVE_GETPID 544#ifdef HAVE_GETPID
546 pid_t bpid = getpid(); 545 pid_t bpid = getpid();
@@ -569,8 +568,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
569 *screen->layerManager(). 568 *screen->layerManager().
570 getLayer(Fluxbox::instance()->getNormalLayer()))); 569 getLayer(Fluxbox::instance()->getNormalLayer())));
571#endif // USE_TOOLBAR 570#endif // USE_TOOLBAR
572 // must do this after systray is created 571
573 screen->setupKdeDockapps(); 572 // must do this after toolbar is created
573 screen->initWindows();
574 574
575 // attach screen signals to this 575 // attach screen signals to this
576 screen->currentWorkspaceSig().attach(this); 576 screen->currentWorkspaceSig().attach(this);