aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-04-19 22:48:19 (GMT)
committerfluxgen <fluxgen>2004-04-19 22:48:19 (GMT)
commitbb991a0166fb5aed0f3b49658b7dc38c0fc2765a (patch)
treec9b7ca370a297233e5188d1c55e295bbbd3841b0 /src/fluxbox.cc
parent20659577859fc0fc85aeaa82f7a6e1e41f17e5e7 (diff)
downloadfluxbox_pavel-bb991a0166fb5aed0f3b49658b7dc38c0fc2765a.zip
fluxbox_pavel-bb991a0166fb5aed0f3b49658b7dc38c0fc2765a.tar.bz2
kde dockapps in systray
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 9bff0e7..05b4ec2 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.238 2004/04/18 21:16:06 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.239 2004/04/19 22:45:44 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -516,6 +516,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
516 delete screen; 516 delete screen;
517 continue; 517 continue;
518 } 518 }
519 // now it's safe to create windows
520 screen->initWindows();
519 521
520#ifdef HAVE_GETPID 522#ifdef HAVE_GETPID
521 pid_t bpid = getpid(); 523 pid_t bpid = getpid();
@@ -543,6 +545,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
543 m_toolbars.push_back(new Toolbar(*screen, 545 m_toolbars.push_back(new Toolbar(*screen,
544 *screen->layerManager().getLayer(Fluxbox::instance()->getNormalLayer()))); 546 *screen->layerManager().getLayer(Fluxbox::instance()->getNormalLayer())));
545#endif // USE_TOOLBAR 547#endif // USE_TOOLBAR
548 // must do this after systray is created
549 screen->setupKdeDockapps();
546 550
547 // attach screen signals to this 551 // attach screen signals to this
548 screen->currentWorkspaceSig().attach(this); 552 screen->currentWorkspaceSig().attach(this);
@@ -559,6 +563,10 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
559 } 563 }
560 564
561 revertFocus(*screen); // make sure focus style is correct 565 revertFocus(*screen); // make sure focus style is correct
566#ifdef SLIT
567 if (screen->slit())
568 screen->slit()->show();
569#endif // SLIT
562 570
563 } // end init screens 571 } // end init screens
564 572
@@ -1474,7 +1482,7 @@ BScreen *Fluxbox::searchScreen(Window window) {
1474} 1482}
1475 1483
1476 1484
1477const AtomHandler* Fluxbox::getAtomHandler(std::string name) { 1485AtomHandler* Fluxbox::getAtomHandler(const std::string &name) {
1478 if ( name != "" ) { 1486 if ( name != "" ) {
1479 for (AtomHandlerContainerIt it= m_atomhandler.begin(); 1487 for (AtomHandlerContainerIt it= m_atomhandler.begin();
1480 it != m_atomhandler.end(); it++ ) { 1488 it != m_atomhandler.end(); it++ ) {
@@ -1484,7 +1492,7 @@ const AtomHandler* Fluxbox::getAtomHandler(std::string name) {
1484 } 1492 }
1485 return 0; 1493 return 0;
1486} 1494}
1487void Fluxbox::addAtomHandler(AtomHandler *atomh, std::string name) { 1495void Fluxbox::addAtomHandler(AtomHandler *atomh, const std::string &name) {
1488 m_atomhandler[atomh]= name;; 1496 m_atomhandler[atomh]= name;;
1489} 1497}
1490 1498