Added missing header for clearShape, which was breaking compilation

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index e1826fa3062402c0100526d4c95aaa002d59fa59..54c047edb1cc8ae2e45b743fcd2e73f15ae3264f 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -52,8 +52,6 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
               "Window-To-Window Snapping"), windowsnapmenu);
   insert(i18n(ConfigmenuSet, ConfigmenuWindowToEdgeSnap,
               "Window-To-Edge Snapping"), edgesnapmenu);
-  insert(i18n(ConfigmenuSet, ConfigmenuWindowPlacement,
-              "Window Placement"), placementmenu);
 #ifdef    XINERAMA
   insert(i18n(ConfigmenuSet, ConfigmenuXineramaSupport,
               "XineramaSupport"), xineramamenu);
@@ -279,7 +277,8 @@ void Configmenu::Placementmenu::setValues(void) {
 
   bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight),
        tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom),
-       e = placement != BScreen::UnderMousePlacement;
+       e = (placement == BScreen::RowSmartPlacement ||
+            placement == BScreen::ColSmartPlacement);
 
   setItemSelected(5, rl);
   setItemSelected(6, ! rl);
@@ -293,6 +292,8 @@ void Configmenu::Placementmenu::setValues(void) {
   
   setItemSelected(9, getScreen()->getPlaceIgnoreShaded());
   setItemSelected(10, getScreen()->getPlaceIgnoreMaximized());
+  setItemEnabled(9, e);
+  setItemEnabled(10, e);
 }
 
 
@@ -314,126 +315,50 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
   switch (item->function()) {
   case BScreen::RowSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, true);
-    setItemSelected(1, false);
-    setItemSelected(2, false);
-    setItemSelected(3, false);
-    setItemSelected(4, false);
-    setItemEnabled(5, true);
-    setItemEnabled(6, true);
-    setItemEnabled(7, true);
-    setItemEnabled(8, true);
-
     break;
 
   case BScreen::ColSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, false);
-    setItemSelected(1, true);
-    setItemSelected(2, false);
-    setItemSelected(3, false);
-    setItemSelected(4, false);
-    setItemEnabled(5, true);
-    setItemEnabled(6, true);
-    setItemEnabled(7, true);
-    setItemEnabled(8, true);
-
     break;
 
   case BScreen::CascadePlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, false);
-    setItemSelected(1, false);
-    setItemSelected(2, true);
-    setItemSelected(3, false);
-    setItemSelected(4, false);
-    setItemEnabled(5, true);
-    setItemEnabled(6, true);
-    setItemEnabled(7, true);
-    setItemEnabled(8, true);
-
     break;
 
   case BScreen::UnderMousePlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, false);
-    setItemSelected(1, false);
-    setItemSelected(2, false);
-    setItemSelected(3, true);
-    setItemSelected(4, false);
-    setItemEnabled(5, false);
-    setItemEnabled(6, false);
-    setItemEnabled(7, false);
-    setItemEnabled(8, false);
-
     break;
 
   case BScreen::ClickMousePlacement:
     getScreen()->savePlacementPolicy(item->function());
-
-    setItemSelected(0, false);
-    setItemSelected(1, false);
-    setItemSelected(2, false);
-    setItemSelected(3, false);
-    setItemSelected(4, true);
-    setItemEnabled(5, false);
-    setItemEnabled(6, false);
-    setItemEnabled(7, false);
-    setItemEnabled(8, false);
-
     break;
 
   case BScreen::LeftRight:
     getScreen()->saveRowPlacementDirection(BScreen::LeftRight);
-
-    setItemSelected(5, true);
-    setItemSelected(6, false);
-
     break;
 
   case BScreen::RightLeft:
     getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
-
-    setItemSelected(5, false);
-    setItemSelected(6, true);
-
     break;
 
   case BScreen::TopBottom:
     getScreen()->saveColPlacementDirection(BScreen::TopBottom);
-
-    setItemSelected(7, true);
-    setItemSelected(8, false);
-
     break;
 
   case BScreen::BottomTop:
     getScreen()->saveColPlacementDirection(BScreen::BottomTop);
-
-    setItemSelected(7, false);
-    setItemSelected(8, true);
-
     break;
   
   case BScreen::IgnoreShaded:
     getScreen()->savePlaceIgnoreShaded(! getScreen()->getPlaceIgnoreShaded());
-
-    setItemSelected(9, getScreen()->getPlaceIgnoreShaded());
-
     break;
 
   case BScreen::IgnoreMaximized:
     getScreen()->
       savePlaceIgnoreMaximized(! getScreen()->getPlaceIgnoreMaximized());
-
-    setItemSelected(10, getScreen()->getPlaceIgnoreMaximized());
-
     break;
   }
+  setValues();
 }