From: Pavel Janík <Pavel@Janik.cz>
Date: Wed, 16 Jan 2002 06:48:30 +0000 (+0000)
Subject: (XTread_socket) [!USE_X_TOOLKIT]: Compute the value of `dont_resize' only
X-Git-Tag: ttn-vms-21-2-B4~17123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7a4bce146c78c19c8d9477d067bb13547cb24248;p=emacs.git

(XTread_socket) [!USE_X_TOOLKIT]: Compute the value of `dont_resize' only
when used.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7565f3cc8e5..07153e47d4e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* xterm.c (XTread_socket) [!USE_X_TOOLKIT]: Compute the value of
+	`dont_resize' only when used.
+
+	* xdisp.c: Remove forgotten extern declaration of `Qimage'.
+
 2002-01-15  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* xdisp.c (display_mode_element): When computing charpos, depend
diff --git a/src/xterm.c b/src/xterm.c
index 9819bc8bc82..77860842d57 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7657,8 +7657,8 @@ fast_find_position (w, pos, hpos, vpos, x, y, stop)
 
 
 /* Find the position of the glyph for position POS in OBJECT in
-   window W's current matrix, and return in *X/*Y the pixel
-   coordinates, and return in *HPOS/*VPOS the column/row of the glyph.
+   window W's current matrix, and return in *X, *Y the pixel
+   coordinates, and return in *HPOS, *VPOS the column/row of the glyph.
 
    RIGHT_P non-zero means return the position of the right edge of the
    glyph, RIGHT_P zero means return the left edge position.
@@ -10848,14 +10848,14 @@ XTread_socket (sd, bufp, numchars, expected)
 	      f = x_top_window_to_frame (dpyinfo, event.xconfigure.window);
 	      if (f)
 		{
+#ifndef USE_X_TOOLKIT
                   /* If there is a pending resize for fullscreen, don't
                      do this one, the right one will come later.
 		     The toolkit version doesn't seem to need this, but we
-		     need to reset it below. */
+		     need to reset it below.  */
                   int dont_resize =
                     ((f->output_data.x->want_fullscreen & FULLSCREEN_WAIT)
                      && FRAME_NEW_WIDTH (f) != 0);
-#ifndef USE_X_TOOLKIT
 		  int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height);
 		  int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width);
                   if (dont_resize)