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

diff --git a/src/Window.cc b/src/Window.cc
index 2d183749..fa49ec21 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -57,6 +57,7 @@ extern "C" {
 #include "Window.hh"
 #include "Windowmenu.hh"
 #include "Workspace.hh"
+#include "Slit.hh"
 
 using std::string;
 using std::abs;
@@ -107,11 +108,6 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
     return;
   }
 
-#ifdef DEBUG
-  fprintf(stderr, "0x%lx: initial (%d, %d) w: %d, h: %d\n", client.window,
-          wattrib.x, wattrib.y, wattrib.width, wattrib.height);
-#endif // DEBUG
-
   // set the eventmask early in the game so that we make sure we get
   // all the events we are interested in
   XSetWindowAttributes attrib_set;
@@ -167,36 +163,31 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
   client.rect.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
   client.old_bw = wattrib.border_width;
 
-  windowmenu = 0;
   lastButtonPressTime = 0;
 
   timer = new BTimer(blackbox, this);
   timer->setTimeout(blackbox->getAutoRaiseDelay());
 
+  windowmenu = new Windowmenu(this);
+
+  // get size, aspect, minimum/maximum size and other hints set by the
+  // client
+
   if (! getBlackboxHints()) {
     getMWMHints();
     getNetWMHints();
   }
 
-  // get size, aspect, minimum/maximum size and other hints set by the
-  // client
   getWMProtocols();
   getWMHints();
   getWMNormalHints();
 
-#ifdef DEBUG
-  fprintf(stderr, "0x%lx: after hints (%d, %d) w: %d, h: %d\n", client.window,
-          client.rect.x(), client.rect.y(),
-          client.rect.width(), client.rect.height());
-#endif // DEBUG
-
   frame.window = createToplevelWindow();
-  frame.plate = createChildWindow(frame.window);
-  associateClientWindow();
 
   blackbox->saveWindowSearch(frame.window, this);
+  
+  frame.plate = createChildWindow(frame.window);
   blackbox->saveWindowSearch(frame.plate, this);
-  blackbox->saveWindowSearch(client.window, this);
 
   // determine if this is a transient window
   getTransientInfo();
@@ -206,6 +197,7 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
   getWindowType();
 
   // adjust the window decorations/behavior based on the window type
+
   switch (window_type) {
   case Type_Desktop:
   case Type_Dock:
@@ -230,6 +222,8 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
     // normal windows retain all of the possible decorations and functionality
     break;
   }
+  
+  setAllowedActions();
 
   // further adjeust the window's decorations/behavior based on window sizes
   if ((client.normal_hint_flags & PMinSize) &&
@@ -239,17 +233,16 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
     decorations &= ~(Decor_Maximize | Decor_Handle);
     functions &= ~(Func_Resize | Func_Maximize);
   }
-  upsize();
+  
+  if (decorations & Decor_Titlebar)
+    createTitlebar();
 
-#ifdef DFEBUG
-  fprintf(stderr, "0x%lx: sizes reflect the frame from now on\n",
-          client.window);
-  fprintf(stderr, "0x%lx: after upsize (%d, %d) w: %d, h: %d\n", client.window,
-          frame.rect.x(), frame.rect.y(),
-          frame.rect.width(), frame.rect.height());
-#endif // DEBUG
+  if (decorations & Decor_Handle)
+    createHandle();
 
-  setAllowedActions();
+  // apply the size and gravity hint to the frame
+
+  upsize();
 
   bool place_window = True;
   if (blackbox->isStartup() || isTransient() ||
@@ -260,30 +253,18 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
       place_window = False;
   }
 
-#ifdef DEBUG
-  fprintf(stderr, "0x%lx: after gravity (%d, %d) w: %d, h: %d\n",
-          client.window,
-          frame.rect.x(), frame.rect.y(),
-          frame.rect.width(), frame.rect.height());
-#endif // DEBUG
-
   // add the window's strut. note this is done *after* placing the window.
   screen->addStrut(&client.strut);
   updateStrut();
   
-  if (decorations & Decor_Titlebar)
-    createTitlebar();
-
-  if (decorations & Decor_Handle)
-    createHandle();
-
 #ifdef    SHAPE
-  if (blackbox->hasShapeExtensions() && flags.shaped) {
+  if (blackbox->hasShapeExtensions() && flags.shaped)
     configureShape();
-  }
 #endif // SHAPE
-
-  windowmenu = new Windowmenu(this);
+  
+  // get the window's title before adding it to the workspace
+  getWMName();
+  getWMIconName();
 
   if (blackbox_attrib.workspace >= screen->getWorkspaceCount())
     screen->getCurrentWorkspace()->addWindow(this, place_window);
@@ -291,20 +272,41 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
     screen->getWorkspace(blackbox_attrib.workspace)->
       addWindow(this, place_window);
 
+  /*
+    the server needs to be grabbed here to prevent client's from sending
+    events while we are in the process of configuring their window.
+    We hold the grab until after we are done moving the window around.
+  */
+
+  XGrabServer(blackbox->getXDisplay());
+
+  associateClientWindow();
+
+  blackbox->saveWindowSearch(client.window, this);
+
   if (! place_window) {
     // don't need to call configure if we are letting the workspace
     // place the window
     configure(frame.rect.x(), frame.rect.y(),
               frame.rect.width(), frame.rect.height());
 
-#ifdef DEBUG
-    fprintf(stderr, "0x%lx: after configure (%d, %d) w: %d, h: %d\n",
-            client.window,
-            frame.rect.x(), frame.rect.y(),
-            frame.rect.width(), frame.rect.height());
-#endif // DEBUG
   }
 
+  positionWindows();
+
+  XUngrabServer(blackbox->getXDisplay());
+
+  // now that we know where to put the window and what it should look like
+  // we apply the decorations
+  decorate();
+
+  grabButtons();
+
+  XMapSubwindows(blackbox->getXDisplay(), frame.window);
+
+  // this ensures the title, buttons, and other decor are properly displayed
+  redrawWindowFrame();
+
   // preserve the window's initial state on first map, and its current state
   // across a restart
   unsigned long initial_state = current_state;
@@ -314,7 +316,7 @@ 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;
 
   if (flags.shaded) {
     flags.shaded = False;
@@ -336,31 +338,6 @@ BlackboxWindow::BlackboxWindow(Blackbox *b, Window w, BScreen *s) {
 
   if (flags.maximized && (functions & Func_Maximize))
     remaximize();
-
-  /*
-    When the window is mapped (and also when its attributes are restored), the
-    current_state that was set here will be used.
-    It is set to Normal if the window is to be mapped or it is set to Iconic
-    if the window is to be iconified.
-    *Note* that for sticky windows, the same rules apply here, they are in
-    fact never set to Iconic since there is no way for us to tell if a sticky
-    window was iconified previously.
-  */
- 
-  positionWindows();
-  decorate();
-  grabButtons();
-
-  XMapSubwindows(blackbox->getXDisplay(), frame.window);
-
-  redrawWindowFrame();
-
-#ifdef DEBUG
-  fprintf(stderr, "0x%lx: end of constructor (%d, %d) w: %d, h: %d\n",
-          client.window,
-          frame.rect.x(), frame.rect.y(),
-          frame.rect.width(), frame.rect.height());
-#endif // DEBUG
 }
 
 
@@ -475,15 +452,15 @@ Window BlackboxWindow::createChildWindow(Window parent, Cursor cursor) {
 
 void BlackboxWindow::associateClientWindow(void) {
   XSetWindowBorderWidth(blackbox->getXDisplay(), client.window, 0);
-  getWMName();
-  getWMIconName();
 
   XChangeSaveSet(blackbox->getXDisplay(), client.window, SetModeInsert);
 
   XSelectInput(blackbox->getXDisplay(), frame.plate, SubstructureRedirectMask);
 
-  XGrabServer(blackbox->getXDisplay());
-
+  /*
+    note we used to grab around this call to XReparentWindow however the
+    server is now grabbed before this method is called
+  */
   unsigned long event_mask = PropertyChangeMask | FocusChangeMask |
                              StructureNotifyMask;
   XSelectInput(blackbox->getXDisplay(), client.window,
@@ -491,12 +468,9 @@ void BlackboxWindow::associateClientWindow(void) {
   XReparentWindow(blackbox->getXDisplay(), client.window, frame.plate, 0, 0);
   XSelectInput(blackbox->getXDisplay(), client.window, event_mask);
 
-  XUngrabServer(blackbox->getXDisplay());
-
   XRaiseWindow(blackbox->getXDisplay(), frame.plate);
   XMapSubwindows(blackbox->getXDisplay(), frame.plate);
 
-
 #ifdef    SHAPE
   if (blackbox->hasShapeExtensions()) {
     XShapeSelectInput(blackbox->getXDisplay(), client.window,
@@ -883,9 +857,7 @@ void BlackboxWindow::grabButtons(void) {
 
 
 void BlackboxWindow::ungrabButtons(void) {
-  if (! screen->isSloppyFocus() || screen->doClickRaise())
-    blackbox->ungrabButton(Button1, 0, frame.plate);
-
+  blackbox->ungrabButton(Button1, 0, frame.plate);
   blackbox->ungrabButton(Button1, ModMask, frame.window);
   blackbox->ungrabButton(Button2, ModMask, frame.window);
   blackbox->ungrabButton(Button3, ModMask, frame.window);
@@ -1568,9 +1540,8 @@ void BlackboxWindow::configureShape(void) {
 bool BlackboxWindow::setInputFocus(void) {
   if (flags.focused) return True;
 
-  assert(! flags.iconic &&
-         (flags.stuck ||  // window must be on the current workspace or sticky
-          blackbox_attrib.workspace == screen->getCurrentWorkspaceID()));
+  assert(flags.stuck ||  // window must be on the current workspace or sticky
+         blackbox_attrib.workspace == screen->getCurrentWorkspaceID());
 
   /*
      We only do this check for normal windows and dialogs because other windows
@@ -1659,6 +1630,11 @@ void BlackboxWindow::iconify(void) {
   setState(IconicState);
 
   screen->getWorkspace(blackbox_attrib.workspace)->removeWindow(this);
+  if (flags.stuck) {
+    for (unsigned int i = 0; i < screen->getNumberOfWorkspaces(); ++i)
+      if (i != blackbox_attrib.workspace)
+        screen->getWorkspace(i)->removeWindow(this, True);
+  }
 
   if (isTransient()) {
     if (client.transient_for != (BlackboxWindow *) ~0ul &&
@@ -1963,12 +1939,12 @@ void BlackboxWindow::stick(void) {
     blackbox_attrib.flags ^= AttribOmnipresent;
     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);
 
-    flags.stuck = False;
-
     if (! flags.iconic)
       screen->reassociateWindow(this, BSENTINEL, True);
     // temporary fix since sticky windows suck. set the hint to what we
@@ -2251,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
@@ -2627,12 +2603,6 @@ void BlackboxWindow::mapRequestEvent(const XMapRequestEvent *re) {
   case InactiveState:
   case ZoomState:
   default:
-#ifdef DEBUG
-    fprintf(stderr, "0x%lx: just before show (%d, %d) w: %d, h: %d\n",
-            client.window,
-            frame.rect.x(), frame.rect.y(),
-            frame.rect.width(), frame.rect.height());
-#endif // DEBUG
     show();
     screen->getWorkspace(blackbox_attrib.workspace)->raiseWindow(this);
     if (isNormal()) {
@@ -2726,12 +2696,6 @@ void BlackboxWindow::propertyNotifyEvent(const XPropertyEvent *pe) {
     }
 
     reconfigure();
-#ifdef DEBUG
-    fprintf(stderr, "0x%lx: transient hint (%d, %d) w: %d, h: %d\n",
-            client.window,
-            frame.rect.x(), frame.rect.y(),
-            frame.rect.width(), frame.rect.height());
-#endif
   }
     break;
 
@@ -2784,12 +2748,6 @@ void BlackboxWindow::propertyNotifyEvent(const XPropertyEvent *pe) {
     if (old_rect != frame.rect)
       reconfigure();
 
-#ifdef DEBUG
-    fprintf(stderr, "0x%lx: normal hint (%d, %d) w: %d, h: %d\n",
-            client.window,
-            frame.rect.x(), frame.rect.y(),
-            frame.rect.width(), frame.rect.height());
-#endif // DEBUG
     break;
   }
 
@@ -2849,19 +2807,11 @@ void BlackboxWindow::configureRequestEvent(const XConfigureRequestEvent *cr) {
       applyGravity(req);
     }
 
-    if (cr->value_mask & CWWidth) {
+    if (cr->value_mask & CWWidth)
       req.setWidth(cr->width + frame.margin.left + frame.margin.right);
-#ifdef DEBUG
-      fprintf(stderr, "0x%lx: new width - %d\n", client.window, cr->width);
-#endif // DEBUG
-    }
 
-    if (cr->value_mask & CWHeight) {
+    if (cr->value_mask & CWHeight)
       req.setHeight(cr->height + frame.margin.top + frame.margin.bottom);
-#ifdef DEBUG
-      fprintf(stderr, "0x%lx: new height - %d\n", client.window, cr->height);
-#endif // DEBUG
-    }
 
     configure(req.x(), req.y(), req.width(), req.height());
   }
@@ -2880,13 +2830,6 @@ void BlackboxWindow::configureRequestEvent(const XConfigureRequestEvent *cr) {
       break;
     }
   }
-
-#ifdef DEBUG
-  fprintf(stderr, "0x%lx: change request (%d, %d) w: %d, h: %d\n",
-          client.window,
-          frame.rect.x(), frame.rect.y(),
-          frame.rect.width(), frame.rect.height());
-#endif // DEBUG
 }
 
 
@@ -3084,103 +3027,217 @@ 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();
 
-  const int snap_distance = screen->getEdgeSnapThreshold();
+  /*
+     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->getResistanceSize();
+
+  // how far away to snap
+  const int snap_distance = screen->getSnapThreshold();
+
+  // 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();
+
+  // find the geomeetery where the moving window currently is
+  const Rect &moving = screen->doOpaqueMove() ? frame.rect : frame.changing;
+
+  // window corners
+  const int wleft = dx,
+           wright = dx + frame.rect.width() - 1,
+             wtop = dy,
+          wbottom = dy + frame.rect.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);
+    }
 
-  if (snap_distance) {
-    // window corners
-    const int wleft = dx,
-              wright = dx + frame.rect.width() - 1,
-              wtop = dy,
-              wbottom = dy + frame.rect.height() - 1;
+    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 (screen->getWindowToWindowSnap()) {
-      Workspace *w = screen->getWorkspace(getWorkspaceNumber());
-      assert(w);
+      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;
 
-      // try snap to another window
-      for (unsigned int i = 0, c = w->getCount(); i < c; ++i) {
-        BlackboxWindow *snapwin = w->getWindow(i);
-        if (snapwin == this)
-          continue;   // don't snap to self
+      int dleft, dright, dtop, dbottom;
 
-        bool snapped = False;
-        
-        const Rect &winrect = snapwin->frameRect();
-        int dleft = abs(wright - winrect.left()),
-           dright = abs(wleft - winrect.right()),
-             dtop = abs(wbottom - winrect.top()),
-          dbottom = abs(wtop - winrect.bottom());
+      // 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 (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 >= 0 && dleft < resistance_size &&
+              dleft < (wright - wleft)) {
+            dx = offsetrect.left() - frame.rect.width();
+            snapped = True;
+          }
+          // snap right of other window?
+          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());
 
           // snap left of other window?
           if (dleft < snap_distance && dleft <= dright) {
-            dx = winrect.left() - frame.rect.width();
+            dx = offsetrect.left() - frame.rect.width();
             snapped = True;
           }
           // snap right of other window?
           else if (dright < snap_distance) {
-            dx = winrect.right() + 1;
+            dx = offsetrect.right() + 1;
             snapped = True;
-          }
+          }            
+        }
 
-          if (snapped) {
-            if (screen->getWindowCornerSnap()) {
-              // try corner-snap to its other sides
+        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 < snap_distance && dtop <= dbottom)
@@ -3188,28 +3245,66 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
               else if (dbottom < snap_distance)
                 dy = winrect.bottom() - frame.rect.height() + 1;
             }
-
-            continue;
           }
+
+          continue;
         }
+      }
 
-        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 >= 0 && dtop < resistance_size && dtop < (wbottom - wtop)) {
+            dy = offsetrect.top() - frame.rect.height();
+            snapped = True;
+          }
+          // snap bottom of other window?
+          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());
 
           // snap top of other window?
           if (dtop < snap_distance && dtop <= dbottom) {
-            dy = winrect.top() - frame.rect.height();
+            dy = offsetrect.top() - frame.rect.height();
             snapped = True;
           }
           // snap bottom of other window?
           else if (dbottom < snap_distance) {
-            dy = winrect.bottom() + 1;
+            dy = offsetrect.bottom() + 1;
             snapped = True;
           }
 
-          if (snapped) {
-            if (screen->getWindowCornerSnap()) {
-              // try corner-snap to its other sides
+        }
+
+        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 < snap_distance && dleft <= dright)
@@ -3217,88 +3312,88 @@ void BlackboxWindow::doMove(int x_root, int y_root) {
               else if (dright < snap_distance)
                 dx = winrect.right() - frame.rect.width() + 1;
             }
-
-            continue;
           }
+
+          continue;
         }
       }
     }
+  }
 
-    RectList snaplist; // the list of rects we will try to snap to
+  if (snap_to_edges) {
+    RectList rectlist;
 
-    // snap to the strut (and screen boundaries for xinerama)
+    // snap to the screen edges (and screen boundaries for xinerama)
 #ifdef    XINERAMA
     if (screen->isXineramaActive() && blackbox->doXineramaSnapping()) {
-      if (! screen->doFullMax())
-        snaplist.insert(snaplist.begin(),
-                        screen->allAvailableAreas().begin(),
-                        screen->allAvailableAreas().end());
-
-      // always snap to the screen edges
-      snaplist.insert(snaplist.begin(),
+      rectlist.insert(rectlist.begin(),
                       screen->getXineramaAreas().begin(),
                       screen->getXineramaAreas().end());
     } else
 #endif // XINERAMA
-    {
-      if (! screen->doFullMax())
-        snaplist.push_back(screen->availableArea());
+      rectlist.push_back(screen->getRect());
 
-      // always snap to the screen edges
-      snaplist.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;
+      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;
+      if (snap_to_edges == BScreen::WindowResistance) {
+      int dleft = offsetrect.left() - wleft,
+         dright = wright - offsetrect.right(),
+           dtop = offsetrect.top() - wtop,
+        dbottom = wbottom - offsetrect.bottom();
 
-      int dleft = abs(wleft - srect.left()),
-         dright = abs(wright - srect.right()),
-           dtop = abs(wtop - srect.top()),
-        dbottom = abs(wbottom - srect.bottom());
+        // snap left?
+        if (dleft > 0 && dleft < resistance_size)
+          dx = offsetrect.left();
+        // snap right?
+        else if (dright > 0 && dright < resistance_size)
+          dx = offsetrect.right() - frame.rect.width() + 1;
+
+        // snap top?
+        if (dtop > 0 && dtop < resistance_size)
+          dy = offsetrect.top();
+        // snap bottom?
+        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());
 
         // snap left?
         if (dleft < snap_distance && dleft <= dright)
-          dx = srect.left();
+          dx = offsetrect.left();
         // snap right?
         else if (dright < snap_distance)
-          dx = srect.right() - frame.rect.width() + 1;
+          dx = offsetrect.right() - frame.rect.width() + 1;
 
         // snap top?
         if (dtop < snap_distance && dtop <= dbottom)
-          dy = srect.top();
+          dy = offsetrect.top();
         // snap bottom?
         else if (dbottom < snap_distance)
-          dy = srect.bottom() - frame.rect.height() + 1;
+          dy = offsetrect.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);
-
-    frame.changing.setPos(dx, dy);
-
-    XDrawRectangle(blackbox->getXDisplay(), screen->getRootWindow(),
-                   screen->getOpGC(),
-                   frame.changing.x(),
-                   frame.changing.y(),
-                   frame.changing.width() - 1,
-                   frame.changing.height() - 1);
-  }
-
-  screen->showPosition(dx, dy);
 }
 
 
@@ -3564,7 +3659,8 @@ void BlackboxWindow::restore(bool remap) {
   XSelectInput(blackbox->getXDisplay(), frame.plate, NoEventMask);
 
   // do not leave a shaded window as an icon unless it was an icon
-  if (flags.shaded && ! flags.iconic) setState(NormalState);
+  if (flags.shaded && ! flags.iconic)
+    setState(NormalState);
 
   restoreGravity(client.rect);