* 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, 10 insertions, 5 deletions

diff --git a/src/xterm.c b/src/xterm.c
index c563757e63b..c686824a003 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8337,8 +8337,11 @@ x_set_offset (f, xoff, yoff, change_gravity)
 
   if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_A)
     {
-      modified_left += FRAME_X_OUTPUT (f)->x_pixels_outer_diff;
-      modified_top += FRAME_X_OUTPUT (f)->y_pixels_outer_diff;
+      /* Some WMs (twm, wmaker at least) has an offset that is smaller
+         than the WM decorations.  So we use the calculated offset instead
+         of the WM decoration sizes here (x/y_pixels_outer_diff).  */
+      modified_left += FRAME_X_OUTPUT (f)->move_offset_left;
+      modified_top += FRAME_X_OUTPUT (f)->move_offset_top;
     }
 
   XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
@@ -8399,11 +8402,13 @@ x_check_expected_move (f)
   {
     int expect_top = FRAME_X_OUTPUT (f)->expected_top;
     int expect_left = FRAME_X_OUTPUT (f)->expected_left;
-    
+
     if (expect_top != f->top_pos || expect_left != f->left_pos)
       {
-        if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN)
-          FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_A;
+        FRAME_X_DISPLAY_INFO (f)->wm_type = X_WMTYPE_A;
+        FRAME_X_OUTPUT (f)->move_offset_left = expect_left - f->left_pos;
+        FRAME_X_OUTPUT (f)->move_offset_top = expect_top - f->top_pos;
+
         x_set_offset (f, expect_left, expect_top, 1);
       }
     else if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN)