X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.cc;h=59b92ee101637fb4aa44a4ffc0723f14260420ec;hb=89563281384c34886fb12b169d1bdf8d293f0b48;hp=b6469957ddf66d72583a9dd853b5bff7853a5ff9;hpb=66c879bd5c0c9f668096f620007388ef347becd0;p=chaz%2Fopenbox

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index b6469957..59b92ee1 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -62,17 +62,16 @@
 # endif // HAVE_SYS_TIME_H
 #endif // TIME_WITH_SYS_TIME
 
-#include <strstream>
+#ifdef    HAVE_SSTREAM
+#  include <sstream>
+#endif // HAVE_SSTREAM
+
 #include <string>
 
 Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
   openbox(scrn.getOpenbox()), config(conf)
 {
-  // default values
-  m_width_percent =66;
-  m_placement = BottomCenter;
-  m_ontop = false;
-  m_hidden = m_autohide = false;
+  load();
 
   // get the clock updating every minute
   clock_timer = new BTimer(openbox, *this);
@@ -158,14 +157,13 @@ Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
   mapToolbar();
 }
 
-int Toolbar::getX() const {
-  return ((m_hidden) ? frame.x_hidden : frame.x);
-}
-
-int Toolbar::getY() const {
-  if (screen.hideToolbar()) return screen.size().h();
-  else if (m_hidden) return frame.y_hidden;
-  else return frame.y;
+Rect Toolbar::area() const {
+  int x = ((m_hidden) ? frame.x_hidden : frame.x);
+  int y;
+  if (screen.hideToolbar()) y = screen.size().h();
+  else if (m_hidden) y = frame.y_hidden;
+  else y = frame.y;
+  return Rect(x, y, frame.width, frame.height);
 }
 
 unsigned int Toolbar::getExposedHeight() const {
@@ -219,32 +217,30 @@ Toolbar::~Toolbar() {
 
 void Toolbar::setOnTop(bool b) {
   m_ontop = b;
-  ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop";
   config.setValue(s.str(), m_ontop ? "True" : "False");
 }
 
 void Toolbar::setAutoHide(bool b) {
   m_autohide = b;
-  ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide" <<
-    ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide";
   config.setValue(s.str(), m_autohide ? "True" : "False");
 }
 
 void Toolbar::setWidthPercent(int w) {
   m_width_percent = w;
-  ostrstream s;
+  std::ostringstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent"
-    << ends;
+   ;
   config.setValue(s.str(), m_width_percent);
 }
 
 void Toolbar::setPlacement(int p) {
   m_placement = p;
-  ostrstream s;
-  s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement" <<
-    ends;
+  std::ostringstream s;
+  s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement";
   const char *placement;
   switch (m_placement) {
   case TopLeft: placement = "TopLeft"; break;
@@ -257,21 +253,30 @@ void Toolbar::setPlacement(int p) {
   config.setValue(s.str(), placement);
 }
 
+void Toolbar::save() {
+  setOnTop(m_ontop);
+  setAutoHide(m_autohide);
+  setWidthPercent(m_width_percent);
+  setPlacement(m_placement);
+}
+
 void Toolbar::load() {
-  std::ostrstream rscreen, rname, rclass;
+  std::ostringstream rscreen, rname, rclass;
   std::string s;
   bool b;
   long l;
-  rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
+  rscreen << "session.screen" << screen.getScreenNumber() << '.';
 
-  rname << rscreen.str() << "toolbar.widthPercent" << ends;
-  rclass << rscreen.str() << "Toolbar.WidthPercent" << ends;
+  rname << rscreen.str() << "toolbar.widthPercent";
+  rclass << rscreen.str() << "Toolbar.WidthPercent";
   if (config.getValue(rname.str(), rclass.str(), l) && (l > 0 && l <= 100))
     m_width_percent = l;
+  else
+    m_width_percent =66;
 
   rname.seekp(0); rclass.seekp(0);
-  rname << rscreen.str() << "toolbar.placement" << ends;
-  rclass << rscreen.str() << "Toolbar.Placement" << ends;
+  rname << rscreen.str() << "toolbar.placement";
+  rclass << rscreen.str() << "Toolbar.Placement";
   if (config.getValue(rname.str(), rclass.str(), s)) {
     if (0 == strncasecmp(s.c_str(), "TopLeft", s.length()))
       m_placement = TopLeft;
@@ -285,19 +290,24 @@ void Toolbar::load() {
       m_placement = BottomRight;
     else if ( 0 == strncasecmp(s.c_str(), "BottomCenter", s.length()))
       m_placement = BottomCenter;
-  }
+  } else
+    m_placement = BottomCenter;
   
   rname.seekp(0); rclass.seekp(0);
-  rname << rscreen.str() << "toolbar.onTop" << ends;
-  rclass << rscreen.str() << "Toolbar.OnTop" << ends;
+  rname << rscreen.str() << "toolbar.onTop";
+  rclass << rscreen.str() << "Toolbar.OnTop";
   if (config.getValue(rname.str(), rclass.str(), b))
     m_ontop = b;
+  else
+    m_ontop = false;
 
   rname.seekp(0); rclass.seekp(0);
-  rname << rscreen.str() << "toolbar.autoHide" << ends;
-  rclass << rscreen.str() << "Toolbar.AutoHide" << ends;
+  rname << rscreen.str() << "toolbar.autoHide";
+  rclass << rscreen.str() << "Toolbar.AutoHide";
   if (config.getValue(rname.str(), rclass.str(), b))
     m_hidden = m_autohide = b;
+  else
+    m_hidden = m_autohide = false;
 }
 
 void Toolbar::reconfigure() {
@@ -379,8 +389,9 @@ void Toolbar::reconfigure() {
     tt = localtime(&ttmp);
     if (tt) {
       char t[1025], *time_string = (char *) 0;
-      int len = strftime(t, 1024, screen.getStrftimeFormat(), tt);
-      t[len++-1] = ' ';   // add a space to the string for padding
+      int len = strftime(t, 1024, screen.strftimeFormat(), tt);
+      t[len++] = 'A';   // add size to the string for padding
+      t[len++] = 'A';   // add size to the string for padding
       t[len] = '\0';
 
       if (i18n->multibyte()) {
@@ -616,7 +627,7 @@ void Toolbar::checkClock(Bool redraw, Bool date) {
   if (redraw) {
 #ifdef    HAVE_STRFTIME
     char t[1024];
-    if (! strftime(t, 1024, screen.getStrftimeFormat(), tt))
+    if (! strftime(t, 1024, screen.strftimeFormat(), tt))
       return;
 #else // !HAVE_STRFTIME
     char t[9];
@@ -950,7 +961,7 @@ void Toolbar::edit() {
     return;
 
   XSetInputFocus(display, frame.workspace_label,
-                 ((screen.isSloppyFocus()) ? RevertToPointerRoot :
+                 ((screen.sloppyFocus()) ? RevertToPointerRoot :
                   RevertToParent),
                  CurrentTime);
   XClearWindow(display, frame.workspace_label);
@@ -1264,9 +1275,13 @@ Toolbarmenu::Toolbarmenu(Toolbar &tb) : Basemenu(tb.screen), toolbar(tb) {
 			  "Edit current workspace name"), 3);
 
   update();
+ 
+  setValues();
+}
 
-  if (toolbar.onTop()) setItemSelected(1, True);
-  if (toolbar.autoHide()) setItemSelected(2, True);
+void Toolbarmenu::setValues() {
+  setItemSelected(1, toolbar.onTop());
+  setItemSelected(2, toolbar.autoHide());
 }
 
 
@@ -1321,6 +1336,7 @@ void Toolbarmenu::internal_hide() {
 
 
 void Toolbarmenu::reconfigure() {
+  setValues();
   placementmenu->reconfigure();
 
   Basemenu::reconfigure();
@@ -1349,7 +1365,6 @@ Toolbarmenu::Placementmenu::Placementmenu(Toolbarmenu &tm)
   update();
 }
 
-
 void Toolbarmenu::Placementmenu::itemSelected(int button, int index) {
   if (button != 1)
     return;