add another return, and return a value for a non-void funtion.

[chaz/openbox] / src / Screen.cc

diff --git a/src/Screen.cc b/src/Screen.cc
index eb81f0ca901e185777c902a01573982777f379fa..1b3860f46166ea02062e74f5ad86b4db340863e4 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -412,6 +412,12 @@ void BScreen::saveWindowToWindowSnap(bool s) {
 }
 
 
+void BScreen::saveResizeZones(unsigned int z) {
+  resource.resize_zones = z;
+  config->setValue(screenstr + "resizeZones", resource.resize_zones);
+}
+
+
 void BScreen::saveWindowCornerSnap(bool s) {
   resource.window_corner_snap = s;
   config->setValue(screenstr + "windowCornerSnap",
@@ -505,6 +511,7 @@ void BScreen::save_rc(void) {
   saveAutoRaise(resource.auto_raise);
   saveImageDither(doImageDither());
   saveAAFonts(resource.aa_fonts);
+  saveResizeZones(resource.resize_zones);
   saveOpaqueMove(resource.opaque_move);
   saveFullMax(resource.full_max);
   saveFocusNew(resource.focus_new);
@@ -551,6 +558,11 @@ void BScreen::load_rc(void) {
   if (! config->getValue(screenstr + "antialiasFonts", resource.aa_fonts))
     resource.aa_fonts = true;
 
+  if (! config->getValue(screenstr + "resizeZones", resource.resize_zones) ||
+      (resource.resize_zones != 1 && resource.resize_zones != 2 &&
+       resource.resize_zones != 4))
+      resource.resize_zones = 4;
+
   if (! config->getValue(screenstr + "hideToolbar", resource.hide_toolbar))
     resource.hide_toolbar = false;
 
@@ -921,10 +933,7 @@ void BScreen::LoadStyle(void) {
 void BScreen::addIcon(BlackboxWindow *w) {
   if (! w) return;
 
-  // we set the workspace to 'all workspaces' so that taskbars will show the
-  // window. otherwise, it made uniconifying a window impoosible without the
-  // blackbox workspace menu
-  w->setWorkspace(0xffffffff);
+  w->setWorkspace(BSENTINEL);
   w->setWindowNumber(iconList.size());
 
   iconList.push_back(w);