X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=7bd90ef24ceea68b9a238f416578c462a18ab5a0;hb=7a55323343635d8a29bb62cd49d8d6a5c103f317;hp=6d1bbed274aa9c39c36ce0229ba885629516a9ff;hpb=5377e3fde108da56894185716d47c3058032b97f;p=chaz%2Fopenbox

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 6d1bbed2..7bd90ef2 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -53,8 +53,12 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
               "Focus New Windows"), 4);
   insert(i18n(ConfigmenuSet, ConfigmenuFocusLast,
               "Focus Last Window on Workspace"), 5);
+  insert(i18n(ConfigmenuSet, ConfigmenuWindowToWindowSnap,
+              "Window-To-Window Snapping"), 6);
+  insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap,
+              "Window Corner Snapping"), 7);
   insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar,
-              "Hide Toolbar"), 6);
+              "Hide Toolbar"), 8);
   update();
   setValues();
 }
@@ -66,7 +70,12 @@ void Configmenu::setValues(void) {
   setItemSelected(4, getScreen()->doFullMax());
   setItemSelected(5, getScreen()->doFocusNew());
   setItemSelected(6, getScreen()->doFocusLast());
-  setItemSelected(7, getScreen()->doHideToolbar());
+  setItemSelected(7, getScreen()->getBlackbox()->getWindowToWindowSnap());
+
+  setItemSelected(8, getScreen()->getBlackbox()->getWindowCornerSnap());
+  setItemEnabled(8, getScreen()->getBlackbox()->getWindowToWindowSnap());
+  
+  setItemSelected(9, getScreen()->doHideToolbar());
 }
 
 
@@ -92,30 +101,47 @@ void Configmenu::itemSelected(int button, unsigned int index) {
   }
 
   case 2: { // opaque move
-    getScreen()->saveOpaqueMove((! getScreen()->doOpaqueMove()));
+    getScreen()->saveOpaqueMove(! getScreen()->doOpaqueMove());
     setItemSelected(index, getScreen()->doOpaqueMove());
     break;
   }
 
   case 3: { // full maximization
-    getScreen()->saveFullMax((! getScreen()->doFullMax()));
+    getScreen()->saveFullMax(! getScreen()->doFullMax());
     setItemSelected(index, getScreen()->doFullMax());
     break;
   }
   case 4: { // focus new windows
-    getScreen()->saveFocusNew((! getScreen()->doFocusNew()));
+    getScreen()->saveFocusNew(! getScreen()->doFocusNew());
     setItemSelected(index, getScreen()->doFocusNew());
     break;
   }
 
   case 5: { // focus last window on workspace
-    getScreen()->saveFocusLast((! getScreen()->doFocusLast()));
+    getScreen()->saveFocusLast(! getScreen()->doFocusLast());
     setItemSelected(index, getScreen()->doFocusLast());
     break;
   }
 
-  case 6: { // hide toolbar
-    getScreen()->saveHideToolbar((! getScreen()->doHideToolbar()));
+  case 6: { // window-to-window snapping
+    getScreen()->getBlackbox()->
+      saveWindowToWindowSnap(! getScreen()->getBlackbox()->
+                             getWindowToWindowSnap());
+    setItemSelected(index, getScreen()->getBlackbox()->getWindowToWindowSnap());
+    setItemEnabled(index + 1,
+                   getScreen()->getBlackbox()->getWindowToWindowSnap());
+    break;
+  }
+
+  case 7: { // window corner snapping
+    getScreen()->getBlackbox()->
+      saveWindowCornerSnap(! getScreen()->getBlackbox()->getWindowCornerSnap());
+    setItemSelected(index, getScreen()->getBlackbox()->getWindowCornerSnap());
+    break;
+  }
+
+  case 8: { // hide toolbar
+    getScreen()->saveHideToolbar(! getScreen()->doHideToolbar());
     setItemSelected(index, getScreen()->doHideToolbar());
     break;
   }
@@ -203,6 +229,8 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
          BScreen::ColSmartPlacement);
   insert(i18n(ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"),
          BScreen::CascadePlacement);
+  insert(i18n(ConfigmenuSet, ConfigmenuUnderMouse, "Under Mouse Placement"),
+         BScreen::UnderMousePlacement);
   insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"),
          BScreen::LeftRight);
   insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"),
@@ -217,28 +245,26 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
 
 
 void Configmenu::Placementmenu::setValues(void) {
-  switch (getScreen()->getPlacementPolicy()) {
-  case BScreen::RowSmartPlacement:
-    setItemSelected(0, True);
-    break;
-
-  case BScreen::ColSmartPlacement:
-    setItemSelected(1, True);
-    break;
-
-  case BScreen::CascadePlacement:
-    setItemSelected(2, True);
-    break;
-  }
+  int placement = getScreen()->getPlacementPolicy();
+  
+  setItemSelected(0, placement == BScreen::RowSmartPlacement);
+  setItemSelected(1, placement == BScreen::ColSmartPlacement);
+  setItemSelected(2, placement == BScreen::CascadePlacement);
+  setItemSelected(3, placement == BScreen::UnderMousePlacement);
 
   bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight),
-       tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom);
-
-  setItemSelected(3, rl);
-  setItemSelected(4, ! rl);
-
-  setItemSelected(5, tb);
-  setItemSelected(6, ! tb);
+       tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom),
+       e = placement != BScreen::UnderMousePlacement;
+
+  setItemSelected(4, rl);
+  setItemSelected(5, ! rl);
+  setItemEnabled(4, e);
+  setItemEnabled(5, e);
+
+  setItemSelected(6, tb);
+  setItemSelected(7, ! tb);
+  setItemEnabled(6, e);
+  setItemEnabled(7, e);
 }
 
 
@@ -261,59 +287,88 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
   case BScreen::RowSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
 
-    setItemSelected(0, True);
-    setItemSelected(1, False);
-    setItemSelected(2, False);
+    setItemSelected(0, true);
+    setItemSelected(1, false);
+    setItemSelected(2, false);
+    setItemSelected(3, false);
+    setItemEnabled(4, true);
+    setItemEnabled(5, true);
+    setItemEnabled(6, true);
+    setItemEnabled(7, true);
 
     break;
 
   case BScreen::ColSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
 
-    setItemSelected(0, False);
-    setItemSelected(1, True);
-    setItemSelected(2, False);
+    setItemSelected(0, false);
+    setItemSelected(1, true);
+    setItemSelected(2, false);
+    setItemSelected(3, false);
+    setItemEnabled(4, true);
+    setItemEnabled(5, true);
+    setItemEnabled(6, true);
+    setItemEnabled(7, true);
 
     break;
 
   case BScreen::CascadePlacement:
     getScreen()->savePlacementPolicy(item->function());
 
-    setItemSelected(0, False);
-    setItemSelected(1, False);
-    setItemSelected(2, True);
+    setItemSelected(0, false);
+    setItemSelected(1, false);
+    setItemSelected(2, true);
+    setItemSelected(3, false);
+    setItemEnabled(4, true);
+    setItemEnabled(5, true);
+    setItemEnabled(6, true);
+    setItemEnabled(7, true);
+
+    break;
+
+  case BScreen::UnderMousePlacement:
+    getScreen()->savePlacementPolicy(item->function());
+
+    setItemSelected(0, false);
+    setItemSelected(1, false);
+    setItemSelected(2, false);
+    setItemSelected(3, true);
+    setItemEnabled(4, false);
+    setItemEnabled(5, false);
+    setItemEnabled(6, false);
+    setItemEnabled(7, false);
 
     break;
 
   case BScreen::LeftRight:
     getScreen()->saveRowPlacementDirection(BScreen::LeftRight);
 
-    setItemSelected(3, True);
-    setItemSelected(4, False);
+    setItemSelected(4, true);
+    setItemSelected(5, false);
 
     break;
 
   case BScreen::RightLeft:
     getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
 
-    setItemSelected(3, False);
-    setItemSelected(4, True);
+    setItemSelected(4, false);
+    setItemSelected(5, true);
 
     break;
 
   case BScreen::TopBottom:
     getScreen()->saveColPlacementDirection(BScreen::TopBottom);
 
-    setItemSelected(5, True);
-    setItemSelected(6, False);
+    setItemSelected(6, true);
+    setItemSelected(7, false);
 
     break;
 
   case BScreen::BottomTop:
     getScreen()->saveColPlacementDirection(BScreen::BottomTop);
 
-    setItemSelected(5, False);
-    setItemSelected(6, True);
+    setItemSelected(6, false);
+    setItemSelected(7, true);
 
     break;
   }