(struct x_output): Add member wait_for_wm.

diff --git a/src/ChangeLog b/src/ChangeLog
index 732dcbd3edfe50387d5429b6e30cd11d31e42a6b..59f7ca34653fd5139e29df86c3d8dc80ca83e18c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2001-06-25  Gerd Moellmann  <gerd@gnu.org>
 
+       * widget.c (EmacsFrameSetCharSize): Set XtNwaitForWm depending
+       on the value of the wait-for-wm frame parameter.
+
+       * xterm.h (struct x_output): Add member wait_for_wm.
+
+       * xfns.c (Qwait_for_wm): New variable.
+       (x_frame_parms): Add entry for `wait-for-wm".
+       (x_set_wait_for_wm): New function.
+       (Fx_create_frame): Call x_default_parameter for wait-for-wm.
+       (syms_of_xfns): Initialize and staticpro Qwait_for_wm.
+
        * xdisp.c (try_window_id) <all changes below window end>: Don't
        take this shortcut if ZV is visible in the window.
        (try_window_id): When checking for window start being in changed

diff --git a/src/xterm.h b/src/xterm.h
index aecd5fead073ff8e2d0532109c30d3650bc32431..acd26535f16576bd3f8f1ae140686f0f8282f0b0 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -581,6 +581,13 @@ struct x_output
   /* The background for which the above relief GCs were set up.
      They are changed only when a different background is involved.  */
   unsigned long relief_background;
+
+  /* Xt waits for a ConfigureNotify event from the window manager in
+     EmacsFrameSetCharSize when the shell widget is resized.  For some
+     window managers like fvwm2 2.2.5 and KDE 2.1 this event doesn't
+     arrive for an unknown reason and Emacs hangs in Xt.  If this is
+     zero, tell Xt not to wait.  */
+  int wait_for_wm;
 };
 
 /* Return the X window used for displaying data in frame F.  */