aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc53
1 files changed, 16 insertions, 37 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 68e098b..5512af3 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.118 2003/04/25 16:00:03 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.119 2003/04/26 05:42:36 rathnor Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -59,7 +59,10 @@
59#endif // USE_GNOME 59#endif // USE_GNOME
60#ifdef USE_NEWWMSPEC 60#ifdef USE_NEWWMSPEC
61#include "Ewmh.hh" 61#include "Ewmh.hh"
62#endif //USE_NEWWMSPEC 62#endif // USE_NEWWMSPEC
63#ifdef REMEMBER
64#include "Remember.hh"
65#endif // REMEMBER
63 66
64// X headers 67// X headers
65#include <X11/Xlib.h> 68#include <X11/Xlib.h>
@@ -421,6 +424,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
421#ifdef USE_NEWWMSPEC 424#ifdef USE_NEWWMSPEC
422 addAtomHandler(new Ewmh()); // for Extended window manager atom support 425 addAtomHandler(new Ewmh()); // for Extended window manager atom support
423#endif // USE_NEWWMSPEC 426#endif // USE_NEWWMSPEC
427#ifdef REMEMBER
428 m_atomhandler.push_back(new Remember()); // for remembering window attribs
429#endif // REMEMBER
424 430
425 grab(); 431 grab();
426 432
@@ -1514,7 +1520,7 @@ void Fluxbox::update(FbTk::Subject *changedsub) {
1514 //!! TODO 1520 //!! TODO
1515#ifdef DEBUG 1521#ifdef DEBUG
1516 cerr<<__FILE__<<"("<<__FUNCTION__<<") TODO: signal stuff for client death!!"<<endl; 1522 cerr<<__FILE__<<"("<<__FUNCTION__<<") TODO: signal stuff for client death!!"<<endl;
1517#endif // DEBUG 1523#endif // DEBUG
1518 } 1524 }
1519} 1525}
1520 1526
@@ -1660,43 +1666,16 @@ void Fluxbox::save_rc() {
1660 for (; it != it_end; ++it) { 1666 for (; it != it_end; ++it) {
1661 BScreen *screen = *it; 1667 BScreen *screen = *it;
1662 int screen_number = screen->getScreenNumber(); 1668 int screen_number = screen->getScreenNumber();
1663 1669
1664/* 1670 /*
1665#ifdef SLIT 1671#ifdef SLIT
1666 string slit_placement; 1672 #ifdef XINERAMA
1667 1673 sprintf(rc_string, "session.screen%d.slit.onHead: %d", screen_number,
1668 switch (screen->getSlitPlacement()) { 1674 screen->getSlitOnHead());
1669 case Slit::TOPLEFT: slit_placement = "TopLeft"; break;
1670 case Slit::CENTERLEFT: slit_placement = "CenterLeft"; break;
1671 case Slit::BOTTOMLEFT: slit_placement = "BottomLeft"; break;
1672 case Slit::TOPCENTER: slit_placement = "TopCenter"; break;
1673 case Slit::BOTTOMCENTER: slit_placement = "BottomCenter"; break;
1674 case Slit::TOPRIGHT: slit_placement = "TopRight"; break;
1675 case Slit::BOTTOMRIGHT: slit_placement = "BottomRight"; break;
1676 case Slit::CENTERRIGHT: default: slit_placement = "CenterRight"; break;
1677 }
1678
1679 sprintf(rc_string, "session.screen%d.slit.placement: %s", screen_number,
1680 slit_placement.c_str());
1681 XrmPutLineResource(&new_blackboxrc, rc_string);
1682
1683 sprintf(rc_string, "session.screen%d.slit.direction: %s", screen_number,
1684 ((screen->getSlitDirection() == Slit::HORIZONTAL) ? "Horizontal" :
1685 "Vertical"));
1686 XrmPutLineResource(&new_blackboxrc, rc_string); 1675 XrmPutLineResource(&new_blackboxrc, rc_string);
1687 1676 #endif // XINERAMA
1688 sprintf(rc_string, "session.screen%d.slit.autoHide: %s", screen_number,
1689 ((screen->getSlit()->doAutoHide()) ? "True" : "False"));
1690 XrmPutLineResource(&new_blackboxrc, rc_string);
1691 /*
1692 #ifdef XINERAMA
1693 sprintf(rc_string, "session.screen%d.slit.onHead: %d", screen_number,
1694 screen->getSlitOnHead());
1695 XrmPutLineResource(&new_blackboxrc, rc_string);
1696 #endif // XINERAMA
1697*//*
1698#endif // SLIT 1677#endif // SLIT
1699 */ 1678 */
1700 sprintf(rc_string, "session.screen%d.rowPlacementDirection: %s", screen_number, 1679 sprintf(rc_string, "session.screen%d.rowPlacementDirection: %s", screen_number,
1701 ((screen->getRowPlacementDirection() == BScreen::LEFTRIGHT) ? 1680 ((screen->getRowPlacementDirection() == BScreen::LEFTRIGHT) ?
1702 "LeftToRight" : "RightToLeft")); 1681 "LeftToRight" : "RightToLeft"));