* w32term.c (w32_read_socket): Remove call to x_check_fullscreen_move,

that function is removed.

* xterm.c (x_set_offset): Use move_offset_left/top instead of
x/y_pixels_outer_diff.
(x_check_expected_move): Calculate move_offset_left/top.

* xterm.h (struct x_output): New members: move_offset_top/left.

* frame.c (x_set_frame_parameters): x_fullscreen_move removed,
call x_set_offset directly.

* frame.h (enum): FULLSCREEN_MOVE_WAIT removed.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/xterm.h b/src/xterm.h
index 5f8a1af0444..fbd268abda2 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -625,10 +625,14 @@ struct x_output
   int focus_state;
 
   /* The latest move we made to FRAME_OUTER_WINDOW.  Saved so we can
-     compensate for type A WMs (see wm_type in dpyinfo above.  */
+     compensate for type A WMs (see wm_type in dpyinfo above).  */
   int expected_top;
   int expected_left;
 
+  /* The offset we need to add to compensate for type A WMs.  */
+  int move_offset_top;
+  int move_offset_left;
+
   /* Nonzero if we have made a move and needs to check if the WM placed us
      at the right position.  */
   int check_expected_move;