make a new autoRaiseDelay value take effect without having to restart

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index e11c7c386116b58d88fa7f60d61462369ca5233d..3282463ef334e761fdd2f35589b6dc9a3756b78c 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -1,4 +1,5 @@
 // Configmenu.cc for Openbox
+// Copyright (c) 2002 - 2002 Ben Jansens <ben@orodu.net>
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -67,7 +68,7 @@ Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(scr)
 }
 
 void Configmenu::setValues() {
-  setItemSelected(2, screen.getImageControl()->doDither());
+  setItemSelected(2, screen.imageDither());
   setItemSelected(3, screen.opaqueMove());
   setItemSelected(4, screen.fullMax());
   setItemSelected(5, screen.focusNew());
@@ -91,9 +92,9 @@ void Configmenu::itemSelected(int button, int index) {
 
   switch(item->function()) {
   case 1: { // dither
-    screen.setImageDither(!screen.getImageControl()->doDither());
+    screen.setImageDither(!screen.imageDither());
 
-    setItemSelected(index, screen.getImageControl()->doDither());
+    setItemSelected(index, screen.imageDither());
 
     break;
   }
@@ -184,32 +185,18 @@ void Configmenu::Focusmenu::itemSelected(int button, int index) {
   case 1: // click to focus
     configmenu->screen.setSloppyFocus(false);
     configmenu->screen.setAutoRaise(false);
-
-    if (! configmenu->screen.getOpenbox().getFocusedWindow())
-      XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
-                    configmenu->screen.getToolbar()->getWindowID(),
-                    RevertToParent, CurrentTime);
-    else
-      XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
-                    configmenu->screen.getOpenbox().
-                    getFocusedWindow()->getClientWindow(),
-                    RevertToParent, CurrentTime);
-
+    // make windows all grab button1 clicks
     configmenu->screen.reconfigure();
-
     break;
 
   case 2: // sloppy focus
     configmenu->screen.setSloppyFocus(true);
-
+    // make windows stop grabbing button1 clicks
     configmenu->screen.reconfigure();
-
     break;
 
   case 3: // auto raise with sloppy focus
-    bool change = ((configmenu->screen.autoRaise()) ? false : true);
-    configmenu->screen.setAutoRaise(change);
-
+    configmenu->screen.setAutoRaise(!configmenu->screen.autoRaise());
     break;
   }
 
@@ -240,6 +227,9 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) :
   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuUnderMouse,
                           "Under Mouse Placement"),
          BScreen::UnderMousePlacement);
+  insert(i18n->getMessage(ConfigmenuSet, ConfigmenuClickMouse,
+                          "Click Mouse Placement"),
+         BScreen::ClickMousePlacement);
   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuLeftRight,
                          "Left to Right"), BScreen::LeftRight);
   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuRightLeft,
@@ -260,21 +250,26 @@ void Configmenu::Placementmenu::setValues() {
   setItemSelected(2, p == BScreen::CascadePlacement);
   setItemSelected(3, p == BScreen::BestFitPlacement);
   setItemSelected(4, p == BScreen::UnderMousePlacement);
+  setItemSelected(5, p == BScreen::ClickMousePlacement);
 
   bool rl = (configmenu->screen.rowPlacementDirection() ==
             BScreen::LeftRight),
        tb = (configmenu->screen.colPlacementDirection() ==
             BScreen::TopBottom);
 
-  setItemSelected(5, rl);
-  setItemEnabled(5, p != BScreen::UnderMousePlacement);
-  setItemSelected(6, !rl);
-  setItemEnabled(6, p != BScreen::UnderMousePlacement);
-
-  setItemSelected(7, tb);
-  setItemEnabled(7, p != BScreen::UnderMousePlacement);
-  setItemSelected(8, !tb);
-  setItemEnabled(8, p != BScreen::UnderMousePlacement);
+  setItemSelected(6, rl);
+  setItemEnabled(6, (p != BScreen::UnderMousePlacement &&
+                     p != BScreen::ClickMousePlacement));
+  setItemSelected(7, !rl);
+  setItemEnabled(7, (p != BScreen::UnderMousePlacement &&
+                     p != BScreen::ClickMousePlacement));
+
+  setItemSelected(8, tb);
+  setItemEnabled(8, (p != BScreen::UnderMousePlacement &&
+                     p != BScreen::ClickMousePlacement));
+  setItemSelected(9, !tb);
+  setItemEnabled(9, (p != BScreen::UnderMousePlacement &&
+                     p != BScreen::ClickMousePlacement));
 }
 
 void Configmenu::Placementmenu::reconfigure() {
@@ -312,6 +307,10 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) {
     configmenu->screen.setPlacementPolicy(item->function());
     break;
 
+  case BScreen::ClickMousePlacement:
+    configmenu->screen.setPlacementPolicy(item->function());
+    break;
+
   case BScreen::LeftRight:
     configmenu->screen.setRowPlacementDirection(BScreen::LeftRight);
     break;