From: Jos v.d.V. <jo...@us...> - 2008-07-25 21:19:25
|
Update of /cvsroot/win32forth/win32forth/apps/WinEd In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7652 Modified Files: Ed_Keys.F Ed_Menu.F Ed_MenuFuncs.F WinEd.f Log Message: Jos: This version can be compiled with the old console and the new console. When the old console is used it works as usual. When the newest console is used it skips the code used for the macro's. There is one BIG problem: It crashes when the new console is used. There is also a problem with the positioning of the cursor when using the new console. Index: WinEd.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/WinEd.f,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** WinEd.f 18 Jun 2008 10:50:40 -0000 1.17 --- WinEd.f 25 Jul 2008 21:19:20 -0000 1.18 *************** *** 64,68 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! : Edit-init ( -- ) ['] view-before-bye is before-bye \ called by WM_CLOSE ['] viewbye is bye --- 64,78 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! : Edit-init ( -- xxx ) ! (( [DEFINED] M_INIT-CONSOLE not [IF] ! initialization-chain do-chain ! init-console drop ! exception@ if bye then ! unset-except set-except \ exception handling needs to be set after the console is started ! menu-off \ close menubar ! HideStatusBar: ConsoleWindow \ close the statusbar ! \ set-console-title \ set window title ! \ get-commandline ! [THEN] )) ['] view-before-bye is before-bye \ called by WM_CLOSE ['] viewbye is bye *************** *** 154,158 **** : WinEdDbg ( -- ) \ load WinEd in 'debug-mode' true to (WinEdDbg) \ turn debug mode for WinEd on ! s" src\wined\wined.f " Prepend<home>\ "Fload ; \ and load it you can run WinEd from the forth console by typing: WinEdDbg <cr> --- 164,168 ---- : WinEdDbg ( -- ) \ load WinEd in 'debug-mode' true to (WinEdDbg) \ turn debug mode for WinEd on ! s" apps\wined\wined.f " Prepend<home>\ "Fload ; \ and load it you can run WinEd from the forth console by typing: WinEdDbg <cr> Index: Ed_Menu.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_Menu.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Ed_Menu.F 18 Jun 2008 10:50:40 -0000 1.4 --- Ed_Menu.F 25 Jul 2008 21:19:20 -0000 1.5 *************** *** 305,308 **** --- 305,310 ---- MENUITEM "&Goto Line Number... \tCtrl+Enter" goto-line ; + [DEFINED] new-macro [IF] + POPUP "&Macros" MENUITEM "&New Key Recording File..." new-macro ; *************** *** 315,318 **** --- 317,321 ---- MENUITEM "&Repeat Key File n times.. \tCtrl+Shft+R" EditorWindow repeat-amacro ; + [THEN] POPUP "H&yper" Index: Ed_MenuFuncs.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_MenuFuncs.F,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Ed_MenuFuncs.F 18 Jun 2008 10:50:40 -0000 1.5 --- Ed_MenuFuncs.F 25 Jul 2008 21:19:20 -0000 1.6 *************** *** 506,509 **** --- 506,511 ---- THEN SetFocus: DocWindow ; + defined "playkeys [IF] + : play-macro ( -- ) Gethandle: EditorWindow Start: PlayLog dup c@ *************** *** 520,523 **** --- 522,526 ---- 10 to playrate \ set the macro execution DELAY to small number for \ HIGH SPEED, normally set to 1000 + [THEN] previous Index: Ed_Keys.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_Keys.F,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Ed_Keys.F 18 Jun 2008 10:50:40 -0000 1.5 --- Ed_Keys.F 25 Jul 2008 21:19:20 -0000 1.6 *************** *** 220,224 **** --- 220,227 ---- 'H' +k_control +k_shift OF make-hex ENDOF 'L' +k_control OF load-active-file ENDOF + + [DEFINED] replay-macro [IF] 'M' +k_control +k_shift OF [ also HIDDEN ] replay-macro [ previous ] ENDOF + [THEN] 'N' +k_control OF new-text ENDOF 'O' +k_control OF open-text ENDOF *************** *** 229,235 **** 'Q' +k_control +k_shift OF revert-text ( see also D ) ENDOF 'R' +k_control OF reformat-text ENDOF - 'R' +k_control +k_shift OF [ also HIDDEN ] EditorWindow repeat-amacro [ previous ] ENDOF 'S' +k_control OF save-text ENDOF 'S' +k_control +k_shift OF [ also HIDDEN ] Start/Stop-macro [ previous ] ENDOF 'T' +k_control OF word-delete ENDOF 'T' +k_control +k_shift OF word-undelete ENDOF --- 232,242 ---- 'Q' +k_control +k_shift OF revert-text ( see also D ) ENDOF 'R' +k_control OF reformat-text ENDOF 'S' +k_control OF save-text ENDOF + + [DEFINED] repeat-amacro [IF] + 'R' +k_control +k_shift OF [ also HIDDEN ] EditorWindow repeat-amacro [ previous ] ENDOF 'S' +k_control +k_shift OF [ also HIDDEN ] Start/Stop-macro [ previous ] ENDOF + [THEN] + 'T' +k_control OF word-delete ENDOF 'T' +k_control +k_shift OF word-undelete ENDOF *************** *** 255,259 **** --- 262,270 ---- k_F3 +k_control OF find-text-highlight ENDOF k_F3 +k_shift +k_control OF replace-text ENDOF + + [DEFINED] replay-macro [IF] k_F5 OF [ also HIDDEN ] replay-macro [ previous ] ENDOF + [THEN] + k_F5 +k_control +k_shift OF cwords ENDOF k_F7 OF browse-toggle ENDOF |