X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWindow.cc;h=7ccca604229fde0018161a59ac8541b06df0bbe7;hb=628a4ff368c09a10a2eb738bac804b9a3025ed64;hp=cd8716e0769a5bdf46430d4ef8c7ad99d858f76b;hpb=a7515b6d85b9cdb97d2365559109af74e68f6ff8;p=chaz%2Fopenbox

diff --git a/src/Window.cc b/src/Window.cc
index cd8716e0..7ccca604 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -316,9 +316,8 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
   // get sticky state from our parent window if we've got one
   if (isTransient() && client.transient_for != (BlackboxWindow *) ~0ul &&
       client.transient_for->isStuck() != flags.stuck)
-    stick();
+    flags.stuck = True;
 
-  // the following flags are set by blackbox native apps only
   if (flags.shaded) {
     flags.shaded = False;
     initial_state = current_state;
@@ -1941,6 +1940,10 @@ void BlackboxWindow::stick(void) {
     blackbox_attrib.attrib ^= AttribOmnipresent;
 
     flags.stuck = False;
+    
+    for (unsigned int i = 0; i < screen->getNumberOfWorkspaces(); ++i)
+      if (i != blackbox_attrib.workspace)
+        screen->getWorkspace(i)->removeWindow(this, True);
 
     if (! flags.iconic)
       screen->reassociateWindow(this, BSENTINEL, True);
@@ -2224,8 +2227,8 @@ void BlackboxWindow::restoreAttributes(void) {
     current_state = NormalState;
   }
 
-  if (net->flags & AttribOmnipresent && net->attrib & AttribOmnipresent) {
-    flags.stuck = False;
+  if (net->flags & AttribOmnipresent && net->attrib & AttribOmnipresent &&
+      ! flags.stuck) {
     stick();
 
     // if the window was on another workspace, it was going to be hidden. this
@@ -3077,9 +3080,18 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
     }
   }
 
-  const int snap_distance = screen->getEdgeSnapThreshold();
+  // how much resistance to edges to provide
+  const int resistance_size = screen->getEdgeSnapThreshold();
+
+  if (resistance_size > 0) {
+    RectList rectlist;
+
+    // the amount of space away from the edge to provide resistance
+    const int resistance_offset = screen->getEdgeSnapThreshold();
+  
+    // find the geomeetery where the moving window currently is
+    const Rect &moving = screen->doOpaqueMove() ? frame.rect : frame.changing;
 
-  if (snap_distance) {
     // window corners
     const int wleft = dx,
               wright = dx + frame.rect.width() - 1,
@@ -3090,17 +3102,13 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
       Workspace *w = screen->getWorkspace(getWorkspaceNumber());
       assert(w);
 
-      RectList winsnaplist;
-
-      // try snap to another window
-
-      // add windows on the workspace to the snap list
+      // 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)
-        winsnaplist.push_back( (*st_it)->frameRect() );
+        rectlist.push_back( (*st_it)->frameRect() );
 
-      // add the toolbar and the slit to the snap list.
+      // add the toolbar and the slit to the rect list.
       // (only if they are not hidden)
       Toolbar *tbar = screen->getToolbar();
       Slit *slit = screen->getSlit();
@@ -3110,35 +3118,42 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
       if (! (screen->doHideToolbar() || tbar->isHidden())) {
         tbar_rect.setRect(tbar->getX(), tbar->getY(), tbar->getWidth() + bwidth,
                           tbar->getHeight() + bwidth);
-        winsnaplist.push_back(tbar_rect);
+        rectlist.push_back(tbar_rect);
       }
 
       if (! slit->isHidden()) {
         slit_rect.setRect(slit->getX(), slit->getY(), slit->getWidth() + bwidth,
                           slit->getHeight() + bwidth);
-        winsnaplist.push_back(slit_rect);
+        rectlist.push_back(slit_rect);
       }
 
-      RectList::const_iterator it, end = winsnaplist.end();
-      for (it = winsnaplist.begin(); it != end; ++it) {
+      RectList::const_iterator it, end = rectlist.end();
+      for (it = rectlist.begin(); it != end; ++it) {
         bool snapped = False;
         
         const Rect &winrect = *it;
-        int dleft = abs(wright - winrect.left()),
-           dright = abs(wleft - winrect.right()),
-             dtop = abs(wbottom - winrect.top()),
-          dbottom = abs(wtop - winrect.bottom());
+        
+        // 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 = wright - winrect.left(),
+           dright = winrect.right() - wleft,
+             dtop = wbottom - winrect.top(),
+          dbottom = winrect.bottom() - wtop;
 
+        // 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)) {
 
           // snap left of other window?
-          if (dleft < snap_distance && dleft <= dright) {
+          if (dleft >= 0 && dleft < resistance_size) {
             dx = winrect.left() - frame.rect.width();
             snapped = True;
           }
           // snap right of other window?
-          else if (dright < snap_distance) {
+          else if (dright >= 0 && dright < resistance_size) {
             dx = winrect.right() + 1;
             snapped = True;
           }
@@ -3146,28 +3161,36 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
           if (snapped) {
             if (screen->getWindowCornerSnap()) {
               // try corner-snap to its other sides
-              dtop = abs(wtop - winrect.top());
-              dbottom = abs(wbottom - winrect.bottom());
-              if (dtop < snap_distance && dtop <= dbottom)
-                dy = winrect.top();
-              else if (dbottom < snap_distance)
-                dy = winrect.bottom() - frame.rect.height() + 1;
+              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;
+              }
             }
 
             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)) {
 
           // snap top of other window?
-          if (dtop < snap_distance && dtop <= dbottom) {
+          if (dtop >= 0 && dtop < resistance_size) {
             dy = winrect.top() - frame.rect.height();
             snapped = True;
           }
           // snap bottom of other window?
-          else if (dbottom < snap_distance) {
+          else if (dbottom >= 0 && dbottom < resistance_size) {
             dy = winrect.bottom() + 1;
             snapped = True;
           }
@@ -3175,12 +3198,19 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
           if (snapped) {
             if (screen->getWindowCornerSnap()) {
               // try corner-snap to its other sides
-              dleft = abs(wleft - winrect.left());
-              dright = abs(wright - winrect.right());
-              if (dleft < snap_distance && dleft <= dright)
-                dx = winrect.left();
-              else if (dright < snap_distance)
-                dx = winrect.right() - frame.rect.width() + 1;
+              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;
+              }
             }
 
             continue;
@@ -3189,44 +3219,43 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
       }
     }
 
-    RectList snaplist; // the list of rects we will try to snap to
-
     // snap to the screen edges (and screen boundaries for xinerama)
+    rectlist.clear();
+
 #ifdef    XINERAMA
     if (screen->isXineramaActive() && blackbox->doXineramaSnapping()) {
-      snaplist.insert(snaplist.begin(),
+      rectlist.insert(rectlist.begin(),
                       screen->getXineramaAreas().begin(),
                       screen->getXineramaAreas().end());
     } else
 #endif // XINERAMA
-      snaplist.push_back(screen->getRect());
+      rectlist.push_back(screen->getRect());
 
-    RectList::const_iterator it, end = snaplist.end();
-    for (it = snaplist.begin(); it != end; ++it) {
+    RectList::const_iterator it, end = rectlist.end();
+    for (it = rectlist.begin(); it != end; ++it) {
       const Rect &srect = *it;
 
       // 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())))
+      if (! srect.contains(moving))
         continue;
 
-      int dleft = abs(wleft - srect.left()),
-         dright = abs(wright - srect.right()),
-           dtop = abs(wtop - srect.top()),
-        dbottom = abs(wbottom - srect.bottom());
+      int dleft = srect.left() - wleft,
+         dright = wright - srect.right(),
+           dtop = srect.top() - wtop,
+        dbottom = wbottom - srect.bottom();
 
         // snap left?
-        if (dleft < snap_distance && dleft <= dright)
+        if (dleft > 0 && dleft < resistance_size)
           dx = srect.left();
         // snap right?
-        else if (dright < snap_distance)
+        else if (dright > 0 && dright < resistance_size)
           dx = srect.right() - frame.rect.width() + 1;
 
         // snap top?
-        if (dtop < snap_distance && dtop <= dbottom)
+        if (dtop > 0 && dtop < resistance_size)
           dy = srect.top();
         // snap bottom?
-        else if (dbottom < snap_distance)
+        else if (dbottom > 0 && dbottom < resistance_size)
           dy = srect.bottom() - frame.rect.height() + 1;
     }
   }