diff options
| author | Pavel Janík | 2002-01-16 06:48:30 +0000 |
|---|---|---|
| committer | Pavel Janík | 2002-01-16 06:48:30 +0000 |
| commit | 7a4bce146c78c19c8d9477d067bb13547cb24248 (patch) | |
| tree | 162ad42a38380eace11be9e5158001d08f3527eb /src/xterm.c | |
| parent | 4b41cebbeff1337081dea113afa2d0b379f12568 (diff) | |
| download | emacs-7a4bce146c78c19c8d9477d067bb13547cb24248.tar.gz emacs-7a4bce146c78c19c8d9477d067bb13547cb24248.zip | |
(XTread_socket) [!USE_X_TOOLKIT]: Compute the value of `dont_resize' only
when used.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
| 7657 | 7657 | ||
| 7658 | 7658 | ||
| 7659 | /* Find the position of the glyph for position POS in OBJECT in | 7659 | /* Find the position of the glyph for position POS in OBJECT in |
| 7660 | window W's current matrix, and return in *X/*Y the pixel | 7660 | window W's current matrix, and return in *X, *Y the pixel |
| 7661 | coordinates, and return in *HPOS/*VPOS the column/row of the glyph. | 7661 | coordinates, and return in *HPOS, *VPOS the column/row of the glyph. |
| 7662 | 7662 | ||
| 7663 | RIGHT_P non-zero means return the position of the right edge of the | 7663 | RIGHT_P non-zero means return the position of the right edge of the |
| 7664 | glyph, RIGHT_P zero means return the left edge position. | 7664 | glyph, RIGHT_P zero means return the left edge position. |
| @@ -10848,14 +10848,14 @@ XTread_socket (sd, bufp, numchars, expected) | |||
| 10848 | f = x_top_window_to_frame (dpyinfo, event.xconfigure.window); | 10848 | f = x_top_window_to_frame (dpyinfo, event.xconfigure.window); |
| 10849 | if (f) | 10849 | if (f) |
| 10850 | { | 10850 | { |
| 10851 | #ifndef USE_X_TOOLKIT | ||
| 10851 | /* If there is a pending resize for fullscreen, don't | 10852 | /* If there is a pending resize for fullscreen, don't |
| 10852 | do this one, the right one will come later. | 10853 | do this one, the right one will come later. |
| 10853 | The toolkit version doesn't seem to need this, but we | 10854 | The toolkit version doesn't seem to need this, but we |
| 10854 | need to reset it below. */ | 10855 | need to reset it below. */ |
| 10855 | int dont_resize = | 10856 | int dont_resize = |
| 10856 | ((f->output_data.x->want_fullscreen & FULLSCREEN_WAIT) | 10857 | ((f->output_data.x->want_fullscreen & FULLSCREEN_WAIT) |
| 10857 | && FRAME_NEW_WIDTH (f) != 0); | 10858 | && FRAME_NEW_WIDTH (f) != 0); |
| 10858 | #ifndef USE_X_TOOLKIT | ||
| 10859 | int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height); | 10859 | int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height); |
| 10860 | int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width); | 10860 | int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width); |
| 10861 | if (dont_resize) | 10861 | if (dont_resize) |