sync with bb cvs

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 77755e27af9212cc795638725e675f41e1f04e7b..d78d3da943ee521e7615cc5fc7b25232fd6fb94e 100644 (file)
--- 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()->getWindowToWindowSnap());
+
+  setItemSelected(8, getScreen()->getWindowCornerSnap());
+  setItemEnabled(8, getScreen()->getWindowToWindowSnap());
+  
+  setItemSelected(9, getScreen()->doHideToolbar());
 }
 
 
@@ -85,41 +94,47 @@ void Configmenu::itemSelected(int button, unsigned int index) {
     return;
 
   switch(item->function()) {
-  case 1: { // dither
+  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: { // hide toolbar
-    getScreen()->saveHideToolbar((! getScreen()->doHideToolbar()));
+  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
 }
 
 
@@ -185,7 +200,8 @@ 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;
   }
   setValues();