[Win32forth-cvs] win32forth-extsrc/extsrc/w32fConsole Console.rc,1.2,1.3 Term.cpp,1.2,1.3

[Dirk B. <db...@us...>]

Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16071/extsrc/w32fConsole

Modified Files:
	Console.rc Term.cpp 
Log Message:
dbu: Changed the console not to move the cursor under the scrollbar

Index: Console.rc
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Console.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Console.rc	17 Jan 2005 18:52:29 -0000	1.2
--- Console.rc	23 Jan 2005 09:02:34 -0000	1.3
***************
*** 55,60 ****
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 6,11,0,16
!  PRODUCTVERSION 6,11,0,16
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
--- 55,60 ----
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 6,11,0,17
!  PRODUCTVERSION 6,11,0,17
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
***************
*** 74,78 ****
              VALUE "CompanyName", "Win32Forth developer team\0"
              VALUE "FileDescription", "Win32Forth console\0"
!             VALUE "FileVersion", "6, 11, 0, 16\0"
              VALUE "InternalName", "CONSOLE\0"
              VALUE "LegalCopyright", "\0"
--- 74,78 ----
              VALUE "CompanyName", "Win32Forth developer team\0"
              VALUE "FileDescription", "Win32Forth console\0"
!             VALUE "FileVersion", "6, 11, 0, 17\0"
              VALUE "InternalName", "CONSOLE\0"
              VALUE "LegalCopyright", "\0"
***************
*** 81,85 ****
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "Win32Forth\0"
!             VALUE "ProductVersion", "6, 11, 0, 16\0"
              VALUE "SpecialBuild", "\0"
          END
--- 81,85 ----
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "Win32Forth\0"
!             VALUE "ProductVersion", "6, 11, 0, 17\0"
              VALUE "SpecialBuild", "\0"
          END

Index: Term.cpp
===================================================================
RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Term.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Term.cpp	17 Jan 2005 18:52:31 -0000	1.2
--- Term.cpp	23 Jan 2005 09:02:34 -0000	1.3
***************
*** 456,459 ****
--- 456,462 ----
  	}
  
+ 	// don't let us type under the scrollbar
+ 	width -= GetSystemMetrics( SM_CXHSCROLL );
+ 
  	int newrows = min( max (height / charH, 1), maxrows );
  	int newcols = min( max (width  / charW, 1), maxcols );
***************
*** 663,677 ****
  
  //*************************************************************************************************
! // output a carraige return
  //*************************************************************************************************
! int APIENTRY c_cr (void)             
  {
!     if (!screen)
!       return 0;
!     x = 0;
!     y += 1;
!     scrollfix();
!     MoveCaret();
!     return 0;
  }
  
--- 666,682 ----
  
  //*************************************************************************************************
! // output carraige return/linefeed
  //*************************************************************************************************
! int APIENTRY c_cr( void )
  {
! 	if( !screen )
! 		return 0;
! 
! 	x = 0;
! 	y += 1;
! 	scrollfix();
! 	MoveCaret();
! 
! 	return 0;
  }
  
***************
*** 681,687 ****
  int APIENTRY c_qcr (int n)           
  {
!     if ((x + n) >= cols)
!         c_cr();
!     return 0;
  }
  
--- 686,692 ----
  int APIENTRY c_qcr (int n)           
  {
! 	if( (x + n) >= cols )
! 		c_cr();
! 	return 0;
  }
  
***************
*** 691,695 ****
  int APIENTRY c_thescreen (void)
  {
!     return (long)screen;
  }
  
--- 696,700 ----
  int APIENTRY c_thescreen (void)
  {
! 	return (long)screen;
  }