[Emacs-diffs] Changes to emacs/src/xterm.c

[Pavel Janík]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.700 emacs/src/xterm.c:1.701
*** emacs/src/xterm.c:1.700     Sun Jan 13 07:05:37 2002
--- emacs/src/xterm.c   Wed Jan 16 01:48:06 2002
***************
*** 7657,7664 ****
  
  
  /* 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.
  
     RIGHT_P non-zero means return the position of the right edge of the
     glyph, RIGHT_P zero means return the left edge position.
--- 7657,7664 ----
  
  
  /* 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.
  
     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,10861 ****
              f = x_top_window_to_frame (dpyinfo, event.xconfigure.window);
              if (f)
                {
                    /* 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. */
                    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)
--- 10848,10861 ----
              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.  */
                    int dont_resize =
                      ((f->output_data.x->want_fullscreen & FULLSCREEN_WAIT)
                       && FRAME_NEW_WIDTH (f) != 0);
                  int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height);
                  int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width);
                    if (dont_resize)