M ChangeLog → ChangeLog

@@ -1,6 +1,8 @@ 
 (Format: Year/Month/Day)
 Changes for 0.9.2:
 *03/05/04:
+   * Fix warping with multiple screens (Simon)
+     Window.cc
    * Set many key events/commands to act on the screen the mouse is on,
      rather than the focused window (Simon)
      fluxbox.cc

M src/Window.cc → src/Window.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.156 2003/05/01 13:19:36 rathnor Exp $
+// $Id: Window.cc,v 1.157 2003/05/04 13:55:39 rathnor Exp $
 
 #include "Window.hh"
 
@@ -2273,7 +2273,7 @@ !isResizing()) {
 
         if (! isMoving()) {
             startMoving(me.window);
-        } else {			
+        } else {
             int dx = me.x_root - button_grab_x, 
                 dy = me.y_root - button_grab_y;
 
@@ -2627,7 +2627,7 @@ // grabbing (and masking) on the root window allows us to
     // freely map and unmap the window we're moving.
     XGrabPointer(display, screen.getRootWindow(), False, Button1MotionMask |
                  ButtonReleaseMask, GrabModeAsync, GrabModeAsync,
-                 None, fluxbox->getMoveCursor(), CurrentTime);
+                 screen.getRootWindow(), fluxbox->getMoveCursor(), CurrentTime);
 
     if (m_windowmenu.isVisible())
         m_windowmenu.hide();