Menu
▾
▴
win32forth-cvs — CVS Commit List
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(70) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(38) |
Feb
(4) |
Mar
(11) |
Apr
(49) |
May
(81) |
Jun
(65) |
Jul
(36) |
Aug
(57) |
Sep
(63) |
Oct
(57) |
Nov
(49) |
Dec
(41) |
| 2006 |
Jan
(75) |
Feb
(80) |
Mar
(10) |
Apr
(13) |
May
(100) |
Jun
(100) |
Jul
(77) |
Aug
(87) |
Sep
(80) |
Oct
(124) |
Nov
(39) |
Dec
(41) |
| 2007 |
Jan
(20) |
Feb
(32) |
Mar
(32) |
Apr
(43) |
May
(146) |
Jun
(40) |
Jul
(49) |
Aug
(33) |
Sep
(25) |
Oct
(19) |
Nov
(11) |
Dec
(8) |
| 2008 |
Jan
(4) |
Feb
(11) |
Mar
(31) |
Apr
(40) |
May
(34) |
Jun
(24) |
Jul
(39) |
Aug
(104) |
Sep
(27) |
Oct
(35) |
Nov
(34) |
Dec
(97) |
| 2009 |
Jan
(75) |
Feb
(29) |
Mar
(45) |
Apr
(76) |
May
(121) |
Jun
(103) |
Jul
(67) |
Aug
(28) |
Sep
(22) |
Oct
(39) |
Nov
(9) |
Dec
(15) |
| 2010 |
Jan
(7) |
Feb
(39) |
Mar
(40) |
Apr
(57) |
May
(67) |
Jun
(69) |
Jul
(49) |
Aug
(68) |
Sep
(22) |
Oct
(7) |
Nov
(2) |
Dec
(10) |
| 2011 |
Jan
|
Feb
|
Mar
(10) |
Apr
(4) |
May
(6) |
Jun
(10) |
Jul
(16) |
Aug
(23) |
Sep
(9) |
Oct
|
Nov
(28) |
Dec
(3) |
| 2012 |
Jan
(11) |
Feb
(10) |
Mar
(1) |
Apr
|
May
(4) |
Jun
(3) |
Jul
(3) |
Aug
(4) |
Sep
(2) |
Oct
|
Nov
|
Dec
(1) |
| 2013 |
Jan
|
Feb
(7) |
Mar
(30) |
Apr
(4) |
May
(4) |
Jun
(8) |
Jul
(10) |
Aug
(4) |
Sep
|
Oct
(2) |
Nov
(24) |
Dec
(13) |
| 2014 |
Jan
(7) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(9) |
Jun
|
Jul
(3) |
Aug
(9) |
Sep
|
Oct
(2) |
Nov
|
Dec
(3) |
| 2015 |
Jan
(4) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
(5) |
Sep
(1) |
Oct
(4) |
Nov
(7) |
Dec
(39) |
| 2016 |
Jan
(17) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(1) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
(1) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
| 2018 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
(1) |
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Dirk B. <db...@us...> - 2005-03-12 09:10:09
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23015/src/console Modified Files: CONSOLE.F Log Message: dbu: DEPRECATED added Index: CONSOLE.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/CONSOLE.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CONSOLE.F 23 Jan 2005 16:32:19 -0000 1.2 --- CONSOLE.F 12 Mar 2005 09:09:57 -0000 1.3 *************** *** 375,393 **** \ The following words are deprecated. \ They are added for compatiblity to existing code only. ! SYNONYM _INIT-CONSOLE x_INIT-CONSOLE ! SYNONYM _INIT-SCREEN x_INIT-SCREEN ! SYNONYM _ACCEPT x_ACCEPT ! SYNONYM _TYPE x_TYPE ! SYNONYM _EMIT x_EMIT ! SYNONYM _CR x_CR ! SYNONYM _CLS x_CLS ! SYNONYM _?CR x_?CR ! SYNONYM _SIZESTATE x_SIZESTATE ! SYNONYM _GOTOXY x_GOTOXY ! SYNONYM _GETXY x_GETXY ! SYNONYM _GETCOLROW x_GETCOLROW ! SYNONYM _MARKCONSOLE x_MARKCONSOLE ! SYNONYM _BYE k_BYE |
|
From: Dirk B. <db...@us...> - 2005-03-12 09:10:06
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23015 Modified Files: fkernel.exe Log Message: dbu: DEPRECATED added Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsa90Hxy and /tmp/cvsO9ohQJ differ |
|
From: George H. <geo...@us...> - 2005-02-23 15:11:49
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21891/win32forth/src Modified Files: CONTROLS.F Log Message: gah: added initialization of pWmKillFocus to CONTROLS.F in V6.10 and V6.11 Index: CONTROLS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/CONTROLS.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CONTROLS.F 21 Dec 2004 00:19:07 -0000 1.1 --- CONTROLS.F 23 Feb 2005 15:10:58 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- 0 to pWmChar 0 to pWmKeyDown + 0 to pWmKillFocus ;M |
|
From: George H. <geo...@us...> - 2005-02-23 15:11:49
|
Update of /cvsroot/win32forth/win32forth-610old/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21891/win32forth-610old/src Modified Files: CONTROLS.F Log Message: gah: added initialization of pWmKillFocus to CONTROLS.F in V6.10 and V6.11 Index: CONTROLS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth-610old/src/CONTROLS.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CONTROLS.F 14 Dec 2004 23:53:57 -0000 1.1 --- CONTROLS.F 23 Feb 2005 15:10:57 -0000 1.2 *************** *** 34,37 **** --- 34,38 ---- 0 to pWmChar 0 to pWmKeyDown + 0 to pWmKillFocus ;M |
|
From: George H. <geo...@us...> - 2005-02-23 15:11:10
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21891/win32forth/src/lib Modified Files: MdiDialog.f Log Message: gah: added initialization of pWmKillFocus to CONTROLS.F in V6.10 and V6.11 Index: MdiDialog.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/MdiDialog.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs2a8FfK and /tmp/cvsOZmKPc differ |
|
From: Alex M. <ale...@us...> - 2005-02-07 23:30:33
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24231/src Added Files: transient.f Log Message: arm: add transient.f; permits efficent use of large blocks of virtual transient memory --- NEW FILE: transient.f --- \ $Id: transient.f,v 1.1 2005/02/07 23:30:25 alex_mcdonald Exp $ \ author: alex mcdonald 07/02/2005 23:25:51 \ public domain \ requires version 6.11 or better \ \ transient memory support \ \ reserves 1Mb of virtual space; allocations of real memory \ are performed by the kernel when an exception is detected. \ the variable exc-count is incremented each time a page is \ written to for the first time. \ \ use .mem or .free to see the amount of space free \ \ programs that compile to the transient area can't be saved; \ currently, there's no check performed by turnkey, fsave or \ application that checks if a transient area has been used. \ 1024 1024 * constant TDPSIZE PAGE_NOACCESS MEM_RESERVE TDPSIZE 0 VirtualAlloc nostack1 \ reserve memory \ CELL OFFSET FUNCTION \ ---- ------ -------- \ 0 0 Current pointer to area \ 1 4 Address of the area (origin) \ 2 8 Highest address of area (origin + length) \ 4 16 Link of all the xDP areas; set in DP-LINK \ 5 20 Counted name of the area \ in-system \ may not matter CREATE TDP DUP , DUP , TDPSIZE + , DP-LINK LINK, ," ^TRANS" \ transient : IN-TRANS ( -- ) TDP TO DP ; \ set the correct pointer : >TRANS ( -- ) TDP >DP ; \ select trans space ' DP> ALIAS TRANS> : TRANS-ORIGIN ( -- a1 ) TDP CELL+ @ ; in-application |
|
From: Dirk B. <db...@us...> - 2005-01-23 16:38:11
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29162/extsrc/w32fScintilla/win32 Modified Files: ScintRes.aps ScintRes.rc Log Message: dbu: Fixed a bug in the ForthLexer Index: ScintRes.rc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintRes.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintRes.rc 22 Dec 2004 20:26:00 -0000 1.1 --- ScintRes.rc 23 Jan 2005 16:38:02 -0000 1.2 *************** *** 32,36 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,6,2,6 PRODUCTVERSION 1,6,2,5 FILEFLAGSMASK 0x3fL --- 32,36 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 1,6,2,7 PRODUCTVERSION 1,6,2,5 FILEFLAGSMASK 0x3fL *************** *** 51,57 **** VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Scintilla Source Editing Component\0" ! VALUE "FileVersion", "1, 6, 2, 6\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2004 by Neil Hodgson, 2004 by Win32Forth developer team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "w32fScintilla.dll\0" --- 51,57 ---- VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Scintilla Source Editing Component\0" ! VALUE "FileVersion", "1, 6, 2, 7\0" VALUE "InternalName", "Scintilla\0" ! VALUE "LegalCopyright", "Copyright 1998-2004 by Neil Hodgson, 2004-2005 by Win32Forth developer team\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "w32fScintilla.dll\0" Index: ScintRes.aps =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/win32/ScintRes.aps,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvseWn0vR and /tmp/cvsm4NlQa differ |
|
From: Dirk B. <db...@us...> - 2005-01-23 16:38:11
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/vcbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29162/extsrc/w32fScintilla/vcbuild Modified Files: SciLexer.dsp Log Message: dbu: Fixed a bug in the ForthLexer Index: SciLexer.dsp =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/vcbuild/SciLexer.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SciLexer.dsp 22 Dec 2004 20:25:59 -0000 1.1 --- SciLexer.dsp 23 Jan 2005 16:38:02 -0000 1.2 *************** *** 55,59 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib imm32.lib comctl32.lib /nologo /dll /machine:I386 /out:"..\..\..\w32fScintilla.dll" !ELSEIF "$(CFG)" == "SciLexer - Win32 Debug" --- 55,59 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib imm32.lib comctl32.lib /nologo /dll /machine:I386 /out:"..\..\..\..\Win32Forth\w32fScintilla.dll" !ELSEIF "$(CFG)" == "SciLexer - Win32 Debug" *************** *** 82,86 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib imm32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\w32fScintilla.dll" /pdbtype:sept !ENDIF --- 82,86 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib imm32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Win32Forth\w32fScintilla.dll" /pdbtype:sept !ENDIF |
|
From: Dirk B. <db...@us...> - 2005-01-23 16:38:10
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29162/extsrc/w32fScintilla/src Modified Files: LexForth.cxx Log Message: dbu: Fixed a bug in the ForthLexer Index: LexForth.cxx =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fScintilla/src/LexForth.cxx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LexForth.cxx 22 Dec 2004 20:25:58 -0000 1.1 --- LexForth.cxx 23 Jan 2005 16:38:02 -0000 1.2 *************** *** 186,190 **** WordList &user6 = *keywordLists[8]; ! char stringList[] = { ",\" Z\" Z,\" +Z,\" C\" S\" .\" ABORT\" EDITOR\" BROWSE\" SHELL\" DOS\"" }; WordList string; string.Set( stringList ); --- 186,190 ---- WordList &user6 = *keywordLists[8]; ! char stringList[] = { ",\" Z\" Z,\" +Z,\" +Z,\" +Z\", C\" S\" .\" ABORT\" EDITOR\" BROWSE\" SHELL\" DOS\"" }; WordList string; string.Set( stringList ); *************** *** 285,289 **** if( ch1 == ' ' && ch2 == ':' && is_eol(ch3) ) { ! if( strcmp( "ABORT\"", buffer ) == 0 || strcmp( ".\"", buffer ) == 0 ) bSkipString = true; continue; --- 285,289 ---- if( ch1 == ' ' && ch2 == ':' && is_eol(ch3) ) { ! // if( strcmp( "ABORT\"", buffer ) == 0 || strcmp( ".\"", buffer ) == 0 ) bSkipString = true; continue; |
|
From: Dirk B. <db...@us...> - 2005-01-23 16:34:28
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28311/extsrc/w32fConsole Modified Files: Console.def Console.rc Term.cpp Log Message: dbu: New word SetConsoleFont ( hFont -- ) to set the font for the console window added Index: Console.rc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Console.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Console.rc 23 Jan 2005 09:02:34 -0000 1.3 --- Console.rc 23 Jan 2005 16:34:19 -0000 1.4 *************** *** 55,60 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 6,11,0,17 ! PRODUCTVERSION 6,11,0,17 FILEFLAGSMASK 0x3fL #ifdef _DEBUG --- 55,60 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 6,11,0,18 ! PRODUCTVERSION 6,11,0,18 FILEFLAGSMASK 0x3fL #ifdef _DEBUG *************** *** 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" --- 74,78 ---- VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Win32Forth console\0" ! VALUE "FileVersion", "6, 11, 0, 18\0" VALUE "InternalName", "CONSOLE\0" VALUE "LegalCopyright", "\0" *************** *** 81,85 **** VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "6, 11, 0, 17\0" VALUE "SpecialBuild", "\0" END --- 81,85 ---- VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "6, 11, 0, 18\0" VALUE "SpecialBuild", "\0" END Index: Console.def =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Console.def,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Console.def 22 Dec 2004 20:25:25 -0000 1.1 --- Console.def 23 Jan 2005 16:34:19 -0000 1.2 *************** *** 32,33 **** --- 32,34 ---- c_getbg c_sizestate + c_setfont Index: Term.cpp =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Term.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Term.cpp 23 Jan 2005 09:02:34 -0000 1.3 --- Term.cpp 23 Jan 2005 16:34:19 -0000 1.4 *************** *** 110,113 **** --- 110,146 ---- } + //************************************************************************************************* + // RegReadKey + //************************************************************************************************* + char *RegReadKey( const char *pszValue, char *pszString, unsigned nStringLen ) + { + *pszString = 0; + + HKEY theKey = RegGetKey(); + if( theKey ) + { + DWORD slen = nStringLen; + DWORD ktype; + RegQueryValueEx( theKey, pszValue, NULL, &ktype, (unsigned char *)pszString, &slen ); + RegCloseKey( theKey ); + } + + return pszString; + } + + //************************************************************************************************* + // RegReadKey + //************************************************************************************************* + int RegReadKey( const char *pszValue, int *pInt ) + { + *pInt = 0; + + char szInt[64] = ""; + if( *RegReadKey( pszValue, szInt, sizeof(szInt) ) != 0 ) + *pInt = atoi( szInt ); + + return *pInt; + } + //################################################################################################# //################################################################################################# *************** *** 811,814 **** --- 844,870 ---- //************************************************************************************************* + // Set the Font for the console window + //************************************************************************************************* + int APIENTRY c_setfont( int iFont ) + { + HFONT hFont = (HFONT)iFont; + if( hFont == NULL ) + hFont = (HFONT)GetStockObject( ANSI_FIXED_FONT ); + + + HDC hdc = GetDC( hWndConsole ); + if( hdc ) + { + DeleteObject( SelectObject( hdc, hFont ) ); + SIZE Size; + GetTextExtentPoint32( hdc, "a", 1 , &Size ); + ReleaseDC( hWndConsole, hdc ); + + c_setcharwh( Size.cy, Size.cx ); + } + return 0; + } + + //************************************************************************************************* // Main Window Procedure //************************************************************************************************* *************** *** 835,839 **** if( hWndConsole != NULL ) ! { c_setfgbg( -1, -1 ); SetScrollRange( hWndConsole, SB_VERT, 0, maxrows, FALSE ); --- 891,896 ---- if( hWndConsole != NULL ) ! { ! c_setfont( 0 ); c_setfgbg( -1, -1 ); SetScrollRange( hWndConsole, SB_VERT, 0, maxrows, FALSE ); *************** *** 947,951 **** { PAINTSTRUCT ps ; - SIZE Size; switch( message ) --- 1004,1007 ---- *************** *** 956,968 **** case WM_CREATE: { - hdc = GetDC (hwnd); - - SelectObject( hdc, GetStockObject(ANSI_FIXED_FONT) ); - GetTextExtentPoint32( hdc, "a", 1 , &Size ); - charW = Size.cx; - charH = Size.cy; - - ReleaseDC( hwnd, hdc ); - return 0; } --- 1012,1015 ---- *************** *** 1165,1174 **** // get console window pos from registry ! BYTE s[512]; ! DWORD slen = sizeof(s); ! DWORD ktype; ! HKEY theKey = RegGetKey(); ! RegQueryValueEx( theKey, "Console", NULL, &ktype, s, &slen ); ! RegCloseKey (theKey); RECT pos; memset( &pos, 0, sizeof(pos) ); // bugfix for SF-Request ID 762961 July 2nd, 2003 - 17:51 dbu --- 1212,1217 ---- // get console window pos from registry ! char s[512] = ""; ! RegReadKey( "Console", s, sizeof(s) ); RECT pos; memset( &pos, 0, sizeof(pos) ); // bugfix for SF-Request ID 762961 July 2nd, 2003 - 17:51 dbu |
|
From: Dirk B. <db...@us...> - 2005-01-23 16:32:28
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27858 Modified Files: w32fConsole.dll Log Message: dbu: New word SetConsoleFont ( hFont -- ) to set the font for the console window added Index: w32fConsole.dll =================================================================== RCS file: /cvsroot/win32forth/win32forth/w32fConsole.dll,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsi2x56I and /tmp/cvs18n1hP differ |
|
From: Dirk B. <db...@us...> - 2005-01-23 16:32:28
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27858/src/console Modified Files: CONSOLE.F Log Message: dbu: New word SetConsoleFont ( hFont -- ) to set the font for the console window added Index: CONSOLE.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/CONSOLE.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CONSOLE.F 21 Dec 2004 00:19:09 -0000 1.1 --- CONSOLE.F 23 Jan 2005 16:32:19 -0000 1.2 *************** *** 189,192 **** --- 189,193 ---- 0 PROC c_maxcolrow 2 PROC c_setmaxcolrow + 1 PROC c_setfont : x_pushkey ( c1 -- ) \ push c1 into the keyboard input stream *************** *** 234,244 **** 3 PROC InvalidateRect : x_SetcharWH ( width height -- ) \ set the width and height of the Call c_setcharwh drop \ current console font ! 1 0 _conHndl call InvalidateRect drop ; \ force repaint : x_setcolrow ( cols rows -- ) \ set the console size Call c_resize drop ; synonym set-consize setcolrow --- 235,265 ---- 3 PROC InvalidateRect + : ConsoleRepaint ( -- ) \ redraw console window + 1 0 _conHndl call InvalidateRect drop ; + : x_SetcharWH ( width height -- ) \ set the width and height of the Call c_setcharwh drop \ current console font ! ConsoleRepaint ; \ force repaint : x_setcolrow ( cols rows -- ) \ set the console size Call c_resize drop ; + : SetConsoleFont ( hFont -- ) \ set the console font. If hFont is NULL the + \ default font will be set. + call c_setfont drop + ConsoleRepaint ; \ force repaint + + \ Usage: + \ + \ Font cFont + \ 16 Height: cFont + \ 8 Width: cFont + \ s" Courier New" SetFaceName: cFont + \ FW_NORMAL Weight: cFont + \ Create: cFont + \ Handle: cFont SetConsoleFont + \ zHandle: cFont \ don't let Win32Forth destroy the font; the console does it !!! + + synonym set-consize setcolrow *************** *** 369,370 **** --- 390,393 ---- SYNONYM _BYE k_BYE + + |
|
From: Dirk B. <db...@us...> - 2005-01-23 10:43:45
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5572/src/console Modified Files: Statbar.f Log Message: dbu: some smal changes Index: Statbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/Statbar.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Statbar.f 21 Dec 2004 00:19:09 -0000 1.1 --- Statbar.f 23 Jan 2005 10:43:36 -0000 1.2 *************** *** 39,43 **** :M DefStyle: ( -- style) \ default control style ! WS_BORDER WS_VISIBLE OR WS_CHILD OR ;M --- 39,43 ---- :M DefStyle: ( -- style) \ default control style ! [ WS_BORDER WS_VISIBLE OR WS_CHILD OR ] literal ;M *************** *** 163,164 **** --- 163,165 ---- ;Class + |
|
From: Dirk B. <db...@us...> - 2005-01-23 10:42:40
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4993/src Modified Files: Extend.f Primutil.f Log Message: dbu: some cosmetic changes Index: Primutil.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Primutil.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Primutil.f 21 Dec 2004 00:19:08 -0000 1.1 --- Primutil.f 23 Jan 2005 10:42:26 -0000 1.2 *************** *** 91,95 **** : _\n->crlf ( a1 n1 -- ) \ parse "\n" occurances, change to CRLF's begin [char] \ scan dup \ found a '\' char ! while over 1+ c@ [char] n = \ followed by 'n' if over 13 swap c! \ replace with CR over 10 swap 1+ c! \ replace with LF --- 91,95 ---- : _\n->crlf ( a1 n1 -- ) \ parse "\n" occurances, change to CRLF's begin [char] \ scan dup \ found a '\' char ! while over 1+ c@ [char] n = \ followed by 'n' if over 13 swap c! \ replace with CR over 10 swap 1+ c! \ replace with LF *************** *** 108,113 **** MAXSTRING newuser z-buf ! : asciiz ( addr len -- buff-z ) ! z-buf ascii-z ; : +z," ( -<text">- ) --- 108,113 ---- MAXSTRING newuser z-buf ! : asciiz ( addr len -- buff-z ) ! z-buf ascii-z ; : +z," ( -<text">- ) *************** *** 1047,1048 **** --- 1047,1049 ---- + |
|
From: Dirk B. <db...@us...> - 2005-01-23 09:02:45
|
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; } |
|
From: Dirk B. <db...@us...> - 2005-01-23 09:00:01
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15427 Modified Files: w32fScintilla.dll Log Message: dbu: Fixed a bug in the ForthLexer Index: w32fScintilla.dll =================================================================== RCS file: /cvsroot/win32forth/win32forth/w32fScintilla.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsjyvrYq and /tmp/cvsWURfm6 differ |
|
From: Dirk B. <db...@us...> - 2005-01-23 08:54:18
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14655 Modified Files: w32fConsole.dll Log Message: dbu: Changed the console not to move the cursor under the scrollbar Index: w32fConsole.dll =================================================================== RCS file: /cvsroot/win32forth/win32forth/w32fConsole.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsv6ULxl and /tmp/cvs1G4XiP differ |
|
From: Dirk B. <db...@us...> - 2005-01-23 08:52:13
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14360/src/console Modified Files: LINEEDIT.F Log Message: dbu: Fixed a bug in the Lineeditor. Sometimes the cursor was placed into a wrong line (thanks Andrew for reporting this). Index: LINEEDIT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/LINEEDIT.F,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LINEEDIT.F 16 Jan 2005 13:09:05 -0000 1.2 --- LINEEDIT.F 23 Jan 2005 08:52:03 -0000 1.3 *************** *** 116,120 **** : lcalcy ( -- y ) \ calculate cursor y positon ! editpos COLS / ledit-y - ; \ rewritten for better line wraping --- 116,121 ---- : lcalcy ( -- y ) \ calculate cursor y positon ! editpos COLS / ledit-y - ! getrowoff 0= if 1- then ; \ rewritten for better line wraping *************** *** 421,426 **** --- 422,429 ---- 1 +accept# then true to accepted? + swap >r >r _legetxy laccept-buf dup off r> lineeditor + if laccept-buf count r@ swap move laccept-buf c@ _legetxy nip _legotoxy |
|
From: Dirk B. <db...@us...> - 2005-01-17 18:57:39
|
Update of /cvsroot/win32forth/win32forth In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17937 Modified Files: fkernel.exe w32fConsole.dll Log Message: dbu: changed TYPE to handle the BELL (ASCII 7), BS (ASCII 8), LF(ASCII 10) and CR (ASCII 13) control characters like EMIT does Index: fkernel.exe =================================================================== RCS file: /cvsroot/win32forth/win32forth/fkernel.exe,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsUmLzHn and /tmp/cvssUbulo differ Index: w32fConsole.dll =================================================================== RCS file: /cvsroot/win32forth/win32forth/w32fConsole.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvshDQk68 and /tmp/cvs4v7Zxl differ |
|
From: Dirk B. <db...@us...> - 2005-01-17 18:57:31
|
Update of /cvsroot/win32forth/win32forth/src/kernel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17937/src/kernel Modified Files: fkernel.f Log Message: dbu: changed TYPE to handle the BELL (ASCII 7), BS (ASCII 8), LF(ASCII 10) and CR (ASCII 13) control characters like EMIT does Index: fkernel.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/kernel/fkernel.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fkernel.f 3 Jan 2005 23:46:33 -0000 1.3 --- fkernel.f 17 Jan 2005 18:56:39 -0000 1.4 *************** *** 2154,2163 **** 1 ( SW_NORMAL ) _conHndl call ShowWindow DROP ; - : x_TYPE ( addr len -- ) - SWAP Call c_type drop ; - : x_EMIT ( char -- ) Call c_emit drop ; : x_CR ( -- ) Call c_cr drop ; --- 2154,2163 ---- 1 ( SW_NORMAL ) _conHndl call ShowWindow DROP ; : x_EMIT ( char -- ) Call c_emit drop ; + : x_TYPE ( addr len -- ) + SWAP Call c_type drop ; + : x_CR ( -- ) Call c_cr drop ; *************** *** 5768,5769 **** --- 5768,5770 ---- \ Prad~ + |
|
From: Dirk B. <db...@us...> - 2005-01-17 18:53:02
|
Update of /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17577/extsrc/w32fConsole Modified Files: Console.dsp Console.rc Term.cpp Log Message: dbu: changed TYPE to handle the BELL (ASCII 7), BS (ASCII 8), LF(ASCII 10) and CR (ASCII 13) control characters like EMIT does Index: Console.dsp =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Console.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Console.dsp 22 Dec 2004 20:25:25 -0000 1.1 --- Console.dsp 17 Jan 2005 18:52:28 -0000 1.2 *************** *** 54,58 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\w32fConsole.dll" !ELSEIF "$(CFG)" == "Console - Win32 Debug" --- 54,58 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"..\..\..\win32forth\w32fConsole.dll" !ELSEIF "$(CFG)" == "Console - Win32 Debug" *************** *** 80,84 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\w32fConsole.dll" /pdbtype:sept !ENDIF --- 80,84 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\win32forth\w32fConsole.dll" /pdbtype:sept !ENDIF *************** *** 164,167 **** --- 164,171 ---- SOURCE=..\..\res\Win32For.ico # End Source File + # Begin Source File + + SOURCE=..\..\..\win32forth\src\res\Win32For.ico + # End Source File # End Group # End Target Index: Console.rc =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Console.rc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Console.rc 22 Dec 2004 20:25:25 -0000 1.1 --- Console.rc 17 Jan 2005 18:52:29 -0000 1.2 *************** *** 55,60 **** VS_VERSION_INFO VERSIONINFO ! FILEVERSION 6,9,0,15 ! PRODUCTVERSION 6,9,0,15 FILEFLAGSMASK 0x3fL #ifdef _DEBUG --- 55,60 ---- VS_VERSION_INFO VERSIONINFO ! FILEVERSION 6,11,0,16 ! PRODUCTVERSION 6,11,0,16 FILEFLAGSMASK 0x3fL #ifdef _DEBUG *************** *** 74,78 **** VALUE "CompanyName", "Win32Forth developer team\0" VALUE "FileDescription", "Win32Forth console\0" ! VALUE "FileVersion", "6, 9, 0, 15\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, 16\0" VALUE "InternalName", "CONSOLE\0" VALUE "LegalCopyright", "\0" *************** *** 81,85 **** VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "6, 9, 0, 15\0" VALUE "SpecialBuild", "\0" END --- 81,85 ---- VALUE "PrivateBuild", "\0" VALUE "ProductName", "Win32Forth\0" ! VALUE "ProductVersion", "6, 11, 0, 16\0" VALUE "SpecialBuild", "\0" END *************** *** 112,116 **** // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! ICON_FORTH ICON DISCARDABLE "..\\..\\res\\Win32For.ico" #endif // Deutsch (Deutschland) resources ///////////////////////////////////////////////////////////////////////////// --- 112,116 ---- // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! ICON_FORTH ICON DISCARDABLE "..\\..\\..\\win32forth\\src\\res\\Win32For.ico" #endif // Deutsch (Deutschland) resources ///////////////////////////////////////////////////////////////////////////// Index: Term.cpp =================================================================== RCS file: /cvsroot/win32forth/win32forth-extsrc/extsrc/w32fConsole/Term.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Term.cpp 22 Dec 2004 20:25:25 -0000 1.1 --- Term.cpp 17 Jan 2005 18:52:31 -0000 1.2 *************** *** 176,185 **** int maxcols = 128; // number of columns in the screen save buffer int charW, charH; // size of a character ! int x, y; // current cursor position ABSOLUTE FROM BUFFER TOP int theFg = -1; // forground color default to system color int theBg = -1; // background color default to system color int cursor_height = 2; // height of the cursor in lines int lmouse_down = 0; // is the left mouse button currently down? ! int rmouse_down = 0; //************************************************************************************************* --- 176,185 ---- int maxcols = 128; // number of columns in the screen save buffer int charW, charH; // size of a character ! int x = 0, y = 0; // current cursor position ABSOLUTE FROM BUFFER TOP int theFg = -1; // forground color default to system color int theBg = -1; // background color default to system color int cursor_height = 2; // height of the cursor in lines int lmouse_down = 0; // is the left mouse button currently down? ! int rmouse_down = 0; // is the right mouse button currently down? //************************************************************************************************* *************** *** 574,592 **** //************************************************************************************************* ! // emit a character to the console window //************************************************************************************************* ! int APIENTRY c_emit (char c) { ! if( !screen ) ! return 0; ! ! scrollfix(); ! ! switch (c) { case BELL: { Beep(500, 100); - return 0; } case BS: --- 574,587 ---- //************************************************************************************************* ! // Emit a character to the console window. ! // Handles BELL (ASCII 7), BS (ASCII 8), LF(ASCII 10) and CR (ASCII 13) control characters. //************************************************************************************************* ! void emit( char c ) { ! switch( c ) { case BELL: { Beep(500, 100); } case BS: *************** *** 616,632 **** default: { ! HideCaret (hWndConsole); ! SetBkColor(hdc, theBg); ! SetTextColor(hdc, theFg); ! TextOut (hdc, gx, gy, &c, 1); ! ShowCaret (hWndConsole); ! SCREEN(x,y) = c; x += 1; wrap(); } } MoveCaret(); ! return 0; } --- 611,641 ---- default: { ! TextOut( hdc, gx, gy, &c, 1 ); ! SCREEN( x, y ) = c; x += 1; wrap(); + break; } } + } + + //************************************************************************************************* + // emit a character to the console window + //************************************************************************************************* + int APIENTRY c_emit( char c ) + { + if( !screen ) + return 0; + + scrollfix(); + HideCaret( hWndConsole ); + + SetBkColor( hdc, theBg ); + SetTextColor( hdc, theFg ); + emit( c ); MoveCaret(); ! ShowCaret( hWndConsole ); ! return 1; } *************** *** 634,663 **** // type a string of characters to the console window //************************************************************************************************* ! int APIENTRY c_type (char *addr, int len) { ! int n; ! ! if( !screen ) return 0; ! scrollfix(); ! HideCaret (hWndConsole); ! SetBkColor(hdc, theBg); ! SetTextColor(hdc, theFg); ! while (len) ! { n = min (len, cols - x); ! TextOut (hdc, gx, gy, addr, n); ! memmove(&SCREEN(x,y), addr, n); ! x += n; ! wrap(); ! addr += n; ! len -= n; ! } ! MoveCaret(); ! ShowCaret (hWndConsole); ! return 0; } --- 643,663 ---- // type a string of characters to the console window //************************************************************************************************* ! int APIENTRY c_type( char *addr, int len ) { ! if( !screen || !addr || !len ) return 0; ! scrollfix(); ! HideCaret( hWndConsole ); ! SetBkColor( hdc, theBg ); ! SetTextColor( hdc, theFg ); ! for( int act = 0; act < len; act++ ) ! emit( addr[act] ); ! MoveCaret(); ! ShowCaret( hWndConsole ); ! return 0; } |
|
From: Dirk B. <db...@us...> - 2005-01-16 13:09:15
|
Update of /cvsroot/win32forth/win32forth/src/console In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3900/src/console Modified Files: LINEEDIT.F Log Message: dbu: Fixed console line wraping bug Index: LINEEDIT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/console/LINEEDIT.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LINEEDIT.F 21 Dec 2004 00:19:09 -0000 1.1 --- LINEEDIT.F 16 Jan 2005 13:09:05 -0000 1.2 *************** *** 82,87 **** true value insertmode \ insert/overwrite mode flag - \ type entered is a letter; - INTERNAL \ internal words start here --- 82,85 ---- *************** *** 92,135 **** 0 value ledit-x \ where we are editing X 0 value ledit-y \ where we are editing Y - 0 value ecursor \ edit cursor position 0 value lenlimit \ line edit length limit ! defer ledbutton ' noop is ledbutton MAXCOUNTED constant maxedit ! create editbuf MAXSTRING allot \ our edit buffer, ! editbuf off \ 255 characters max : _legetxy ( --- x ~y ) \ Negative y indicates buffer coordinates ! getxy getrowoff + invert ! ; : _legotoxy ( x y --- ) \ Goto screen or buffer coordinates ! dup 0< ! if \ if y is negative, go to buffer coordinates (x,~y) ! invert dup getrowoff dup rows + 1- between 0= ! if \ If the desired buffer y is not in the window, scroll it in ! dup rows - 1+ setrowoff ! then ! getrowoff - ! then ! gotoxy ! ; : .lecursor ( --- ) \ show the cursor ! ecursor to accept-cnt ! ledit-x ecursor + COLS 1- min ledit-y _legotoxy ; : .leline ( --- ) \ redisplay edit line ledit-x ledit-y _legotoxy ! editbuf count "clip" type lenlimit ledit-x + COLS 1- min SP>COL ; ! : __le-ldel ( -- ) \ Line delete 0 editbuf c! ! 0 to ecursor ; ! : _lichar ( c1 -- ) autoclear \ should we clear the line on the if __le-ldel \ first character typed? --- 90,137 ---- 0 value ledit-x \ where we are editing X 0 value ledit-y \ where we are editing Y 0 value lenlimit \ line edit length limit ! defer ledbutton ' noop is ledbutton MAXCOUNTED constant maxedit ! create editbuf MAXSTRING allot \ our edit buffer, ! editbuf off \ 255 characters max ! 0 value editpos \ current edit position in buffer : _legetxy ( --- x ~y ) \ Negative y indicates buffer coordinates ! getxy getrowoff + invert ; : _legotoxy ( x y --- ) \ Goto screen or buffer coordinates ! dup 0< ! if \ if y is negative, go to buffer coordinates (x,~y) ! invert dup getrowoff dup rows + 1- between 0= ! if \ If the desired buffer y is not in the window, scroll it in ! dup rows - 1+ setrowoff ! then ! getrowoff - ! then gotoxy ; + : lcalcx ( -- x ) \ calculate cursor x positon + editpos COLS /mod drop ledit-x + ; + : lcalcy ( -- y ) \ calculate cursor y positon + editpos COLS / ledit-y - ; + + \ rewritten for better line wraping + \ Sonntag, Januar 16 2005 dbu : .lecursor ( --- ) \ show the cursor ! editpos to accept-cnt ! lcalcx lcalcy _legotoxy ; : .leline ( --- ) \ redisplay edit line ledit-x ledit-y _legotoxy ! editbuf count type lenlimit ledit-x + COLS 1- min SP>COL ; ! : __le-ldel ( -- ) \ Line delete 0 editbuf c! ! 0 to editpos ; ! : _lichar ( c1 -- ) autoclear \ should we clear the line on the if __le-ldel \ first character typed? *************** *** 137,149 **** then insertmode ! if editbuf 1+ ecursor + dup 1+ ! maxedit ecursor - move editbuf c@ 1+ lenlimit min editbuf c! then ! editbuf 1+ ecursor + c! ! ecursor 1+ lenlimit min COLS 1- min to ecursor ! ecursor editbuf c@ max editbuf c! ; ! : ?lechar ( --- ) \ handle normal keys, insert them lchar bl 0xFF between if lchar _lichar --- 139,153 ---- then insertmode ! if editbuf 1+ editpos + dup 1+ ! maxedit editpos - move editbuf c@ 1+ lenlimit min editbuf c! then ! editbuf 1+ editpos + c! ! \ removed 'COLS 1- min' for better line wraping ! \ Sonntag, Januar 16 2005 dbu ! editpos 1+ lenlimit min ( COLS 1- min ) to editpos ! editpos editbuf c@ max editbuf c! ; ! : ?lechar ( --- ) \ handle normal keys, insert them lchar bl 0xFF between if lchar _lichar *************** *** 151,164 **** : _le-home ( --- ) \ beginning of line ! 0 to ecursor ; : _le-end ( --- ) \ End of line ! editbuf c@ to ecursor ; : _le-right ( --- ) \ right a character ! ecursor 1+ editbuf c@ min COLS 1- min to ecursor ; : _le-left ( --- ) \ left a character ! ecursor 1- 0MAX to ecursor ; : _ledone ( --- ) \ flag edit is finished, save changes --- 155,170 ---- : _le-home ( --- ) \ beginning of line ! 0 to editpos ; : _le-end ( --- ) \ End of line ! editbuf c@ to editpos ; : _le-right ( --- ) \ right a character ! \ removed 'COLS 1- min' for better line wraping ! \ Sonntag, Januar 16 2005 dbu ! editpos 1+ editbuf c@ min ( COLS 1- min ) to editpos ; : _le-left ( --- ) \ left a character ! editpos 1- 0MAX to editpos ; : _ledone ( --- ) \ flag edit is finished, save changes *************** *** 182,200 **** : _le-fdel ( --- ) \ Forward delete ! ecursor 1+ editbuf c@ max editbuf c! ! editbuf 1+ ecursor + dup 1+ swap maxedit ecursor - move -1 editbuf c+! ; : >to=bl ( --- ) \ forward to a blank ! editbuf 1+ dup maxedit + swap ecursor + ?do i c@ bl = ?leave ! 1 +to ecursor ! loop editbuf c@ ecursor min to ecursor ; : >to<>bl ( --- ) \ forward to a non blank ! editbuf 1+ dup maxedit + swap ecursor + ?do i c@ bl <> ?leave ! 1 +to ecursor ! loop editbuf c@ ecursor min to ecursor ; : _le-rword ( --- ) \ Forward to next word --- 188,206 ---- : _le-fdel ( --- ) \ Forward delete ! editpos 1+ editbuf c@ max editbuf c! ! editbuf 1+ editpos + dup 1+ swap maxedit editpos - move -1 editbuf c+! ; : >to=bl ( --- ) \ forward to a blank ! editbuf 1+ dup maxedit + swap editpos + ?do i c@ bl = ?leave ! 1 +to editpos ! loop editbuf c@ editpos min to editpos ; : >to<>bl ( --- ) \ forward to a non blank ! editbuf 1+ dup maxedit + swap editpos + ?do i c@ bl <> ?leave ! 1 +to editpos ! loop editbuf c@ editpos min to editpos ; : _le-rword ( --- ) \ Forward to next word *************** *** 203,217 **** : <to=bl+1 ( --- ) \ back to char following BL ! ecursor 1- 0MAX to ecursor ! editbuf 1+ dup ecursor + 1- editbuf 1+ max ?do i c@ bl = ?leave ! -1 +to ecursor -1 +loop ; : <to<>bl ( --- ) \ Back to non blank ! ecursor 1- 0MAX to ecursor ! editbuf 1+ dup ecursor + 1- editbuf 1+ max ?do i c@ bl <> ?leave ! -1 +to ecursor loop ; --- 209,223 ---- : <to=bl+1 ( --- ) \ back to char following BL ! editpos 1- 0MAX to editpos ! editbuf 1+ dup editpos + 1- editbuf 1+ max ?do i c@ bl = ?leave ! -1 +to editpos -1 +loop ; : <to<>bl ( --- ) \ Back to non blank ! editpos 1- 0MAX to editpos ! editbuf 1+ dup editpos + 1- editbuf 1+ max ?do i c@ bl <> ?leave ! -1 +to editpos loop ; *************** *** 221,230 **** : _le-bdel ( --- ) \ back delete ! ecursor editbuf c@ max editbuf c! ! ecursor ( --- f1 ) _le-left ( --- f1 ) if insertmode \ if we are in insertmode ! if _le-fdel \ then delete the character ! else bl editbuf 1+ ecursor + c! \ else change char to blank then --- 227,236 ---- : _le-bdel ( --- ) \ back delete ! editpos editbuf c@ max editbuf c! ! editpos ( --- f1 ) _le-left ( --- f1 ) if insertmode \ if we are in insertmode ! if _le-fdel \ then delete the character ! else bl editbuf 1+ editpos + c! \ else change char to blank then *************** *** 233,253 **** : _le-wdel ( --- ) \ word delete ! begin ecursor editbuf c@ < ! editbuf 1+ ecursor + c@ bl <> and while _le-fdel repeat ! begin ecursor editbuf c@ < ! editbuf 1+ ecursor + c@ bl = and while _le-fdel repeat ; : strip_bl's ( --- ) \ strip blanks from editbuf ! ecursor >r _le-end begin _le-left ! editbuf 1+ ecursor + c@ bl = ! ecursor 0<> and while _le-fdel ! repeat editbuf c@ r> min 0MAX to ecursor editbuf c@ 1 = \ count=1 & char=blank editbuf 1+ c@ bl = and --- 239,259 ---- : _le-wdel ( --- ) \ word delete ! begin editpos editbuf c@ < ! editbuf 1+ editpos + c@ bl <> and while _le-fdel repeat ! begin editpos editbuf c@ < ! editbuf 1+ editpos + c@ bl = and while _le-fdel repeat ; : strip_bl's ( --- ) \ strip blanks from editbuf ! editpos >r _le-end begin _le-left ! editbuf 1+ editpos + c@ bl = ! editpos 0<> and while _le-fdel ! repeat editbuf c@ r> min 0MAX to editpos editbuf c@ 1 = \ count=1 & char=blank editbuf 1+ c@ bl = and *************** *** 257,263 **** : _le-ins ( --- ) \ toggle insert mode insertmode 0= dup to insertmode ! if big-cursor ! else norm-cursor ! then ; : _le-any ( --- ) \ handle any character entry --- 263,269 ---- : _le-ins ( --- ) \ toggle insert mode insertmode 0= dup to insertmode ! if big-cursor ! else norm-cursor ! then ; : _le-any ( --- ) \ handle any character entry *************** *** 313,319 **** then ; ! \ c1 = keyboard character ! \ f1 = true for done editing ! : _le-key ( c1 --- ) \ process a key to lchar ?lechar \ handle normal ascii --- 319,325 ---- then ; ! \ c1 = keyboard character ! \ f1 = true for done editing ! : _le-key ( c1 --- ) \ process a key to lchar ?lechar \ handle normal ascii *************** *** 321,332 **** ?control ; \ control chars ! \ x = char pos on row ! \ y = line number ! \ a1 = counted string ! \ n1 = edit limit length : <ledit> ( x y a1 n1 --- ) \ Edit line currently in EDITBUF. lenlimit >r get-cursor >r ! over c@ ecursor min to ecursor maxedit min to lenlimit \ save max edit length dup >r \ save source address --- 327,338 ---- ?control ; \ control chars ! \ x = char pos on row ! \ y = line number ! \ a1 = counted string ! \ n1 = edit limit length : <ledit> ( x y a1 n1 --- ) \ Edit line currently in EDITBUF. lenlimit >r get-cursor >r ! over c@ editpos min to editpos maxedit min to lenlimit \ save max edit length dup >r \ save source address *************** *** 364,368 **** defer@ _le-quit >r ['] _lequit is _le-quit defer@ _le-LF >r ['] noop is _le-LF ! 0 to ecursor <ledit> r> is _le-LF --- 370,374 ---- defer@ _le-quit >r ['] _lequit is _le-quit defer@ _le-LF >r ['] noop is _le-LF ! 0 to editpos <ledit> r> is _le-LF *************** *** 397,401 **** -1 +accept# prev-accept-buf" editbuf place ! editbuf c@ to ecursor ; : accept-ldown ( -- ) --- 403,407 ---- -1 +accept# prev-accept-buf" editbuf place ! editbuf c@ to editpos ; : accept-ldown ( -- ) *************** *** 404,408 **** then false to accepted? prev-accept-buf" editbuf place ! editbuf c@ to ecursor ; : __laccept ( a1 n1 -- ) --- 410,414 ---- then false to accepted? prev-accept-buf" editbuf place ! editbuf c@ to editpos ; : __laccept ( a1 n1 -- ) *************** *** 448,449 **** --- 454,456 ---- cr samplebuffer count type ; + |
|
From: Dirk B. <db...@us...> - 2005-01-16 13:09:15
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3900/src Modified Files: Keysave.f Log Message: dbu: Fixed console line wraping bug Index: Keysave.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Keysave.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Keysave.f 21 Dec 2004 00:19:08 -0000 1.1 --- Keysave.f 16 Jan 2005 13:09:04 -0000 1.2 *************** *** 473,500 **** : paste-load ( -- ) ! conhndl call OpenClipboard 0= ! if beep ! else CF_TEXT call GetClipboardData ?dup ! if to paste-hdl ! paste-hdl call GlobalLock abs>rel to paste-ptr \ lock memory ! paste-ptr 1000000 2dup 0 scan nip - to paste-len to paste-ptr ! paste-len ! if 0 to paste-off ! 0 to play0cnt ! 0x0 pushkey \ kick start playkeys ! ['] paste1key is auto_key ! ['] paste1key? is auto_key? ! paste1key ! else beep ! 0 to paste-ptr ! 0 to paste-len ! 0 to paste-off ! paste-hdl call GlobalUnlock drop \ unlock it, done ! call CloseClipboard ?win-error ! then \ cleanup for clipboard ! else beep ! Call CloseClipboard ?win-error ! then ! then ; : win-paste-load ( wParam lParam -- wParam lParam ) --- 473,499 ---- : paste-load ( -- ) ! conhndl call OpenClipboard 0= ! if beep ! else CF_TEXT call GetClipboardData ?dup ! if dup to paste-hdl ! call GlobalLock to paste-ptr \ lock memory ! paste-ptr zcount nip dup to paste-len \ get len ! if 0 to paste-off ! 0 to play0cnt ! 0x0 pushkey \ kick start playkeys ! ['] paste1key is auto_key ! ['] paste1key? is auto_key? ! paste1key ! else beep ! 0 to paste-ptr ! 0 to paste-len ! 0 to paste-off ! paste-hdl call GlobalUnlock drop \ unlock it, done ! call CloseClipboard ?win-error ! then \ cleanup for clipboard ! else beep ! Call CloseClipboard ?win-error ! then ! then ; : win-paste-load ( wParam lParam -- wParam lParam ) *************** *** 518,522 **** GMEM_MOVEABLE GMEM_DDESHARE or \ flags call GlobalAlloc to gblhndl \ allocate a buffer ! gblhndl call GlobalLock abs>rel to gblptr \ lock memory getxy nip getrowoff + l/s min to l/s \ adjust to lines needed --- 517,521 ---- GMEM_MOVEABLE GMEM_DDESHARE or \ flags call GlobalAlloc to gblhndl \ allocate a buffer ! gblhndl call GlobalLock to gblptr \ lock memory getxy nip getrowoff + l/s min to l/s \ adjust to lines needed *************** *** 573,574 **** --- 572,574 ---- MODULE \ finish up the module + |
|
From: Dirk B. <db...@us...> - 2005-01-08 14:04:31
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17696/src/lib Modified Files: HtmlDisplayControl.f MDI.F RegistryWindowPos.f Log Message: dbu: some cosmetic changes Index: MDI.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/MDI.F,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MDI.F 21 Dec 2004 00:19:10 -0000 1.1 --- MDI.F 8 Jan 2005 14:03:49 -0000 1.2 *************** *** 11,18 **** cr .( Loading Multiple Document Interface classes...) - True value NotCancelled \ set to False in child's WM_CLOSE to cancel during CloseAll - \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ MDI Client Window class --- 11,16 ---- Index: HtmlDisplayControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/HtmlDisplayControl.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsHA0sNb and /tmp/cvs7wVjg9 differ Index: RegistryWindowPos.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/RegistryWindowPos.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsljP2qe and /tmp/cvsbUej0b differ |
|
From: Dirk B. <db...@us...> - 2005-01-08 14:04:06
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17696/src Modified Files: Window.f Log Message: dbu: some cosmetic changes Index: Window.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Window.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Window.f 21 Dec 2004 00:19:09 -0000 1.1 --- Window.f 8 Jan 2005 14:03:48 -0000 1.2 *************** *** 374,391 **** : create-frame-window ( -- hwnd ) 0 0 \ adjust x,y relative to 0,0 StartSize: [ self ] \ width, height SetRect: WinRect ! ExWindowStyle: [ self ] WindowHasMenu: [ self ] \ have menu flag? ! WindowStyle: [ self ] \ the window style ! AddrOf: WinRect \ make a new rectangle call AdjustWindowRectEx ?win-error \ adjust the window ^base \ creation parameters appInst \ program instance NULL LoadMenu: [ self ] \ menu ParentWindow: [ self ] \ parent window handle ! Bottom: WinRect Top: WinRect - \ adjusted height ! Right: WinRect Left: WinRect - \ adjusted width StartPos: [ self ] swap \ y, x starting position WindowStyle: [ self ] \ the window style --- 374,396 ---- : create-frame-window ( -- hwnd ) + + \ calc window rect 0 0 \ adjust x,y relative to 0,0 StartSize: [ self ] \ width, height SetRect: WinRect ! ! ExWindowStyle: [ self ] \ extended window style WindowHasMenu: [ self ] \ have menu flag? ! WindowStyle: [ self ] \ window style ! AddrOf: WinRect \ make a new rectangle call AdjustWindowRectEx ?win-error \ adjust the window + + \ create the window ^base \ creation parameters appInst \ program instance NULL LoadMenu: [ self ] \ menu ParentWindow: [ self ] \ parent window handle ! Bottom: WinRect Top: WinRect - \ adjusted height ! Right: WinRect Left: WinRect - \ adjusted width StartPos: [ self ] swap \ y, x starting position WindowStyle: [ self ] \ the window style *************** *** 394,398 **** ExWindowStyle: [ self ] \ extended window style Call CreateWindowEx ! EraseRect: WinRect ; :M SetClassName: ( adr len -- ) --- 399,404 ---- ExWindowStyle: [ self ] \ extended window style Call CreateWindowEx ! EraseRect: WinRect ! ; :M SetClassName: ( adr len -- ) *************** *** 511,521 **** :M Start: ( -- ) \ create a new window object hWnd 0= ! if register-frame-window drop ! create-frame-window to hWnd ! SW_SHOWNORMAL Show: self ! Update: self ! else SetFocus: self ! then ! ;M :M Enable: ( f1 -- ) --- 517,526 ---- :M Start: ( -- ) \ create a new window object hWnd 0= ! if register-frame-window drop ! create-frame-window to hWnd ! SW_SHOWNORMAL Show: self ! Update: self ! else SetFocus: self ! then ;M :M Enable: ( f1 -- ) *************** *** 562,566 **** :M WM_CREATE On_Init: [ self ] ! 0 ;M :M WM_DESTROY --- 567,572 ---- :M WM_CREATE On_Init: [ self ] ! 0 ! ;M :M WM_DESTROY *************** *** 820,825 **** : LoadIconFile ( adr len -- hIcon ) \ load an icon from a ico-file ! asciiz >r LR_LOADFROMFILE 0 0 IMAGE_ICON r> NULL call LoadImage ; ! \ No newline at end of file --- 826,832 ---- : LoadIconFile ( adr len -- hIcon ) \ load an icon from a ico-file ! asciiz >r LR_LOADFROMFILE 0 0 IMAGE_ICON r> NULL call LoadImage ; ! ! |
1040 messages has been excluded from this view by a project administrator.
