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

[Kim F. Storm]

Index: emacs/src/w32console.c
diff -c emacs/src/w32console.c:1.35 emacs/src/w32console.c:1.36
*** emacs/src/w32console.c:1.35 Fri Mar 21 17:56:52 2003
--- emacs/src/w32console.c      Sat May 24 18:05:05 2003
***************
*** 121,128 ****
  {
    struct frame * f = PICK_FRAME ();
  
!   clear_end_of_line (FRAME_WIDTH (f) - 1);
!   ins_del_lines (cursor_coords.Y, FRAME_HEIGHT (f) - cursor_coords.Y - 1);
  }
  
  /* Clear the frame.  */
--- 121,128 ----
  {
    struct frame * f = PICK_FRAME ();
  
!   clear_end_of_line (FRAME_COLS (f) - 1);
!   ins_del_lines (cursor_coords.Y, FRAME_LINES (f) - cursor_coords.Y - 1);
  }
  
  /* Clear the frame.  */
***************
*** 138,144 ****
    GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
  
    /* Remember that the screen buffer might be wider than the window.  */
!   n = FRAME_HEIGHT (f) * info.dwSize.X;
    dest.X = dest.Y = 0;
  
    FillConsoleOutputAttribute (cur_screen, char_attr_normal, n, dest, &r);
--- 138,144 ----
    GetConsoleScreenBufferInfo (GetStdHandle (STD_OUTPUT_HANDLE), &info);
  
    /* Remember that the screen buffer might be wider than the window.  */
!   n = FRAME_LINES (f) * info.dwSize.X;
    dest.X = dest.Y = 0;
  
    FillConsoleOutputAttribute (cur_screen, char_attr_normal, n, dest, &r);
***************
*** 180,196 ****
    if (n < 0)
      {
        scroll.Top = vpos - n;
!       scroll.Bottom = FRAME_HEIGHT (f);
        dest.Y = vpos;
      }
    else
      {
        scroll.Top = vpos;
!       scroll.Bottom = FRAME_HEIGHT (f) - n;
        dest.Y = vpos + n;
      }
    scroll.Left = 0;
!   scroll.Right = FRAME_WIDTH (f);
  
    dest.X = 0;
  
--- 180,196 ----
    if (n < 0)
      {
        scroll.Top = vpos - n;
!       scroll.Bottom = FRAME_LINES (f);
        dest.Y = vpos;
      }
    else
      {
        scroll.Top = vpos;
!       scroll.Bottom = FRAME_LINES (f) - n;
        dest.Y = vpos + n;
      }
    scroll.Left = 0;
!   scroll.Right = FRAME_COLS (f);
  
    dest.X = 0;
  
***************
*** 213,219 ****
          for (i = scroll.Bottom; i < dest.Y; i++)
              {
              move_cursor (i, 0);
!             clear_end_of_line (FRAME_WIDTH (f));
              }
          }
      }
--- 213,219 ----
          for (i = scroll.Bottom; i < dest.Y; i++)
              {
              move_cursor (i, 0);
!             clear_end_of_line (FRAME_COLS (f));
              }
          }
      }
***************
*** 226,232 ****
          for (i = nb; i < scroll.Top; i++)
              {
              move_cursor (i, 0);
!             clear_end_of_line (FRAME_WIDTH (f));
              }
          }
      }
--- 226,232 ----
          for (i = nb; i < scroll.Top; i++)
              {
              move_cursor (i, 0);
!             clear_end_of_line (FRAME_COLS (f));
              }
          }
      }
***************
*** 256,267 ****
    if (direction == LEFT)
      {
        scroll.Left = cursor_coords.X + dist;
!       scroll.Right = FRAME_WIDTH (f) - 1;
      }
    else
      {
        scroll.Left = cursor_coords.X;
!       scroll.Right = FRAME_WIDTH (f) - dist - 1;
      }
  
    dest.X = cursor_coords.X;
--- 256,267 ----
    if (direction == LEFT)
      {
        scroll.Left = cursor_coords.X + dist;
!       scroll.Right = FRAME_COLS (f) - 1;
      }
    else
      {
        scroll.Left = cursor_coords.X;
!       scroll.Right = FRAME_COLS (f) - dist - 1;
      }
  
    dest.X = cursor_coords.X;
***************
*** 661,676 ****
  
    if (w32_use_full_screen_buffer)
      {
!       FRAME_HEIGHT (SELECTED_FRAME ()) = info.dwSize.Y;       /* lines per 
page */
!       SET_FRAME_WIDTH (SELECTED_FRAME (), info.dwSize.X);  /* characters per 
line */
      }
    else
      {
        /* Lines per page.  Use buffer coords instead of buffer size.  */
!       FRAME_HEIGHT (SELECTED_FRAME ()) = 1 + info.srWindow.Bottom -
        info.srWindow.Top;
        /* Characters per line.  Use buffer coords instead of buffer size.  */
!       SET_FRAME_WIDTH (SELECTED_FRAME (), 1 + info.srWindow.Right -
                       info.srWindow.Left);
      }
  
--- 661,676 ----
  
    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 */
      }
    else
      {
        /* Lines per page.  Use buffer coords instead of buffer size.  */
!       FRAME_LINES (SELECTED_FRAME ()) = 1 + info.srWindow.Bottom -
        info.srWindow.Top;
        /* Characters per line.  Use buffer coords instead of buffer size.  */
!       SET_FRAME_COLS (SELECTED_FRAME (), 1 + info.srWindow.Right -
                       info.srWindow.Left);
      }