[Emacs-diffs] Changes to emacs/src/xterm.c

[Jan Djärv]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.814 emacs/src/xterm.c:1.815
*** emacs/src/xterm.c:1.814     Sun Oct  5 08:15:37 2003
--- emacs/src/xterm.c   Sun Oct  5 09:42:03 2003
***************
*** 8337,8344 ****
  
    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;
      }
  
    XMoveWindow (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
--- 8337,8347 ----
  
    if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_A)
      {
!       /* 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,8409 ****
    {
      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;
          x_set_offset (f, expect_left, expect_top, 1);
        }
      else if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_UNKNOWN)
--- 8402,8414 ----
    {
      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)
        {
!         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)