From: Dirk B. <db...@us...> - 2007-05-26 08:27:54
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv389/apps/Win32ForthIDE Modified Files: CommandID.f EdDebug.f EdMenu.f EdVersion.f Main.f Log Message: - Changed the shortkey for the "Winodw" menu to ALT-W. - Made the "Data Iquire" button in the "Debug" dialog work. - "Set breakpoint" CTRL+B command added Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** Main.f 14 May 2007 05:37:39 -0000 1.40 --- Main.f 26 May 2007 08:27:49 -0000 1.41 *************** *** 953,956 **** --- 953,957 ---- 0 VK_F11 IDM_DEBUG ACCELENTRY 0 VK_F10 IDM_HTML_PREVIEW ACCELENTRY + FCONTROL 'B' IDM_SET_BREAK_POINT ACCELENTRY \ Help menu Index: EdVersion.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdVersion.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdVersion.f 15 Apr 2007 02:55:45 -0000 1.5 --- EdVersion.f 26 May 2007 08:27:49 -0000 1.6 *************** *** 1,5 **** \ $Id$ ! 10203 value sciedit_version# \ Version numbers: v.ww.rr --- 1,5 ---- \ $Id$ ! 10204 value sciedit_version# \ Version numbers: v.ww.rr *************** *** 273,274 **** --- 273,281 ---- - Added "Search and Replace" ability to the IDE editor. In the process corrected a few bugs in ScintillaControl.f . + + \ changes for Version 1.02.04 + dbu Samstag, Mai 26 2007 + - Changed the shortkey for the "Winodw" menu to ALT-W. + - Made the "Data Iquire" button in the "Debug" dialog work. + - "Set breakpoint" CTRL+B command added + Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CommandID.f 15 Apr 2007 02:55:45 -0000 1.10 --- CommandID.f 26 May 2007 08:27:49 -0000 1.11 *************** *** 97,100 **** --- 97,101 ---- NewID IDM_HANDLEW32FMSG NewID IDM_RESET_CON_IO + NewID IDM_SET_BREAK_POINT \ Window menu Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** EdMenu.f 26 May 2007 05:51:12 -0000 1.20 --- EdMenu.f 26 May 2007 08:27:49 -0000 1.21 *************** *** 165,168 **** --- 165,169 ---- :MenuItem mp_reset "&Reset" IDM_RESET_CON_IO DoCommand ; MenuSeparator + :MenuItem mp_setbp "&Set breakpoint...\tCTRL+B" IDM_SET_BREAK_POINT DoCommand ; :MenuItem mp_debug "&Debug...\tF11" IDM_DEBUG DoCommand ; :MenuItem mp_HandleW32FMsg "&Handle debug messages?" IDM_HANDLEW32FMSG DoCommand ; *************** *** 359,368 **** CreateBackup? Check: mp_backup SaveAllBeforeCompile? Check: mp_sabcompile ! StripTrailingWhitespace? Check: mp_rtwh ! FinalNewLine? Check: mp_efle \ Win32Forth menu ActiveRemote ActiveChild = HandleW32FMsg? and Enable: mp_debug ! HandleW32FMsg? Check: mp_HandleW32FMsg \ Help menu --- 360,370 ---- CreateBackup? Check: mp_backup SaveAllBeforeCompile? Check: mp_sabcompile ! StripTrailingWhitespace? Check: mp_rtwh ! FinalNewLine? Check: mp_efle \ Win32Forth menu ActiveRemote ActiveChild = HandleW32FMsg? and Enable: mp_debug ! ActiveRemote ActiveChild = HandleW32FMsg? and Enable: mp_setbp ! HandleW32FMsg? Check: mp_HandleW32FMsg \ Help menu Index: EdDebug.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdDebug.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EdDebug.f 13 May 2007 07:52:26 -0000 1.2 --- EdDebug.f 26 May 2007 08:27:49 -0000 1.3 *************** *** 43,46 **** --- 43,48 ---- 0 WM_DONEBP win32forth-message ; + NewEditDialog InquireDlg "Inquire for Data Item" "Get Current Value for:" "Inquire" "" "" + 0 value debug-buttons? *************** *** 54,61 **** --- 56,65 ---- int HexBase Font dbFont + int inq-running? :M ClassInit: ( -- ) ClassInit: super FALSE to HexBase \ FALSE = Decimal, TRUE = Hex + FALSE to inq-running? 8 Width: dbFont 14 Height: dbFont *************** *** 64,74 **** :M GetTemplate: ( -- template ) ! template ! ;M :M ExWindowStyle: ( -- ) ! ExWindowStyle: super ! WS_EX_TOOLWINDOW or ! ;M : "addstack { adr len \ ztemp -- } --- 68,75 ---- :M GetTemplate: ( -- template ) ! template ;M :M ExWindowStyle: ( -- ) ! ExWindowStyle: super WS_EX_TOOLWINDOW or ;M : "addstack { adr len \ ztemp -- } *************** *** 141,144 **** --- 142,173 ---- ;M + : show-inquire { \ temp$ -- } + MAXSTRING LocalAlloc: temp$ + s" " temp$ place \ init to empty type + ed-result @ 4 min 0 + ?DO ed-result i 1+ cells+ @ n>" temp$ +place + s" " temp$ +place + LOOP temp$ count IDT_RESULT SetDlgItemText: self ; + + : inquirebp ( -- ) + \ *G inquire for the value of a data item + ed-ptr 0= ?EXIT \ only if we have shared memory + inq-running? 0= + IF TRUE to inq-running? + + SelTextToPad ?dup + if ed-inquire place + else drop + then + + ed-inquire self Start: InquireDlg + ed-inquire c@ 0> and + IF 0 WM_INQUIRE win32forth-message + THEN + + FALSE to inq-running? + ELSE beep + THEN ; + :M On_Init: ( -- ) On_Init: super *************** *** 168,171 **** --- 197,201 ---- IDB_HERE OF herebp ENDOF IDB_DONE OF donebp ENDOF + IDB_INQUIRE OF inquirebp show-inquire ENDOF IDR_HEX OF TRUE to HexBase ShowStack: self ENDOF IDR_DECIMAL OF FALSE to HexBase ShowStack: self ENDOF *************** *** 184,216 **** ;Object ! : debug-buttons ( -- ) \ open the Debug dialog Frame Start: DbgButtonsDlg TRUE to debug-buttons? ; ! : receive-stack ( -- ) \ get stack from Forth ShowStack: DbgButtonsDlg ; : receive-debug ( -- ) ShowDebug: DbgButtonsDlg ; \ ----------------------------------------------------------------------------- \ ----------------------------------------------------------------------------- - \ : zMessageBox ( szString -- ) - \ z" Notice" - \ MB_OK MB_ICONSTOP or - \ MessageBox: Frame ; - \ - \ MAXSTRING pointer debug-buf - \ NewEditDialog DebugDlg "Insert BreakPoint at Word" "BreakPoint at: ' [ vocabulary (sp) ] word '" "Set" "" "" - \ - \ : "debug-word ( a1 n1 -- ) - \ ed-name place \ the name we want debugged - \ ed-response off \ clear return result - \ 0 WM_SETBP win32forth-message - \ ed-response @ 0= - \ IF z" Failed to set BreakPoint!" zMessageBox - \ THEN - \ ed-response @ \ browse mode it BP is set - \ IF debug-buttons - \ THEN ; --- 214,259 ---- ;Object ! : debug-buttons ( -- ) ! \ *G Open the Debug dialog Frame Start: DbgButtonsDlg TRUE to debug-buttons? ; ! : receive-stack ( -- ) ! \ *G Get stack from Forth ShowStack: DbgButtonsDlg ; : receive-debug ( -- ) + \ *G ??? ShowDebug: DbgButtonsDlg ; \ ----------------------------------------------------------------------------- \ ----------------------------------------------------------------------------- + MAXSTRING pointer debug-buf + NewEditDialog DebugDlg "Set BreakPoint at Word" "BreakPoint at: ' [ vocabulary (sp) ] word '" "Set" "" "" + + : "debug-word ( a1 n1 -- ) + \ *G Set a breakpoint on word a1 n1 + ed-name place \ the name we want debugged + ed-response off \ clear return result + 0 WM_SETBP win32forth-message + ed-response @ 0= + IF z" Failed to set BreakPoint!" WindowTitle: MainWindow + [ MB_OK MB_ICONERROR or ] literal + GetHandle: MainWindow call MessageBox drop + THEN + ed-response @ \ browse mode it BP is set + IF debug-buttons + THEN ; + + : debug-word ( -- ) + \ *G Set a breakpoint on a word + SelTextToPad ?dup + if debug-buf place + debug-buf count -trailing nip debug-buf c! \ no trailing bl's + else drop + then + + debug-buf MainWindow start: DebugDlg + IF debug-buf count "debug-word + THEN ; IDM_SET_BREAK_POINT SetCommand |