(x_real_positions): Get real position from OS instead of calculating it.

2 files changed, 13 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f3829dcfd55..f6c2b4751ec 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Jason Rumney  <jasonr@gnu.org>
+
+        * w32fns.c (x_real_positions): Get real position from OS instead of
+        calculating it.
+
 2007-07-23  Jason Rumney  <jasonr@gnu.org>
 
         * filelock.c (current_lock_owner): Allow for @ sign in username.
diff --git a/src/w32fns.c b/src/w32fns.c
index 47ca9157623..fcf2761ce98 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -436,20 +436,21 @@ x_real_positions (f, xptr, yptr)
   POINT pt;
   RECT rect;
 
-  GetClientRect(FRAME_W32_WINDOW(f), &rect);
-  AdjustWindowRect(&rect, f->output_data.w32->dwStyle, FRAME_EXTERNAL_MENU_BAR(f));
+  /* Get the bounds of the WM window.  */
+  GetWindowRect (FRAME_W32_WINDOW (f), &rect);
 
-  pt.x = rect.left;
-  pt.y = rect.top;
+  pt.x = 0;
+  pt.y = 0;
 
-  ClientToScreen (FRAME_W32_WINDOW(f), &pt);
+  /* Convert (0, 0) in the client area to screen co-ordinates.  */
+  ClientToScreen (FRAME_W32_WINDOW (f), &pt);
 
   /* Remember x_pixels_diff and y_pixels_diff.  */
   f->x_pixels_diff = pt.x - rect.left;
   f->y_pixels_diff = pt.y - rect.top;
 
-  *xptr = pt.x;
-  *yptr = pt.y;
+  *xptr = rect.left;
+  *yptr = rect.top;
 }