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: Jos v.d.V. <jo...@us...> - 2006-07-10 19:29:39
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26815/apps/Win32ForthIDE Modified Files: Main.f Log Message: Jos: Repaired the Win32ForthIDE Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** Main.f 8 Jul 2006 10:09:20 -0000 1.20 --- Main.f 10 Jul 2006 19:29:02 -0000 1.21 *************** *** 102,107 **** TabWindow cTabWindow ! : show-project-tab ( -- ) ! 1 ShowTab: cTabWindow ; IDM_SHOWPROJECT_TAB SetCommand Needs Task.f --- 102,107 ---- TabWindow cTabWindow ! : show-project-tab ( -- ) ! 1 ShowTab: cTabWindow ; IDM_SHOWPROJECT_TAB SetCommand Needs Task.f *************** *** 497,506 **** if Resize: self then l GetNotifyWnd dup>r GetHandle: pToolBar = ToolTipHandle: pToolBar r@ = or ! if w l Handle_Notify: pToolBar ! else r@ GetHandle: ControlToolBar = ToolTipHandle: ControlToolBar r@ = or ! if w l Handle_Notify: ControlToolbar ! else false ! then ! then r>drop ;M --- 497,506 ---- if Resize: self then l GetNotifyWnd dup>r GetHandle: pToolBar = ToolTipHandle: pToolBar r@ = or ! if w l Handle_Notify: pToolBar ! else r@ GetHandle: ControlToolBar = ToolTipHandle: ControlToolBar r@ = or ! if w l Handle_Notify: ControlToolbar ! else false ! then ! then r>drop ;M *************** *** 520,533 **** int FileNotFound 2 CallBack: FindFile { hChild lparam -- f } ! hChild Call GetParent MDIClient: self = ! IF MAXCOUNTED temp$ hChild Call GetWindowText ! temp$ swap lParam count caps-compare to FileNotFound ! FileNotFound 0= IF hChild Activate: self beep THEN ! THEN FileNotFound ; \ FALSE if found :M FileNotFound: ( Filename$ -- f ) \ child window is activated if file is already open ! TRUE to FileNotFound ! &FindFile EnumChildWindows: self drop ! FileNotFound ;M ;Object --- 520,533 ---- int FileNotFound 2 CallBack: FindFile { hChild lparam -- f } ! hChild Call GetParent MDIClient: self = ! IF MAXCOUNTED temp$ hChild Call GetWindowText ! temp$ swap lParam count caps-compare to FileNotFound ! FileNotFound 0= IF hChild Activate: self beep THEN ! THEN FileNotFound ; \ FALSE if found :M FileNotFound: ( Filename$ -- f ) \ child window is activated if file is already open ! TRUE to FileNotFound ! &FindFile EnumChildWindows: self drop ! FileNotFound ;M ;Object *************** *** 537,557 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! WM_USER 0x0201 + constant WM_SAVE ! WM_USER 0x0202 + constant WM_UPDATE 0 value LastActiveChild \ the object address of the child window that was activated at last :Class MDIChild <Super MDIChildWindow ! int ChildWindow \ the child window for this MDI-Child ! int ChildParent \ the parent class of this MDI-Child :M WindowStyle: ( -- style ) ! WindowStyle: super ! WS_CLIPCHILDREN or ! GetActive: Frame 0= or IF WS_MAXIMIZE or THEN \ start new child maximised unless ! ;M \ the active child is not maximised :M DefaultIcon: ( -- hIcon ) ! s" res\SciEditMDI.ico" Prepend<home>\ LoadIconFile ;M :M GetFileName: ( -- addr ) --- 537,557 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! WM_USER 0x0201 + constant WM_SAVE ! WM_USER 0x0202 + constant WM_UPDATE 0 value LastActiveChild \ the object address of the child window that was activated at last :Class MDIChild <Super MDIChildWindow ! int ChildWindow \ the child window for this MDI-Child ! int ChildParent \ the parent class of this MDI-Child :M WindowStyle: ( -- style ) ! WindowStyle: super ! WS_CLIPCHILDREN or ! GetActive: Frame 0= or IF WS_MAXIMIZE or THEN \ start new child maximised unless ! ;M \ the active child is not maximised :M DefaultIcon: ( -- hIcon ) ! s" res\SciEditMDI.ico" Prepend<home>\ LoadIconFile ;M :M GetFileName: ( -- addr ) *************** *** 563,601 **** 0 value Starting? ! :M Start: ( parent -- ) true to Starting? ! Start: super ! self start: ChildWindow ! 0 0 Width Height Move: ChildWindow self AddFile: cTabWindow \ add the file to the file list ! \ SetFocus: ChildWindow ! SetFocus: self false to Starting? ! ;M ! :M ?Modified: ( -- f ) ! ?Modified: ChildParent ;M ! :M GetFileType: ( -- n ) ! GetFileType: ChildParent ;M :M UpdateStatusBar: ( -- ) ! ShowToolbar? ! if Update: ScintillaStatusbar ! then ;M :M On_SetFocus: ( -- ) \ A child window can be selected by clicking on it, ! \ selecting it from the Window menu or using CTRL+F6 ! SetFocus: ChildWindow ! ChildWindow to CurrentWindow ! self to ActiveChild ! Update: ChildParent ! UpdateStatusBar: self ! EnableToolbar \ self SelectFile: cTabWindow \ select the in the file list ;M ! :M On_Size: ( h m w l -- h m w l ) ! 0 0 Width Height Move: ChildWindow ;M \ :M On_ChildActivate: ( -- ) --- 563,601 ---- 0 value Starting? ! :M Start: ( parent -- ) true to Starting? ! Start: super ! self start: ChildWindow ! 0 0 Width Height Move: ChildWindow self AddFile: cTabWindow \ add the file to the file list ! \ SetFocus: ChildWindow ! SetFocus: self false to Starting? ! ;M ! :M ?Modified: ( -- f ) ! ?Modified: ChildParent ;M ! :M GetFileType: ( -- n ) ! GetFileType: ChildParent ;M :M UpdateStatusBar: ( -- ) ! ShowToolbar? ! if Update: ScintillaStatusbar ! then ;M :M On_SetFocus: ( -- ) \ A child window can be selected by clicking on it, ! \ selecting it from the Window menu or using CTRL+F6 ! SetFocus: ChildWindow ! ChildWindow to CurrentWindow ! self to ActiveChild ! Update: ChildParent ! UpdateStatusBar: self ! EnableToolbar \ self SelectFile: cTabWindow \ select the in the file list ;M ! :M On_Size: ( h m w l -- h m w l ) ! 0 0 Width Height Move: ChildWindow ;M \ :M On_ChildActivate: ( -- ) *************** *** 618,680 **** \ ;M ! : ?SaveMessage ( -- n ) \ IDYES, IDNO or IDCANCEL ! s" Do you want to save " pad place ! GetFileName: ChildParent count "to-pathend" pad +place ! s" ?" pad +place pad +NULL ! pad 1+ z" Win32Forth IDE" ! [ MB_ICONEXCLAMATION MB_YESNOCANCEL or ] literal ! hWnd MessageBox ; ! :M On_Close: ( -- f ) \ True = close, False = cancel close ! ?Modified: self ! IF ?SaveMessage ! Case ! IDCANCEL Of FALSE Endof ! IDYES Of SaveFile: ChildParent TRUE Endof ! ( otherwise IDNO ) TRUE swap ! EndCase ! ELSE TRUE ! THEN ! dup dup to NotCancelled ! IF \ if we don't cancel the close ! GetFileName: ChildParent Insert: RecentFiles \ save filename in recent files list self RemoveFile: cTabWindow \ remove the file from the file list ! GetHandle: self Destroy: Frame \ sugested by Rod Oakford ! ChildWindow dispose \ then close the child window ! self dispose \ and dispose of both the ! \ EditControl and the child window ! THEN ! ;M :M WM_NOTIFY ( h m w l -- res ) ! GetFileType: self FT_SOURCE = ! if 2 cells + @ SCN_UPDATEUI = if UpdateStatusBar: self ! EnableToolbar then ! then false ;M :M WM_CONTEXTMENU ( hwnd msg wparam lparam -- res ) ! GetFileType: self FT_SOURCE = ! if ?BrowseMode: ChildParent ! if VK_CONTROL Call GetKeyState 0x8000 and if <Hyper: ChildParent else Hyper>: ChildParent then ! then ! then 0 ;M ! :M WM_SAVE ( -- ) \ save the current file if modified ! GetFileType: self FT_SOURCE = ! if ?Modified: self ! if SaveFile: ChildParent then ! then ;M ! :M WM_UPDATE ( -- ) \ save the current child from global variables ! GetFileType: self FT_SOURCE = ! if Update: ChildParent ! then ;M ;Class --- 618,680 ---- \ ;M ! : ?SaveMessage ( -- n ) \ IDYES, IDNO or IDCANCEL ! s" Do you want to save " pad place ! GetFileName: ChildParent count "to-pathend" pad +place ! s" ?" pad +place pad +NULL ! pad 1+ z" Win32Forth IDE" ! [ MB_ICONEXCLAMATION MB_YESNOCANCEL or ] literal ! hWnd MessageBox ; ! :M On_Close: ( -- f ) \ True = close, False = cancel close ! ?Modified: self ! IF ?SaveMessage ! Case ! IDCANCEL Of FALSE Endof ! IDYES Of SaveFile: ChildParent TRUE Endof ! ( otherwise IDNO ) TRUE swap ! EndCase ! ELSE TRUE ! THEN ! dup dup to NotCancelled ! IF \ if we don't cancel the close ! GetFileName: ChildParent Insert: RecentFiles \ save filename in recent files list self RemoveFile: cTabWindow \ remove the file from the file list ! GetHandle: self Destroy: Frame \ sugested by Rod Oakford ! ChildWindow dispose \ then close the child window ! self dispose \ and dispose of both the ! \ EditControl and the child window ! THEN ! ;M :M WM_NOTIFY ( h m w l -- res ) ! GetFileType: self FT_SOURCE = ! if 2 cells + @ SCN_UPDATEUI = if UpdateStatusBar: self ! EnableToolbar then ! then false ;M :M WM_CONTEXTMENU ( hwnd msg wparam lparam -- res ) ! GetFileType: self FT_SOURCE = ! if ?BrowseMode: ChildParent ! if VK_CONTROL Call GetKeyState 0x8000 and if <Hyper: ChildParent else Hyper>: ChildParent then ! then ! then 0 ;M ! :M WM_SAVE ( -- ) \ save the current file if modified ! GetFileType: self FT_SOURCE = ! if ?Modified: self ! if SaveFile: ChildParent then ! then ;M ! :M WM_UPDATE ( -- ) \ save the current child from global variables ! GetFileType: self FT_SOURCE = ! if Update: ChildParent ! then ;M ;Class *************** *** 751,827 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! :noname ( -- ) ! UpdateStatusBar ! EnableToolbar ! 0 0 WM_UPDATE SendMessageToAllChildren: Frame ; is Update ! : NewEditWnd ( -- ) \ open a new child window for editing ! New> HyperEditorChild to ActiveChild ! MDIClientWindow: Frame Start: ActiveChild ; ! : NewHtmlWnd ( -- ) \ open a new child window for displaying HTML-Files ! New> HtmlChild to ActiveChild ! MDIClientWindow: Frame Start: ActiveChild ; :noname ( -- ) \ open a new child window for browsing the source files \ used by 'the class and vocabulary browser' and the ! \ 'Find text in Files' dialog ActiveBrowser 0= ! if NewEditWnd ActiveChild to ActiveBrowser ! then GetHandle: ActiveBrowser Activate: Frame ; is NewBrowseChild : NewRemoteChild ( -- ) \ open a new child window used to open a file \ remotly by the Win32Forth console ! ActiveRemote 0= ! if NewEditWnd ActiveChild to ActiveRemote ! then GetHandle: ActiveRemote Activate: Frame ; : (OpenHtmlFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewHtmlWnd ! temp$ count asciiz SetURL: ActiveChild ! then Update ; : (OpenSourceFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewEditWnd ! temp$ count OpenNamedFile: ActiveChild ! then Update ; : (OpenBinaryFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewHexViewWnd ! temp$ count SetFileName: ActiveChild ! GetBuffer: ViewerFile Dump: ActiveChild ! then Update ; : (OpenImageFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewImageViewWnd ! temp$ count SetFileName: ActiveChild ! then Update ; : (OpenRemoteFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewRemoteChild ! temp$ count OpenNamedFile: ActiveChild ! else ActiveChild to ActiveRemote ! then Update ; :noname ( addr -- ) --- 751,827 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! :noname ( -- ) ! UpdateStatusBar ! EnableToolbar ! 0 0 WM_UPDATE SendMessageToAllChildren: Frame ; is Update ! : NewEditWnd ( -- ) \ open a new child window for editing ! New> HyperEditorChild to ActiveChild ! MDIClientWindow: Frame Start: ActiveChild ; ! : NewHtmlWnd ( -- ) \ open a new child window for displaying HTML-Files ! New> HtmlChild to ActiveChild ! MDIClientWindow: Frame Start: ActiveChild ; :noname ( -- ) \ open a new child window for browsing the source files \ used by 'the class and vocabulary browser' and the ! \ 'Find text in Files' dialog ActiveBrowser 0= ! if NewEditWnd ActiveChild to ActiveBrowser ! then GetHandle: ActiveBrowser Activate: Frame ; is NewBrowseChild : NewRemoteChild ( -- ) \ open a new child window used to open a file \ remotly by the Win32Forth console ! ActiveRemote 0= ! if NewEditWnd ActiveChild to ActiveRemote ! then GetHandle: ActiveRemote Activate: Frame ; : (OpenHtmlFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewHtmlWnd ! temp$ count asciiz SetURL: ActiveChild ! then Update ; : (OpenSourceFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewEditWnd ! temp$ count OpenNamedFile: ActiveChild ! then Update ; : (OpenBinaryFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewHexViewWnd ! temp$ count SetFileName: ActiveChild ! GetBuffer: ViewerFile Dump: ActiveChild ! then Update ; : (OpenImageFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewImageViewWnd ! temp$ count SetFileName: ActiveChild ! then Update ; : (OpenRemoteFile) ( adr len -- ) ! { \ temp$ -- } ! MAX-PATH 2 + LocalAlloc: temp$ ! temp$ place ! temp$ FileNotFound: Frame ! if NewRemoteChild ! temp$ count OpenNamedFile: ActiveChild ! else ActiveChild to ActiveRemote ! then Update ; :noname ( addr -- ) *************** *** 848,911 **** \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! : DoMDIMsg ( pMsg f -- pMsg f ) ! dup MDIClient: Frame 0<> and ! IF drop dup MDIClient: Frame Call TranslateMDISysAccel 0= ! THEN ; msg-chain chain-add DoMDIMsg \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ Accelerator Table - support \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ AccelTable table ! \ falgs key-code command-id ! \ File menu ! FCONTROL 'N' IDM_NEW_SOURCE_FILE ACCELENTRY ! FCONTROL 'O' IDM_OPEN_SOURCE_FILE ACCELENTRY ! FCONTROL 'S' IDM_SAVE ACCELENTRY ! FALT 'S' IDM_SAVE_ALL ACCELENTRY ! FCONTROL 'P' IDM_PRINT ACCELENTRY ! \ FCONTROL 'R' IDM_RELOAD ACCELENTRY ! FSHIFT FCONTROL or 'O' IDM_OPEN_HIGHLIGHTED_FILE ACCELENTRY ! \ Edit menu ! FCONTROL 'F' IDM_FIND_TEXT ACCELENTRY ! FCONTROL VK_F3 IDM_FIND_TEXT ACCELENTRY ! 0 VK_F3 IDM_FIND_NEXT ACCELENTRY ! \ FSHIFT VK_F3 IDM_FIND_PREVIOUS ACCELENTRY ! FALT 'D' IDM_INSERT_DATE ACCELENTRY ! FALT 'T' IDM_INSERT_DATE&TIME ACCELENTRY ! FALT 'C' IDM_COMMENT_BLOCK ACCELENTRY ! FALT 'U' IDM_UNCOMMENT_BLOCK ACCELENTRY ! FSHIFT FCONTROL or 'F' IDM_FIND_IN_FILES ACCELENTRY ! \ DexH menu ! FALT 'G' IDM_DEX_GLOSSARY ACCELENTRY ! FALT 'P' IDM_DEX_PARAGRAPH ACCELENTRY ! FALT FCONTROL or 'C' IDM_DEX_CODE_PARAGRAPH ACCELENTRY ! FALT 'B' IDM_DEX_STYLE_BOLD ACCELENTRY ! FALT 'I' IDM_DEX_STYLE_ITALIC ACCELENTRY ! FALT FCONTROL or 'T' IDM_DEX_STYLE_TYPEWRITER ACCELENTRY ! \ Properties menu ! 0 VK_F7 IDM_BROWSE ACCELENTRY ! \ Win32Forth menu ! 0 VK_F12 IDM_COMPILE ACCELENTRY ! 0 VK_F11 IDM_DEBUG ACCELENTRY ! 0 VK_F10 IDM_HTML_PREVIEW ACCELENTRY ! \ Help menu ! FCONTROL VK_F1 IDM_W32F_ANS_HELP ACCELENTRY ! FSHIFT VK_F1 IDM_API_HELP ACCELENTRY ! 0 VK_F1 IDM_W32F_DOC ACCELENTRY ! FALT VK_F1 IDM_ANS_DOC ACCELENTRY Frame HandlesThem \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ command line handling \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ --- 848,911 ---- \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! : DoMDIMsg ( pMsg f -- pMsg f ) ! dup MDIClient: Frame 0<> and ! IF drop dup MDIClient: Frame Call TranslateMDISysAccel 0= ! THEN ; msg-chain chain-add DoMDIMsg \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ Accelerator Table - support \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ AccelTable table ! \ falgs key-code command-id ! \ File menu ! FCONTROL 'N' IDM_NEW_SOURCE_FILE ACCELENTRY ! FCONTROL 'O' IDM_OPEN_SOURCE_FILE ACCELENTRY ! FCONTROL 'S' IDM_SAVE ACCELENTRY ! FALT 'S' IDM_SAVE_ALL ACCELENTRY ! FCONTROL 'P' IDM_PRINT ACCELENTRY ! \ FCONTROL 'R' IDM_RELOAD ACCELENTRY ! FSHIFT FCONTROL or 'O' IDM_OPEN_HIGHLIGHTED_FILE ACCELENTRY ! \ Edit menu ! FCONTROL 'F' IDM_FIND_TEXT ACCELENTRY ! FCONTROL VK_F3 IDM_FIND_TEXT ACCELENTRY ! 0 VK_F3 IDM_FIND_NEXT ACCELENTRY ! \ FSHIFT VK_F3 IDM_FIND_PREVIOUS ACCELENTRY ! FALT 'D' IDM_INSERT_DATE ACCELENTRY ! FALT 'T' IDM_INSERT_DATE&TIME ACCELENTRY ! FALT 'C' IDM_COMMENT_BLOCK ACCELENTRY ! FALT 'U' IDM_UNCOMMENT_BLOCK ACCELENTRY ! FSHIFT FCONTROL or 'F' IDM_FIND_IN_FILES ACCELENTRY ! \ DexH menu ! FALT 'G' IDM_DEX_GLOSSARY ACCELENTRY ! FALT 'P' IDM_DEX_PARAGRAPH ACCELENTRY ! FALT FCONTROL or 'C' IDM_DEX_CODE_PARAGRAPH ACCELENTRY ! FALT 'B' IDM_DEX_STYLE_BOLD ACCELENTRY ! FALT 'I' IDM_DEX_STYLE_ITALIC ACCELENTRY ! FALT FCONTROL or 'T' IDM_DEX_STYLE_TYPEWRITER ACCELENTRY ! \ Properties menu ! 0 VK_F7 IDM_BROWSE ACCELENTRY ! \ Win32Forth menu ! 0 VK_F12 IDM_COMPILE ACCELENTRY ! 0 VK_F11 IDM_DEBUG ACCELENTRY ! 0 VK_F10 IDM_HTML_PREVIEW ACCELENTRY ! \ Help menu ! FCONTROL VK_F1 IDM_W32F_ANS_HELP ACCELENTRY ! FSHIFT VK_F1 IDM_API_HELP ACCELENTRY ! 0 VK_F1 IDM_W32F_DOC ACCELENTRY ! FALT VK_F1 IDM_ANS_DOC ACCELENTRY Frame HandlesThem \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! \ command line handling \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ *************** *** 939,952 **** strip-cmdline ! 2dup IsHtmlFile? ! if (OpenHtmlFile) ! else (OpenRemoteFile) ActiveChild if bBrowse SetBrowseMode: ActiveChild #line 1- GotoLine: ActiveChild then ! then else drop then ; \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ The word to start the application --- 939,953 ---- strip-cmdline ! 2dup IsHtmlFile? ! if (OpenHtmlFile) ! else (OpenRemoteFile) ActiveChild if bBrowse SetBrowseMode: ActiveChild #line 1- GotoLine: ActiveChild then ! then else drop then ; + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ The word to start the application *************** *** 962,966 **** Turnkeyed? IF Begin key drop again THEN ; - [defined] sysgen [IF] --- 963,966 ---- |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-10 19:29:17
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26815/src Modified Files: paths.f Log Message: Jos: Repaired the Win32ForthIDE Index: paths.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** paths.f 8 Jul 2006 17:58:07 -0000 1.10 --- paths.f 10 Jul 2006 19:29:06 -0000 1.11 *************** *** 46,49 **** --- 46,54 ---- /parse-word count "chdir cr .dir ; + : path: ( - ) \ map: 2variable_path-source counted_path + create -1 , 0 , MAX-PATH 1+ allot does> \ run-time: ( - path-ptr ) + [ 2 cells ] literal + + ; + IN-APPLICATION *************** *** 56,64 **** create path-file$ MAX-PATH 1+ allot - : path: ( - ) \ map: 2variable_path-source counted_path - create -1 , 0 , MAX-PATH 1+ allot does> \ run-time: ( - path-ptr ) - [ 2 cells ] literal + - ; - : path-source ( path-ptr - 2variable_path-source ) 2 cells- ; --- 61,64 ---- |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-10 19:29:10
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26815/src/lib Modified Files: FileLister.f Log Message: Jos: Repaired the Win32ForthIDE Index: FileLister.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/FileLister.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileLister.f 8 Jul 2006 17:50:33 -0000 1.3 --- FileLister.f 10 Jul 2006 19:29:05 -0000 1.4 *************** *** 286,290 **** int #dirs \ number of directories found when updating int #fls \ ditto files - max-path bytes thespecs int hwndlabel \ handle to window to display path \ number of files shown is limited only by available memory --- 286,289 ---- *************** *** 296,299 **** --- 295,299 ---- 2 cells bytes rootname max-path 1+ bytes Treepath + path: thespecs : free-recbuffer ( -- ) *************** *** 520,525 **** : FindAllFiles ( -- ) - path-ptr >r - thespecs to path-ptr 0 to #dirs 0 to #fls \ we get all directories first --- 520,523 ---- *************** *** 533,537 **** repeat FindClose: FileFinder \ now we get the rest of the files ! path-ptr first-path" begin dup 0> while TreePath count 2swap SetUp: FileFinder --- 531,535 ---- repeat FindClose: FileFinder \ now we get the rest of the files ! thespecs first-path" begin dup 0> while TreePath count 2swap SetUp: FileFinder *************** *** 543,549 **** then FindNextFile: FileFinder repeat FindClose: FileFinder ! path-ptr next-path" repeat 2drop ! r> to path-ptr ; : recbuffer() ( n -- addr ) --- 541,547 ---- then FindNextFile: FileFinder repeat FindClose: FileFinder ! thespecs next-path" repeat 2drop ! ; : recbuffer() ( n -- addr ) |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-10 18:31:33
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2384/apps/Player4 Added Files: SearchPath.f SearchPath.ff Log Message: Jos: Added the missing files to specify the relative path --- NEW FILE: SearchPath.ff --- (This appears to be a binary file; contents omitted.) --- NEW FILE: SearchPath.f --- \- textbox needs excontrols.f :Object Form_search_path <Super DialogWindow Font WinFont \ default font ' 2drop value WmCommand-Func \ function pointer for WM_COMMAND ColorObject FrmColor \ the background color \ 0 value hWndParent \ window handle of the parent of form TextBox tb1 TextBox tb2 TextBox tb3 TextBox tb4 TextBox tb5 TextBox tb6 TextBox tb7 PushButton bt1 PushButton bt2 PushButton bt3 PushButton bt4 PushButton bt5 PushButton bt6 PushButton bt7 PushButton btOk PushButton btCancel :M ClassInit: ( -- ) ClassInit: super \ Insert your code here ;M :M WindowStyle: ( -- style ) WS_POPUPWINDOW WS_DLGFRAME or ;M \ if this form is a modal form a non-zero parent must be set :M ParentWindow: ( -- hwndparent | 0 if no parent ) hWndParent ;M :M SetParent: ( hwndparent -- ) \ set owner window to hWndParent ;M :M WindowTitle: ( -- ztitle ) z" Setup search path" ;M :M StartSize: ( -- width height ) 288 233 ;M :M StartPos: ( -- x y ) 150 175 ;M :M Close: ( -- ) \ Insert your code here Close: super ;M :M On_Init: ( -- ) s" MS Sans Serif" SetFaceName: WinFont 8 Width: WinFont Create: WinFont drop \ set form color to system color COLOR_BTNFACE Call GetSysColor NewColor: FrmColor self Start: tb1 30 20 200 23 Move: tb1 Handle: Winfont SetFont: tb1 WS_CHILD WindowStyle: tb1 self Start: tb2 30 42 200 23 Move: tb2 Handle: Winfont SetFont: tb2 WS_CHILD WindowStyle: tb1 self Start: tb3 30 63 200 23 Move: tb3 Handle: Winfont SetFont: tb3 self Start: tb4 30 83 200 25 Move: tb4 Handle: Winfont SetFont: tb4 self Start: tb5 30 106 200 23 Move: tb5 Handle: Winfont SetFont: tb5 self Start: tb6 30 127 200 23 Move: tb6 Handle: Winfont SetFont: tb6 self Start: tb7 30 149 200 23 Move: tb7 Handle: Winfont SetFont: tb7 self Start: bt1 231 22 30 20 Move: bt1 Handle: Winfont SetFont: bt1 s" ......." SetText: bt1 self Start: bt2 231 44 30 20 Move: bt2 Handle: Winfont SetFont: bt2 s" ......." SetText: bt2 self Start: bt3 231 65 30 20 Move: bt3 Handle: Winfont SetFont: bt3 s" ......." SetText: bt3 self Start: bt4 231 86 30 20 Move: bt4 Handle: Winfont SetFont: bt4 s" ......." SetText: bt4 self Start: bt5 231 108 30 20 Move: bt5 Handle: Winfont SetFont: bt5 s" ......." SetText: bt5 self Start: bt6 231 130 30 20 Move: bt6 Handle: Winfont SetFont: bt6 s" ......." SetText: bt6 self Start: bt7 231 151 30 20 Move: bt7 Handle: Winfont SetFont: bt7 s" ......." SetText: bt7 self Start: btOk 40 190 100 25 Move: btOk Handle: Winfont SetFont: btOk s" OK" SetText: btOk self Start: btCancel 150 190 100 25 Move: btCancel Handle: Winfont SetFont: btCancel s" Cancel" SetText: btCancel CatalogPath first-path" SetText: tb1 CatalogPath next-path" SetText: tb2 CatalogPath next-path" SetText: tb3 CatalogPath next-path" SetText: tb4 CatalogPath next-path" SetText: tb5 CatalogPath next-path" SetText: tb6 CatalogPath next-path" SetText: tb7 ;M : AskFolder ( - adr cnt ) z" Add to search path:" temp$ GetHandle: self BrowseForFolder temp$ dup +null count ; : AddToPath ( str cnt - ) dup 0> if CatalogPath "path+ else 2drop then ; : SaveSearchPath ( -- ) CatalogPath off GetText: tb1 AddToPath GetText: tb2 AddToPath GetText: tb3 AddToPath GetText: tb4 AddToPath GetText: tb5 AddToPath GetText: tb6 AddToPath GetText: tb7 AddToPath \ path-ptr dup c@ 1- swap c! path-ptr +NULL Close: Self ; : HandleButtons ( Action/Button - ) case GetId: bt1 of AskFolder SetText: tb1 endof GetId: bt2 of AskFolder SetText: tb2 endof GetId: bt3 of AskFolder SetText: tb3 endof GetId: bt4 of AskFolder SetText: tb4 endof GetId: bt5 of AskFolder SetText: tb5 endof GetId: bt6 of AskFolder SetText: tb6 endof GetId: bt7 of AskFolder SetText: tb7 endof GetId: btOk of SaveSearchPath endof GetId: btCancel of Close: Self endof endcase ; :M WM_COMMAND ( h m w l -- res ) over LOWORD ( ID ) self \ object address on stack WMCommand-Func ?dup \ must not be zero if execute drop HandleButtons else 2drop \ drop ID and object address then 0 ;M :M SetCommand: ( cfa -- ) \ set WMCommand function to WMCommand-Func ;M :M On_Paint: ( -- ) 0 0 GetSize: self Addr: FrmColor FillArea: dc ;M :M On_Done: ( -- ) Delete: WinFont \ Insert your code here On_Done: super ;M ;Object \s |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-08 19:59:54
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32051/src/lib Modified Files: SUB_DIRS.F Log Message: Jos: Bugfix Index: SUB_DIRS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/SUB_DIRS.F,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SUB_DIRS.F 8 Jul 2006 17:50:33 -0000 1.6 --- SUB_DIRS.F 8 Jul 2006 19:59:50 -0000 1.7 *************** *** 219,225 **** : sdir ( path count file-spec count flag-subdir - ) to sub-dirs? ! mask-buf place mask-buf +NULL ! sdir-path place sdir-path +NULL ! (do-files-process ; --- 219,225 ---- : sdir ( path count file-spec count flag-subdir - ) to sub-dirs? ! mask-buf place mask-buf +NULL ! sdir-path place sdir-path +NULL ! sdir-path (do-files-process ; |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-08 19:58:55
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31458/apps/Player4 Modified Files: Catalog.f CommandID.f Commands.f PLAYER4.F Pl_MciWindow.f Pl_Version.f PopupWindow.f Log Message: Jos: Made the use of a relative search path in the catalog possible Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/CommandID.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CommandID.f 24 May 2006 15:27:43 -0000 1.3 --- CommandID.f 8 Jul 2006 19:58:52 -0000 1.4 *************** *** 8,12 **** : NewID ( <name> -- ) ! defined IF drop ELSE count "header NextId DOCON , , --- 8,12 ---- : NewID ( <name> -- ) ! defined IF drop ELSE count "header NextId DOCON , , *************** *** 48,68 **** IdCounter constant IDM_LAST ! : allot-erase ( n -- ) ! here over allot swap erase ; Create CommandTable IDM_LAST IDM_FIRST - cells allot-erase ! : IsCommand? ( ID -- f ) ! IDM_FIRST IDM_LAST within ; ! : >CommandTable ( ID -- addr ) ! dup IsCommand? ! if IDM_FIRST - cells CommandTable + ! else drop abort" error - command ID out of range" ! then ; ! : DoCommand ( ID -- ) ! >CommandTable @ ?dup IF execute THEN ; ! : SetCommand ( ID -- ) ! last @ name> swap >CommandTable ! ; --- 48,69 ---- IdCounter constant IDM_LAST ! : allot-erase ( n -- ) ! here over allot swap erase ; Create CommandTable IDM_LAST IDM_FIRST - cells allot-erase ! : IsCommand? ( ID -- f ) ! IDM_FIRST IDM_LAST within ; ! : >CommandTable ( ID -- addr ) ! dup IsCommand? ! if IDM_FIRST - cells CommandTable + ! else drop abort" error - command ID out of range" ! then ; ! : DoCommand ( ID -- ) ! >CommandTable @ ?dup IF execute THEN ; ! : SetCommand ( ID -- ) ! last @ name> swap >CommandTable ! ; ! \s Index: Pl_Version.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_Version.f,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Pl_Version.f 28 Jun 2006 11:43:12 -0000 1.18 --- Pl_Version.f 8 Jul 2006 19:58:52 -0000 1.19 *************** *** 3,7 **** anew -Pl_Version.f ! 10125 value player_version# \ Version numbers: v.ww.rr --- 3,7 ---- anew -Pl_Version.f ! 10126 value player_version# \ Version numbers: v.ww.rr *************** *** 38,43 **** - Create *.m3u files and import them the catalog - - BTW the filenames should be stored with relative - - Addtional search path's - Columns in the treeview. - Only add a new file to the catalog when it wasn't added before --- 38,41 ---- *************** *** 176,177 **** --- 174,179 ---- Push the joystick to the right when you would like to go in an already open child in a tree. + + \ changes for Version 1.01.26 + Jos: July 8th, 2006. + File names will now be relative stored when a search path is filled. Index: Catalog.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** Catalog.f 28 Jun 2006 11:43:12 -0000 1.36 --- Catalog.f 8 Jul 2006 19:58:52 -0000 1.37 *************** *** 56,59 **** --- 56,61 ---- DWORD VolLevel BYTE JoyStickDisabled- + 2 CELLS Field: SourcePathCatalog + MAX-PATH 1+ Field: SearchPathCatalog ;struct *************** *** 123,127 **** sizeof RecordDef dup to record-size mkstruct: InlineRecord ! : file-exist? ( adr len -- true-if-file-exist ) file-status nip 0= ; : file-size>s ( fileid -- len ) file-size drop d>s ; --- 125,129 ---- sizeof RecordDef dup to record-size mkstruct: InlineRecord ! : file-exist? ( adr len -- true-if-file-exist ) file-status nip 0= ; : file-size>s ( fileid -- len ) file-size drop d>s ; *************** *** 137,141 **** : create-index-file ( #records - f ) ! cells index$ create-file-ptrs index$ open-file-ptrs --- 139,143 ---- : create-index-file ( #records - f ) ! cells index$ create-file-ptrs index$ open-file-ptrs *************** *** 155,159 **** ; ! : unmap-configuration ( - ) database-mhndl dup flush-view-file drop close-map-file drop ; --- 157,161 ---- ; ! : unmap-configuration ( - ) database-mhndl dup flush-view-file drop close-map-file drop ; *************** *** 162,166 **** count 2dup file-exist? if r/w open-file abort" Can't open the file for writing" ! else r/w create-file abort" Can't create the file" then ; --- 164,168 ---- count 2dup file-exist? if r/w open-file abort" Can't open the file for writing" ! else r/w create-file abort" Can't create the file" then ; *************** *** 222,226 **** rebuild-index-hdrs ; ! : generate-index-file ( - ) unmap-database _generate-index-file ; --- 224,228 ---- rebuild-index-hdrs ; ! : generate-index-file ( - ) unmap-database _generate-index-file ; *************** *** 228,233 **** ! : vadr-config ( - vadr-config ) s" config-mhndl map-hndl>vadr " EVALUATE ; IMMEDIATE ! : SeparatorX ( - adr ) vadr-config _SeparatorX ; : check-config ( flag -- ) \ creates one with the right size --- 230,242 ---- ! : vadr-config ( - vadr-config ) s" config-mhndl map-hndl>vadr " EVALUATE ; IMMEDIATE ! : CatalogPath ( - CatalogPath ) vadr-config SearchPathCatalog ; ! ! : SeparatorX ( - adr ) vadr-config _SeparatorX ; ! ! \ : UseCatalogPath ( - ) vadr-config SearchPath to path-ptr ; ! \ : UseForthPath ( - ) &fpath to path-ptr ; ! : UseCatalogPath ( - ) ; ! : UseForthPath ( - ) ; : check-config ( flag -- ) \ creates one with the right size *************** *** 239,243 **** r> close-file throw map-config-file ! true vadr-config s_Artist_Title- c! 1000 vadr-config VolLevel ! then --- 248,252 ---- r> close-file throw map-config-file ! true vadr-config s_Artist_Title- c! 1000 vadr-config VolLevel ! then *************** *** 552,559 **** else 0 struct, InlineRecord RecordDef Cnt_Artist c! drop then ! ! drop ! struct, InlineRecord RecordDef File_name r@ cmove ! r> struct, InlineRecord RecordDef Cnt_File_name c! ; --- 561,567 ---- else 0 struct, InlineRecord RecordDef Cnt_Artist c! drop then ! drop struct, InlineRecord RecordDef File_name swap r> ! CatalogPath FindRelativeName drop >r swap r@ cmove ! r> struct, InlineRecord RecordDef Cnt_File_name c! ; *************** *** 634,640 **** DatFile$ count file-exist? database$ count file-exist? and - \ database-mhndl map-file-open? or DataBaseFilled? and dup ! if index$ count file-exist? not if _generate-index-file then --- 642,647 ---- DatFile$ count file-exist? database$ count file-exist? and DataBaseFilled? and dup ! if UseCatalogPath index$ count file-exist? not if _generate-index-file then *************** *** 714,718 **** : EnableAllRecords ( - ) s" *" "search-records ; ! string: tmp$ : n>tmp$ ( n - ) 0 (d.) tmp$ place ; --- 721,725 ---- : EnableAllRecords ( - ) s" *" "search-records ; ! string: tmp$ : n>tmp$ ( n - ) 0 (d.) tmp$ place ; Index: PLAYER4.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** PLAYER4.F 28 Jun 2006 11:43:12 -0000 1.60 --- PLAYER4.F 8 Jul 2006 19:58:52 -0000 1.61 *************** *** 51,54 **** --- 51,55 ---- needs catalog.f needs view.f + needs SearchPath.f needs Player4.frm \ "Control center" dialog *************** *** 231,235 **** then else map-config-file ! then SortByFlags -1 to #playing GetHandle: Self SetParent: ControlCenter --- 232,237 ---- then else map-config-file ! then ! SortByFlags -1 to #playing GetHandle: Self SetParent: ControlCenter *************** *** 361,365 **** : HandleCmdLine { \ bPlayFolder bPlayList -- } \ simple command-line handling ! CMDLINE ?dup if false to bPlayFolder false to bPlayList --- 363,367 ---- : HandleCmdLine { \ bPlayFolder bPlayList -- } \ simple command-line handling ! UseForthPath CMDLINE ?dup if false to bPlayFolder false to bPlayList *************** *** 496,500 **** vadr-config JoyStickDisabled- c@ 0= if IDJoystick GetJoystickInfo dup JOY_BUTTON1 >= ! if JoystickBrowser WaitTillDepressed 3drop else HandleMovesJoystickBrowser then --- 498,502 ---- vadr-config JoyStickDisabled- c@ 0= if IDJoystick GetJoystickInfo dup JOY_BUTTON1 >= ! if JoystickBrowser WaitTillDepressed 3drop else HandleMovesJoystickBrowser then *************** *** 507,513 **** MENUBAR player4-Menu-bar POPUP "&File" ! MENUITEM "&Play file...\tCtrl+O" IDM_OPEN_FILE DoCommand ; ! MENUITEM "Play &folder...\tCtrl+F" IDM_OPEN_FOLDER DoCommand ; ! MENUITEM "&Play &list...\tShift+L" IDM_OPEN_PLAYLIST DoCommand ; MENUSEPARATOR MENUITEM "&Exit\tAlt+F4" IDM_QUIT DoCommand ; --- 509,515 ---- MENUBAR player4-Menu-bar POPUP "&File" ! MENUITEM "&Play file...\tCtrl+O" IDM_OPEN_FILE DoCommand ; ! MENUITEM "Play &folder...\tCtrl+F" IDM_OPEN_FOLDER DoCommand ; ! MENUITEM "&Play &list...\tShift+L" IDM_OPEN_PLAYLIST DoCommand ; MENUSEPARATOR MENUITEM "&Exit\tAlt+F4" IDM_QUIT DoCommand ; *************** *** 523,528 **** MENUSEPARATOR SUBMENU "S&ort and view" ! MENUITEM "Define a view and sort" StartViewForm ; ! MENUITEM "&Sort / Refresh" SortCatalog ; MENUSEPARATOR MENUITEM "Se&t maximum random level" SetRandomLevel ; --- 525,530 ---- MENUSEPARATOR SUBMENU "S&ort and view" ! MENUITEM "Define a view and sort" UseCatalogPath StartViewForm ; ! MENUITEM "&Sort / Refresh" UseCatalogPath SortCatalog ; MENUSEPARATOR MENUITEM "Se&t maximum random level" SetRandomLevel ; *************** *** 556,559 **** --- 558,562 ---- MENUITEM "&Audio off\tShift+A" IDM_AUDIO_OFF DoCommand ; MENUSEPARATOR + MENUITEM "&Setup search path catalog" Self start: Form_search_path ; :MENUITEM mAutostart "Auto play the catalog at the start" AutoPlay ; *************** *** 653,656 **** --- 656,660 ---- \ build an application on disk or run Player \ ----------------------------------------------------------------------------- + turnkey? [if] ' QuitPlayer is StopPlayer *************** *** 665,669 **** s" Player4.ico" s" Player4.exe" AddAppIcon ! PLAYER4 [then] --- 669,674 ---- s" Player4.ico" s" Player4.exe" AddAppIcon ! PLAYER4 ! [then] Index: Pl_MciWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** Pl_MciWindow.f 28 Jun 2006 11:43:12 -0000 1.25 --- Pl_MciWindow.f 8 Jul 2006 19:58:52 -0000 1.26 *************** *** 288,293 **** else n>record dup>r RecordDef File_name r@ Cnt_File_name c@ 2dup type-cr ! r@ incr-#played r@ to #playing r> mark-played ! (PlayOneFile) then then --- 288,295 ---- else n>record dup>r RecordDef File_name r@ Cnt_File_name c@ 2dup type-cr ! r@ incr-#played r@ to #playing r> mark-played ! CatalogPath full-path not ! if (PlayOneFile) ! then then then *************** *** 301,305 **** vadr-config PathMediaFiles dup +null GetHandle: Self BrowseForFolder ! If vadr-config PathMediaFiles count GetLabel add_dir_tree then ; --- 303,307 ---- vadr-config PathMediaFiles dup +null GetHandle: Self BrowseForFolder ! If vadr-config PathMediaFiles count GetLabel add_dir_tree then ; Index: PopupWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PopupWindow.f,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PopupWindow.f 28 Jun 2006 11:43:12 -0000 1.8 --- PopupWindow.f 8 Jul 2006 19:58:52 -0000 1.9 *************** *** 13,19 **** if 2dup cr type-space then ! PlayFile: PLAYER4W ! ; ! defer ClosePopupWindow ' noop is ClosePopupWindow --- 13,19 ---- if 2dup cr type-space then ! CatalogPath full-path not ! if PlayFile: Player4W ! then ; defer ClosePopupWindow ' noop is ClosePopupWindow Index: Commands.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Commands.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Commands.f 28 Jun 2006 11:43:12 -0000 1.4 --- Commands.f 8 Jul 2006 19:58:52 -0000 1.5 *************** *** 26,36 **** : PlayFile ( -- ) ! OpenFile: Player4W ; IDM_OPEN_FILE SetCommand : OpenFolder ( -- ) ! OpenFolder: Player4W ; IDM_OPEN_FOLDER SetCommand : OpenPlayList ( -- ) ! OpenPlayList: Player4W ; IDM_OPEN_PLAYLIST SetCommand : QuitPlayer ( -- ) --- 26,36 ---- : PlayFile ( -- ) ! UseForthPath OpenFile: Player4W ; IDM_OPEN_FILE SetCommand : OpenFolder ( -- ) ! UseForthPath OpenFolder: Player4W ; IDM_OPEN_FOLDER SetCommand : OpenPlayList ( -- ) ! UseForthPath OpenPlayList: Player4W ; IDM_OPEN_PLAYLIST SetCommand : QuitPlayer ( -- ) *************** *** 45,52 **** : AddFiles ( -- ) ! AddFilesFromSelector: Player4W ; IDM_ADD_FILES SetCommand : ImportFolder ( -- ) ! Import-to-catalog: Player4W RefreshCatalog ; IDM_IMPORT_FOLDER SetCommand : start/resume ( -- ) --- 45,52 ---- : AddFiles ( -- ) ! UseCatalogPath AddFilesFromSelector: Player4W ; IDM_ADD_FILES SetCommand : ImportFolder ( -- ) ! Import-to-catalog: Player4W RefreshCatalog ; IDM_IMPORT_FOLDER SetCommand : start/resume ( -- ) |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-08 17:58:12
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11980/src Modified Files: paths.f Log Message: Jos: Removed a check point. Index: paths.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** paths.f 8 Jul 2006 17:50:36 -0000 1.9 --- paths.f 8 Jul 2006 17:58:07 -0000 1.10 *************** *** 272,276 **** new$ >r /parse-s$ count r@ place \ store file name r@ ?defext r> count \ add default ext if needed ! "path-file drop cr 2dup type \ extend to full path "loaded? ; --- 272,276 ---- new$ >r /parse-s$ count r@ place \ store file name r@ ?defext r> count \ add default ext if needed ! "path-file drop \ extend to full path "loaded? ; |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-08 17:50:41
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8995/src Modified Files: paths.f Log Message: Jos: Made multiple search path's possible and changed subdirs. Now it will not destroy the search path when sdir is used. Index: paths.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** paths.f 2 Jul 2006 13:18:43 -0000 1.8 --- paths.f 8 Jul 2006 17:50:36 -0000 1.9 *************** *** 55,94 **** create path-file$ MAX-PATH 1+ allot ! create &fpath MAX-PATH 1+ allot \ a static forth path buffer ! &fpath off ! 2variable path-source EXTERNAL ! &fpath value path-ptr \ initialize the path buffer pointer ! : next-path" ( -- a1 n1 ) \ get the next path from dir list ! path-source 2@ 2dup ';' scan 2dup 1 /string path-source 2! nip - ; ! : reset-path-source ( -- ) path-ptr count path-source 2! ; ! : first-path" ( -- a1 n1 ) \ get the first forth directory path ! reset-path-source next-path" ; ! : "fpath+ ( a1 n1 -- ) \ append a directory to forth path ! 2dup upper 2dup + 1- c@ '\' = \ end in '\'? if 1- 0max \ if so, delete it ! then first-path" \ get first path begin dup 0> >r 2over compare 0<> dup r> and \ check it ! while drop next-path" \ and remaining paths repeat 0= \ -- f1=true if already in list if 2drop ! else dup path-ptr c@ if char+ then MAX-PATH >= abort" Path overflow" ! path-ptr c@ if path-ptr ?+; then ! path-ptr +place ! then ; : fpath+ ( -<directory>- ) \ append a directory to forth path ! /parse-s$ count "fpath+ ; ! : .fpath ( -- ) \ display the forth directory search path list ! path-ptr count begin ?dup while 2dup ';' scan 2dup 2>r nip - dup char+ ?cr type --- 55,103 ---- create path-file$ MAX-PATH 1+ allot ! ! : path: ( - ) \ map: 2variable_path-source counted_path ! create -1 , 0 , MAX-PATH 1+ allot does> \ run-time: ( - path-ptr ) ! [ 2 cells ] literal + ! ; ! ! : path-source ( path-ptr - 2variable_path-source ) 2 cells- ; EXTERNAL ! path: path-ptr \ initialize the path buffer pointer ! : next-path" ( path-ptr -- a1 n1 ) \ get the next path from dir list ! dup>r path-source 2@ 2dup ';' scan 2dup 1 /string r> path-source 2! nip - ; ! : reset-path-source ( path-ptr -- ) dup>r count r> path-source 2! ; ! : first-path" ( path-ptr -- a1 n1 ) \ get the first forth directory path ! dup>r reset-path-source r> next-path" ; ! : "path+ ( a1 n1 path-ptr -- ) \ append a directory to a path ! >r 2dup upper 2dup + 1- c@ '\' = \ end in '\'? if 1- 0max \ if so, delete it ! then r@ first-path" \ get first path begin dup 0> >r 2over compare 0<> dup r> and \ check it ! while drop r@ next-path" \ and remaining paths repeat 0= \ -- f1=true if already in list if 2drop ! else dup r@ c@ if char+ then MAX-PATH >= abort" Path overflow" ! r@ c@ if r@ ?+; then ! r@ +place ! then r>drop ; ! ! : "fpath+ ( a1 n1 path-ptr -- ) \ append a directory to forth path ! path-ptr "path+ ; ! : fpath+ ( -<directory>- ) \ append a directory to forth path ! /parse-s$ count "fpath+ ; ! ! : .path ( path-ptr -- ) \ display the a directory search path list ! count begin ?dup while 2dup ';' scan 2dup 2>r nip - dup char+ ?cr type *************** *** 98,110 **** repeat drop ; INTERNAL 6 PROC SearchPath ! : ("path-file) { a1 n1 \ searchpath$ filename$ -- a2 n2 f1 } \ find file a1,n1 return full path \ a2,n2 and f1=false, succeeded a1 n1 MAX-PATH 1+ localalloc ascii-z to filename$ ! MAX-PATH 1+ localalloc: searchpath$ ! first-path" begin dup>r searchpath$ place searchpath$ +null --- 107,123 ---- repeat drop ; + : .fpath ( -- ) \ display the forth directory search path list + path-ptr .path ; + + INTERNAL 6 PROC SearchPath ! : full-path { a1 n1 path-ptr \ searchpath$ filename$ -- a2 n2 f1 } \ find file a1,n1 return full path \ a2,n2 and f1=false, succeeded a1 n1 MAX-PATH 1+ localalloc ascii-z to filename$ ! MAX-PATH 1+ localalloc: searchpath$ ! path-ptr first-path" begin dup>r searchpath$ place searchpath$ +null *************** *** 122,126 **** r> ! while next-path" repeat a1 n1 path-file$ place path-file$ count true \ return input file and error flag ; --- 135,139 ---- r> ! while path-ptr next-path" repeat a1 n1 path-file$ place path-file$ count true \ return input file and error flag ; *************** *** 147,151 **** \ first try it in the current directory ! a1 n1 ("path-file) -if 3drop \ then try it in the forth directory --- 160,164 ---- \ first try it in the current directory ! a1 n1 path-ptr full-path -if 3drop \ then try it in the forth directory *************** *** 155,163 **** char+ $current-dir! not abort" $current-dir!" \ set current dir to forth dir ! a1 n1 ("path-file) current$ char+ $current-dir! not abort" $current-dir!" \ restore current dir then ; \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ "open with Multiple directory path search --- 168,177 ---- char+ $current-dir! not abort" $current-dir!" \ set current dir to forth dir ! a1 n1 path-ptr full-path current$ char+ $current-dir! not abort" $current-dir!" \ restore current dir then ; + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ "open with Multiple directory path search *************** *** 207,224 **** <AbsRelPath$> ; ! : FindRelativePath ( a1 n1 - a2 n2 ) \ n2=0 means not in search path ! reset-path-source ! begin path-source 2@ nip 0> ! if next-path" 4dup IsPathRelativeTo? not else over 0 false then while 2drop repeat ! 2nip ; ! : FindRelativeName ( a1 n1 - a2 n2 f ) ! 2dup FindRelativePath dup 0> ! if nip 1+ /string true else 2drop false then --- 221,241 ---- <AbsRelPath$> ; ! : FindRelativePath ( a1 n1 path-ptr - a2 n2 ) \ n2=0 means not in search path ! dup>r reset-path-source ! begin r@ path-source 2@ nip 0> ! if r@ next-path" 4dup IsPathRelativeTo? not else over 0 false then while 2drop repeat ! 2nip r>drop ; ! : FindRelativeName ( a1 n1 path-ptr - a2 n2 f ) ! >r 2dup r> FindRelativePath dup 0> ! if nip dup 3 > ! if 1+ ! then ! /string true else 2drop false then *************** *** 255,259 **** new$ >r /parse-s$ count r@ place \ store file name r@ ?defext r> count \ add default ext if needed ! "path-file drop \ extend to full path "loaded? ; --- 272,276 ---- new$ >r /parse-s$ count r@ place \ store file name r@ ?defext r> count \ add default ext if needed ! "path-file drop cr 2dup type \ extend to full path "loaded? ; |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-08 17:50:40
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8995/src/lib Modified Files: FileLister.f SUB_DIRS.F Log Message: Jos: Made multiple search path's possible and changed subdirs. Now it will not destroy the search path when sdir is used. Index: FileLister.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/FileLister.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileLister.f 15 Jun 2006 18:48:46 -0000 1.2 --- FileLister.f 8 Jul 2006 17:50:33 -0000 1.3 *************** *** 533,537 **** repeat FindClose: FileFinder \ now we get the rest of the files ! first-path" begin dup 0> while TreePath count 2swap SetUp: FileFinder --- 533,537 ---- repeat FindClose: FileFinder \ now we get the rest of the files ! path-ptr first-path" begin dup 0> while TreePath count 2swap SetUp: FileFinder *************** *** 543,547 **** then FindNextFile: FileFinder repeat FindClose: FileFinder ! next-path" repeat 2drop r> to path-ptr ; --- 543,547 ---- then FindNextFile: FileFinder repeat FindClose: FileFinder ! path-ptr next-path" repeat 2drop r> to path-ptr ; Index: SUB_DIRS.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/SUB_DIRS.F,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** SUB_DIRS.F 4 Jan 2006 22:17:38 -0000 1.5 --- SUB_DIRS.F 8 Jul 2006 17:50:33 -0000 1.6 *************** *** 172,185 **** THEN ; EXTERNAL ! : do-files-process ( -- ) ! false to search-aborted? ! first-path" "process-directory ! BEGIN next-path" dup search-aborted? 0= and WHILE "process-directory ! REPEAT 2drop ; INTERNAL --- 172,193 ---- THEN ; + Path: sdir-path + EXTERNAL ! ! : (do-files-process ( path-ptr -- ) ! >r false to search-aborted? ! r@ first-path" "process-directory ! BEGIN r@ next-path" dup search-aborted? 0= and WHILE "process-directory ! REPEAT 2drop r>drop ; + + : do-files-process ( -- ) \ In the Forth-part + path-ptr (do-files-process + ; + INTERNAL *************** *** 212,219 **** to sub-dirs? mask-buf place mask-buf +NULL ! path-ptr place path-ptr +NULL ! do-files-process ; MODULE --- 220,229 ---- to sub-dirs? mask-buf place mask-buf +NULL ! sdir-path place sdir-path +NULL ! (do-files-process ; MODULE + \s + |
|
From: George H. <geo...@us...> - 2006-07-08 10:09:25
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1031/win32forth/apps/Win32ForthIDE Modified Files: Main.f Log Message: gah: Set priority of background tasks to Idle Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Main.f 1 Jul 2006 11:59:04 -0000 1.19 --- Main.f 8 Jul 2006 10:09:20 -0000 1.20 *************** *** 107,112 **** Needs Task.f ! 0 :NoName ( -- ) InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask ! 0 :NoName ( -- ) InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask : InitClassBrowsers ( -- ) --- 107,117 ---- Needs Task.f ! 0 proc GetCurrentThread ! 2 proc SetThreadPriority ! ! : Idle ( -- ) THREAD_PRIORITY_IDLE GetCurrentThread SetThreadPriority drop ; ! ! 0 :NoName ( -- ) Idle InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask ! 0 :NoName ( -- ) Idle InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask : InitClassBrowsers ( -- ) |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-05 14:38:49
|
Update of /cvsroot/win32forth/win32forth/apps/ForthForm In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18983/apps/ForthForm Modified Files: FORMOBJECT.F Log Message: Jos: Removed the duplicate hWndParent Index: FORMOBJECT.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/ForthForm/FORMOBJECT.F,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FORMOBJECT.F 29 May 2006 17:13:14 -0000 1.11 --- FORMOBJECT.F 5 Jul 2006 14:38:43 -0000 1.12 *************** *** 1509,1514 **** if s" MultiStatusBar TheStatusBar" append&crlf then GetSuperclass: self DIALOG-CLASS = \ only for dialogwindow super class ! if s" 0 value hWndParent \ window handle of the parent of form" append&crlf ! SaveScreen? if frmXPos #append frmYPos #append s" 2value XYPos \ save screen location of form" append&crlf --- 1509,1513 ---- if s" MultiStatusBar TheStatusBar" append&crlf then GetSuperclass: self DIALOG-CLASS = \ only for dialogwindow super class ! if SaveScreen? if frmXPos #append frmYPos #append s" 2value XYPos \ save screen location of form" append&crlf |
|
From: Ezra B. <ezr...@us...> - 2006-07-04 03:59:01
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19719 Modified Files: EdTabControl.f Log Message: Undo. Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** EdTabControl.f 30 Jun 2006 04:17:13 -0000 1.13 --- EdTabControl.f 4 Jul 2006 03:58:57 -0000 1.14 *************** *** 174,178 **** :M Start: ( Parent -- ) ! TCS_BUTTONS AddStyle: self Start: super DEFAULT_GUI_FONT call GetStockObject SetFont: self --- 174,178 ---- :M Start: ( Parent -- ) ! \ TCS_BUTTONS TCS_MULTILINE or AddStyle: self Start: super DEFAULT_GUI_FONT call GetStockObject SetFont: self |
|
From: Rod O. <rod...@us...> - 2006-07-03 07:16:50
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16584/src/lib Modified Files: FileAssociations.f Log Message: Rod: Allot more space in PreviousKey (PictureViewer.exe was too long) Index: FileAssociations.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/FileAssociations.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileAssociations.f 3 Oct 2005 22:07:12 -0000 1.1 --- FileAssociations.f 3 Jul 2006 07:16:44 -0000 1.2 *************** *** 18,22 **** Create TypeName 32 allot \ this key will be called App.ext Create FileExtension 8 allot \ the file extension including the . ! Create PreviousKey 16 allot \ this key will be called App.bak to hold the previous Type Name Create FileType 32 allot \ the description that appears under the Type heading in explorer Create DefaultIcon 256 allot \ full path to Icon, with index in .exe --- 18,22 ---- Create TypeName 32 allot \ this key will be called App.ext Create FileExtension 8 allot \ the file extension including the . ! Create PreviousKey 32 allot \ this key will be called App.bak to hold the previous Type Name Create FileType 32 allot \ the description that appears under the Type heading in explorer Create DefaultIcon 256 allot \ full path to Icon, with index in .exe |
|
From: Jos v.d.V. <jo...@us...> - 2006-07-02 13:18:49
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8536/src Modified Files: paths.f Log Message: Jos: Added FindRelativeName. Index: paths.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** paths.f 24 Dec 2005 11:52:08 -0000 1.7 --- paths.f 2 Jul 2006 13:18:43 -0000 1.8 *************** *** 67,73 **** nip - ; : first-path" ( -- a1 n1 ) \ get the first forth directory path ! path-ptr count path-source 2! ! next-path" ; : "fpath+ ( a1 n1 -- ) \ append a directory to forth path --- 67,74 ---- nip - ; + : reset-path-source ( -- ) path-ptr count path-source 2! ; + : first-path" ( -- a1 n1 ) \ get the first forth directory path ! reset-path-source next-path" ; : "fpath+ ( a1 n1 -- ) \ append a directory to forth path *************** *** 159,163 **** then ; - \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ \ "open with Multiple directory path search --- 160,163 ---- *************** *** 207,210 **** --- 207,227 ---- <AbsRelPath$> ; + : FindRelativePath ( a1 n1 - a2 n2 ) \ n2=0 means not in search path + reset-path-source + begin path-source 2@ nip 0> + if next-path" 4dup IsPathRelativeTo? not + else over 0 false + then + while 2drop + repeat + 2nip + ; + + : FindRelativeName ( a1 n1 - a2 n2 f ) + 2dup FindRelativePath dup 0> + if nip 1+ /string true + else 2drop false + then + ; \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ |
|
From: George H. <geo...@us...> - 2006-07-01 11:59:11
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5011/win32forth/apps/Win32ForthIDE Modified Files: Main.f Log Message: gah: Removed duplicate needs task.f (even with 2 tasks it's only needed once !) Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Main.f 30 Jun 2006 04:17:13 -0000 1.18 --- Main.f 1 Jul 2006 11:59:04 -0000 1.19 *************** *** 19,23 **** only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\Win32ForthIDE" "fpath+ --- 19,23 ---- only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\Win32ForthIDE" "fpath+ *************** *** 38,42 **** needs src\lib\Resources.f needs excontrols.f - needs task.f 0 value ActiveChild \ the active MDI child window --- 38,41 ---- |
|
From: Ezra B. <ezr...@us...> - 2006-06-30 04:17:16
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1634 Modified Files: CommandID.f EdCommand.f EdTabControl.f EdToolbar.f Main.f ProjectTree.f Log Message: Switch to Project Manager tab when a project is opened. Bug fixes.EAB Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** EdTabControl.f 29 Jun 2006 10:01:01 -0000 1.12 --- EdTabControl.f 30 Jun 2006 04:17:13 -0000 1.13 *************** *** 282,285 **** --- 282,290 ---- false ; + :M ShowTab: ( n -- ) + \ show tab n + SetSelectedTab: ctab + SelChange: self ;M + :M WM_NOTIFY ( h m w l -- f ) \ Handle the notification messages of the controls. Index: ProjectTree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ProjectTree.f 14 Jun 2006 06:02:56 -0000 1.10 --- ProjectTree.f 30 Jun 2006 04:17:13 -0000 1.11 *************** *** 707,711 **** ReleaseBuffer: viewerfile arrow-cursor ! \ IDM_SHOW_FILE_PRJ DoCommand ; --- 707,711 ---- ReleaseBuffer: viewerfile arrow-cursor ! IDM_SHOWPROJECT_TAB DoCommand ; Index: EdToolbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdToolbar.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EdToolbar.f 15 Jun 2006 20:55:08 -0000 1.3 --- EdToolbar.f 30 Jun 2006 04:17:13 -0000 1.4 *************** *** 182,185 **** --- 182,186 ---- :M On_ToolBarChange: ( -- f ) \ User has changed toolbar Autosize: self false + Update ;M Index: EdCommand.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCommand.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EdCommand.f 11 Jun 2006 18:04:10 -0000 1.5 --- EdCommand.f 30 Jun 2006 04:17:13 -0000 1.6 *************** *** 307,311 **** : mcCompile ( -- ) ! SaveAllBeforeCompile? if SaveAllSourceFiles then --- 307,311 ---- : mcCompile ( -- ) ! SaveAllBeforeCompile? ActiveChild 0<> and \ avoid crash when compiling with no open file if SaveAllSourceFiles then Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Main.f 29 Jun 2006 10:01:01 -0000 1.17 --- Main.f 30 Jun 2006 04:17:13 -0000 1.18 *************** *** 19,23 **** only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\Win32ForthIDE" "fpath+ --- 19,23 ---- only forth also editor definitions \ put all words into the EDITOR vocabulary ! true value sysgen s" apps\Win32ForthIDE" "fpath+ *************** *** 71,78 **** 3 constant FT_BITMAP - needs EdToolbar.f - needs EdStatusbar.f - needs EdMenu.f - defer Compile-File ' beep is Compile-File defer HandleW32FMsg ' noop is HandleW32FMsg --- 71,74 ---- *************** *** 81,84 **** --- 77,84 ---- defer OnSelect ' drop is OnSelect \ called when item is selected in the file listview + needs EdToolbar.f + needs EdStatusbar.f + needs EdMenu.f + AcceleratorTable AccelTable \ create the Accelerator-Key-Table *************** *** 103,108 **** TabWindow cTabWindow ! 0 :NoName ( -- ) InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask 0 :NoName ( -- ) InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask --- 103,112 ---- TabWindow cTabWindow ! : show-project-tab ( -- ) ! 1 ShowTab: cTabWindow ; IDM_SHOWPROJECT_TAB SetCommand + Needs Task.f + + 0 :NoName ( -- ) InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask 0 :NoName ( -- ) InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask *************** *** 455,458 **** --- 459,463 ---- On_Init: super load-defaults + Update ;M Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CommandID.f 29 Jun 2006 04:18:47 -0000 1.6 --- CommandID.f 30 Jun 2006 04:17:13 -0000 1.7 *************** *** 136,139 **** --- 136,140 ---- NewID IDM_COPY_PRJ NewID IDM_OPEN_RECENT_FILE_PRJ + NewID IDM_SHOWPROJECT_TAB IdCounter constant IDM_LAST |
|
From: George H. <geo...@us...> - 2006-06-29 10:47:32
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21234/win32forth/src/lib Modified Files: Calendar.f Log Message: gah: Marked up comments on styles and format Index: Calendar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/Calendar.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Calendar.f 11 Jun 2006 09:03:49 -0000 1.2 --- Calendar.f 29 Jun 2006 10:47:28 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + \ $Id$ + anew -Calendar.f *************** *** 168,268 **** ;M - /* - Date and Time Picker Control Styles - - The window styles listed here are specific to date and time picker controls. - - Constants - DTS_APPCANPARSE - Allows the owner to parse user input and take necessary action. It enables users to edit - within the client area of the control when they press the F2 key. The control sends - DTN_USERSTRING notification messages when users are finished. - - DTS_LONGDATEFORMAT - Displays the date in long format. The default format string for this style is - defined by LOCALE_SLONGDATEFORMAT, which produces output like "Friday, April 19, 1996". - - DTS_RIGHTALIGN - The drop-down month calendar will be right-aligned with the control instead of - left-aligned, which is the default. - - DTS_SHOWNONE - It is possible to have no date currently selected in the control. With this style, - the control displays a check box that users can check once they have entered or selected - a date. Until this check box is checked, the application will not be able to retrieve - the date from the control because, in essence, the control has no date. This state can - be set with the DTM_SETSYSTEMTIME message or queried with the DTM_GETSYSTEMTIME message. - - DTS_SHORTDATEFORMAT - Displays the date in short format. The default format string for this style is defined - by LOCALE_SSHORTDATE, which produces output like "4/19/96". - - DTS_SHORTDATECENTURYFORMAT - Version 5.80. Similar to the DTS_SHORTDATEFORMAT style, except the year is a - four-digit field. The default format string for this style is based on LOCALE_SSHORTDATE. - The output looks like: "4/19/1996". - - DTS_TIMEFORMAT - Displays the time. The default format string for this style is defined by - LOCALE_STIMEFORMAT, which produces output like "5:31:42 PM". - - DTS_UPDOWN - Places an up-down control to the right of the DTP control to modify date-time values. - This style can be used in place of the drop-down month calendar, which is the default - style. - - Remarks - - The DTS_XXXFORMAT styles that define the display format cannot be combined. If none of - the format styles are suitable, use a DTM_SETFORMAT message to define a custom format. - */ - :M WindowStyle: ( -- style ) \ *G Get the window style of the control. Default style is: WS_BORDER. WindowStyle: super WS_BORDER or style or ;M - /* - Format Strings - A DTP format string consists of a series of elements that represent a particular piece of - information and define its display format. The elements will be displayed in the order - they appear in the format string. ! Date and time format elements will be replaced by the actual date and time. They are ! defined by the following groups of characters: ! ! Element Description ! "d" The one- or two-digit day. ! "dd" The two-digit day. Single-digit day values are preceded by a zero. ! "ddd" The three-character weekday abbreviation. ! "dddd" The full weekday name. ! "h" The one- or two-digit hour in 12-hour format. ! "hh" The two-digit hour in 12-hour format. Single-digit values are preceded by a zero. ! "H" The one- or two-digit hour in 24-hour format. ! "HH" The two-digit hour in 24-hour format. Single-digit values are preceded by a zero. ! "m" The one- or two-digit minute. ! "mm" The two-digit minute. Single-digit values are preceded by a zero. ! "M" The one- or two-digit month number. ! "MM" The two-digit month number. Single-digit values are preceded by a zero. ! "MMM" The three-character month abbreviation. ! "MMMM" The full month name. ! "t" The one-letter AM/PM abbreviation (that is, AM is displayed as "A"). ! "tt" The two-letter AM/PM abbreviation (that is, AM is displayed as "AM"). ! "yy" The last two digits of the year (that is, 1996 would be displayed as "96"). ! "yyyy" The full year (that is, 1996 would be displayed as "1996"). - To make the information more readable, you can add body text to the format string by - enclosing it in single quotes. Spaces and punctuation marks do not need to be quoted. - Note Nonformat characters that are not delimited by single quotes will result in - unpredictable display by the DTP control. - For example, to display the current date with the format - "'Today is: 04:22:31 Tuesday Mar 23, 1996", the format string is - "'Today is: 'hh':'m':'s dddd MMM dd', 'yyyy". To include a single quote in your body text, - use two consecutive single quotes. For example, "'Don''t forget' MMM dd',' yyyy" produces - output that looks like: Don't forget Mar 23, 1996. It is not necessary to use quotes - with the comma, so "'Don''t forget' MMM dd, yyyy" is also valid, and produces the same - output. - */ :M SetCustomFormat: ( z"format" -- ) --- 170,228 ---- ;M :M WindowStyle: ( -- style ) \ *G Get the window style of the control. Default style is: WS_BORDER. WindowStyle: super WS_BORDER or style or ;M ! \ *P Date and Time Picker Control Styles ! \ ** ! \ ** The window styles listed here are specific to date and time picker controls. ! \ ** ! \ ** Constants ! \ ** DTS_APPCANPARSE ! \ ** Allows the owner to parse user input and take necessary action. It enables users to edit ! \ ** within the client area of the control when they press the F2 key. The control sends ! \ ** DTN_USERSTRING notification messages when users are finished. ! \ ** ! \ ** DTS_LONGDATEFORMAT ! \ ** Displays the date in long format. The default format string for this style is ! \ ** defined by LOCALE_SLONGDATEFORMAT, which produces output like "Friday, April 19, 1996". ! \ ** ! \ ** DTS_RIGHTALIGN ! \ ** The drop-down month calendar will be right-aligned with the control instead of ! \ ** left-aligned, which is the default. ! \ ** ! \ ** DTS_SHOWNONE ! \ ** It is possible to have no date currently selected in the control. With this style, ! \ ** the control displays a check box that users can check once they have entered or selected ! \ ** a date. Until this check box is checked, the application will not be able to retrieve ! \ ** the date from the control because, in essence, the control has no date. This state can ! \ ** be set with the DTM_SETSYSTEMTIME message or queried with the DTM_GETSYSTEMTIME message. ! \ ** ! \ ** DTS_SHORTDATEFORMAT ! \ ** Displays the date in short format. The default format string for this style is defined ! \ ** by LOCALE_SSHORTDATE, which produces output like "4/19/96". ! \ ** ! \ ** DTS_SHORTDATECENTURYFORMAT ! \ ** Version 5.80. Similar to the DTS_SHORTDATEFORMAT style, except the year is a ! \ ** four-digit field. The default format string for this style is based on LOCALE_SSHORTDATE. ! \ ** The output looks like: "4/19/1996". ! \ ** ! \ ** DTS_TIMEFORMAT ! \ ** Displays the time. The default format string for this style is defined by ! \ ** LOCALE_STIMEFORMAT, which produces output like "5:31:42 PM". ! \ ** ! \ ** DTS_UPDOWN ! \ ** Places an up-down control to the right of the DTP control to modify date-time values. ! \ ** This style can be used in place of the drop-down month calendar, which is the default ! \ ** style. ! \ ** ! \ ** Remarks ! \ ** ! \ ** The DTS_XXXFORMAT styles that define the display format cannot be combined. If none of ! \ ** the format styles are suitable, use a DTM_SETFORMAT message to define a custom format. :M SetCustomFormat: ( z"format" -- ) *************** *** 271,274 **** --- 231,276 ---- ;M + \ *P Format Strings + \ ** A DTP format string consists of a series of elements that represent a particular piece of + \ ** information and define its display format. The elements will be displayed in the order + \ ** they appear in the format string. + \ ** + \ ** Date and time format elements will be replaced by the actual date and time. They are + \ ** defined by the following groups of characters: + \ ** + \ ** Element Description + \ ** "d" The one- or two-digit day. + \ ** "dd" The two-digit day. Single-digit day values are preceded by a zero. + \ ** "ddd" The three-character weekday abbreviation. + \ ** "dddd" The full weekday name. + \ ** "h" The one- or two-digit hour in 12-hour format. + \ ** "hh" The two-digit hour in 12-hour format. Single-digit values are preceded by a zero. + \ ** "H" The one- or two-digit hour in 24-hour format. + \ ** "HH" The two-digit hour in 24-hour format. Single-digit values are preceded by a zero. + \ ** "m" The one- or two-digit minute. + \ ** "mm" The two-digit minute. Single-digit values are preceded by a zero. + \ ** "M" The one- or two-digit month number. + \ ** "MM" The two-digit month number. Single-digit values are preceded by a zero. + \ ** "MMM" The three-character month abbreviation. + \ ** "MMMM" The full month name. + \ ** "t" The one-letter AM/PM abbreviation (that is, AM is displayed as "A"). + \ ** "tt" The two-letter AM/PM abbreviation (that is, AM is displayed as "AM"). + \ ** "yy" The last two digits of the year (that is, 1996 would be displayed as "96"). + \ ** "yyyy" The full year (that is, 1996 would be displayed as "1996"). + \ ** + \ ** To make the information more readable, you can add body text to the format string by + \ ** enclosing it in single quotes. Spaces and punctuation marks do not need to be quoted. + \ ** + \ ** Note Nonformat characters that are not delimited by single quotes will result in + \ ** unpredictable display by the DTP control. + \ ** + \ ** For example, to display the current date with the format + \ ** "'Today is: 04:22:31 Tuesday Mar 23, 1996", the format string is + \ ** "'Today is: 'hh':'m':'s dddd MMM dd', 'yyyy". To include a single quote in your body text, + \ ** use two consecutive single quotes. For example, "'Don''t forget' MMM dd',' yyyy" produces + \ ** output that looks like: Don't forget Mar 23, 1996. It is not necessary to use quotes + \ ** with the comma, so "'Don''t forget' MMM dd, yyyy" is also valid, and produces the same + \ ** output. + :M GetTime: ( -- hrs min secs ) \ *G get user selected time |
|
From: George H. <geo...@us...> - 2006-06-29 10:27:45
|
Update of /cvsroot/win32forth/win32forth/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12904/win32forth/src Modified Files: Class.f Log Message: gah: added M@ and M! for compatibility with Doug Hoffmans ANSI neon object system. Index: Class.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/Class.f,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Class.f 11 Jun 2006 20:11:38 -0000 1.18 --- Class.f 29 Jun 2006 10:27:42 -0000 1.19 *************** *** 993,998 **** : bytes ( n -<name>- ) \ W32F Class \ *G n-Bytes instance variable (array of bytes) - \ create ^class DFA @ , class-allot - \ does> @ ^base + ; header (&iv) , \ return address of array of bytes --- 993,996 ---- *************** *** 1106,1109 **** --- 1104,1120 ---- 2 cells class-allot ; + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ + \ Primatives for cell sized objects. + \ Ported from Doug Hoffman's Class11 for compatibility + \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ + + : M@ ( -- n ) + \ *G Fetch the contents of the first cell of the object. Designed for use with VAR + POSTPONE ^base POSTPONE @ ; IMMEDIATE + + : M! ( n -- ) + \ *G Store the TOS into the first cell of the object. Designed for use with VAR + POSTPONE ^base POSTPONE ! ; IMMEDIATE + in-application |
|
From: George H. <geo...@us...> - 2006-06-29 10:14:17
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7406/win32forth/src/lib Modified Files: AXControl.F Log Message: gah: minor mods Index: AXControl.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/AXControl.F,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AXControl.F 11 Jun 2006 07:37:27 -0000 1.4 --- AXControl.F 29 Jun 2006 10:14:14 -0000 1.5 *************** *** 60,64 **** :M AXCreate: ( str len -- ) \ *G Initialize the ActiveX control ! 1+ asc>uni over + 0 swap 2 - w! dup >r AXUCreate: self r> free drop --- 60,64 ---- :M AXCreate: ( str len -- ) \ *G Initialize the ActiveX control ! 1+ asc>uni over + 0 swap 2 - w! dup>r AXUCreate: self r> free drop *************** *** 67,73 **** :M QueryInterface: ( ppv riid -- flag ) \ *G flag is true on error ! 0 >r rp@ hwnd AtlAxGetControl if r> drop true exitm then rp@ COM IUnknown IQueryInterface ! rp@ COM IUnknown IReleaseRef drop r> drop ;M --- 67,73 ---- :M QueryInterface: ( ppv riid -- flag ) \ *G flag is true on error ! 0 >r rp@ hwnd AtlAxGetControl if r>drop true exitm then rp@ COM IUnknown IQueryInterface ! rp@ COM IUnknown IReleaseRef drop r>drop ;M |
|
From: George H. <geo...@us...> - 2006-06-29 10:02:15
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1703/win32forth/apps/Win32ForthIDE Modified Files: ClassBrowser.f EdTabControl.f Main.f Log Message: gah: modified to use separate tasks to initialise vocabularies and classes Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Main.f 29 Jun 2006 04:18:47 -0000 1.16 --- Main.f 29 Jun 2006 10:01:01 -0000 1.17 *************** *** 38,41 **** --- 38,42 ---- needs src\lib\Resources.f needs excontrols.f + needs task.f 0 value ActiveChild \ the active MDI child window *************** *** 102,111 **** TabWindow cTabWindow ! Needs Task.f ! 0 :NoName ( -- ) InitBrowsers: cTabWindow ; Task-Block Constant BrowseInitTask : InitClassBrowsers ( -- ) ! BrowseInitTask run-task 0= abort" Failed to start background Task" ; :Object LeftPane <Super Child-Window --- 103,113 ---- TabWindow cTabWindow ! 0 :NoName ( -- ) InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask ! 0 :NoName ( -- ) InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask : InitClassBrowsers ( -- ) ! VocInitTask run-task 0= abort" Failed to start background Task" ! ClassInitTask run-task 0= abort" Failed to start background Task" ; :Object LeftPane <Super Child-Window *************** *** 686,689 **** --- 688,694 ---- max-path 2 + bytes FileName + :M GetTextLength: ( -- n ) + 0 ;M + :M Start: ( parent -- ) New> HtmlControl to ChildWindow Index: ClassBrowser.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ClassBrowser.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ClassBrowser.f 9 Jun 2006 12:10:32 -0000 1.3 --- ClassBrowser.f 29 Jun 2006 10:01:01 -0000 1.4 *************** *** 64,73 **** to hPrev ; ! create NameBuf$ MAXSTRING 1+ allot \ The following definitions enable us to find the name of an object defined with :OBJECT \ from the xt of it's nameless class; gah ! 0 value SearchClass : (objname) ( nfa -- ) --- 64,73 ---- to hPrev ; ! MAXSTRING 1+ bytes NameBuf$ \ The following definitions enable us to find the name of an object defined with :OBJECT \ from the xt of it's nameless class; gah ! int SearchClass : (objname) ( nfa -- ) Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** EdTabControl.f 29 Jun 2006 04:18:47 -0000 1.11 --- EdTabControl.f 29 Jun 2006 10:01:01 -0000 1.12 *************** *** 257,260 **** --- 257,266 ---- AddClasses: cClassTree ;M + :M InitVocBrowser: ( -- ) + AddVocabularies: cVocTree ;M + + :M InitClassBrowser: ( -- ) + AddClasses: cClassTree ;M + :M SelChange: ( -- ) \ Show the control for the currently selected tab. |
|
From: Ezra B. <ezr...@us...> - 2006-06-29 04:22:29
|
Update of /cvsroot/win32forth/win32forth/proj In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20834/proj Modified Files: Win32ForthIDE.fpj Log Message: Updated. EAB Index: Win32ForthIDE.fpj =================================================================== RCS file: /cvsroot/win32forth/win32forth/proj/Win32ForthIDE.fpj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Win32ForthIDE.fpj 11 Jun 2006 09:03:45 -0000 1.2 --- Win32ForthIDE.fpj 29 Jun 2006 04:22:26 -0000 1.3 *************** *** 1,7 **** ProjectName= Win32Forth IDE BuildFile= apps\Win32ForthIDE\Main.f ! SearchPath= .;SRC;SRC\LIB;RES;DEMOS;SRC\CONSOLE;HTM;src\ProMgr;src\ProMgr\res;APPS\PROMGR;APPS\PROMGR\RES;APPS\WIN32FORTHIDE;APPS\WINED\RES;SRC\WINED;SRC\WINED\RES Win32Forth IDE,0 ! Modules,63 apps\Win32ForthIDE\Main.f SRC\LIB\Mdi.f --- 1,7 ---- ProjectName= Win32Forth IDE BuildFile= apps\Win32ForthIDE\Main.f ! SearchPath= .;SRC;SRC\LIB;RES;DEMOS;SRC\CONSOLE;HTM;SRC\FORTHFORM;SRC\FORTHFORM\RES;APPS\FORTHFORM;APPS\FORTHFORM\RES;APPS\PROMGR\RES;APPS\WIN32FORTHIDE;APPS\WINED\RES;APPS\WIN32FORTHIDE\RES;SRC\WINED;SRC\WINED\RES Win32Forth IDE,0 ! Modules,69 apps\Win32ForthIDE\Main.f SRC\LIB\Mdi.f *************** *** 67,76 **** APPS\WIN32FORTHIDE\EdAbout.f APPS\WIN32FORTHIDE\EdVersion.f DLLs,2 w32fScintilla.dll FreeImage.dll ! Forms,0 Auxiliary Files,0 ! Resources,5 APPS\WINED\RES\WINEDIT.h APPS\WINED\RES\WINEDIT.res --- 67,83 ---- APPS\WIN32FORTHIDE\EdAbout.f APPS\WIN32FORTHIDE\EdVersion.f + APPS\WIN32FORTHIDE\edfilepane.f + SRC\LIB\filelister.f + apps\forthform\quiksort.f + SRC\LIB\imagewindow.f + APPS\WIN32FORTHIDE\edhtmlpreview.f + SRC\LIB\HtmlDisplayWindow.f DLLs,2 w32fScintilla.dll FreeImage.dll ! Forms,1 ! APPS\WIN32FORTHIDE\filewindow.frm Auxiliary Files,0 ! Resources,13 APPS\WINED\RES\WINEDIT.h APPS\WINED\RES\WINEDIT.res *************** *** 78,80 **** --- 85,95 ---- APPS\PROMGR\RES\treeimages.bmp src\res\SciEditMDI.ico + APPS\PROMGR\RES\ToolbarBitmaps.bmp + apps\forthform\res\folder.bmp + APPS\WIN32FORTHIDE\RES\drive.bmp + APPS\WIN32FORTHIDE\RES\specs.bmp + APPS\WIN32FORTHIDE\RES\copy.bmp + APPS\WIN32FORTHIDE\RES\delete.bmp + APPS\WIN32FORTHIDE\RES\dupe.bmp + apps\sciedit\res\toolbar.bmp Docs,0 |
|
From: Ezra B. <ezr...@us...> - 2006-06-29 04:18:50
|
Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19112 Modified Files: CommandID.f EdMenu.f EdTabControl.f Main.f ScintillaHyperMDI.f Added Files: EdHtmlPreview.f Log Message: Better handling of multiple toolbars, window for previewing html source. EAB Index: EdTabControl.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** EdTabControl.f 14 Jun 2006 06:02:56 -0000 1.10 --- EdTabControl.f 29 Jun 2006 04:18:47 -0000 1.11 *************** *** 174,177 **** --- 174,178 ---- :M Start: ( Parent -- ) + TCS_BUTTONS AddStyle: self Start: super DEFAULT_GUI_FONT call GetStockObject SetFont: self *************** *** 313,317 **** z" Directory" IsPszText: cTab 3 InsertTab: cTab ! TCIF_TEXT IsMask: cTab z" Vocabularies" IsPszText: cTab --- 314,318 ---- z" Directory" IsPszText: cTab 3 InsertTab: cTab ! TCIF_TEXT IsMask: cTab z" Vocabularies" IsPszText: cTab *************** *** 353,355 **** --- 354,359 ---- UpdateFileName: cFileList ;M + :M FindFile: ( addr -- f ) + FindFile: cFileList ;M + ;class Index: EdMenu.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** EdMenu.f 11 Jun 2006 18:04:10 -0000 1.9 --- EdMenu.f 29 Jun 2006 04:18:47 -0000 1.10 *************** *** 33,37 **** MenuSeparator MENUITEM "Open &HTML File..." IDM_OPEN_HTML_FILE DoCommand ; ! MenuSeparator :MenuItem mf_print "&Print...\tCtrl+P" IDM_PRINT DoCommand ; --- 33,37 ---- MenuSeparator MENUITEM "Open &HTML File..." IDM_OPEN_HTML_FILE DoCommand ; ! MENUITEM "New Html Source File" IDM_NEW_HTML_SOURCE_FILE DoCommand ; MenuSeparator :MenuItem mf_print "&Print...\tCtrl+P" IDM_PRINT DoCommand ; *************** *** 124,127 **** --- 124,128 ---- MenuSeparator :MenuItem mp_browse "&Browse\tF7" IDM_BROWSE DoCommand ; + :MenuItem mp_viewhtml "&PreView As HTML\tF10" IDM_HTML_PREVIEW DoCommand ; Popup "&Options" *************** *** 268,271 **** --- 269,273 ---- dup Enable: mp_colorize dup Enable: mp_browse + dup Enable: mp_viewhtml \ Options menu --- NEW FILE: EdHtmlPreview.f --- \ EdHtmlPreview.f \ Edit Html source and preview in an Html window /* 0 value PreviewChild \ create preview object : HtmlPreview { \ child -- } ActiveChild 0= ?exit GetFileType: ActiveChild FT_SOURCE <> ?exit SaveFile: ActiveChild \ save edit first GetFileName: ActiveChild c@ 0= ?exit \ saving was cancelled ActiveChild to Child PreviewChild 0= if NewHtmlWnd ActiveChild to PreviewChild then GetHandle: PreviewChild Activate: Frame GetFileName: Child count asciiz SetURL: PreviewChild Update ; IDM_HTML_PREVIEW SetCommand */ needs HtmlDisplayWindow.f HtmlDisplayWindow PreviewWindow : HtmlPreview { \ child -- } ActiveChild 0= ?exit GetFileType: ActiveChild FT_SOURCE <> ?exit SaveFile: ActiveChild \ save edit first GetFileName: ActiveChild c@ 0= ?exit \ saving was cancelled GetHandle: MainWindow SetParentWindow: PreviewWindow Start: PreviewWindow GetFileName: ActiveChild count over SetUrl: PreviewWindow s" HtmlPreview - " pad place pad +place pad count SetText: PreviewWindow ; IDM_HTML_PREVIEW SetCommand create HtmlDefaultSource ," <html>\n<head>\n <title>Untitled</title>\n</head>\n\n<body>\n\n</body>\n</html>" 32 allot : NewHtmlFile ( -- ) NewEditWnd \ start a new window HtmlDefaultSource count SetTextZ: ActiveChild ; IDM_NEW_HTML_SOURCE_FILE SetCommand \s Index: ScintillaHyperMDI.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ScintillaHyperMDI.f,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScintillaHyperMDI.f 5 Jun 2006 09:19:00 -0000 1.1 --- ScintillaHyperMDI.f 29 Jun 2006 04:18:47 -0000 1.2 *************** *** 93,97 **** over + 0 swap c! \ 0-terminate false SetReadOnly: ChildWindow ! SetText: self Browse? SetReadOnly: ChildWindow ;M --- 93,97 ---- over + 0 swap c! \ 0-terminate false SetReadOnly: ChildWindow ! SetText: ChildWindow Browse? SetReadOnly: ChildWindow ;M Index: Main.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Main.f 15 Jun 2006 20:57:10 -0000 1.15 --- Main.f 29 Jun 2006 04:18:47 -0000 1.16 *************** *** 485,490 **** \ must NOT resize rebar on RBN_AUTOSIZE if Resize: self ! then h m w l Handle_Notify: pToolBar \ must be first for some reason ! h m w l Handle_Notify: ControlToolbar ;M --- 485,495 ---- \ must NOT resize rebar on RBN_AUTOSIZE if Resize: self ! then l GetNotifyWnd dup>r GetHandle: pToolBar = ToolTipHandle: pToolBar r@ = or ! if w l Handle_Notify: pToolBar ! else r@ GetHandle: ControlToolBar = ToolTipHandle: ControlToolBar r@ = or ! if w l Handle_Notify: ControlToolbar ! else false ! then ! then r>drop ;M *************** *** 814,818 **** \ the Win32Forth console interface support \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! fload EdDebug.f fload EdRemote.f --- 819,823 ---- \ the Win32Forth console interface support \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ! fload EdHtmlPreview.f fload EdDebug.f fload EdRemote.f *************** *** 877,880 **** --- 882,886 ---- 0 VK_F12 IDM_COMPILE ACCELENTRY 0 VK_F11 IDM_DEBUG ACCELENTRY + 0 VK_F10 IDM_HTML_PREVIEW ACCELENTRY \ Help menu Index: CommandID.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/CommandID.f,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CommandID.f 14 Jun 2006 06:02:56 -0000 1.5 --- CommandID.f 29 Jun 2006 04:18:47 -0000 1.6 *************** *** 34,37 **** --- 34,38 ---- NewID IDM_OPEN_RECENT_FILE NewID IDM_OPEN_HIGHLIGHTED_FILE + NewID IDM_NEW_HTML_SOURCE_FILE \ Edit menu *************** *** 74,77 **** --- 75,79 ---- NewID IDM_COLORIZE NewID IDM_BROWSE + NewID IDM_HTML_PREVIEW \ Options menu |
|
From: Ezra B. <ezr...@us...> - 2006-06-29 04:09:47
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15339/src/lib Modified Files: HtmlDisplayWindow.f StatusBar.f toolbar.f Log Message: Minor changes to classes. EAB Index: toolbar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/toolbar.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** toolbar.f 25 Sep 2005 18:31:51 -0000 1.3 --- toolbar.f 29 Jun 2006 04:09:43 -0000 1.4 *************** *** 627,630 **** --- 627,636 ---- ;M + :M ToolTipHandle: ( -- hwnd | 0 ) + hwnd + if 0 0 TB_GETTOOLTIPS SendMessage:Self + else 0 + then ;M + ;Class Index: StatusBar.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/StatusBar.f,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StatusBar.f 11 Jun 2006 09:03:50 -0000 1.2 --- StatusBar.f 29 Jun 2006 04:09:43 -0000 1.3 *************** *** 24,32 **** int style - :M ClassInit: ( -- ) - \ *G Initialise the class. - ClassInit: super - 0 to style ;M - :M AddStyle: ( n -- ) \ *G Set any additional style of the control. Must be done before the control --- 24,27 ---- *************** *** 61,65 **** ClassInit: super RaisedBorder: self ! ;M :M MinHeight: ( #pixels -- ) --- 56,60 ---- ClassInit: super RaisedBorder: self ! 0 to style ;M :M MinHeight: ( #pixels -- ) Index: HtmlDisplayWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/HtmlDisplayWindow.f,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HtmlDisplayWindow.f 11 Jan 2006 17:45:20 -0000 1.4 --- HtmlDisplayWindow.f 29 Jun 2006 04:09:43 -0000 1.5 *************** *** 144,148 **** \ restore any settings ! false SaveRestore: HtmlToolbar [ RBBIM_CHILD RBBIM_CHILDSIZE or RBBIM_STYLE or RBBIM_SIZE or ] LITERAL --- 144,148 ---- \ restore any settings ! \ false SaveRestore: HtmlToolbar [ RBBIM_CHILD RBBIM_CHILDSIZE or RBBIM_STYLE or RBBIM_SIZE or ] LITERAL |
|
From: Jos v.d.V. <jo...@us...> - 2006-06-28 11:43:16
|
Update of /cvsroot/win32forth/win32forth/apps/Player4 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5896/apps/Player4 Modified Files: Catalog.f Commands.f Mediatree.f PLAYER4.F Pl_MciWindow.f Pl_Version.f PopupWindow.f Log Message: Jos: Made joystickbrowsing in the treeview easier and faster. The long list problem has been solved by an extra index that will be shown when the catalog is sorted by artist and record in a hierarical view Index: Pl_Version.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_Version.f,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Pl_Version.f 10 Jun 2006 18:00:04 -0000 1.17 --- Pl_Version.f 28 Jun 2006 11:43:12 -0000 1.18 *************** *** 3,7 **** anew -Pl_Version.f ! 10124 value player_version# \ Version numbers: v.ww.rr --- 3,7 ---- anew -Pl_Version.f ! 10125 value player_version# \ Version numbers: v.ww.rr *************** *** 153,155 **** --- 153,177 ---- button6 shutdown the pc + \ changes for Version 1.01.25 + Jos: June 28th, 2006. + Added a Joystickbrowser and some more button commands. They are now: + button1 Next OR the current selected record + button2 Change the Font into big or small + button3 DecreaseVolume + button4 IncreaseVolume + button5 PAUSE/RESUME + button6 shutdown the pc + button9 Opens the item that is playing from the catalog + + Movements: Forward: Up in tree + Backward: Down in tree + Left: Close child in tree + Right: Open child in tree + + Added also an option to disable the joystick to avoid conflicts with games etc. + To keep the movements in the treeview under control you must move the + joystick between the center and a direction outside the center and then back to + the center to prevent continuous scrolling, + Push the joystick to the right when you would like to go in an already open child + in a tree. Index: Catalog.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** Catalog.f 10 Jun 2006 18:00:04 -0000 1.35 --- Catalog.f 28 Jun 2006 11:43:12 -0000 1.36 *************** *** 17,20 **** --- 17,21 ---- string: index$ 0 value #Excluded + 0 value #playing true value _DriveType *************** *** 53,58 **** DWORD _SeparatorX BYTE Endless- - \ DWORD Noop DWORD VolLevel ;struct --- 54,59 ---- DWORD _SeparatorX BYTE Endless- DWORD VolLevel + BYTE JoyStickDisabled- ;struct *************** *** 113,117 **** BYTE CollectedNotPlayed- BYTE NotUsed1 ! DWORD NotUsed2 ;struct --- 114,118 ---- BYTE CollectedNotPlayed- BYTE NotUsed1 ! DWORD hInTree ;struct *************** *** 238,241 **** --- 239,243 ---- r> close-file throw map-config-file + true vadr-config s_Artist_Title- c! 1000 vadr-config VolLevel ! then Index: Mediatree.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Mediatree.f,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** Mediatree.f 22 Jun 2006 09:03:32 -0000 1.33 --- Mediatree.f 28 Jun 2006 11:43:12 -0000 1.34 *************** *** 13,16 **** --- 13,17 ---- Font TreeViewFont 0 value UseBigFont + 0 value MaxDif :Class MediaTree <super TreeViewControl *************** *** 103,108 **** --- 104,114 ---- int hMovies int hMusic + int hMovieChar + int hMusicChar int hRequests int OtherArtist? + int PrevRecAdr + int rec-addr + int LastChar sizeof RecordDef dup create dummy allot dummy swap 01 fill *************** *** 122,164 **** ; ! : hMusic/hMovie ( rec-adr - hMusic|hMovie ) ! CountedFilename music? ! if hMusic ! else hMovies then ; ! : AddArtist { PrevRecAdr } ( rec-addr PrevRecAdr - ) ! dup CountedArtist 1 max PrevRecAdr @ CountedArtist 1 max compareia 0<> ! over RecordDef Cnt_Artist c@ 0> and ! if dup PrevRecAdr ! true to OtherArtist? NotPlayable ! dup RecordDef Artist hPrev ! 2 pick RecordDef Request- c@ ! if rot drop hRequests ! else rot hMusic/hMovie then 1 AddItemHierarical PrevRecAdr hArtist ! ! else drop false to OtherArtist? then ; ! : AddAlbum { PrevRecAdr } ( rec-addr PrevRecAdr - ) ! dup CountedAlbum 1 max PrevRecAdr @ CountedAlbum 1 max compareia 0<> OtherArtist? or ! over RecordDef Cnt_Artist c@ 0> and ! if dup PrevRecAdr ! NotPlayable ! RecordDef Album hPrev PrevRecAdr hArtist @ ! 1 AddItemHierarical PrevRecAdr hAlbum ! ! else drop then ; ! : AddTitle { rec-addr PrevRecAdr } ( rec-addr PrevRecAdr - ) rec-addr RecordDef CountedTitle +InlineRecord InlineRecord +null InlineRecord 1+ hPrev PrevRecAdr rec-addr RecordDef Cnt_Artist c@ 0> if hAlbum @ ! else drop rec-addr hMusic/hMovie then ! 0 AddItemHierarical drop ; --- 128,181 ---- ; ! : AddNewChar ( hMusic|hMovie hChar - hChar ) ! rec-addr RecordDef Artist c@ upc dup LastChar <> ! if dup to LastChar 0x100 * 1+ pad ! ! drop dup pad 1+ -rot 1 AddItemHierarical ! else drop nip ! then ! ; ! ! : hMusic/hMovie ( - hMusic|hMovie|hChar ) \ hMovieChar ! rec-addr CountedFilename music? ! if hMusic vadr-config s_Artist_Title- c@ \ When sorted by artist + title ! if hMusicChar AddNewChar dup to hMusicChar ! then ! else hMovies true \ sorted by rec ! if hMovieChar AddNewChar dup to hMovieChar ! then then ; ! : AddArtist ( - ) ! rec-addr CountedArtist 1 max PrevRecAdr @ CountedArtist 1 max compareia 0<> ! rec-addr RecordDef Cnt_Artist c@ 0> and ! if rec-addr PrevRecAdr ! true to OtherArtist? NotPlayable ! rec-addr RecordDef Artist hPrev ! rec-addr RecordDef Request- c@ ! if hRequests ! else hMusic/hMovie then 1 AddItemHierarical PrevRecAdr hArtist ! ! else false to OtherArtist? then ; ! : AddAlbum ( - ) ! rec-addr CountedAlbum 1 max PrevRecAdr @ CountedAlbum 1 max compareia 0<> OtherArtist? or ! rec-addr RecordDef Cnt_Artist c@ 0> and ! if rec-addr PrevRecAdr ! NotPlayable ! rec-addr RecordDef Album hPrev PrevRecAdr hArtist @ ! 1 AddItemHierarical PrevRecAdr RecordDef hAlbum ! then ; ! : AddTitle ( - ) rec-addr RecordDef CountedTitle +InlineRecord InlineRecord +null InlineRecord 1+ hPrev PrevRecAdr rec-addr RecordDef Cnt_Artist c@ 0> if hAlbum @ ! else drop hMusic/hMovie then ! 0 AddItemHierarical rec-addr RecordDef hIntree ! ; *************** *** 166,170 **** dup NotIncollection? over n>record RecordDef Request- c@ not and if drop ! else ( 1306 +) >r ResetInlineRecord r@ n>record dup RecordDef Request- c@ if 1 +to #requests &PrevRequest --- 183,187 ---- dup NotIncollection? over n>record RecordDef Request- c@ not and if drop ! else >r ResetInlineRecord r@ n>record dup RecordDef Request- c@ if 1 +to #requests &PrevRequest *************** *** 174,186 **** then then \ ( n vadr-config rec-addr PrevRecAdr - ) ! 2dup AddArtist ! 2dup AddAlbum ! 2 pick l_Index- c@ if r> dup +(l.int) else r> then to lParam ! >r OptionalElements r> ! AddTitle drop then ; --- 191,204 ---- then then \ ( n vadr-config rec-addr PrevRecAdr - ) ! to PrevRecAdr to rec-addr ! AddArtist ! AddAlbum ! dup l_Index- c@ if r> dup +(l.int) else r> then to lParam ! rec-addr OptionalElements 2drop ! AddTitle then ; *************** *** 201,205 **** --- 219,225 ---- for-all-records AddRecordFlat else root-items to hPrev + 0 to hMovieChar 0 to hMusicChar for-all-records AddRecordHierarical + hMovies TVGN_CARET SelectItem: Self then ;M *************** *** 218,222 **** then ; ! :M GetLparm: ( hItem - lParm ) to hItem --- 238,242 ---- then ; ! :M GetLparm: ( hItem - lParm ) to hItem *************** *** 233,237 **** hItemNew GetLparm: Self dup to last-selected-rec -1 <> ! if UseBigFont not if StartPopupWindow then --- 253,257 ---- hItemNew GetLparm: Self dup to last-selected-rec -1 <> ! if MaxDif not if StartPopupWindow then *************** *** 273,278 **** Start: super false to UseBigFont SetfontTreeView: Self ;M ! :M ExWindowStyle: ( -- style ) ExWindowStyle: Super --- 293,299 ---- Start: super false to UseBigFont SetfontTreeView: Self + 0 to MaxDif ;M ! :M ExWindowStyle: ( -- style ) ExWindowStyle: Super *************** *** 305,332 **** ! \ GetNextItem: bij 0 terug dicht en next parent ! : SelectTreeViewItem ( hitem - ) dup 0<> if TVGN_CARET SelectItem: TreeView else drop then ! ; ! :M GetLparm: ( - hItem ) GetLparm: TreeView ;M :M GetSelectedItem: ( - hItem ) 0 TVGN_CARET GetNextItem: TreeView ;M :M DownInTree: ( - ) GetSelectedItem: Self TVGN_NEXT GetNextItem: TreeView ! SelectTreeViewItem ;M :M UpInTree: ( - ) GetSelectedItem: Self GetPrevious: TreeView ! SelectTreeViewItem ;M :M OpenChild: ( - ) GetSelectedItem: Self GetChild: TreeView ! SelectTreeViewItem ;M --- 326,352 ---- ! :M SelectTreeViewItem: ( hitem - ) dup 0<> if TVGN_CARET SelectItem: TreeView else drop then ! ;M ! :M GetLparm: ( - hItem ) GetLparm: TreeView ;M :M GetSelectedItem: ( - hItem ) 0 TVGN_CARET GetNextItem: TreeView ;M :M DownInTree: ( - ) GetSelectedItem: Self TVGN_NEXT GetNextItem: TreeView ! SelectTreeViewItem: Self ;M :M UpInTree: ( - ) GetSelectedItem: Self GetPrevious: TreeView ! SelectTreeViewItem: Self ;M :M OpenChild: ( - ) GetSelectedItem: Self GetChild: TreeView ! SelectTreeViewItem: Self ;M Index: PLAYER4.F =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PLAYER4.F,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** PLAYER4.F 22 Jun 2006 09:03:32 -0000 1.59 --- PLAYER4.F 28 Jun 2006 11:43:12 -0000 1.60 *************** *** 232,236 **** else map-config-file then SortByFlags ! GetHandle: Self SetParent: ControlCenter GetHandle: Self SetParent: ViewForm --- 232,236 ---- else map-config-file then SortByFlags ! -1 to #playing GetHandle: Self SetParent: ControlCenter GetHandle: Self SetParent: ViewForm *************** *** 251,255 **** [ *lpjoycapsa joycapsa wXmax ] literal @ [ *lpjoycapsa joycapsa wXmin ] literal @ - 2/ to JoycenterX ! 0 200 1 hWnd Call SetTimer drop then ;M --- 251,255 ---- [ *lpjoycapsa joycapsa wXmax ] literal @ [ *lpjoycapsa joycapsa wXmin ] literal @ - 2/ to JoycenterX ! 0 100 1 hWnd Call SetTimer drop then ;M *************** *** 405,424 **** : ChangeFont ( Big|small - ) ! to UseBigFont Delete: TreeViewFont SetfontTreeView: Catalog SW_SHOWMAXIMIZED Show: MainWindow ; ! : PlaymodeForJoystick ( button - ) ! case ! JOY_BUTTON1 of IDM_NEXT DoCommand endof ! JOY_BUTTON2 of true ChangeFont endof ! JOY_BUTTON3 of DecreaseVolume endof ! JOY_BUTTON4 of IncreaseVolume endof ! JOY_BUTTON5 of IDM_PAUSE/RESUME DoCommand endof ! JOY_BUTTON6 of down endof ! endcase ; ! : PlayFromJoystick GetSelectedItem: Catalog GetLparm: Catalog dup -1 = --- 405,419 ---- : ChangeFont ( Big|small - ) ! to UseBigFont Delete: TreeViewFont SetfontTreeView: Catalog SW_SHOWMAXIMIZED Show: MainWindow ; ! : ShowPlaying ! #playing -1 > ! if #playing RecordDef hIntree @ SelectTreeViewItem: Catalog ! then ; ! : PlayFromJoystick ( - ) GetSelectedItem: Catalog GetLparm: Catalog dup -1 = *************** *** 430,440 **** : JoystickBrowser ( button - ) case ! JOY_BUTTON1 of PlayFromJoystick endof ! JOY_BUTTON8 of OpenChild: Catalog endof ! JOY_BUTTON7 of CloseChild: Catalog endof ! JOY_BUTTON2 of false ChangeFont endof endcase - ; : DifToCenter? { pos } ( Joycenter pos - dif ) dup 2 / over pos - abs > --- 425,438 ---- : JoystickBrowser ( button - ) case ! JOY_BUTTON1 of IDM_NEXT DoCommand endof ! JOY_BUTTON2 of UseBigFont not ChangeFont endof ! JOY_BUTTON3 of DecreaseVolume endof ! JOY_BUTTON4 of IncreaseVolume endof ! JOY_BUTTON5 of IDM_PAUSE/RESUME DoCommand endof ! JOY_BUTTON6 of down endof ! JOY_BUTTON9 of 10 to MaxDif ShowPlaying endof endcase ; + : DifToCenter? { pos } ( Joycenter pos - dif ) dup 2 / over pos - abs > *************** *** 444,451 **** ; - \ debug DifToCenter? 65000 JoycenterY swap DifToCenter? - \ debug DifToCenter? 32767 JoycenterY swap DifToCenter? - - : XYDifCenter ( posx posy - difx dify ) JoycenterY swap DifToCenter? >r --- 442,445 ---- *************** *** 455,460 **** 0 value incr-fact : ScrollFlag ( difx dify - f ) ! abs swap abs max dup 0= if to incr-fact else incr-fact JoycenterY >= --- 449,456 ---- 0 value incr-fact + : 2abs ( n1 n2 - n1Abs n2Abs ) abs swap abs swap ; + : ScrollFlag ( difx dify - f ) ! 2abs max dup to MaxDif dup 0= if to incr-fact else incr-fact JoycenterY >= *************** *** 479,485 **** dup 0<> if 0> ! if OpenChild: Catalog else CloseChild: Catalog ! then JoycenterY negate 2* to incr-fact else drop then --- 475,481 ---- dup 0<> if 0> ! if OpenChild: Catalog else CloseChild: Catalog ! then JoycenterY negate 3 * to incr-fact else drop then *************** *** 488,492 **** : HandleMovesJoystickBrowser ( x y z button - ) 2drop XYDifCenter 2dup ScrollFlag ! if down/up Left/Right else 2drop then --- 484,491 ---- : HandleMovesJoystickBrowser ( x y z button - ) 2drop XYDifCenter 2dup ScrollFlag ! if 2dup 2abs <= ! if down/up drop ! else drop Left/Right ! then else 2drop then *************** *** 494,510 **** ; ! :Noname ( - >>> ) ! IDJoystick GetJoystickInfo ! dup JOY_BUTTON1 >= ! if UseBigFont ! if JoystickBrowser WaitTillDepressed 3drop ! else PlaymodeForJoystick WaitTillDepressed 3drop ! then ! else UseBigFont ! if HandleMovesJoystickBrowser ! else 4drop then then - ; is HandleJoystick --- 493,503 ---- ; ! :Noname ( - ) ! vadr-config JoyStickDisabled- c@ 0= ! if IDJoystick GetJoystickInfo dup JOY_BUTTON1 >= ! if JoystickBrowser WaitTillDepressed 3drop ! else HandleMovesJoystickBrowser then then ; is HandleJoystick *************** *** 526,530 **** MENUITEM "S&earch and make a collection..." SearchCatalog ; MENUSEPARATOR ! :MENUITEM mEndless "Endless play" Endless ; MENUITEM "&Start/Resume playing\tCtrl+R" IDM_START/RESUME DoCommand ; MENUSEPARATOR --- 519,523 ---- MENUITEM "S&earch and make a collection..." SearchCatalog ; MENUSEPARATOR ! :MENUITEM mEndless "Endless play" Endless ; MENUITEM "&Start/Resume playing\tCtrl+R" IDM_START/RESUME DoCommand ; MENUSEPARATOR *************** *** 566,569 **** --- 559,563 ---- AutoPlay ; :MENUITEM mTray "Tray window at the start" TrayWindowCmd ; + :MENUITEM mJoyStickDisabled "Disable joystick" NoJoysticks ; POPUP "&Help" *************** *** 572,580 **** :Noname ( -- ) ! vadr-config AutoStart- c@ Check: mAutostart ! vadr-config AutoMinimized- c@ Check: mTray ! vadr-config IgnoreRequests c@ Check: mHandelReq ! vadr-config KeepRequests c@ Check: mKeepReq ! vadr-config Endless- c@ Check: mEndless ; is MenuChecks \ enable/disable the menu items --- 566,575 ---- :Noname ( -- ) ! vadr-config AutoStart- c@ Check: mAutostart ! vadr-config AutoMinimized- c@ Check: mTray ! vadr-config IgnoreRequests c@ Check: mHandelReq ! vadr-config KeepRequests c@ Check: mKeepReq ! vadr-config Endless- c@ Check: mEndless ! vadr-config JoyStickDisabled- c@ Check: mJoyStickDisabled ; is MenuChecks \ enable/disable the menu items Index: Pl_MciWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Pl_MciWindow.f 10 Jun 2006 18:00:04 -0000 1.24 --- Pl_MciWindow.f 28 Jun 2006 11:43:12 -0000 1.25 *************** *** 288,292 **** else n>record dup>r RecordDef File_name r@ Cnt_File_name c@ 2dup type-cr ! r@ incr-#played r> mark-played (PlayOneFile) then --- 288,292 ---- else n>record dup>r RecordDef File_name r@ Cnt_File_name c@ 2dup type-cr ! r@ incr-#played r@ to #playing r> mark-played (PlayOneFile) then Index: PopupWindow.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/PopupWindow.f,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** PopupWindow.f 21 May 2006 15:30:03 -0000 1.7 --- PopupWindow.f 28 Jun 2006 11:43:12 -0000 1.8 *************** *** 6,10 **** : PlaySelectedFromTreeView ( -- ) ! last-selected-rec n>record dup>r RecordDef File_name r@ Cnt_File_name c@ r@ incr-#played --- 6,10 ---- : PlaySelectedFromTreeView ( -- ) ! last-selected-rec n>record dup to #playing dup>r RecordDef File_name r@ Cnt_File_name c@ r@ incr-#played Index: Commands.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Commands.f,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Commands.f 25 May 2006 15:36:50 -0000 1.3 --- Commands.f 28 Jun 2006 11:43:12 -0000 1.4 *************** *** 172,176 **** vadr-config AutoStart- invert-check ; ! : Endless ( -- ) vadr-config Endless- invert-check ; --- 172,176 ---- vadr-config AutoStart- invert-check ; ! : Endless ( -- ) vadr-config Endless- invert-check ; *************** *** 178,181 **** --- 178,184 ---- vadr-config AutoMinimized- invert-check ; + : NoJoysticks ( -- ) + vadr-config JoyStickDisabled- invert-check ; + \ -------------------------------------------------------------------------- \ Help menu |
|
From: Jos v.d.V. <jo...@us...> - 2006-06-28 11:21:19
|
Update of /cvsroot/win32forth/win32forth/src/lib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29264/src/lib Modified Files: treeview.f Log Message: Jos: Corrected 2 stacknotations. Index: treeview.f =================================================================== RCS file: /cvsroot/win32forth/win32forth/src/lib/treeview.f,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** treeview.f 22 Jun 2006 09:04:35 -0000 1.10 --- treeview.f 28 Jun 2006 11:21:15 -0000 1.11 *************** *** 249,254 **** :M Collapse: ( hItem -- ) TVE_COLLAPSE TVE_COLLAPSE or Expand: self ;M :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage:Self ;M ! :M SelectItem: ( flag hItem -- ) TVM_SELECTITEM SendMessage:SelfDrop ;M ! :M GetNextItem: ( flag hItem -- h ) TVM_GETNEXTITEM SendMessage:Self ;M :M GetRoot: ( -- hItem ) 0 TVGN_ROOT GetNextItem: self ;M :M GetChild: ( hItem -- hItem ) TVGN_CHILD GetNextItem: self ;M --- 249,254 ---- :M Collapse: ( hItem -- ) TVE_COLLAPSE TVE_COLLAPSE or Expand: self ;M :M GetItemRect: ( hItem -- f ) ItemRect ! ItemRect true TVM_GETITEMRECT SendMessage:Self ;M ! :M SelectItem: ( hItem flag -- ) TVM_SELECTITEM SendMessage:SelfDrop ;M ! :M GetNextItem: ( hItem flag -- h ) TVM_GETNEXTITEM SendMessage:Self ;M :M GetRoot: ( -- hItem ) 0 TVGN_ROOT GetNextItem: self ;M :M GetChild: ( hItem -- hItem ) TVGN_CHILD GetNextItem: self ;M |
1040 messages has been excluded from this view by a project administrator.
