X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FToolbar.cc;h=fd2191445da5f34b08fa59107f91f6394f301eb8;hb=d58f7b569e6c39fbeb96d55a139cd3a07ec3b5a7;hp=7659c87f6291ec927d8959007303e6cc986dd728;hpb=9f9cdf1194c82cc5aee2ec01d7db73551408d1d5;p=chaz%2Fopenbox

diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 7659c87f..fd219144 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -64,7 +64,7 @@
 
 #include <strstream>
 #include <string>
-using namespace std;
+using std::ends;
 
 Toolbar::Toolbar(BScreen &scrn, Resource &conf) : screen(scrn),
   openbox(scrn.getOpenbox()), config(conf)
@@ -215,7 +215,7 @@ Toolbar::~Toolbar() {
 
 void Toolbar::setOnTop(bool b) {
   m_ontop = b;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.onTop" << ends;
   config.setValue(s.str(), m_ontop ? "True" : "False");
   s.rdbuf()->freeze(0);
@@ -223,7 +223,7 @@ void Toolbar::setOnTop(bool b) {
 
 void Toolbar::setAutoHide(bool b) {
   m_autohide = b;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.autoHide"
     << ends;
   config.setValue(s.str(), m_autohide ? "True" : "False");
@@ -232,7 +232,7 @@ void Toolbar::setAutoHide(bool b) {
 
 void Toolbar::setWidthPercent(int w) {
   m_width_percent = w;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.widthPercent"
     << ends;
   config.setValue(s.str(), m_width_percent);
@@ -241,7 +241,7 @@ void Toolbar::setWidthPercent(int w) {
 
 void Toolbar::setPlacement(int p) {
   m_placement = p;
-  ostrstream s;
+  std::ostrstream s;
   s << "session.screen" << screen.getScreenNumber() << ".toolbar.placement"
     << ends;
   const char *placement;
@@ -265,8 +265,8 @@ void Toolbar::save() {
 }
 
 void Toolbar::load() {
-  ostrstream rscreen, rname, rclass;
-  string s;
+  std::ostrstream rscreen, rname, rclass;
+  std::string s;
   bool b;
   long l;
   rscreen << "session.screen" << screen.getScreenNumber() << '.' << ends;
@@ -724,11 +724,11 @@ void Toolbar::checkClock(Bool redraw, Bool date) {
 
 
 void Toolbar::redrawWindowLabel(Bool redraw) {
-  if (screen.getOpenbox().focusedWindow()) {
+  OpenboxWindow *foc = screen.getOpenbox().focusedWindow();
+  if (foc != (OpenboxWindow *) 0) {
     if (redraw)
       XClearWindow(display, frame.window_label);
 
-    OpenboxWindow *foc = screen.getOpenbox().focusedWindow();
     if (foc->getScreen() != &screen) return;
 
     int dx = (frame.bevel_w * 2), dlen = strlen(*foc->getTitle());
@@ -971,9 +971,7 @@ void Toolbar::edit() {
     return;
 
   XSetInputFocus(display, frame.workspace_label,
-                 ((screen.sloppyFocus()) ? RevertToPointerRoot :
-                  RevertToParent),
-                 CurrentTime);
+                 RevertToPointerRoot, CurrentTime);
   XClearWindow(display, frame.workspace_label);
 
   openbox.setNoFocus(True);