acquire and provide Xinerama information for the window manager. now we just gotta...

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index e060f8de2bc2881a5e137e127238924a5d0cd369..c5c58d916cab03aa98476c4ff1f6f9af94274de3 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -57,8 +57,10 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
               "Window-To-Window Snapping"), 6);
   insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap,
               "Window Corner Snapping"), 7);
+  insert(i18n(ConfigmenuSet, ConfigmenuDisableBindings,
+              "Disable Mouse with Scroll Lock"), 8);
   insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar,
-              "Hide Toolbar"), 8);
+              "Hide Toolbar"), 9);
   update();
   setValues();
 }
@@ -75,7 +77,8 @@ void Configmenu::setValues(void) {
   setItemSelected(8, getScreen()->getWindowCornerSnap());
   setItemEnabled(8, getScreen()->getWindowToWindowSnap());
   
-  setItemSelected(9, getScreen()->doHideToolbar());
+  setItemSelected(9, getScreen()->allowScrollLock());
+  setItemSelected(10, getScreen()->doHideToolbar());
 }
 
 
@@ -84,6 +87,7 @@ Configmenu::~Configmenu(void) {
   delete placementmenu;
 }
 
+
 void Configmenu::itemSelected(int button, unsigned int index) {
   if (button != 1)
     return;
@@ -130,7 +134,13 @@ void Configmenu::itemSelected(int button, unsigned int index) {
     setItemSelected(index, getScreen()->getWindowCornerSnap());
     break;
 
-  case 8: // hide toolbar
+  case 8: // disable mouse bindings with Scroll Lock
+    getScreen()->saveAllowScrollLock(! getScreen()->allowScrollLock());
+    setItemSelected(index, getScreen()->allowScrollLock());
+    getScreen()->reconfigure();
+    break;
+
+  case 9: // hide toolbar
     getScreen()->saveHideToolbar(! getScreen()->doHideToolbar());
     setItemSelected(index, getScreen()->doHideToolbar());
     break;
@@ -231,10 +241,10 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
          BScreen::TopBottom);
   insert(i18n(ConfigmenuSet, ConfigmenuBottomTop, "Bottom to Top"),
          BScreen::BottomTop);
-  insert(i18n(ConfigmenuSet, ConfigmenuIgnoreShaded, "Ignore shaded windows"),
+  insert(i18n(ConfigmenuSet, ConfigmenuIgnoreShaded, "Ignore Shaded Windows"),
          BScreen::IgnoreShaded);
   insert(i18n(ConfigmenuSet, ConfigmenuIgnoreMax,
-              "Ignore full-maximized windows"),
+              "Ignore Full-Maximized Windows"),
          BScreen::IgnoreMaximized);
   update();
   setValues();