X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=1033d6b0184268cd73b2dd9694dd4ecc092452cd;hb=a488360f48abbfd6e67576a1844d792b28e6065c;hp=71241117ce824627da006a557473c3cbcdce271a;hpb=64c65f3b67364bb82420dbdd05d7e655b1d74d43;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 71241117..1033d6b0 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -1,7 +1,8 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    moveresize.c for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2006        Mikael Magnusson
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -72,7 +73,7 @@ void moveresize_shutdown(gboolean reconfig)
     popup = NULL;
 }
 
-static void popup_coords(ObClient *c, gchar *format, gint a, gint b)
+static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 {
     gchar *text;
 
@@ -81,7 +82,7 @@ static void popup_coords(ObClient *c, gchar *format, gint a, gint b)
         popup_position(popup, SouthGravity,
                        c->frame->area.x
                      + c->frame->area.width/2,
-                       c->frame->area.y);
+                       c->frame->area.y - ob_rr_theme->fbwidth);
     else /* == "Center" */
         popup_position(popup, CenterGravity,
                        c->frame->area.x + c->frame->size.left +
@@ -163,14 +164,14 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     else
         g_assert_not_reached();
 
-    grab_pointer(TRUE, cur);
+    grab_pointer(TRUE, FALSE, cur);
     grab_keyboard(TRUE);
 }
 
 void moveresize_end(gboolean cancel)
 {
     grab_keyboard(FALSE);
-    grab_pointer(FALSE, OB_CURSOR_NONE);
+    grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 
     popup_hide(popup);
 
@@ -192,9 +193,10 @@ void moveresize_end(gboolean cancel)
 
 static void do_move(gboolean resist)
 {
-    if (resist)
+    if (resist) {
         resist_move_windows(moveresize_client, &cur_x, &cur_y);
-    resist_move_monitors(moveresize_client, &cur_x, &cur_y);
+        resist_move_monitors(moveresize_client, &cur_x, &cur_y);
+    }
 
     /* get where the client should be */
     frame_frame_gravity(moveresize_client->frame, &cur_x, &cur_y);
@@ -215,9 +217,10 @@ static void do_resize(gboolean resist)
     cur_y += moveresize_client->frame->size.top +
         moveresize_client->frame->size.bottom;
 
-    if (resist)
+    if (resist) {
         resist_size_windows(moveresize_client, &cur_x, &cur_y, lockcorner);
-    resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+        resist_size_monitors(moveresize_client, &cur_x, &cur_y, lockcorner);
+    }
 
     cur_x -= moveresize_client->frame->size.left +
         moveresize_client->frame->size.right;