X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWindow.cc;h=fa49ec216f296f0a06c9278eea252371d80f94f3;hb=b8c0c7af126928fde8c4bb4a90d10f6d86fd0d75;hp=6ecb454a48a8c7b123166d3d86a22a31107de8f2;hpb=e9a5c7158a8c0303e63bf3e14618eee705701cca;p=chaz%2Fopenbox

diff --git a/src/Window.cc b/src/Window.cc
index 6ecb454a..fa49ec21 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3027,178 +3027,303 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
   dx -= frame.border_w;
   dy -= frame.border_w;
 
-  if (screen->doWorkspaceWarping()) {
-    // workspace warping
-    bool warp = False;
-    unsigned int dest = screen->getCurrentWorkspaceID();
-    if (x_root <= 0) {
-      warp = True;
+  if (screen->doWorkspaceWarping())
+    if (doWorkspaceWarping(x_root, y_root, dx, dy))
+      return;
 
-      if (dest > 0) dest--;
-      else dest = screen->getNumberOfWorkspaces() - 1;
+  doWindowSnapping(dx, dy);
 
-    } else if (x_root >= screen->getRect().right()) {
-      warp = True;
+  if (screen->doOpaqueMove()) {
+    configure(dx, dy, frame.rect.width(), frame.rect.height());
+  } else {
+    XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+                   screen->getOpGC(),
+                   frame.changing.x(),
+                   frame.changing.y(),
+                   frame.changing.width() - 1,
+                   frame.changing.height() - 1);
 
-      if (dest < screen->getNumberOfWorkspaces() - 1) dest++;
-      else dest = 0;
-    }
-    if (warp) {
-      endMove();
-      bool focus = flags.focused; // had focus while moving?
-      if (! flags.stuck)
-        screen->reassociateWindow(this, dest, False);
-      screen->changeWorkspaceID(dest);
-      if (focus)
-        setInputFocus();
+    frame.changing.setPos(dx, dy);
 
-      /*
-         If the XWarpPointer is done after the configure, we can end up
-         grabbing another window, so made sure you do it first.
-      */
-      int dest_x;
-      if (x_root <= 0) {
-        dest_x = screen->getRect().right() - 1;
-        XWarpPointer(blackbox->getXDisplay(), None, 
-                     screen->getRootWindow(), 0, 0, 0, 0,
-                     dest_x, y_root);
-
-        configure(dx + (screen->getRect().width() - 1), dy,
-                  frame.rect.width(), frame.rect.height());
-      } else {
-        dest_x = 0;
-        XWarpPointer(blackbox->getXDisplay(), None, 
-                     screen->getRootWindow(), 0, 0, 0, 0,
-                     dest_x, y_root);
+    XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
+                   screen->getOpGC(),
+                   frame.changing.x(),
+                   frame.changing.y(),
+                   frame.changing.width() - 1,
+                   frame.changing.height() - 1);
+  }
 
-        configure(dx - (screen->getRect().width() - 1), dy,
-                  frame.rect.width(), frame.rect.height());
-      }
+  screen->showPosition(dx, dy);
+}
 
-      beginMove(dest_x, y_root);
-      return;
-    }
+
+bool BlackboxWindow::doWorkspaceWarping(int x_root, int y_root,
+                                        int dx, int dy) {
+  // workspace warping
+  bool warp = False;
+  unsigned int dest = screen->getCurrentWorkspaceID();
+  if (x_root <= 0) {
+    warp = True;
+
+    if (dest > 0) dest--;
+    else dest = screen->getNumberOfWorkspaces() - 1;
+
+  } else if (x_root >= screen->getRect().right()) {
+    warp = True;
+
+    if (dest < screen->getNumberOfWorkspaces() - 1) dest++;
+    else dest = 0;
+  }
+  if (! warp)
+    return false;
+
+  endMove();
+  bool focus = flags.focused; // had focus while moving?
+  if (! flags.stuck)
+    screen->reassociateWindow(this, dest, False);
+  screen->changeWorkspaceID(dest);
+  if (focus)
+    setInputFocus();
+
+  /*
+     If the XWarpPointer is done after the configure, we can end up
+     grabbing another window, so made sure you do it first.
+     */
+  int dest_x;
+  if (x_root <= 0) {
+    dest_x = screen->getRect().right() - 1;
+    XWarpPointer(blackbox->getXDisplay(), None, 
+                 screen->getRootWindow(), 0, 0, 0, 0,
+                 dest_x, y_root);
+
+    configure(dx + (screen->getRect().width() - 1), dy,
+              frame.rect.width(), frame.rect.height());
+  } else {
+    dest_x = 0;
+    XWarpPointer(blackbox->getXDisplay(), None, 
+                 screen->getRootWindow(), 0, 0, 0, 0,
+                 dest_x, y_root);
+
+    configure(dx - (screen->getRect().width() - 1), dy,
+              frame.rect.width(), frame.rect.height());
   }
 
+  beginMove(dest_x, y_root);
+  return true;
+}
+
+
+void BlackboxWindow::doWindowSnapping(int &dx, int &dy) {
   // how much resistance to edges to provide
-  const int resistance_size = screen->getEdgeSnapThreshold();
+  const int resistance_size = screen->getResistanceSize();
 
-  if (resistance_size > 0) {
-    RectList rectlist;
+  // how far away to snap
+  const int snap_distance = screen->getSnapThreshold();
 
-    // the amount of space away from the edge to provide resistance
-    const int resistance_offset = screen->getEdgeSnapThreshold();
-  
-    // window corners
-    const int wleft = dx,
-              wright = dx + frame.rect.width() - 1,
-              wtop = dy,
-              wbottom = dy + frame.rect.height() - 1;
-
-    if (screen->getWindowToWindowSnap()) {
-      Workspace *w = screen->getWorkspace(getWorkspaceNumber());
-      assert(w);
-
-      // add windows on the workspace to the rect list
-      const BlackboxWindowList& stack_list = w->getStackingList();
-      BlackboxWindowList::const_iterator st_it, st_end = stack_list.end();
-      for (st_it = stack_list.begin(); st_it != st_end; ++st_it)
-        rectlist.push_back( (*st_it)->frameRect() );
-
-      // add the toolbar and the slit to the rect list.
-      // (only if they are not hidden)
-      Toolbar *tbar = screen->getToolbar();
-      Slit *slit = screen->getSlit();
-      Rect tbar_rect, slit_rect;
-      unsigned int bwidth = screen->getBorderWidth() * 2;
-
-      if (! (screen->doHideToolbar() || tbar->isHidden())) {
-        tbar_rect.setRect(tbar->getX(), tbar->getY(), tbar->getWidth() + bwidth,
-                          tbar->getHeight() + bwidth);
-        rectlist.push_back(tbar_rect);
-      }
+  // how to snap windows
+  const int snap_to_windows = screen->getWindowToWindowSnap();
+  const int snap_to_edges = screen->getWindowToEdgeSnap();
+  // the amount of space away from the edge to provide resistance/snap
+  const int snap_offset = screen->getSnapOffset();
 
-      if (! slit->isHidden()) {
-        slit_rect.setRect(slit->getX(), slit->getY(), slit->getWidth() + bwidth,
-                          slit->getHeight() + bwidth);
-        rectlist.push_back(slit_rect);
-      }
+  // find the geomeetery where the moving window currently is
+  const Rect &moving = screen->doOpaqueMove() ? frame.rect : frame.changing;
 
-      RectList::const_iterator it, end = rectlist.end();
-      for (it = rectlist.begin(); it != end; ++it) {
-        bool snapped = False;
-        
-        const Rect &winrect = *it;
-        int dleft = wright - winrect.left(),
-           dright = wleft - winrect.right(),
-             dtop = wbottom - winrect.top(),
-          dbottom = wtop - winrect.bottom();
+  // window corners
+  const int wleft = dx,
+           wright = dx + frame.rect.width() - 1,
+             wtop = dy,
+          wbottom = dy + frame.rect.height() - 1;
 
-        // if the windows are in the same plane vertically
-        if (wtop >= (signed)(winrect.y() - frame.rect.height() + 1) &&
-            wtop < (signed)(winrect.y() + winrect.height() - 1)) {
+  if (snap_to_windows) {
+    RectList rectlist;
+
+    Workspace *w = screen->getWorkspace(getWorkspaceNumber());
+    assert(w);
+
+    // add windows on the workspace to the rect list
+    const BlackboxWindowList& stack_list = w->getStackingList();
+    BlackboxWindowList::const_iterator st_it, st_end = stack_list.end();
+    for (st_it = stack_list.begin(); st_it != st_end; ++st_it)
+      rectlist.push_back( (*st_it)->frameRect() );
+
+    // add the toolbar and the slit to the rect list.
+    // (only if they are not hidden)
+    Toolbar *tbar = screen->getToolbar();
+    Slit *slit = screen->getSlit();
+    Rect tbar_rect, slit_rect;
+    unsigned int bwidth = screen->getBorderWidth() * 2;
+
+    if (! (screen->doHideToolbar() || tbar->isHidden())) {
+      tbar_rect.setRect(tbar->getX(), tbar->getY(), tbar->getWidth() + bwidth,
+                        tbar->getHeight() + bwidth);
+      rectlist.push_back(tbar_rect);
+    }
+
+    if (! slit->isHidden()) {
+      slit_rect.setRect(slit->getX(), slit->getY(), slit->getWidth() + bwidth,
+                        slit->getHeight() + bwidth);
+      rectlist.push_back(slit_rect);
+    }
+
+    RectList::const_iterator it, end = rectlist.end();
+    for (it = rectlist.begin(); it != end; ++it) {
+      bool snapped = False;
+      const Rect &winrect = *it;
+      Rect offsetrect;
+      offsetrect.setCoords(winrect.left() - snap_offset,
+                           winrect.top() - snap_offset,
+                           winrect.right() + snap_offset,
+                           winrect.bottom() + snap_offset);
+
+      if (snap_to_windows == BScreen::WindowResistance)
+        // if the window is already over top of this snap target, then
+        // resistance is futile, so just ignore it
+        if (winrect.intersects(moving))
+          continue;
+
+      int dleft, dright, dtop, dbottom;
+
+      // if the windows are in the same plane vertically
+      if (wtop >= (signed)(winrect.y() - frame.rect.height() + 1) &&
+          wtop < (signed)(winrect.y() + winrect.height() - 1)) {
+
+        if (snap_to_windows == BScreen::WindowResistance) {
+          dleft = wright - offsetrect.left();
+          dright = offsetrect.right() - wleft;
 
           // snap left of other window?
-          if (dleft < resistance_size && dleft > dright) {
-            dx = winrect.left() - frame.rect.width();
+          if (dleft >= 0 && dleft < resistance_size &&
+              dleft < (wright - wleft)) {
+            dx = offsetrect.left() - frame.rect.width();
             snapped = True;
           }
           // snap right of other window?
-          else if (dright < resistance_size) {
-            dx = winrect.right() + 1;
+          else if (dright >= 0 && dright < resistance_size &&
+                   dright < (wright - wleft)) {
+            dx = offsetrect.right() + 1;
             snapped = True;
           }
+        } else { // BScreen::WindowSnap
+          dleft = abs(wright - offsetrect.left());
+          dright = abs(wleft - offsetrect.right());
 
-          if (snapped) {
-            if (screen->getWindowCornerSnap()) {
-              // try corner-snap to its other sides
+          // snap left of other window?
+          if (dleft < snap_distance && dleft <= dright) {
+            dx = offsetrect.left() - frame.rect.width();
+            snapped = True;
+          }
+          // snap right of other window?
+          else if (dright < snap_distance) {
+            dx = offsetrect.right() + 1;
+            snapped = True;
+          }            
+        }
+
+        if (snapped) {
+          if (screen->getWindowCornerSnap()) {
+            // try corner-snap to its other sides
+            if (snap_to_windows == BScreen::WindowResistance) {
+              dtop = winrect.top() - wtop;
+              dbottom = wbottom - winrect.bottom();
+              if (dtop > 0 && dtop < resistance_size) {
+                // if we're already past the top edge, then don't provide
+                // resistance
+                if (moving.top() >= winrect.top())
+                  dy = winrect.top();
+              } else if (dbottom > 0 && dbottom < resistance_size) {
+                // if we're already past the bottom edge, then don't provide
+                // resistance
+                if (moving.bottom() <= winrect.bottom())
+                  dy = winrect.bottom() - frame.rect.height() + 1;
+              }
+            } else { // BScreen::WindowSnap
               dtop = abs(wtop - winrect.top());
               dbottom = abs(wbottom - winrect.bottom());
-              if (dtop < resistance_size && dtop <= dbottom)
+              if (dtop < snap_distance && dtop <= dbottom)
                 dy = winrect.top();
-              else if (dbottom < resistance_size)
+              else if (dbottom < snap_distance)
                 dy = winrect.bottom() - frame.rect.height() + 1;
             }
-
-            continue;
           }
+
+          continue;
         }
+      }
 
-        // if the windows are on the same plane horizontally
-        if (wleft >= (signed)(winrect.x() - frame.rect.width() + 1) &&
-            wleft < (signed)(winrect.x() + winrect.width() - 1)) {
+      // if the windows are on the same plane horizontally
+      if (wleft >= (signed)(winrect.x() - frame.rect.width() + 1) &&
+          wleft < (signed)(winrect.x() + winrect.width() - 1)) {
+
+        if (snap_to_windows == BScreen::WindowResistance) {
+          dtop = wbottom - offsetrect.top();
+          dbottom = offsetrect.bottom() - wtop;
 
           // snap top of other window?
-          if (dtop < resistance_size && dtop > dbottom) {
-            dy = winrect.top() - frame.rect.height();
+          if (dtop >= 0 && dtop < resistance_size && dtop < (wbottom - wtop)) {
+            dy = offsetrect.top() - frame.rect.height();
             snapped = True;
           }
           // snap bottom of other window?
-          else if (dbottom < resistance_size) {
-            dy = winrect.bottom() + 1;
+          else if (dbottom >= 0 && dbottom < resistance_size &&
+                   dbottom < (wbottom - wtop)) {
+            dy = offsetrect.bottom() + 1;
             snapped = True;
           }
+        } else { // BScreen::WindowSnap
+          dtop = abs(wbottom - offsetrect.top());
+          dbottom = abs(wtop - offsetrect.bottom());
 
-          if (snapped) {
-            if (screen->getWindowCornerSnap()) {
-              // try corner-snap to its other sides
+          // snap top of other window?
+          if (dtop < snap_distance && dtop <= dbottom) {
+            dy = offsetrect.top() - frame.rect.height();
+            snapped = True;
+          }
+          // snap bottom of other window?
+          else if (dbottom < snap_distance) {
+            dy = offsetrect.bottom() + 1;
+            snapped = True;
+          }
+
+        }
+
+        if (snapped) {
+          if (screen->getWindowCornerSnap()) {
+            // try corner-snap to its other sides
+            if (snap_to_windows == BScreen::WindowResistance) {
+              dleft = winrect.left() - wleft;
+              dright = wright - winrect.right();
+              if (dleft > 0 && dleft < resistance_size) {
+                // if we're already past the left edge, then don't provide
+                // resistance
+                if (moving.left() >= winrect.left())
+                  dx = winrect.left();
+              } else if (dright > 0 && dright < resistance_size) {
+                // if we're already past the right edge, then don't provide
+                // resistance
+                if (moving.right() <= winrect.right())
+                  dx = winrect.right() - frame.rect.width() + 1;
+              }
+            } else { // BScreen::WindowSnap
               dleft = abs(wleft - winrect.left());
               dright = abs(wright - winrect.right());
-              if (dleft < resistance_size && dleft <= dright)
+              if (dleft < snap_distance && dleft <= dright)
                 dx = winrect.left();
-              else if (dright < resistance_size)
+              else if (dright < snap_distance)
                 dx = winrect.right() - frame.rect.width() + 1;
             }
-
-            continue;
           }
+
+          continue;
         }
       }
     }
+  }
 
-    // snap to the screen edges (and screen boundaries for xinerama)
-    rectlist.clear();
+  if (snap_to_edges) {
+    RectList rectlist;
 
+    // snap to the screen edges (and screen boundaries for xinerama)
 #ifdef    XINERAMA
     if (screen->isXineramaActive() && blackbox->doXineramaSnapping()) {
       rectlist.insert(rectlist.begin(),
@@ -3211,54 +3336,64 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
     RectList::const_iterator it, end = rectlist.end();
     for (it = rectlist.begin(); it != end; ++it) {
       const Rect &srect = *it;
+      Rect offsetrect;
+      offsetrect.setCoords(srect.left() + snap_offset,
+                           srect.top() + snap_offset,
+                           srect.right() - snap_offset,
+                           srect.bottom() - snap_offset);
+
+      if (snap_to_edges == BScreen::WindowResistance) {
+        // if we're not in the rectangle then don't snap to it.
+        if (! srect.contains(moving))
+          continue;
+      } else { // BScreen::WindowSnap
+        // if we're not in the rectangle then don't snap to it.
+        if (! srect.intersects(Rect(wleft, wtop, frame.rect.width(),
+                                    frame.rect.height())))
+          continue;
+      }
 
-      // if we're not in the rectangle then don't snap to it.
-      if (! srect.intersects(Rect(wleft, wtop, frame.rect.width(),
-                                  frame.rect.height())))
-        continue;
-
-      int dleft = wleft - srect.left(),
-         dright = wright - srect.right(),
-           dtop = wtop - srect.top(),
-        dbottom = wbottom - srect.bottom();
+      if (snap_to_edges == BScreen::WindowResistance) {
+      int dleft = offsetrect.left() - wleft,
+         dright = wright - offsetrect.right(),
+           dtop = offsetrect.top() - wtop,
+        dbottom = wbottom - offsetrect.bottom();
 
         // snap left?
-        if (dleft < resistance_size && dleft > dright)
-          dx = srect.left();
+        if (dleft > 0 && dleft < resistance_size)
+          dx = offsetrect.left();
         // snap right?
-        else if (dright < resistance_size)
-          dx = srect.right() - frame.rect.width() + 1;
+        else if (dright > 0 && dright < resistance_size)
+          dx = offsetrect.right() - frame.rect.width() + 1;
 
         // snap top?
-        if (dtop < resistance_size && dtop > dbottom)
-          dy = srect.top();
+        if (dtop > 0 && dtop < resistance_size)
+          dy = offsetrect.top();
         // snap bottom?
-        else if (dbottom < resistance_size)
-          dy = srect.bottom() - frame.rect.height() + 1;
-    }
-  }
-
-  if (screen->doOpaqueMove()) {
-    configure(dx, dy, frame.rect.width(), frame.rect.height());
-  } else {
-    XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
-                   screen->getOpGC(),
-                   frame.changing.x(),
-                   frame.changing.y(),
-                   frame.changing.width() - 1,
-                   frame.changing.height() - 1);
+        else if (dbottom > 0 && dbottom < resistance_size)
+          dy = offsetrect.bottom() - frame.rect.height() + 1;
+      } else { // BScreen::WindowSnap
+        int dleft = abs(wleft - offsetrect.left()),
+           dright = abs(wright - offsetrect.right()),
+             dtop = abs(wtop - offsetrect.top()),
+          dbottom = abs(wbottom - offsetrect.bottom());
 
-    frame.changing.setPos(dx, dy);
+        // snap left?
+        if (dleft < snap_distance && dleft <= dright)
+          dx = offsetrect.left();
+        // snap right?
+        else if (dright < snap_distance)
+          dx = offsetrect.right() - frame.rect.width() + 1;
 
-    XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
-                   screen->getOpGC(),
-                   frame.changing.x(),
-                   frame.changing.y(),
-                   frame.changing.width() - 1,
-                   frame.changing.height() - 1);
+        // snap top?
+        if (dtop < snap_distance && dtop <= dbottom)
+          dy = offsetrect.top();
+        // snap bottom?
+        else if (dbottom < snap_distance)
+          dy = offsetrect.bottom() - frame.rect.height() + 1;
+      }
+    }
   }
-
-  screen->showPosition(dx, dy);
 }