Redo the whole window offsets and coordinate translation for X.

* frame.h (struct frame): Remove x_pixels_diff, y_pixels_diff.

* w32fns.c (x_real_positions): Remove setting of x_pixels_diff,
y_pixels_diff.

* xfns.c (x_real_pos_and_offsets): New function, basically the code
from x_real_positions.
(x_real_positions): Call x_real_pos_and_offsets.
(x_relative_mouse_position): Use XTranslateCoordinates instead of
OUTER_TO_INNER_DIFF macros.
(Fx_frame_geometry): Get offsets with x_real_pos_and_offsets,
border from window attributes.  Adjust tool bar and menu widths.

* xmenu.c (create_and_show_popup_menu): Use XTranslateCoordinates
instead of OUTER_TO_INNER_DIFF macros.

* xterm.h (struct x_output): Remove x_pixels_outer_diff,
y_pixels_outer_diff, FRAME_OUTER_TO_INNER_DIFF_X,
FRAME_OUTER_TO_INNER_DIFF_Y. Declare x_real_pos_and_offsets.

1 files changed, 22 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1f0781fef10..e4506968baa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2015-02-25  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.h (struct x_output): Remove x_pixels_outer_diff,
+        y_pixels_outer_diff, FRAME_OUTER_TO_INNER_DIFF_X,
+        FRAME_OUTER_TO_INNER_DIFF_Y. Declare x_real_pos_and_offsets.
+
+        * xmenu.c (create_and_show_popup_menu): Use XTranslateCoordinates
+        instead of OUTER_TO_INNER_DIFF macros.
+
+        * xfns.c (x_real_pos_and_offsets): New function, basically the code
+        from x_real_positions.
+        (x_real_positions): Call x_real_pos_and_offsets.
+        (x_relative_mouse_position): Use XTranslateCoordinates instead of
+        OUTER_TO_INNER_DIFF macros.
+        (Fx_frame_geometry): Get offsets with x_real_pos_and_offsets,
+        border from window attributes.  Adjust tool bar and menu widths.
+
+        * w32fns.c (x_real_positions): Remove setting of x_pixels_diff,
+        y_pixels_diff.
+
+        * frame.h (struct frame): Remove x_pixels_diff, y_pixels_diff.
+
 2015-02-25  Paul Eggert  <eggert@cs.ucla.edu>
 
         Backtrace after malloc arena is corrupted