summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-06-25 15:38:01 +0000
committerGerd Moellmann <gerd@gnu.org>2001-06-25 15:38:01 +0000
commit80de57df35a9319c21526203f9410dccab354b91 (patch)
tree8636aeed95addbcb5abbe9b49550b234b32d9f6c /src
parentea0a1f53c78b7d997dab4f58f5d752186787b604 (diff)
downloademacs-80de57df35a9319c21526203f9410dccab354b91.tar.gz
(struct x_output): Add member wait_for_wm.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/xterm.h7
2 files changed, 18 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 732dcbd3edf..59f7ca34653 100644
--- 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 aecd5fead07..acd26535f16 100644
--- 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. */