some fixes for the new "Raise on Move/Resize" option

diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m
index f3fd312de1b4d9dc53e61870007013e86c8effa8..10cfdade616ac07faa5cf9c490bf870a70c0d938 100644 (file)
--- a/nls/C/Configmenu.m
+++ b/nls/C/Configmenu.m
@@ -13,7 +13,7 @@ $ #ImageDithering
 $ #OpaqueMove
 # Opaque Window Moving
 $ #ModMove
-# Raise Window on Alt-Click Move
+# Raise Window on Move/Resize
 $ #FullMax
 # Full Maximization
 $ #FocusNew

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 4d4f91f1d376cd4e42492ca5133de4a8d67f2532..6d34dedbf5a469c13e13705e2f625ee059a21d8f 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -68,7 +68,7 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
   insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove,
               "Opaque Window Moving"), 2);
   insert(i18n(ConfigmenuSet, ConfigmenuModMove,
-              "Raise Window on Alt-Click Move"), 3);
+              "Raise Window on Move/Resize"), 3);
   insert(i18n(ConfigmenuSet, ConfigmenuWorkspaceWarping,
               "Workspace Warping"), 4);
   insert(i18n(ConfigmenuSet, ConfigmenuFullMax,
@@ -96,7 +96,7 @@ void Configmenu::setValues(void) {
 #endif // XFT
   setItemSelected(index++, getScreen()->doImageDither());
   setItemSelected(index++, getScreen()->doOpaqueMove());
-  setItemSelected(index++, getScreen()->doRaiseOnMove());
+  setItemSelected(index++, getScreen()->doRaiseOnMoveResize());
   setItemSelected(index++, getScreen()->doWorkspaceWarping());
   setItemSelected(index++, getScreen()->doFullMax());
   setItemSelected(index++, getScreen()->doFocusNew());
@@ -141,8 +141,8 @@ void Configmenu::itemSelected(int button, unsigned int index) {
     break;
 
   case 3: // raise on alt-move
-    getScreen()->saveRaiseOnMove(! getScreen()->doRaiseOnMove());
-    setItemSelected(index, getScreen()->doRaiseOnMove());
+    getScreen()->saveRaiseOnMoveResize(! getScreen()->doRaiseOnMoveResize());
+    setItemSelected(index, getScreen()->doRaiseOnMoveResize());
 
   case 4: // workspace wrapping
     getScreen()->saveWorkspaceWarping(! getScreen()->doWorkspaceWarping());

diff --git a/src/Screen.cc b/src/Screen.cc
index d79b30dc7f67583493e227baf18b4e8afdb8a63a..6e0c06cf4d10abb55e4abf9baa347a3fd0b2cd24 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -408,9 +408,9 @@ void BScreen::saveOpaqueMove(bool o) {
   config->setValue(screenstr + "opaqueMove", resource.opaque_move);
 }
 
-void BScreen::saveRaiseOnMove(bool r) {
+void BScreen::saveRaiseOnMoveResize(bool r) {
   resource.raise_on_move = r;
-  config->setValue(screenstr + "raiseOnAltMove", resource.raise_on_move);
+  config->setValue(screenstr + "raiseOnMoveResize", resource.raise_on_move);
 }
 
 
@@ -662,7 +662,7 @@ void BScreen::save_rc(void) {
   saveAAFonts(resource.aa_fonts);
   saveResizeZones(resource.resize_zones);
   saveOpaqueMove(resource.opaque_move);
-  saveRaiseOnMove(resource.raise_on_move);
+  saveRaiseOnMoveResize(resource.raise_on_move);
   saveFullMax(resource.full_max);
   saveFocusNew(resource.focus_new);
   saveFocusLast(resource.focus_last);
@@ -715,7 +715,8 @@ void BScreen::load_rc(void) {
   if (! config->getValue(screenstr + "opaqueMove", resource.opaque_move))
     resource.opaque_move = false;
 
-  if (! config->getValue(screenstr + "raiseOnAltMove", resource.raise_on_move))
+  if (! config->getValue(screenstr + "raiseOnMoveResize",
+                         resource.raise_on_move))
     resource.raise_on_move = true;
 
   if (! config->getValue(screenstr + "antialiasFonts", resource.aa_fonts))

diff --git a/src/Screen.hh b/src/Screen.hh
index 202778a008330fd4555ac1e3ad73c38c96790f08..b4a64f3b247466d39b9c905e25ef135af0a64e84 100644 (file)
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -236,7 +236,7 @@ public:
 
   inline bool isSloppyFocus(void) const { return resource.sloppy_focus; }
   inline bool isRootColormapInstalled(void) const
-  { return root_colormap_installed; }
+    { return root_colormap_installed; }
   inline bool doAutoRaise(void) const { return resource.auto_raise; }
   inline bool doClickRaise(void) const { return resource.click_raise; }
   inline bool isScreenManaged(void) const { return managed; }
@@ -245,7 +245,8 @@ public:
   inline bool doImageDither(void) const { return image_control->doDither(); }
   inline bool doOrderedDither(void) const { return resource.ordered_dither; }
   inline bool doOpaqueMove(void) const { return resource.opaque_move; }
-  inline bool doRaiseOnMove(void) const { return resource.raise_on_move; }
+  inline bool doRaiseOnMoveResize(void) const
+    { return resource.raise_on_move; }
   inline bool doFullMax(void) const { return resource.full_max; }
   inline bool doFocusNew(void) const { return resource.focus_new; }
   inline bool doFocusLast(void) const { return resource.focus_last; }
@@ -256,7 +257,8 @@ public:
     { return resource.snap_to_edges; }
   inline bool getWindowCornerSnap(void) const
     { return resource.window_corner_snap; }
-  inline bool allowScrollLock(void) const { return resource.allow_scroll_lock; }
+  inline bool allowScrollLock(void) const
+    { return resource.allow_scroll_lock; }
   inline bool doWorkspaceWarping(void) const
     { return resource.workspace_warping; }
   inline int rootScrollDirection(void) const { return resource.root_scroll; }
@@ -333,7 +335,7 @@ public:
   void saveShadowFonts(bool f);
   void saveAAFonts(bool f);
   void saveOpaqueMove(bool o);
-  void saveRaiseOnMove(bool r);
+  void saveRaiseOnMoveResize(bool r);
   void saveFullMax(bool f);
   void saveFocusNew(bool f);
   void saveFocusLast(bool f);

diff --git a/src/Window.cc b/src/Window.cc
index dafd2382e3db85dd2108880dfb1eb47947ad7b20..a7b4f1a7786e72d2cddeb5133cddb2cae44aa44d 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3123,7 +3123,8 @@ void BlackboxWindow::buttonPressEvent(const XButtonEvent *be) {
     } else if (frame.plate == be->window) {
       if (windowmenu && windowmenu->isVisible()) windowmenu->hide();
 
-      screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
+      if (be->state != mod_mask || getScreen()->doRaiseOnMoveResize())
+        screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
 
       XAllowEvents(blackbox->getXDisplay(), ReplayPointer, be->time);
     } else {
@@ -3140,7 +3141,7 @@ void BlackboxWindow::buttonPressEvent(const XButtonEvent *be) {
 
       if (windowmenu && windowmenu->isVisible()) windowmenu->hide();
       
-      if ( (be->state == mod_mask && getScreen()->doRaiseOnMove()))
+      if (be->state == mod_mask && getScreen()->doRaiseOnMoveResize())
         screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
     }
   } else if (be->button == 2 && (be->window != frame.iconify_button) &&