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

[Jason Rumney]

Index: emacs/src/w32console.c
diff -c emacs/src/w32console.c:1.42 emacs/src/w32console.c:1.43
*** emacs/src/w32console.c:1.42 Mon Jul  4 16:06:36 2005
--- emacs/src/w32console.c      Wed Jul  6 21:35:43 2005
***************
*** 635,641 ****
    meta_key = 1;
    char_attr_normal = info.wAttributes;
  
!   if (w32_use_full_screen_buffer)
      {
        FRAME_LINES (SELECTED_FRAME ()) = info.dwSize.Y;        /* lines per 
page */
        SET_FRAME_COLS (SELECTED_FRAME (), info.dwSize.X);  /* characters per 
line */
--- 635,658 ----
    meta_key = 1;
    char_attr_normal = info.wAttributes;
  
!   /* Determine if the info returned by GetConsoleScreenBufferInfo
!      is realistic.  Old MS Telnet servers used to only fill out
!      the dwSize portion, even modern one fill the whole struct with
!      garbage when using non-MS telnet clients.  */
!   if ((w32_use_full_screen_buffer
!        && (info.dwSize.Y < 20 || info.dwSize.Y > 100
!          || info.dwSize.X < 40 || info.dwSize.X > 200))
!       || (!w32_use_full_screen_buffer
!         && (info.srWindow.Bottom - info.srWindow.Top < 20
!             || info.srWindow.Bottom - info.srWindow.Top > 100
!             || info.srWindow.Right - info.srWindow.Left < 40
!             || info.srWindow.Right - info.srWindow.Left > 100)))
!     {
!       FRAME_LINES (SELECTED_FRAME ()) = 25;
!       SET_FRAME_COLS (SELECTED_FRAME (), 80);
!     }
! 
!   else if (w32_use_full_screen_buffer)
      {
        FRAME_LINES (SELECTED_FRAME ()) = info.dwSize.Y;        /* lines per 
page */
        SET_FRAME_COLS (SELECTED_FRAME (), info.dwSize.X);  /* characters per 
line */
***************
*** 691,697 ****
  A value of nil means use the current console window dimensions; this
  may be preferrable when working directly at the console with a large
  scroll-back buffer.  */);
!   w32_use_full_screen_buffer = 1;
  
    defsubr (&Sset_screen_color);
    defsubr (&Sset_cursor_size);
--- 708,714 ----
  A value of nil means use the current console window dimensions; this
  may be preferrable when working directly at the console with a large
  scroll-back buffer.  */);
!   w32_use_full_screen_buffer = 0;
  
    defsubr (&Sset_screen_color);
    defsubr (&Sset_cursor_size);