Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-121
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-122
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-123
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-124
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-125
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-108

3 files changed, 30 insertions, 59 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b5944a1866..c1a63aab953 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2004-02-28  Kim F. Storm  <storm@cua.dk>
+
+        * dispnew.c (update_window): Update header line also if there are
+        no other changes in window (move code after set_cursor label).
+
+        * lisp.h (mark_window_display_accurate): Remove prototype.
+
+        * window.c (window_loop, Fforce_window_update): Force mode line
+        updates by setting prevent_redisplay_optimizations_p and
+        update_mode_lines.
+
+2004-02-28  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * xfns.c (x_window): Fixed indentation.
+
+        * xterm.c (x_calc_absolute_position): Call x_real_positions
+        to get WM window sizes and use those to calculate position.
+        (x_set_offset): Removed code commented out.
+
 2004-02-28  Miles Bader  <miles@gnu.org>
 
         * keyboard.c (adjust_point_for_property): #ifdef-out dodgy xassert.
diff --git a/src/xfns.c b/src/xfns.c
index 5b3f8ffe552..9f21cc98502 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2838,7 +2838,7 @@ x_window (f)
 
 #ifdef HAVE_X_I18N
   FRAME_XIC (f) = NULL;
-if (use_xim)
+  if (use_xim)
   {
     BLOCK_INPUT;
     create_frame_xic (f);
diff --git a/src/xterm.c b/src/xterm.c
index 6100eaacffa..feefdf24e81 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8151,65 +8151,24 @@ x_calc_absolute_position (f)
   Window child;
   int win_x = 0, win_y = 0;
   int flags = f->size_hint_flags;
-  int this_window;
 
   /* We have nothing to do if the current position
      is already for the top-left corner.  */
   if (! ((flags & XNegative) || (flags & YNegative)))
     return;
 
-  this_window = FRAME_OUTER_WINDOW (f);
-
-  /* Find the position of the outside upper-left corner of
+  /* Find the offsets of the outside upper-left corner of
      the inner window, with respect to the outer window.
      But do this only if we will need the results.  */
   if (f->output_data.x->parent_desc != FRAME_X_DISPLAY_INFO (f)->root_window)
-    {
-      int count;
-
-      BLOCK_INPUT;
-      count = x_catch_errors (FRAME_X_DISPLAY (f));
-      while (1)
-        {
-          x_clear_errors (FRAME_X_DISPLAY (f));
-          XTranslateCoordinates (FRAME_X_DISPLAY (f),
-
-                                 /* From-window, to-window.  */
-                                 this_window,
-                                 f->output_data.x->parent_desc,
-
-                                 /* From-position, to-position.  */
-                                 0, 0, &win_x, &win_y,
-
-                                 /* Child of win.  */
-                                 &child);
-          if (x_had_errors_p (FRAME_X_DISPLAY (f)))
-            {
-              Window newroot, newparent = 0xdeadbeef;
-              Window *newchildren;
-              unsigned int nchildren;
-
-              if (! XQueryTree (FRAME_X_DISPLAY (f), this_window, &newroot,
-                                &newparent, &newchildren, &nchildren))
-                break;
-
-              XFree ((char *) newchildren);
-
-              f->output_data.x->parent_desc = newparent;
-            }
-          else
-            break;
-        }
-
-      x_uncatch_errors (FRAME_X_DISPLAY (f), count);
-      UNBLOCK_INPUT;
-    }
+    /* This is to get *_pixels_outer_diff.  */
+    x_real_positions (f, &win_x, &win_y);
 
   /* Treat negative positions as relative to the leftmost bottommost
      position that fits on the screen.  */
   if (flags & XNegative)
     f->left_pos = (FRAME_X_DISPLAY_INFO (f)->width
-                   - 2 * f->border_width - win_x
+                   - 2 * FRAME_X_OUTPUT (f)->x_pixels_outer_diff
                    - FRAME_PIXEL_WIDTH (f)
                    + f->left_pos);
 
@@ -8234,8 +8193,12 @@ x_calc_absolute_position (f)
 
   if (flags & YNegative)
     f->top_pos = (FRAME_X_DISPLAY_INFO (f)->height
-                  - 2 * f->border_width
-                  - win_y
+                  - FRAME_X_OUTPUT (f)->y_pixels_outer_diff
+
+                  /* Assume the window manager decorations are the same size on
+                     three sides, i.e. left, right and bottom.  This is to
+                     compensate for the bottom part.  */
+                  - FRAME_X_OUTPUT (f)->x_pixels_outer_diff
                   - height
                   + f->top_pos);
   }
@@ -8279,17 +8242,6 @@ x_set_offset (f, xoff, yoff, change_gravity)
   modified_left = f->left_pos;
   modified_top = f->top_pos;
 
-#if 0 /* Running on psilocin (Debian), and displaying on the NCD X-terminal,
-         this seems to be unnecessary and incorrect.  rms, 4/17/97.  */
-  /* It is a mystery why we need to add the border_width here
-     when the frame is already visible, but experiment says we do.  */
-  if (change_gravity != 0)
-    {
-      modified_left += f->border_width;
-      modified_top += f->border_width;
-    }
-#endif
-
   if (FRAME_X_DISPLAY_INFO (f)->wm_type == X_WMTYPE_A)
     {
       /* Some WMs (twm, wmaker at least) has an offset that is smaller