handle all combinations of lock modifiers on keypress

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index c4f2326ecea72c4284790a9eda7d878edd8c472c..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;
@@ -221,6 +231,8 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
          BScreen::CascadePlacement);
   insert(i18n(ConfigmenuSet, ConfigmenuUnderMouse, "Under Mouse Placement"),
          BScreen::UnderMousePlacement);
+  insert(i18n(ConfigmenuSet, ConfigmenuClickMouse, "Click Mouse Placement"),
+         BScreen::ClickMousePlacement);
   insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"),
          BScreen::LeftRight);
   insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"),
@@ -229,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();
@@ -246,23 +258,24 @@ void Configmenu::Placementmenu::setValues(void) {
   setItemSelected(1, placement == BScreen::ColSmartPlacement);
   setItemSelected(2, placement == BScreen::CascadePlacement);
   setItemSelected(3, placement == BScreen::UnderMousePlacement);
+  setItemSelected(4, placement == BScreen::ClickMousePlacement);
 
   bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight),
        tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom),
        e = placement != BScreen::UnderMousePlacement;
 
-  setItemSelected(4, rl);
-  setItemSelected(5, ! rl);
-  setItemEnabled(4, e);
+  setItemSelected(5, rl);
+  setItemSelected(6, ! rl);
   setItemEnabled(5, e);
-
-  setItemSelected(6, tb);
-  setItemSelected(7, ! tb);
   setItemEnabled(6, e);
+
+  setItemSelected(7, tb);
+  setItemSelected(8, ! tb);
   setItemEnabled(7, e);
+  setItemEnabled(8, e);
   
-  setItemSelected(8, getScreen()->getPlaceIgnoreShaded());
-  setItemSelected(9, getScreen()->getPlaceIgnoreMaximized());
+  setItemSelected(9, getScreen()->getPlaceIgnoreShaded());
+  setItemSelected(10, getScreen()->getPlaceIgnoreMaximized());
 }
 
 
@@ -289,10 +302,11 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
     setItemSelected(1, false);
     setItemSelected(2, false);
     setItemSelected(3, false);
-    setItemEnabled(4, true);
+    setItemSelected(4, false);
     setItemEnabled(5, true);
     setItemEnabled(6, true);
     setItemEnabled(7, true);
+    setItemEnabled(8, true);
 
     break;
 
@@ -303,10 +317,11 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
     setItemSelected(1, true);
     setItemSelected(2, false);
     setItemSelected(3, false);
-    setItemEnabled(4, true);
+    setItemSelected(4, false);
     setItemEnabled(5, true);
     setItemEnabled(6, true);
     setItemEnabled(7, true);
+    setItemEnabled(8, true);
 
     break;
 
@@ -317,10 +332,11 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
     setItemSelected(1, false);
     setItemSelected(2, true);
     setItemSelected(3, false);
-    setItemEnabled(4, true);
+    setItemSelected(4, false);
     setItemEnabled(5, true);
     setItemEnabled(6, true);
     setItemEnabled(7, true);
+    setItemEnabled(8, true);
 
     break;
 
@@ -331,49 +347,65 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
     setItemSelected(1, false);
     setItemSelected(2, false);
     setItemSelected(3, true);
-    setItemEnabled(4, false);
+    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(4, true);
-    setItemSelected(5, false);
+    setItemSelected(5, true);
+    setItemSelected(6, false);
 
     break;
 
   case BScreen::RightLeft:
     getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
 
-    setItemSelected(4, false);
-    setItemSelected(5, true);
+    setItemSelected(5, false);
+    setItemSelected(6, true);
 
     break;
 
   case BScreen::TopBottom:
     getScreen()->saveColPlacementDirection(BScreen::TopBottom);
 
-    setItemSelected(6, true);
-    setItemSelected(7, false);
+    setItemSelected(7, true);
+    setItemSelected(8, false);
 
     break;
 
   case BScreen::BottomTop:
     getScreen()->saveColPlacementDirection(BScreen::BottomTop);
 
-    setItemSelected(6, false);
-    setItemSelected(7, true);
+    setItemSelected(7, false);
+    setItemSelected(8, true);
 
     break;
   
   case BScreen::IgnoreShaded:
     getScreen()->savePlaceIgnoreShaded(! getScreen()->getPlaceIgnoreShaded());
 
-    setItemSelected(8, getScreen()->getPlaceIgnoreShaded());
+    setItemSelected(9, getScreen()->getPlaceIgnoreShaded());
 
     break;
 
@@ -381,7 +413,7 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
     getScreen()->
       savePlaceIgnoreMaximized(! getScreen()->getPlaceIgnoreMaximized());
 
-    setItemSelected(9, getScreen()->getPlaceIgnoreMaximized());
+    setItemSelected(10, getScreen()->getPlaceIgnoreMaximized());
 
     break;
   }