renamed the obResource class to Resource.

[chaz/openbox] / src / Screen.cc

diff --git a/src/Screen.cc b/src/Screen.cc
index 7438a9d84abbc70b7ae66276cd859ee4fd00bdcb..08c2d9eeb14eed235e2dd8a499ccdf3c1982ee28 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -50,11 +50,17 @@
 #include "Workspace.h"
 #include "Workspacemenu.h"
 
-#ifdef    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
 #  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
+#endif // HAVE_STRING_H
+
+#ifdef    HAVE_SYS_TYPES_H
 #  include <sys/types.h>
-#endif // STDC_HEADERS
+#endif // HAVE_SYS_TYPES_H
 
 #ifdef    HAVE_CTYPE_H
 #  include <ctype.h>
@@ -990,7 +996,7 @@ void BScreen::removeWorkspaceNames(void) {
 
 
 void BScreen::LoadStyle(void) {
-  obResource &conf = resource.styleconfig;
+  Resource &conf = resource.styleconfig;
   
   conf.setFile(openbox.getStyleFilename());
   if (!conf.load()) {
@@ -2251,10 +2257,20 @@ void BScreen::showGeometry(unsigned int gx, unsigned int gy) {
   }
 }
 
-
 void BScreen::hideGeometry(void) {
   if (geom_visible) {
     XUnmapWindow(getBaseDisplay().getXDisplay(), geom_window);
     geom_visible = False;
   }
 }
+
+void BScreen::saveToolbarHide(Bool b){
+  resource.toolbar_total_hide = b;
+  if (toolbar != NULL){
+    if (b)
+      toolbar->unMapToolbar();
+    else
+      toolbar->mapToolbar();
+  }
+
+}