X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=d78d3da943ee521e7615cc5fc7b25232fd6fb94e;hb=9e99a9a1e21b7b7214b17a759e58efd00b254551;hp=3a314af575fdf5af8cf6928d6dc24182e0956b26;hpb=8794d357e67abddf9fda9db77b235e294d0ec590;p=chaz%2Fopenbox

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 3a314af5..d78d3da9 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -53,15 +53,32 @@ 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"), 8);
   update();
+  setValues();
+}
+
 
-  setItemSelected(2, getScreen()->getImageControl()->doDither());
+void Configmenu::setValues(void) {
+  setItemSelected(2, getScreen()->doImageDither());
   setItemSelected(3, getScreen()->doOpaqueMove());
   setItemSelected(4, getScreen()->doFullMax());
   setItemSelected(5, getScreen()->doFocusNew());
   setItemSelected(6, getScreen()->doFocusLast());
+  setItemSelected(7, getScreen()->getWindowToWindowSnap());
+
+  setItemSelected(8, getScreen()->getWindowCornerSnap());
+  setItemEnabled(8, getScreen()->getWindowToWindowSnap());
+  
+  setItemSelected(9, getScreen()->doHideToolbar());
 }
 
+
 Configmenu::~Configmenu(void) {
   delete focusmenu;
   delete placementmenu;
@@ -73,51 +90,56 @@ void Configmenu::itemSelected(int button, unsigned int index) {
 
   BasemenuItem *item = find(index);
 
-  if (!item->function())
+  if (! item->function())
     return;
 
   switch(item->function()) {
-  case 1: { // dither
-    getScreen()->getImageControl()->
-      setDither((! getScreen()->getImageControl()->doDither()));
-
-    setItemSelected(index, getScreen()->getImageControl()->doDither());
-
+  case 1: // dither
+    getScreen()->saveImageDither(! getScreen()->doImageDither());
+    setItemSelected(index, getScreen()->doImageDither());
     break;
-  }
-
-  case 2: { // opaque move
-    getScreen()->saveOpaqueMove((! getScreen()->doOpaqueMove()));
 
+  case 2: // opaque move
+    getScreen()->saveOpaqueMove(! getScreen()->doOpaqueMove());
     setItemSelected(index, getScreen()->doOpaqueMove());
-
     break;
-  }
-
-  case 3: { // full maximization
-    getScreen()->saveFullMax((! getScreen()->doFullMax()));
 
+  case 3: // full maximization
+    getScreen()->saveFullMax(! getScreen()->doFullMax());
     setItemSelected(index, getScreen()->doFullMax());
-
     break;
-  }
-  case 4: { // focus new windows
-    getScreen()->saveFocusNew((! getScreen()->doFocusNew()));
 
+  case 4: // focus new windows
+    getScreen()->saveFocusNew(! getScreen()->doFocusNew());
     setItemSelected(index, getScreen()->doFocusNew());
     break;
-  }
 
-  case 5: { // focus last window on workspace
-    getScreen()->saveFocusLast((! getScreen()->doFocusLast()));
+  case 5: // focus last window on workspace
+    getScreen()->saveFocusLast(! getScreen()->doFocusLast());
     setItemSelected(index, getScreen()->doFocusLast());
     break;
+
+  case 6: // window-to-window snapping
+    getScreen()->saveWindowToWindowSnap(! getScreen()->getWindowToWindowSnap());
+    setItemSelected(index, getScreen()->getWindowToWindowSnap());
+    setItemEnabled(index + 1, getScreen()->getWindowToWindowSnap());
+    break;
+
+  case 7: // window corner snapping
+    getScreen()->saveWindowCornerSnap(! getScreen()->getWindowCornerSnap());
+    setItemSelected(index, getScreen()->getWindowCornerSnap());
+    break;
+
+  case 8: // hide toolbar
+    getScreen()->saveHideToolbar(! getScreen()->doHideToolbar());
+    setItemSelected(index, getScreen()->doHideToolbar());
+    break;
   }
-  } // switch
 }
 
 
 void Configmenu::reconfigure(void) {
+  setValues();
   focusmenu->reconfigure();
   placementmenu->reconfigure();
 
@@ -134,8 +156,12 @@ Configmenu::Focusmenu::Focusmenu(Configmenu *cm) : Basemenu(cm->getScreen()) {
   insert(i18n(ConfigmenuSet, ConfigmenuAutoRaise, "Auto Raise"), 3);
   insert(i18n(ConfigmenuSet, ConfigmenuClickRaise, "Click Raise"), 4);
   update();
+  setValues();
+}
+
 
-  setItemSelected(0, (! getScreen()->isSloppyFocus()));
+void Configmenu::Focusmenu::setValues(void) {
+  setItemSelected(0, ! getScreen()->isSloppyFocus());
   setItemSelected(1, getScreen()->isSloppyFocus());
   setItemEnabled(2, getScreen()->isSloppyFocus());
   setItemSelected(2, getScreen()->doAutoRaise());
@@ -144,13 +170,19 @@ Configmenu::Focusmenu::Focusmenu(Configmenu *cm) : Basemenu(cm->getScreen()) {
 }
 
 
+void Configmenu::Focusmenu::reconfigure(void) {
+  setValues();
+  Basemenu::reconfigure();
+}
+
+
 void Configmenu::Focusmenu::itemSelected(int button, unsigned int index) {
   if (button != 1)
     return;
 
   BasemenuItem *item = find(index);
 
-  if (!item->function())
+  if (! item->function())
     return;
 
   switch (item->function()) {
@@ -168,16 +200,11 @@ void Configmenu::Focusmenu::itemSelected(int button, unsigned int index) {
 
   case 4: // click raise with sloppy focus
     getScreen()->saveClickRaise(! getScreen()->doClickRaise());
-    getScreen()->updateFocusModel();
+    // make sure the appropriate mouse buttons are grabbed on the windows
+    getScreen()->toggleFocusModel(BScreen::SloppyFocus);
     break;
   }
-
-  setItemSelected(0, (! getScreen()->isSloppyFocus()));
-  setItemSelected(1, getScreen()->isSloppyFocus());
-  setItemEnabled(2, getScreen()->isSloppyFocus());
-  setItemSelected(2, getScreen()->doAutoRaise());
-  setItemEnabled(3, getScreen()->isSloppyFocus());
-  setItemSelected(3, getScreen()->doClickRaise());
+  setValues();
 }
 
 
@@ -192,6 +219,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"),
@@ -201,31 +230,37 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
   insert(i18n(ConfigmenuSet, ConfigmenuBottomTop, "Bottom to Top"),
          BScreen::BottomTop);
   update();
+  setValues();
+}
 
-  switch (getScreen()->getPlacementPolicy()) {
-  case BScreen::RowSmartPlacement:
-    setItemSelected(0, True);
-    break;
 
-  case BScreen::ColSmartPlacement:
-    setItemSelected(1, True);
-    break;
+void Configmenu::Placementmenu::setValues(void) {
+  int placement = getScreen()->getPlacementPolicy();
+  
+  setItemSelected(0, placement == BScreen::RowSmartPlacement);
+  setItemSelected(1, placement == BScreen::ColSmartPlacement);
+  setItemSelected(2, placement == BScreen::CascadePlacement);
+  setItemSelected(3, placement == BScreen::UnderMousePlacement);
 
-  case BScreen::CascadePlacement:
-    setItemSelected(2, True);
-    break;
-  }
+  bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight),
+       tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom),
+       e = placement != BScreen::UnderMousePlacement;
+
+  setItemSelected(4, rl);
+  setItemSelected(5, ! rl);
+  setItemEnabled(4, e);
+  setItemEnabled(5, e);
 
-  bool rl = (getScreen()->getRowPlacementDirection() ==
-             BScreen::LeftRight),
-    tb = (getScreen()->getColPlacementDirection() ==
-          BScreen::TopBottom);
+  setItemSelected(6, tb);
+  setItemSelected(7, ! tb);
+  setItemEnabled(6, e);
+  setItemEnabled(7, e);
+}
 
-  setItemSelected(3, rl);
-  setItemSelected(4, ! rl);
 
-  setItemSelected(5, tb);
-  setItemSelected(6, ! tb);
+void Configmenu::Placementmenu::reconfigure(void) {
+  setValues();
+  Basemenu::reconfigure();
 }
 
 
@@ -235,66 +270,95 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
 
   BasemenuItem *item = find(index);
 
-  if (!item->function())
+  if (! item->function())
     return;
 
   switch (item->function()) {
   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;
   }