optimized the finding-the-slit-position code in positionWindow

[chaz/openbox] / src / Slit.cc

diff --git a/src/Slit.cc b/src/Slit.cc
index b180714a5b107f05c7ff682541a9af6fec2b9836..2fbce2d11a7b39cf88028c45828aab86697e7367 100644 (file)
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -52,6 +52,7 @@ Slit::Slit(BScreen &scr, Resource &conf) : screen(scr),
   m_direction = Vertical;
   m_ontop = false;
   m_hidden = m_autohide = false;
+  load();
   
   display = screen.getBaseDisplay().getXDisplay();
   frame.window = frame.pixmap = None;
@@ -230,7 +231,6 @@ void Slit::setAutoHide(bool b) {
 
 void Slit::setPlacement(int p) {
   m_placement = p;
-  cout << "setting " << p << " " << m_placement << endl;
   ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".slit.placement" <<
     ends;
@@ -257,6 +257,13 @@ void Slit::setDirection(int d) {
                   m_direction == Horizontal ? "Horizontal" : "Vertical");
 }
 
+void Slit::save() {
+  setOnTop(m_ontop);
+  setAutoHide(m_autohide);
+  setPlacement(m_placement);
+  setDirection(m_direction);
+}
+
 void Slit::load() {
   std::ostrstream rscreen, rname, rclass;
   std::string s;
@@ -266,7 +273,6 @@ void Slit::load() {
   rname << rscreen.str() << "slit.placement" << ends;
   rclass << rscreen.str() << "Slit.Placement" << ends;
   if (config.getValue(rname.str(), rclass.str(), s)) {
-    cout << "getting " << s.c_str() << endl;
     if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
       m_placement = TopLeft;
     else if (0 == strncasecmp(s.c_str(), "CenterLeft", s.length()))
@@ -309,8 +315,6 @@ void Slit::load() {
 }
 
 void Slit::reconfigure(void) {
-  load();
-  
   frame.area.setSize(0, 0);
   LinkedListIterator<SlitClient> it(clientList);
   SlitClient *client;
@@ -705,8 +709,12 @@ Slitmenu::Slitmenu(Slit &sl) : Basemenu(sl.screen), slit(sl) {
 
   update();
 
-  if (slit.onTop()) setItemSelected(2, True);
-  if (slit.autoHide()) setItemSelected(3, True);
+  setValues();
+}
+
+void Slitmenu::setValues() {
+  setItemSelected(2, slit.onTop());
+  setItemSelected(3, slit.autoHide());
 }
 
 
@@ -752,6 +760,7 @@ void Slitmenu::internal_hide(void) {
 
 
 void Slitmenu::reconfigure(void) {
+  setValues();
   directionmenu->reconfigure();
   placementmenu->reconfigure();
 
@@ -771,12 +780,21 @@ Slitmenu::Directionmenu::Directionmenu(Slitmenu &sm)
 
   update();
 
-  if (sm.slit.direction() == Slit::Horizontal)
+  setValues();
+}
+
+
+void Slitmenu::Directionmenu::setValues() {
+  if (slitmenu.slit.direction() == Slit::Horizontal)
     setItemSelected(0, True);
   else
     setItemSelected(1, True);
 }
 
+void Slitmenu::Directionmenu::reconfigure() {
+  setValues();
+}
+
 
 void Slitmenu::Directionmenu::itemSelected(int button, int index) {
   if (button != 1)