mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 07:41:28 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
when used.
This commit is contained in:
Pavel Janík 2002-01-16 06:48:30 +00:00
parent 4b41cebbef
commit 7a4bce146c
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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

8
src/xterm.c
View file

@ -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)