win32forth-cvs — CVS Commit List

[Win32forth-cvs] win32forth/apps/WinEd Ed_MessageBrodcast.F, 1.4, 1.5

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

Update of /cvsroot/win32forth/win32forth/apps/WinEd
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26633/apps/WinEd

Modified Files:
	Ed_MessageBrodcast.F 
Log Message:
- Fixed F12 in WinEd, SciEdit and the Win32Forth IDE. Now it should work when a Win32Forth turnkey application with an embedded console window (e.g. Solipon) is running, too.

Index: Ed_MessageBrodcast.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_MessageBrodcast.F,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Ed_MessageBrodcast.F	28 Aug 2005 07:28:07 -0000	1.4
--- Ed_MessageBrodcast.F	22 Jul 2006 08:21:53 -0000	1.5
***************
*** 9,16 ****
  
  create Win32ForthClassName ," Win32Forth" \ the window class name of the forth console
! create Win32ForthName ," Win32Forth Console" \ the window name of the forth console
  0 value hWndForthWindow \ holds the current handle of forth console
  
! 2 CallBack: GetForthWindowCallback { hWnd WinEdProcessID \ buff$ -- int }
          MAXSTRING localalloc: buff$
  
--- 9,16 ----
  
  create Win32ForthClassName ," Win32Forth" \ the window class name of the forth console
! create Win32ForthName MAXSTRING allot Win32ForthName off \ the window name of the forth console
  0 value hWndForthWindow \ holds the current handle of forth console
  
! 2 CallBack: GetForthWindowCallback { hWnd SciEditProcessID \ buff$ -- int }
          MAXSTRING localalloc: buff$
  
***************
*** 22,33 ****
               Win32ForthClassName count buff$ over COMPARE 0=
               if   MAXSTRING buff$ hWnd call GetWindowText drop
!                   Win32ForthName count buff$ over COMPARE 0<>
!                   if   hWnd to hWndForthWindow
!                        drop false \ stop enum
                    then
               then
          then ;
  
  : GetForthWindow ( -- ) \ get the handle of the forth console window
          0 to hWndForthWindow
          GetHandle: EditorWindow GetProcessId
--- 22,50 ----
               Win32ForthClassName count buff$ over COMPARE 0=
               if   MAXSTRING buff$ hWnd call GetWindowText drop
!                   Win32ForthName count buff$ over COMPARE 0=
!                   if   \ don't return our own (hidden) console window
!                        hWnd GetProcessId SciEditProcessID <>
!                        if   hWnd to hWndForthWindow
!                             drop false \ stop enum
!                        then
                    then
               then
          then ;
  
+ : BuildWin32ForthName ( -- )
+ \ Build the window name of the Forth console window.
+ \ If a Forth console window is embedded within an turnkey application
+ \ the name is "Win32Forth".
+ \ For a stand alone console which is needed here it is "Win32forth <Version>",
+ \ were <Version> is something like "6.11.09" (see src/extend.f).
+         base @ decimal
+         S" Win32Forth " Win32ForthName place
+         version# ((version)) Win32ForthName +place
+         Win32ForthName +NULL
+         base !
+         ;
+ 
  : GetForthWindow ( -- ) \ get the handle of the forth console window
+         BuildWin32ForthName
          0 to hWndForthWindow
          GetHandle: EditorWindow GetProcessId
***************
*** 54,56 ****
          else 2drop  \ [rda 1/18/04]
          then ;
!         
--- 71,73 ----
          else 2drop  \ [rda 1/18/04]
          then ;
! 

[Win32forth-cvs] win32forth/apps/SciEdit EdCompile.f,1.3,1.4

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

Update of /cvsroot/win32forth/win32forth/apps/SciEdit
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26633/apps/SciEdit

Modified Files:
	EdCompile.f 
Log Message:
- Fixed F12 in WinEd, SciEdit and the Win32Forth IDE. Now it should work when a Win32Forth turnkey application with an embedded console window (e.g. Solipon) is running, too.

Index: EdCompile.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/EdCompile.f,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EdCompile.f	21 Aug 2005 11:11:04 -0000	1.3
--- EdCompile.f	22 Jul 2006 08:21:52 -0000	1.4
***************
*** 18,22 ****
  
  create Win32ForthClassName ," Win32Forth" \ the window class name of the forth console
! create Win32ForthName ," Win32Forth" \ the window name of the forth console
  0 value hWndForthWindow \ holds the current handle of forth console
  
--- 18,22 ----
  
  create Win32ForthClassName ," Win32Forth" \ the window class name of the forth console
! create Win32ForthName MAXSTRING allot Win32ForthName off \ the window name of the forth console
  0 value hWndForthWindow \ holds the current handle of forth console
  
***************
*** 41,48 ****
          then ;
  
  : GetForthWindow ( -- ) \ get the handle of the forth console window
          0 to hWndForthWindow
          GetHandle: Frame GetProcessId
!         &GetForthWindowCallback 
          Call EnumWindows drop ;
  
--- 41,62 ----
          then ;
  
+ : BuildWin32ForthName ( -- )
+ \ Build the window name of the Forth console window.
+ \ If a Forth console window is embedded within an turnkey application
+ \ the name is "Win32Forth".
+ \ For a stand alone console which is needed here it is "Win32forth <Version>",
+ \ were <Version> is something like "6.11.09" (see src/extend.f).
+         base @ decimal
+         S" Win32Forth " Win32ForthName place
+         version# ((version)) Win32ForthName +place
+         Win32ForthName +NULL
+         base !
+         ;
+ 
  : GetForthWindow ( -- ) \ get the handle of the forth console window
+         BuildWin32ForthName
          0 to hWndForthWindow
          GetHandle: Frame GetProcessId
!         &GetForthWindowCallback
          Call EnumWindows drop ;
  

[Win32forth-cvs] win32forth/src Extend.f,1.9,1.10

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

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26633/src

Modified Files:
	Extend.f 
Log Message:
- Fixed F12 in WinEd, SciEdit and the Win32Forth IDE. Now it should work when a Win32Forth turnkey application with an embedded console window (e.g. Solipon) is running, too.

Index: Extend.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Extend.f,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Extend.f	29 Aug 2005 15:56:27 -0000	1.9
--- Extend.f	22 Jul 2006 08:21:53 -0000	1.10
***************
*** 98,101 ****
--- 98,104 ----
  \ set title of the console window
  \ August 31st, 2003 - 13:24 dbu (SF-ID 778673)
+ \
+ \ Note: If the window title for a stand alone Forth console window is changed here
+ \ the word BuildWin32ForthName in SciEdit, WinEd and the IDE must be changed, too !!!
  : (ConsoleTitle) { \ $buff -- }
          256 LocalAlloc: $buff
***************
*** 122,126 ****
  
                  ed-ptr  0<>                     \ if shared memory was inited
!                 IF   
                       ed-forth-count @ 1 >
                       IF   TRUE to second-forth?
--- 125,129 ----
  
                  ed-ptr  0<>                     \ if shared memory was inited
!                 IF
                       ed-forth-count @ 1 >
                       IF   TRUE to second-forth?

[Win32forth-cvs] win32forth/apps/Win32ForthIDE EdCompile.f, 1.1, 1.2

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

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26633/apps/Win32ForthIDE

Modified Files:
	EdCompile.f 
Log Message:
- Fixed F12 in WinEd, SciEdit and the Win32Forth IDE. Now it should work when a Win32Forth turnkey application with an embedded console window (e.g. Solipon) is running, too.

Index: EdCompile.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdCompile.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EdCompile.f	5 Jun 2006 09:19:00 -0000	1.1
--- EdCompile.f	22 Jul 2006 08:21:53 -0000	1.2
***************
*** 18,22 ****
  
  create Win32ForthClassName ," Win32Forth" \ the window class name of the forth console
! create Win32ForthName ," Win32Forth" \ the window name of the forth console
  0 value hWndForthWindow \ holds the current handle of forth console
  
--- 18,22 ----
  
  create Win32ForthClassName ," Win32Forth" \ the window class name of the forth console
! create Win32ForthName MAXSTRING allot Win32ForthName off \ the window name of the forth console
  0 value hWndForthWindow \ holds the current handle of forth console
  
***************
*** 41,48 ****
          then ;
  
  : GetForthWindow ( -- ) \ get the handle of the forth console window
          0 to hWndForthWindow
          GetHandle: Frame GetProcessId
!         &GetForthWindowCallback 
          Call EnumWindows drop ;
  
--- 41,62 ----
          then ;
  
+ : BuildWin32ForthName ( -- )
+ \ Build the window name of the Forth console window.
+ \ If a Forth console window is embedded within an turnkey application
+ \ the name is "Win32Forth".
+ \ For a stand alone console which is needed here it is "Win32forth <Version>",
+ \ were <Version> is something like "6.11.09" (see src/extend.f).
+         base @ decimal
+         S" Win32Forth " Win32ForthName place
+         version# ((version)) Win32ForthName +place
+         Win32ForthName +NULL
+         base !
+         ;
+ 
  : GetForthWindow ( -- ) \ get the handle of the forth console window
+         BuildWin32ForthName
          0 to hWndForthWindow
          GetHandle: Frame GetProcessId
!         &GetForthWindowCallback
          Call EnumWindows drop ;
  
***************
*** 92,98 ****
          WaitForConsole
  
!         \ adjust count of Forths currently running
!         -1 ed-forth-count +! ;  \ SF-RequestID 745393 - fixed June 8th, 2003 - 12:59 dbu
  
  
  \ -----------------------------------------------------------------------------
--- 106,119 ----
          WaitForConsole
  
!         ConsoleReady? 0=
!         if   z" Error starting Win32Forth console window"
!              WindowTitle: MainWindow
!              [ MB_OK MB_ICONERROR or ] literal
!              GetHandle: MainWindow MessageBox drop
!         then
  
+         \ adjust count of Forths currently running
+         -1 ed-forth-count +! \ SF-RequestID 745393 - fixed June 8th, 2003 - 12:59 dbu
+         ;
  
  \ -----------------------------------------------------------------------------

[Win32forth-cvs] win32forth/src paths.f,1.13,1.14

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1371/src

Modified Files:
	paths.f 
Log Message:
Jos: Now a defined path may be spread over several volumes.

Index: paths.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** paths.f	16 Jul 2006 13:41:59 -0000	1.13
--- paths.f	20 Jul 2006 19:39:20 -0000	1.14
***************
*** 145,170 ****
  
  6 PROC SearchPath
! : full-path  { a1 n1 path-ptr \ searchpath$ filename$ -- a2 n2 f1 }
  \ *G Find file a1,n1 in a path and return the full path. \n
  \ ** 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
! 
!                         0  \ file component
!                         path-file$ \ found file name buffer
!                         max-path  \ size of buffer
!                         defextz$ \ file extension
!                         filename$ \ file name
                          searchpath$ char+ \ search path
                          call SearchPath
!                         0<> if
!                                 path-file$ zcount false
!                                 exit
                          then
                          r>
!                 while   path-ptr next-path"
!                 repeat  a1 n1 path-file$ place path-file$ count true \ return input file and error flag
                  ;
  
--- 145,177 ----
  
  6 PROC SearchPath
! : full-path  { a1 n1 path-ptr \ searchpath$ filename$ current$ -- a2 n2 f1 }
  \ *G Find file a1,n1 in a path and return the full path. \n
  \ ** a2,n2 and f1=false, succeeded.
                  a1 n1 MAX-PATH 1+ localalloc ascii-z to filename$
                  MAX-PATH 1+  localalloc: searchpath$
+                 MAX_PATH 1+ LocalAlloc: current$
+                 current-dir$ count current$ place current$ +null \ save current dir
                  path-ptr first-path"
                  begin   dup>r searchpath$ place searchpath$ +null
!                         searchpath$ 2 + c@ ascii : =     \ Test for another volume
!                                 if  searchpath$ char+
!                                     $current-dir! not abort" $current-dir!" \ set current dir to the search path
!                                 then 
!                         0                 \ file component
!                         path-file$        \ found file name buffer
!                         max-path          \ size of buffer
!                         defextz$          \ file extension
!                         filename$         \ file name
                          searchpath$ char+ \ search path
                          call SearchPath
!                         0<> if  path-file$ zcount false    \ path not found
!                                 current$ char+ $current-dir!
!                                 not abort" $current-dir!"  \ restore current dir
!                                 r>drop  exit               \ clear the retun stack and exit
                          then
                          r>
!                 while   searchpath$ off path-ptr next-path"
!                 repeat  a1 n1 path-file$ place path-file$ count true   \ return input file and error flag
!                 current$ char+ $current-dir! not abort" $current-dir!" \ restore current dir
                  ;
  
***************
*** 192,203 ****
  \ first try it in the current directory
                a1 n1 path-ptr full-path
!               -if   3drop
!                    \ then try it in the forth directory
!                    MAX_PATH 1+ LocalAlloc: current$
!                    current-dir$ count current$ place current$ +null \ save current dir
!                    &forthdir dup +null
!                    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 ;
  
--- 199,204 ----
  \ first try it in the current directory
                a1 n1 path-ptr full-path
!               -if   3drop     \ then try it in the forth directory
!                     a1 n1 path-ptr full-path
                then ;
  

[Win32forth-cvs] win32forth/src/lib Joystick.f,1.4,1.5

[George H. <geo...@us...>]

Update of /cvsroot/win32forth/win32forth/src/lib
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28964/win32forth/src/lib

Modified Files:
	Joystick.f 
Log Message:
gah:Changed to use ?DO to stop hanging when no joysticks are installed.

Index: Joystick.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/Joystick.f,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Joystick.f	13 Jun 2006 20:48:39 -0000	1.4
--- Joystick.f	20 Jul 2006 15:50:47 -0000	1.5
***************
*** 104,108 ****
  : FindFirstJoyStick     ( -  *lpjoycapsa ID  )  \ ID should be <= MaxJoysticks
    *lpjoycapsa [ sizeof JOYCAPSA ] literal 2dup erase swap MaxJoysticks 0
!         do     2dup  i Call joyGetDevCaps 0=
                    if   nip  I leave
                    then
--- 104,108 ----
  : FindFirstJoyStick     ( -  *lpjoycapsa ID  )  \ ID should be <= MaxJoysticks
    *lpjoycapsa [ sizeof JOYCAPSA ] literal 2dup erase swap MaxJoysticks 0
!         ?do     2dup  i Call joyGetDevCaps 0=
                    if   nip  I leave
                    then

[Win32forth-cvs] Undeliverable mail: Hello!

[<MAI...@mf...>]

Failed to deliver to 'wi...@tm...'
LOCAL module(account wi...@tm...) reports:
 account is full (quota exceeded)

[Win32forth-cvs] win32forth/apps/Player4 Catalog.f, 1.37, 1.38 Commands.f, 1.5, 1.6 Mediatree.f, 1.34, 1.35 Pl_MciWindow.f, 1.26, 1.27 Pl_Version.f, 1.19, 1.20 mshell_r.f, 1.3, 1.4

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Player4
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14287/apps/Player4

Modified Files:
	Catalog.f Commands.f Mediatree.f Pl_MciWindow.f Pl_Version.f 
	mshell_r.f 
Log Message:
Jos:  The catalog now only adds a new record to the catalog when it is not a duplicate.
2 records are considered to be duplicate when the
medialabel, relative filename and filesize are the same.

Index: mshell_r.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/mshell_r.f,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mshell_r.f	8 Mar 2006 21:42:56 -0000	1.3
--- mshell_r.f	19 Jul 2006 15:25:26 -0000	1.4
***************
*** 14,18 ****
  \ The number of keys is only limited by the unused size of the stack.
  \ Each key can be sorted in an ascending or descending way.
! \ A key may contain a number or a string.
  \ The sort is case-insensitive for stings.
  \ Easy to expand to sort doubles etc.
--- 14,18 ----
  \ The number of keys is only limited by the unused size of the stack.
  \ Each key can be sorted in an ascending or descending way.
! \ A key may contain a byte, word, cell, float or a string.
  \ The sort is case-insensitive for stings.
  \ Easy to expand to sort doubles etc.
***************
*** 86,91 ****
      f2dup f= if  f2drop 0  else f<  if 1 else  true  then  then ;
  
! : cmp-cells  ( cand1 cand2 by - n )  locals| by |  >key @  swap >key @  <>=  ;
  : cmp-words  ( cand1 cand2 by - n )  locals| by |  >key w@ swap >key w@ <>=  ;
  : cmp-floats ( cand1 cand2 by - n )  locals| by |  >key f@      >key f@ f<>= ;
  
--- 86,92 ----
      f2dup f= if  f2drop 0  else f<  if 1 else  true  then  then ;
  
! : cmp-bytes  ( cand1 cand2 by - n )  locals| by |  >key c@ swap >key c@ <>=  ;
  : cmp-words  ( cand1 cand2 by - n )  locals| by |  >key w@ swap >key w@ <>=  ;
+ : cmp-cells  ( cand1 cand2 by - n )  locals| by |  >key @  swap >key @  <>=  ;
  : cmp-floats ( cand1 cand2 by - n )  locals| by |  >key f@      >key f@ f<>= ;
  
***************
*** 97,102 ****
  : Descending  ( key - key ) dup -1 2 mod-cell ;
  : $sort       ( key - )     ['] cmp$       3 mod-cell ;
! : bin-sort    ( key - )     ['] cmp-cells  3 mod-cell ;
  : word-sort   ( key - )     ['] cmp-words  3 mod-cell ;
  : float-sort  ( key - )     ['] cmp-floats 3 mod-cell ;
  
--- 98,104 ----
  : Descending  ( key - key ) dup -1 2 mod-cell ;
  : $sort       ( key - )     ['] cmp$       3 mod-cell ;
! : byte-sort   ( key - )     ['] cmp-bytes  3 mod-cell ;
  : word-sort   ( key - )     ['] cmp-words  3 mod-cell ;
+ : bin-sort    ( key - )     ['] cmp-cells  3 mod-cell ;
  : float-sort  ( key - )     ['] cmp-floats 3 mod-cell ;
  

Index: Pl_Version.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_Version.f,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Pl_Version.f	8 Jul 2006 19:58:52 -0000	1.19
--- Pl_Version.f	19 Jul 2006 15:25:26 -0000	1.20
***************
*** 3,7 ****
  anew -Pl_Version.f
  
! 10126 value player_version#
  
  \ Version numbers: v.ww.rr
--- 3,7 ----
  anew -Pl_Version.f
  
! 10127 value player_version#
  
  \ Version numbers: v.ww.rr
***************
*** 39,43 ****
   - Create *.m3u files and import them the catalog
   - Columns in the treeview.
-  - Only add a new file to the catalog when it wasn't added before
  
  \ ---------------------------------------------------------------------------
--- 39,42 ----
***************
*** 178,179 ****
--- 177,186 ----
  Jos: July 8th, 2006.
  File names will now be relative stored when a search path is filled.
+ 
+ \ changes for Version 1.01.27
+ Jos: July 19th, 2006.
+ The catalog now only adds a new record to the catalog when it is not a duplicate.
+ 2 records are considered to be duplicate when the
+ medialabel, relative filename and filesize are the same.
+ 
+ 

Index: Catalog.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Catalog.f,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Catalog.f	8 Jul 2006 19:58:52 -0000	1.37
--- Catalog.f	19 Jul 2006 15:25:26 -0000	1.38
***************
*** 335,338 ****
--- 335,339 ----
   ;
  
+ /artist /album + /Title +  constant  /Record
  
  0 RecordDef File_name   previous /file_name key: FileNameKey
***************
*** 340,351 ****
  0 RecordDef RandomLevel previous 1 cells    key: RandomKey       RandomKey       bin-sort
  0 RecordDef #played     previous 1 cells    key: leastPlayedKey  leastPlayedKey  bin-sort
  0 RecordDef FileSize    previous 1 cells    key: FileSizeKey     FileSizeKey     bin-sort
  0 RecordDef Request-    previous 1 cells 2/ key: RequestKey      RequestKey Descending word-sort
  
  : &FlexKeyLen ( - &FlexKeyLen ) FlexKey &key-len ;
  : MinFlexKey! ( n - )           min FlexKey !    ;
  
- /artist /album + /Title +  constant  /Record
- 
  : by_record  ( - FlexKey )
      /Record &FlexKeyLen ! FlexKey @ 0 RecordDef Artist MinFlexKey! FlexKey
--- 341,352 ----
  0 RecordDef RandomLevel previous 1 cells    key: RandomKey       RandomKey       bin-sort
  0 RecordDef #played     previous 1 cells    key: leastPlayedKey  leastPlayedKey  bin-sort
+ 0 RecordDef Deleted-    previous 1          key: DeletedKey      DeletedKey      byte-sort
  0 RecordDef FileSize    previous 1 cells    key: FileSizeKey     FileSizeKey     bin-sort
  0 RecordDef Request-    previous 1 cells 2/ key: RequestKey      RequestKey Descending word-sort
+ 0 RecordDef MediaLabel  previous /MediaLabel /Record + key: LabelKey
  
  : &FlexKeyLen ( - &FlexKeyLen ) FlexKey &key-len ;
  : MinFlexKey! ( n - )           min FlexKey !    ;
  
  : by_record  ( - FlexKey )
      /Record &FlexKeyLen ! FlexKey @ 0 RecordDef Artist MinFlexKey! FlexKey
***************
*** 362,368 ****
--- 363,373 ----
  : by_leastPlayed        ( - by )  by[   leastPlayedKey Ascending RequestKeyFlagged ]by ;
  : by_FileSize           ( - by )  by[   FileSizeKey    RequestKeyFlagged ]by ;
+ : by_cand_duplicates    ( - by )  by[   leastPlayedKey Ascending FileSizeKey
+                                         FileNameKey LabelKey DeletedKey  ]by ;
  
  : not-deleted? ( rec-adr - flag )   s" RecordDef deleted- c@ 0= " EVALUATE ; IMMEDIATE
  
+ :inline FileSizeRecord   ( adr - FileSizeRecord )  RecordDef FileSize @ ;
+ 
  : _list-record ( rec-adr - )
      dup>r not-deleted?
***************
*** 380,384 ****
                  r@ RecordDef Played-   c@ .
                  r@ RecordDef Excluded- c@ .
!                 r@ RecordDef FileSize  @ 12  U,.R
                  r@ RecordDef RequestLevelRecord c@  ."  Req " .
          then
--- 385,389 ----
                  r@ RecordDef Played-   c@ .
                  r@ RecordDef Excluded- c@ .
!                 r@ FileSizeRecord 12  U,.R
                  r@ RecordDef RequestLevelRecord c@  ."  Req " .
          then
***************
*** 425,429 ****
             r@ RecordDef Title      r@ Cnt_Title  c@ type-separator
             r@ RecordDef #played     @ .csv  type-separator
!            r@ RecordDef FileSize    @ .csv  type-separator
             r@ RecordDef RequestLevelRecord c@ .csv +inlineRecord
             InlineRecord count       fwrite
--- 430,434 ----
             r@ RecordDef Title      r@ Cnt_Title  c@ type-separator
             r@ RecordDef #played     @ .csv  type-separator
!            r@ FileSizeRecord          .csv  type-separator
             r@ RecordDef RequestLevelRecord c@ .csv +inlineRecord
             InlineRecord count       fwrite
***************
*** 459,465 ****
   ;
  
! : sort_by_filename      ( - )    by_FileName    sort-database ;
! : sort_by_leastPlayed   ( - )    by_leastPlayed sort-database ;
! : sort_by_size          ( - )    by_FileSize    sort-database ;
  
  : SortByFlags ( - )
--- 464,471 ----
   ;
  
! : sort_by_filename              ( - )    by_FileName            sort-database ;
! : sort_by_leastPlayed           ( - )    by_leastPlayed         sort-database ;
! : sort_by_size                  ( - )    by_FileSize            sort-database ;
! : sort_by_cand_duplicates       ( - )    by_cand_duplicates     sort-database ;
  
  : SortByFlags ( - )
***************
*** 672,675 ****
--- 678,711 ----
  external
  
+ \ 2 records are considered to be duplicate when the
+ \ medialabel, relative filename and filesize are the same
+ 
+ : duplicates? { rec1 rec2 } ( rec rec+1 - f )
+    rec1 FileSizeRecord rec2 FileSizeRecord =
+         if      rec1 RecordDef MediaLabel  rec1 RecordDef Cnt_MediaLabel c@
+                 rec2 RecordDef MediaLabel  rec2 RecordDef Cnt_MediaLabel c@ compareia 0=
+                         if      rec1 RecordDef File_name  rec1 RecordDef Cnt_File_name c@
+                                 rec2 RecordDef File_name  rec2 RecordDef Cnt_File_name c@ compareia 0=
+                         else    false
+                         then
+         else    false
+         then
+  ;
+ 
+ : DuplicatedToNext? ( n - f ) dup n>record swap 1+ n>record duplicates? ;
+ 
+ : RemoveDuplicates   ( - )
+    sort_by_cand_duplicates
+    database-mhndl #records-in-database 1- 0
+         ?do   i n>record in-freelist?
+                 if      leave
+                 then
+               i DuplicatedToNext?
+                         if      i delete-record
+                         then
+         loop
+    SortByFlags
+  ;
+ 
  : CloseReMap  ( wHndl - )
          close-file abort" Close error database"
***************
*** 686,689 ****
--- 722,726 ----
          select_tree sdir
          CloseReMap
+         RemoveDuplicates
          arrow-cursor
          ;

Index: Mediatree.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Mediatree.f,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Mediatree.f	28 Jun 2006 11:43:12 -0000	1.34
--- Mediatree.f	19 Jul 2006 15:25:26 -0000	1.35
***************
*** 320,323 ****
--- 320,324 ----
          2drop hDrop Call DragFinish
          wHndl CloseReMap
+         RemoveDuplicates
          RefreshCatalog ;
  

Index: Pl_MciWindow.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Pl_MciWindow.f,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Pl_MciWindow.f	8 Jul 2006 19:58:52 -0000	1.26
--- Pl_MciWindow.f	19 Jul 2006 15:25:26 -0000	1.27
***************
*** 315,320 ****
               #SelectedFiles: GetFilesDialog
               wait-cursor 0
!              do   dup i GetFile: GetFilesDialog AddFile
!              loop
               arrow-cursor  CloseReMap  RefreshCatalog
          then ;M
--- 315,321 ----
               #SelectedFiles: GetFilesDialog
               wait-cursor 0
!                 do   dup i GetFile: GetFilesDialog AddFile
!                 loop
!              RemoveDuplicates
               arrow-cursor  CloseReMap  RefreshCatalog
          then ;M

Index: Commands.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Player4/Commands.f,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Commands.f	8 Jul 2006 19:58:52 -0000	1.5
--- Commands.f	19 Jul 2006 15:25:26 -0000	1.6
***************
*** 58,61 ****
--- 58,62 ----
          catalog-exist?
          if   0 to last-selected-rec player-base search-records
+              SortByFlags
          then ;
  

[Win32forth-cvs] win32forth/doc p-index.htm,1.13,1.14

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

Update of /cvsroot/win32forth/win32forth/doc
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28219/doc

Modified Files:
	p-index.htm 
Log Message:
Added "Path.htm" to the Advanced Topics

Index: p-index.htm
===================================================================
RCS file: /cvsroot/win32forth/win32forth/doc/p-index.htm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** p-index.htm	25 May 2006 09:22:35 -0000	1.13
--- p-index.htm	17 Jul 2006 15:29:36 -0000	1.14
***************
*** 152,155 ****
--- 152,156 ----
    <li><a href="p-numconv.htm">Number Conversion</a></li>
    <li><a href="p-AcceleratorTables.htm">Accelerator tables</a></li>
+   <li><a href="Paths.htm">Multiple search path support</a></li>
    <li><a href="p-relnotes.6.12.htm">Release Notes</a></li>
  </ul>

[Win32forth-cvs] win32forth/src Class.f,1.19,1.20

[George H. <geo...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12508/win32forth/src

Modified Files:
	Class.f 
Log Message:
gah:Added code for dealing with indexed IVARS.

Index: Class.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Class.f,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Class.f	29 Jun 2006 10:27:42 -0000	1.19
--- Class.f	17 Jul 2006 12:07:39 -0000	1.20
***************
*** 449,457 ****
  \ Build a class header with its superclass pointer
  : inherit       ( pfa -- )
!                 dup here class-size move        \ copy class data
!                 here body> vcfa>voc voc>vlink
                  voc-link @ over !
                  voc-link !
-                 class-size allot                \ reserve rest of class data
  
                  dup ^Class SFA !                \ store pointer to superclass
--- 449,456 ----
  \ Build a class header with its superclass pointer
  : inherit       ( pfa -- )
!                 here 2dup class-size dup allot move  \ copy class data
!                 body> vcfa>voc voc>vlink
                  voc-link @ over !
                  voc-link !
  
                  dup ^Class SFA !                \ store pointer to superclass
***************
*** 459,463 ****
                  ^Class ^Self iclass !           \ store my class in SELF
                                                  \ add to search order
!                 ^Class XFA OFF
                  also ^class body> vcfa>voc context ! definitions
                  obj-class 0= if reveal then ;
--- 458,462 ----
                  ^Class ^Self iclass !           \ store my class in SELF
                                                  \ add to search order
!                 ^Class XFA dup @ 0max swap !    \ inherit indexing
                  also ^class body> vcfa>voc context ! definitions
                  obj-class 0= if reveal then ;
***************
*** 505,509 ****
  
  : <Super        ( -- )        \ W32F     Class
! \ *G allow inheriting from a class or an object
  \ *E Specify the superclass of the class or object being created. Used as follows;
  \ **       :Class  <newclassname> <Super <superclassname>
--- 504,508 ----
  
  : <Super        ( -- )        \ W32F     Class
! \ *G Allow inheriting from a class or an object
  \ *E Specify the superclass of the class or object being created. Used as follows;
  \ **       :Class  <newclassname> <Super <superclassname>
***************
*** 521,525 ****
--- 520,526 ----
  
  synonym <Object <Super
+ \ *G See <Super
  synonym <Class  <Super
+ \ *G See <Super.
  
  \ Create an identical copy (clone) of an existing object
***************
*** 788,793 ****
                    1 ( object ) of  Obj.Var,                     endof
                    2 ( class  ) of  >Class (findm) ,             endof
!                   3 ( vector ) of  ,  POSTPONE (defer) ,        endof
!                   4 ( parm   ) of  ,  POSTPONE (defer) ,        endof
                    5 ( paren  ) of  drop LateBound               endof
                  Endcase ;
--- 789,794 ----
                    1 ( object ) of  Obj.Var,                     endof
                    2 ( class  ) of  >Class (findm) ,             endof
!                   3 ( vector ) of  compile,  POSTPONE (defer) ,        endof
!                   4 ( parm   ) of  compile,  POSTPONE (defer) ,        endof
                    5 ( paren  ) of  drop LateBound               endof
                  Endcase ;
***************
*** 950,954 ****
  
  : <noClassPointer ( -- )
! \ *G Set a class and its subclasses to suppress the class pointer when used as IVARs.
  \ XFA is -1 when no class pointer is reserved for IVARs.
          -1 ^class XFA ! ;
--- 951,956 ----
  
  : <noClassPointer ( -- )
! \ *G Set a class to suppress the class pointer when used for IVARs.
! \ ** Not inherited by subclasses.
  \ XFA is -1 when no class pointer is reserved for IVARs.
          -1 ^class XFA ! ;
***************
*** 959,964 ****
  
  : Self  ( -- addr )
! \ *G Compile a self reference, but only if the class is guaranteed to
! \ ** have a class pointer.  We can send ourself late-bound messages
  \ ** with the syntax:   Msg: [ self ].
          POSTPONE ^base ; IMMEDIATE
--- 961,966 ----
  
  : Self  ( -- addr )
! \ *G Compile a self reference so we can send ourself late-bound messages, but
! \ ** only if the class is guaranteed to have a class pointer.
  \ ** with the syntax:   Msg: [ self ].
          POSTPONE ^base ; IMMEDIATE
***************
*** 1119,1122 ****
--- 1121,1171 ----
  in-application
  
+ : @width  ( ^class -- elWidth )  \ return the indexed element width for a class
+  XFA @  0 MAX ;
+ 
+ \ =====================================================================
+ \ Indexed primitives. These should be in code for best performance.
+ 
+ : idxBase  ( -- addr )  \ get base of idx data area
+  ^base  DUP obj>class DFA @ +  CELL+ ;
+ 
+ : limit    ( -- n )  \ get idx limit (#elems)
+  ^base  DUP obj>class DFA @ + 2 + w@ ;
+ 
+ : #width    ( -- n )  \ width of an idx element
+  ^base obj>class XFA @ ;
+ 
+ : ^elem   ( index -- addr ) \ get addr of idx element
+  #width *  idxBase + ;
+ 
+ \ Fast access to byte and cell arrays.
+ : At1  ( index -- char )   idxBase + C@ ;
+ : At4  ( index -- cell )   CELLS idxBase + @ ;
+ 
+ : To1  ( char index -- )   idxBase + C! ;
+ : To4  ( cell index -- )   CELLS idxBase + ! ;
+ 
+ : ++1  ( char index -- )   idxBase + C+! ;
+ : ++4  ( cell index -- )   CELLS idxBase + +! ;
+ 
+ \ Compute total length of object.
+ \ The length does not include class pointer.
+ : objlen  ( -- objlen )
+  ^base obj>class DUP DFA @  ( non-indexed data )
+  SWAP @width ?DUP
+  IF  idxBase 2 - w@ ( #elems ) * +  CELL+  THEN ;
+ 
+ \ =====================================================================
+ \ Runtime indexed range checking. Use +range and -range to turn range
+ \ checking on and off.
+ 
+ defer ?idx
+ 
+ internal
+ 
+ : ?range  ( index -- index )  \ range check
+  DUP idxBase CELL - 2 + w@ ( #elems )  U< IF EXIT THEN
+  TRUE ABORT" Index out of range" ;
+ 
  \ : int-array    ( size -<name>- )
  \                header
***************
*** 1129,1133 ****
  module
  
! forth definitions
  
  : Dispose       ( addr -- )
--- 1178,1189 ----
  module
  
! forth definitions also hidden
! 
! : +range  ['] ?range is ?idx ;  +range
! : -range  ['] NOOP   is ?idx ;
! 
! initialization-chain chain-add +range
! 
! previous
  
  : Dispose       ( addr -- )

[Win32forth-cvs] win32forth/apps/Win32ForthIDE EdTabControl.f, 1.14, 1.15 Main.f, 1.22, 1.23

[George H. <geo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10456/win32forth/apps/Win32ForthIDE

Modified Files:
	EdTabControl.f Main.f 
Log Message:
gah:Adjusted priority of tasks and made tabs multi-line.

Index: Main.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Main.f	16 Jul 2006 11:54:34 -0000	1.22
--- Main.f	17 Jul 2006 12:02:21 -0000	1.23
***************
*** 110,117 ****
  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 ( -- )
--- 110,118 ----
  2 proc SetThreadPriority
  
! : Below    ( -- ) THREAD_PRIORITY_BELOW_NORMAL GetCurrentThread SetThreadPriority drop ;
! : Above     ( -- ) THREAD_PRIORITY_ABOVE_NORMAL GetCurrentThread SetThreadPriority drop ;
  
! 0 :NoName ( -- ) Below InitVocBrowser: cTabWindow ; Task-Block Constant VocInitTask
! 0 :NoName ( -- ) Below InitClassBrowser: cTabWindow ; Task-Block Constant ClassInitTask
  
  : InitClassBrowsers ( -- )
***************
*** 957,960 ****
--- 958,962 ----
  
  : Main          ( -- )
+                 above
                  start: Frame
                  GetHandle: frame hwndOwner !  DefaultPrinter   \ initialise PSD and PD

Index: EdTabControl.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdTabControl.f,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** EdTabControl.f	4 Jul 2006 03:58:57 -0000	1.14
--- EdTabControl.f	17 Jul 2006 12:02:21 -0000	1.15
***************
*** 174,178 ****
  
  :M Start:	( Parent -- )
! \	TCS_BUTTONS TCS_MULTILINE or AddStyle: self
  	Start: super
  	DEFAULT_GUI_FONT call GetStockObject SetFont: self
--- 174,178 ----
  
  :M Start:	( Parent -- )
! 	TCS_MULTILINE AddStyle: self
  	Start: super
  	DEFAULT_GUI_FONT call GetStockObject SetFont: self

[Win32forth-cvs] win32forth/demos WINHELLO.F,1.2,1.3

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/demos
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25558/demos

Modified Files:
	WINHELLO.F 
Log Message:
Jos: Made the text more clear.

Index: WINHELLO.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/demos/WINHELLO.F,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WINHELLO.F	8 Jan 2006 09:43:13 -0000	1.2
--- WINHELLO.F	16 Jul 2006 19:40:38 -0000	1.3
***************
*** 43,47 ****
                       \ let's draw...
                       black SetBkColor: dc
!                      green SetTextColor: dc
  
                       MAXSTRING LocalAlloc: temp$
--- 43,47 ----
                       \ let's draw...
                       black SetBkColor: dc
!                      ltgreen SetTextColor: dc
  
                       MAXSTRING LocalAlloc: temp$

[Win32forth-cvs] win32forth/doc Paths.htm,NONE,1.1

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/doc
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20927/doc

Added Files:
	Paths.htm 
Log Message:
Jos: The html file generated with DEX of paths.f

--- NEW FILE: Paths.htm ---
<?xml version="1.0"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/xml; charset=iso-8859-1" />
<meta name="GENERATOR" content="DexH v03" />
<style type="text/css">
</style>
<title>
</title>
</head>
<body>
<hr /><h1>Paths -- Multiple search path support
</h1><hr /><h2>Glossary
</h2><pre><b><a name="0">create &amp;forthdir
</a></b></pre><p>A static forth installation directory.
</p><pre><b><a name="1">: init-Win32fDirectory { \ kernel$ -- }
</a></b></pre><p>Set &amp;forthdir to the folder of the current forth application. <br />
</p><pre><b><a name="2">: .program &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -- )
</a></b></pre><p>Type the program path.
</p><pre><b><a name="3">: .forthdir &nbsp;&nbsp;&nbsp;&nbsp;( -- )
</a></b></pre><p>Type the forth directory.
</p><pre><b><a name="4">: &quot;chdir &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( a1 n1 -- )
</a></b></pre><p>Set the current directory.
</p><pre><b><a name="5">: .dir &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -- )
</a></b></pre><p>Print the current directory.
</p><pre><b><a name="6">: chdir &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -&lt;optional_new_directory&gt;- )
</a></b></pre><p>Set the current directory.
</p><pre><b><a name="7">: path: &nbsp;( - )
</a></b></pre><p>Defines a directory search path. <br />
The first 2 cells are used too handle a search path. <br />
The next 260 bytes are reserved for a counted string of a path. <br />
followed by 0. <br />
In runtime it returns adres of the counted string of a path
</p><pre><b><a name="8">: path-source &nbsp;&nbsp;( path-ptr &nbsp;- 2variable_path-source )
</a></b></pre><p>Path-source points to a substring in a path. <br />
Path-source returns this adres.
</p><pre><b><a name="9">path: path-ptr
</a></b></pre><p>Path-ptr defines the path buffer for Forth. Applications that let Forth
compile should not change it in a way that Forth is not able too compile.
</p><pre><b><a name="10">: next-path&quot; &nbsp;&nbsp;&nbsp;( path-ptr -- a1 n1 &nbsp;)
</a></b></pre><p>Get the next path from dir list.
</p><pre><b><a name="11">: reset-path-source &nbsp;&nbsp;&nbsp;&nbsp;( path-ptr -- &nbsp;)
</a></b></pre><p>Points the path-source to the whole path.
</p><pre><b><a name="12">: first-path&quot; &nbsp;&nbsp;( path-ptr -- a1 n1 &nbsp;)
</a></b></pre><p>Get the first forth directory path.
</p><pre><b><a name="13">: &quot;path+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( a1 n1 path-ptr -- )
</a></b></pre><p>Append a directory to a path.
</p><pre><b><a name="14">: &quot;fpath+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( a1 n1 path-ptr -- ) &nbsp;
</a></b></pre><p>Append a directory to a path.
</p><pre><b><a name="15">: fpath+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -&lt;directory&gt;- )
</a></b></pre><p>Append a directory to the Forth path.
</p><pre><b><a name="16">: .path &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( path-ptr -- ) &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</a></b></pre><p>Display a directory search path list.
</p><pre><b><a name="17">: .fpath &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -- )
</a></b></pre><p>Display the Forth directory search path list.
</p><pre><b><a name="18">: full-path &nbsp;{ a1 n1 path-ptr \ searchpath$ filename$ -- a2 n2 f1 }
</a></b></pre><p>Find file a1,n1 in a path and return the full path. <br />
a2,n2 and f1=false, succeeded.
</p><pre><b><a name="19">: program-path-init ( -- ) &nbsp;
</a></b></pre><p>Initialize the Forth directory search path list.
</p><pre><b><a name="20">: &quot;path-file &nbsp;{ a1 n1 \ current$ -- a2 n2 f1 }
</a></b></pre><p>Find file a1,n1 in the Forth path and return the full path. <br />
a2,n2 and f1=false, succeeded.
</p><pre><b><a name="21">: n&quot;open &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( a1 n1 -- handle f1 ) &nbsp;
</a></b></pre><p>Open file a1,n1 with a Forth path search.
</p><pre><b><a name="22">: MakeAbsolutePath &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( a1 n1 a2 n2 -- a3 ) &nbsp;
</a></b></pre><p>Make path a1 n1 absolute to path a2 n2.
</p><pre><b><a name="23">: IsPathRelativeTo? &nbsp;&nbsp;&nbsp;&nbsp;{ a1 n1 a2 n2 -- f } &nbsp;
</a></b></pre><p>Return true if path a1 n1 is relative to path a2 n2
</p><pre><b><a name="24">: MakePathRelativeTo &nbsp;&nbsp;&nbsp;( a1 n1 a2 n2 -- a3 ) &nbsp;
</a></b></pre><p>Make path a1 n1 relative to path a2 n2.
</p><pre><b><a name="25">: FindRelativePath &nbsp;( a1 n1 path-ptr - a2 n2 )
</a></b></pre><p>Returns a releative path for file a1 n1 in path-ptr ( first part ). <br />
n2=0 means not in search path.
</p><pre><b><a name="26">: FindRelativeName &nbsp;( a1 n1 path-ptr - a2 n2 f )
</a></b></pre><p>Returns a releative name for file a1 n1 in path-ptr ( last-part ). <br />
n2=0 means not in search path.
</p><pre><b><a name="27">: &quot;LOADED? &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( addr len -- flag )
</a></b></pre><p>True if a file addr len is loaded. The filename must cointain a full path.
</p><pre><b><a name="28">: LOADED? &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -&lt;name&gt;- -- flag ) &nbsp;{ \ current$ }
</a></b></pre><p>True if the following file is loaded. The filename may be relative.
</p><pre><b><a name="29">: \LOADED- &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -&lt;name&gt;- ) &nbsp;
</a></b></pre><p>If the following file IS NOT LOADED interpret line.
</p><pre><b><a name="30">: \LOADED &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -&lt;name&gt;- )
</a></b></pre><p>&nbsp;If the following file IS LOADED interpret line.
</p><pre><b><a name="31">: NEEDS &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;( -&lt;name&gt;- )
</a></b></pre><p>Conditionally load file &quot;name&quot; if not loaded.
</p><pre><b><a name="32">: &quot;file-clip&quot; &nbsp;&nbsp;{ adr len limit \ temp$ pre -- 'adr 'len } &nbsp;
</a></b></pre><p>Clip filename to limit.
</p>

[Win32forth-cvs] win32forth/src paths.f,1.12,1.13

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19756/src

Modified Files:
	paths.f 
Log Message:
Jos: DEXed paths.f

Index: paths.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** paths.f	10 Jul 2006 21:31:36 -0000	1.12
--- paths.f	16 Jul 2006 13:41:59 -0000	1.13
***************
*** 1,3 ****
! \ $Id$
  
  cr .( Loading Path Functions...)
--- 1,8 ----
! \ $Id$  Ed_FileStack.f
! 
! \ *D doc\
! \ *! Paths
! \ *T Paths -- Multiple search path support
! \ *S Glossary
  
  cr .( Loading Path Functions...)
***************
*** 5,13 ****
  in-application
  
! create &forthdir MAXCOUNTED 1+ allot \ static forth installation directory
!        &forthdir off
  
  : init-Win32fDirectory { \ kernel$ -- }
!                 \ set &forthdir to the folder of the current forth application
                  &prognam count "path-only" &forthdir place
                  &forthdir c@ 0=
--- 10,19 ----
  in-application
  
! create &forthdir
! \ *G A static forth installation directory.
!                 MAXCOUNTED 1+ allot        &forthdir off
  
  : init-Win32fDirectory { \ kernel$ -- }
! \ *G Set &forthdir to the folder of the current forth application. \n
                  &prognam count "path-only" &forthdir place
                  &forthdir c@ 0=
***************
*** 26,33 ****
  IN-SYSTEM
  
! : .program      ( -- ) \ type program path
                  &prognam count type ;
  
! : .forthdir     ( -- ) \ type forth directory
                  &forthdir count type ;
  
--- 32,41 ----
  IN-SYSTEM
  
! : .program      ( -- )
! \ *G Type the program path.
                  &prognam count type ;
  
! : .forthdir     ( -- )
! \ *G Type the forth directory.
                  &forthdir count type ;
  
***************
*** 37,47 ****
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! : "chdir        ( a1 n1 -- ) \ set current directory
                  IF $current-dir! THEN drop ;
  
! : .dir          ( -- ) \ print current directory
                  cr ." Current directory: " current-dir$ count type ;
  
! : chdir         ( -<optional_new_directory>- ) \ set current directory
                  /parse-word count "chdir cr .dir ;
  
--- 45,58 ----
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! : "chdir        ( a1 n1 -- )
! \ *G Set the current directory.
                  IF $current-dir! THEN drop ;
  
! : .dir          ( -- )
! \ *G Print the current directory.
                  cr ." Current directory: " current-dir$ count type ;
  
! : chdir         ( -<optional_new_directory>- )
! \ *G Set the current directory.
                  /parse-word count "chdir cr .dir ;
  
***************
*** 49,53 ****
  IN-APPLICATION
  
! : path:  ( - )                   \ map:  2variable_path-source counted_path
          create  -1 , 0 , MAX-PATH 1+ allot  does>   \ run-time: ( - path-ptr )
          [ 2 cells ] literal +
--- 60,69 ----
  IN-APPLICATION
  
! : path:  ( - )
! \ *G Defines a directory search path. \n
! \ ** The first 2 cells are used too handle a search path. \n
! \ ** The next 260 bytes are reserved for a counted string of a path. \n
! \ ** followed by 0. \n
! \ ** In runtime it returns adres of the counted string of a path
          create  -1 , 0 , MAX-PATH 1+ allot  does>   \ run-time: ( - path-ptr )
          [ 2 cells ] literal +
***************
*** 62,81 ****
     create path-file$ MAX-PATH 1+ allot
  
! : 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 '\'?
--- 78,107 ----
     create path-file$ MAX-PATH 1+ allot
  
! : path-source   ( path-ptr  - 2variable_path-source )
! \ *G Path-source points to a substring in a path. \n
! \ ** Path-source returns this adres.
!         2 cells- ;
  
  EXTERNAL
  
! path: path-ptr
! \ *G Path-ptr defines the path buffer for Forth. Applications that let Forth
! \ ** compile should not change it in a way that Forth is not able too compile.
  
! : next-path"    ( path-ptr -- a1 n1  )
! \ *G 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 --  )
! \ *G Points the path-source to the whole path.
!                 dup>r count r> path-source 2! ;
  
! : first-path"   ( path-ptr -- a1 n1  )
! \ *G Get the first forth directory path.
                  dup>r reset-path-source  r>  next-path" ;
  
! : "path+       ( a1 n1 path-ptr -- )
! \ *G Append a directory to a path.
                  >r 2dup upper
                  2dup + 1- c@ '\' =  \ end in '\'?
***************
*** 91,103 ****
                  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
--- 117,132 ----
                  then    r>drop ;
  
! : "fpath+       ( a1 n1 path-ptr -- )  
! \ *G Append a directory to a path.
                  path-ptr "path+ ;
  
  
! : fpath+        ( -<directory>- )
! \ *G Append a directory to the Forth path.
                  /parse-s$ count  "fpath+ ;
  
  
! : .path        ( path-ptr -- )           
! \ *G Display a directory search path list.
                  count
                  begin   ?dup
***************
*** 108,112 ****
                  repeat  drop ;
  
! : .fpath        ( -- )          \ display the forth directory search path list
                  path-ptr  .path ;
  
--- 137,142 ----
                  repeat  drop ;
  
! : .fpath        ( -- )
! \ *G Display the Forth directory search path list.
                  path-ptr  .path ;
  
***************
*** 115,123 ****
  
  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
--- 145,153 ----
  
  6 PROC SearchPath
! : full-path  { a1 n1 path-ptr \ searchpath$ filename$ -- a2 n2 f1 }
! \ *G Find file a1,n1 in a path and return the full path. \n
! \ ** 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
***************
*** 134,138 ****
                                  exit
                          then
- 
                          r>
                  while   path-ptr next-path"
--- 164,167 ----
***************
*** 142,146 ****
  EXTERNAL
  
! : program-path-init ( -- ) \ initialize the forth directory search path list
                  path-ptr off \ clear path list
                  s" ."       "fpath+ \ current dir is first
--- 171,176 ----
  EXTERNAL
  
! : program-path-init ( -- )  
! \ *G Initialize the Forth directory search path list.
                  path-ptr off \ clear path list
                  s" ."       "fpath+ \ current dir is first
***************
*** 157,164 ****
  INITIALIZATION-CHAIN CHAIN-ADD PROGRAM-PATH-INIT
  
! : "path-file  { a1 n1 \ current$ -- a2 n2 f1 } \ find file a1,n1 return full path
!                                                \ a2,n2 and f1=false, succeeded
! 
!               \ first try it in the current directory
                a1 n1 path-ptr full-path
                -if   3drop
--- 187,194 ----
  INITIALIZATION-CHAIN CHAIN-ADD PROGRAM-PATH-INIT
  
! : "path-file  { a1 n1 \ current$ -- a2 n2 f1 }
! \ *G Find file a1,n1 in the Forth path and return the full path. \n
! \ ** a2,n2 and f1=false, succeeded.
! \ first try it in the current directory
                a1 n1 path-ptr full-path
                -if   3drop
***************
*** 168,174 ****
                     &forthdir dup +null
                     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 ;
--- 198,202 ----
***************
*** 181,185 ****
  create open-path$ MAXSTRING allot
  
! : n"open        ( a1 n1 -- handle f1 ) \ open file a1,n1 with path search
                  "path-file
                  if   2drop 0 -1
--- 209,214 ----
  create open-path$ MAXSTRING allot
  
! : n"open        ( a1 n1 -- handle f1 )  
! \ *G Open file a1,n1 with a Forth path search.
                  "path-file
                  if   2drop 0 -1
***************
*** 201,205 ****
  EXTERNAL
  
! : MakeAbsolutePath      ( a1 n1 a2 n2 -- a3 ) \ make path a1 n1 absolute to path a2 n2
          ?DUP \ only if a2 n2 point's to a path
          IF   2OVER IsAbsolutePath?
--- 230,235 ----
  EXTERNAL
  
! : MakeAbsolutePath      ( a1 n1 a2 n2 -- a3 )  
! \ *G Make path a1 n1 absolute to path a2 n2.
          ?DUP \ only if a2 n2 point's to a path
          IF   2OVER IsAbsolutePath?
***************
*** 212,219 ****
          then <AbsRelPath$> dup +null ;
  
! : IsPathRelativeTo?     { a1 n1 a2 n2 -- f } \ return true if path a1 n1 is relative to path a2 n2
          a1 n1 n2 MIN a2 OVER ISTR= ;
  
! : MakePathRelativeTo    ( a1 n1 a2 n2 -- a3 ) \ make path a1 n1 relative to path a2 n2
          4DUP IsPathRelativeTo?
          IF   NIP DUP>R - SWAP R> + SWAP ( a2 n3 )
--- 242,251 ----
          then <AbsRelPath$> dup +null ;
  
! : IsPathRelativeTo?     { a1 n1 a2 n2 -- f }  
! \ *G Return true if path a1 n1 is relative to path a2 n2
          a1 n1 n2 MIN a2 OVER ISTR= ;
  
! : MakePathRelativeTo    ( a1 n1 a2 n2 -- a3 )  
! \ *G Make path a1 n1 relative to path a2 n2.
          4DUP IsPathRelativeTo?
          IF   NIP DUP>R - SWAP R> + SWAP ( a2 n3 )
***************
*** 222,226 ****
               <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>
--- 254,260 ----
               <AbsRelPath$> ;
  
! : FindRelativePath  ( a1 n1 path-ptr - a2 n2 )
! \ *G Returns a releative path for file a1 n1 in path-ptr ( first part ). \n
! \ ** n2=0 means not in search path.
          dup>r reset-path-source
                  begin   r@ path-source 2@ nip 0>
***************
*** 234,237 ****
--- 268,273 ----
  
  : FindRelativeName  ( a1 n1 path-ptr - a2 n2 f )
+ \ *G Returns a releative name for file a1 n1 in path-ptr ( last-part ). \n
+ \ ** n2=0 means not in search path.
          >r 2dup r> FindRelativePath dup 0>
                  if      nip dup 3 >
***************
*** 257,261 ****
  in-system
  
! : "LOADED?      ( addr len -- flag )       \ is file loaded?
                  CONTEXT @ >R               \ save context
                  files                      \ set context
--- 293,298 ----
  in-system
  
! : "LOADED?      ( addr len -- flag )
! \ *G True if a file addr len is loaded. The filename must cointain a full path.
                  CONTEXT @ >R               \ save context
                  files                      \ set context
***************
*** 265,274 ****
                  ;
  
! : LOADED?       ( -<name>- -- flag )       \ is file loaded?
!                 { \ current$ }
                  MAX_PATH 1+ LocalAlloc: current$
                  current-dir$ count current$ place \ get current dir
                  current$ ?+\                      \ append '\'
- 
                  new$ >r /parse-s$ count r@ place \ store file name
                  r@ ?defext r> count              \ add default ext if needed
--- 302,310 ----
                  ;
  
! : LOADED?       ( -<name>- -- flag )  { \ current$ }
! \ *G True if the following file is loaded. The filename may be relative.
                  MAX_PATH 1+ LocalAlloc: current$
                  current-dir$ count current$ place \ get current dir
                  current$ ?+\                      \ append '\'
                  new$ >r /parse-s$ count r@ place \ store file name
                  r@ ?defext r> count              \ add default ext if needed
***************
*** 276,280 ****
                  "loaded? ;
  
! : \LOADED-      ( -<name>- ) \ if the following file IS NOT LOADED interpret line
                  >in @ >r
                  loaded? 0=
--- 312,317 ----
                  "loaded? ;
  
! : \LOADED-      ( -<name>- )  
! \ *G If the following file IS NOT LOADED interpret line.
                  >in @ >r
                  loaded? 0=
***************
*** 283,287 ****
                  then    r>drop ;
  
! : \LOADED       ( -<name>- ) \ if the following file IS LOADED interpret line
                  >in @ >r
                  loaded?
--- 320,325 ----
                  then    r>drop ;
  
! : \LOADED       ( -<name>- )
! \ *G  If the following file IS LOADED interpret line.
                  >in @ >r
                  loaded?
***************
*** 290,294 ****
                  then    r>drop ;
  
! : NEEDS         ( -<name>- ) \ conditionally load file "name" if not loaded
                  >in @ >r
                  loaded? 0=                     \ if file isn't loaded
--- 328,333 ----
                  then    r>drop ;
  
! : NEEDS         ( -<name>- )
! \ *G Conditionally load file "name" if not loaded.
                  >in @ >r
                  loaded? 0=                     \ if file isn't loaded
***************
*** 302,306 ****
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! : "file-clip"   { adr len limit \ temp$ pre -- 'adr 'len } \ clip filename to limit
                  MAX-PATH LocalAlloc: temp$
                  limit 20 max to limit                   \ must be at east 16
--- 341,346 ----
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  
! : "file-clip"   { adr len limit \ temp$ pre -- 'adr 'len }  
! \ *G Clip filename to limit.
                  MAX-PATH LocalAlloc: temp$
                  limit 20 max to limit                   \ must be at east 16
***************
*** 315,317 ****
                  then    ;
  
! MODULE
--- 355,357 ----
                  then    ;
  
! MODULE 

[Win32forth-cvs] win32forth/apps/Win32ForthIDE EdMenu.f, 1.10, 1.11 EdToolbar.f, 1.4, 1.5 EdVersion.f, 1.1, 1.2 Main.f, 1.21, 1.22 ProjectTree.f, 1.11, 1.12 ScintillaMDI.f, 1.3, 1.4

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

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10682/apps/Win32ForthIDE

Modified Files:
	EdMenu.f EdToolbar.f EdVersion.f Main.f ProjectTree.f 
	ScintillaMDI.f 
Log Message:
- Fixed some smal search path problems in SciEdit and the IDE.
- Added new Menu entry "Set search path for build..." in the Project menu of the IDE
- Fixed some smal bugs in the toolbars of the IDE.

Index: EdVersion.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdVersion.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EdVersion.f	5 Jun 2006 09:19:00 -0000	1.1
--- EdVersion.f	16 Jul 2006 11:54:34 -0000	1.2
***************
*** 1,5 ****
  \ $Id$
  
! 10128 value sciedit_version#
  
  \ Version numbers: v.ww.rr
--- 1,5 ----
  \ $Id$
  
! 10201 value sciedit_version#
  
  \ Version numbers: v.ww.rr

Index: EdMenu.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdMenu.f,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EdMenu.f	29 Jun 2006 04:18:47 -0000	1.10
--- EdMenu.f	16 Jul 2006 11:54:34 -0000	1.11
***************
*** 87,94 ****
                  MenuItem "&Rebuild \tCtrl+B"                   IDM_REBUILD_PRJ DoCommand ;
  \                 MenuItem "Set build file\tCtrl+B"       IDM_SET_BUILD_FILE_PRJ DoCommand ;
! \                 MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ;
! \                 MenuSeparator
! \                 MenuItem "&Compile \tF12"                      IDM_COMPILE_PRJ DoCommand ;
! \                 MenuItem "&Set Forth Name..."                IDM_SET_FORTH_PRJ DoCommand ;
                  MenuSeparator
                  MenuItem "&New Module... \tCtrl+M"          IDM_NEW_MODULE_PRJ DoCommand ;
--- 87,91 ----
                  MenuItem "&Rebuild \tCtrl+B"                   IDM_REBUILD_PRJ DoCommand ;
  \                 MenuItem "Set build file\tCtrl+B"       IDM_SET_BUILD_FILE_PRJ DoCommand ;
!                 MenuItem "Set search &path for build..." IDM_SET_BUILD_PATH_PRJ DoCommand ;
                  MenuSeparator
                  MenuItem "&New Module... \tCtrl+M"          IDM_NEW_MODULE_PRJ DoCommand ;
***************
*** 289,305 ****
                  drop ;
  
- : CompileActiveChild? ( -- f )
-                 ActiveChild
-                 if   GetTextLength: ActiveChild
-                 else false
-                 then ;
- 
- : Compile?      ( -- f )
-                 CompileProject?
-                 if   GetBuildFile: TheProject nip 0=
-                      if CompileActiveChild? else true then
-                 else CompileActiveChild?
-                 then ;
- 
  : EnableMenuBar	( -- )  \ enable/disable the menu items
  		IsEditWnd? dup EnableEdit
--- 286,289 ----

Index: ProjectTree.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ProjectTree.f,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ProjectTree.f	30 Jun 2006 04:17:13 -0000	1.11
--- ProjectTree.f	16 Jul 2006 11:54:34 -0000	1.12
***************
*** 181,184 ****
--- 181,185 ----
  File ProjectFile
  load-bitmap imagelist "treeimages.bmp"
+ path: project-path-ptr
  
  wm_user 100 + value TreeId
***************
*** 462,470 ****
              start: super
              self to TheProject
              CreateImageList
              AddImages
              RegisterList
              CreateTree
!             AddParentLists ;M
  
  :m ~:   ( -- )
--- 463,473 ----
              start: super
              self to TheProject
+             project-path-ptr program-path-init \ init project search path
              CreateImageList
              AddImages
              RegisterList
              CreateTree
!             AddParentLists
!             ;M
  
  :m ~:   ( -- )
***************
*** 557,561 ****
                  s" ProjectName= " append ProjectName: self append&crlf
                  s" BuildFile= " append GetBuildFile: self  relpath&append&crlf \ Sonntag, Mai 30 2004 - 10:40 dbu
!                 s" SearchPath= " append path-ptr count append&crlf
                  GetList: self lcount cells bounds
                  do      i @ to ThisList
--- 560,564 ----
                  s" ProjectName= " append ProjectName: self append&crlf
                  s" BuildFile= " append GetBuildFile: self  relpath&append&crlf \ Sonntag, Mai 30 2004 - 10:40 dbu
!                 s" SearchPath= " append project-path-ptr count append&crlf
                  GetList: self lcount cells bounds
                  do      i @ to ThisList
***************
*** 610,614 ****
                  else    true abort" Build file name not found!"
                  then    bl get-word s" SearchPath=" caps-compare 0=
!                 if      bl word  drop \   count path-ptr place TODO TODO TODO
                  else    true abort" Search path not found!"
                  then    \ now we read in files
--- 613,617 ----
                  else    true abort" Build file name not found!"
                  then    bl get-word s" SearchPath=" caps-compare 0=
!                 if      bl word count project-path-ptr place
                  else    true abort" Search path not found!"
                  then    \ now we read in files
***************
*** 643,646 ****
--- 646,652 ----
          ;M
  
+ :M path-ptr:    ( -- addr )
+         project-path-ptr ;M
+ 
  ;class
  
***************
*** 692,696 ****
  
  : (open-project) ( a1 n1 -- )
- \         clear-status-bar
          wait-cursor
          2dup SetProjectFileName: TheProject
--- 698,701 ----
***************
*** 708,711 ****
--- 713,717 ----
          arrow-cursor
          IDM_SHOWPROJECT_TAB DoCommand
+         Update
          ;
  
***************
*** 845,853 ****
                  pad count w/o create-file
                  if drop exit then
!                 >r path-ptr count r@ write-line drop
                  r> close-file drop ;
  
  : set-build-path ( -- )
!                 path-ptr MainWindow Start: GetPathDialog
                  dup if  true to Modified  then
                  2 = if  save-path-to-file  then
--- 851,859 ----
                  pad count w/o create-file
                  if drop exit then
!                 >r path-ptr: TheProject count r@ write-line drop
                  r> close-file drop ;
  
  : set-build-path ( -- )
!                 path-ptr: TheProject MainWindow Start: GetPathDialog
                  dup if  true to Modified  then
                  2 = if  save-path-to-file  then
***************
*** 977,983 ****
                  false to comment?
                  maxstring localalloc: tmp$
!                                 fname fcnt "open
!                 if          drop exit
!                 then        source-ID >r to source-ID
                  source-ID file-size 2drop +to total-size
                  >in @ >r
--- 983,989 ----
                  false to comment?
                  maxstring localalloc: tmp$
!                 fname fcnt "open
!                 if   drop exit
!                 then source-ID >r to source-ID
                  source-ID file-size 2drop +to total-size
                  >in @ >r
***************
*** 996,1000 ****
                              if
                                  2dup addfile
!                                  2dup SetText: ProjStatus
                                  dialog? IF
                                              2dup pad place -2 pad c+! s" .res" pad +place
--- 1002,1006 ----
                              if
                                  2dup addfile
!                                 2dup SetText: ProjStatus
                                  dialog? IF
                                              2dup pad place -2 pad c+! s" .res" pad +place
***************
*** 1013,1017 ****
                  r> to source-id ;
  
! : (build-project) ( f -- )
                  reset-results
                  GetBuildFile: TheProject nip 0=
--- 1019,1028 ----
                  r> to source-id ;
  
! : (build-project) { fClear \ old-path$ -- }
! 
!                 MAXSTRING CHARS 1+ LocalAlloc: old-path$
!                 path-ptr count old-path$ place \ save current search path
!                 path-ptr: TheProject count path-ptr place \ set project search path
! 
                  reset-results
                  GetBuildFile: TheProject nip 0=
***************
*** 1024,1028 ****
                                  true to Modified
                  then
!                 if Clear: TheProject then
                  s" " SetText: ProjStatus
                  GetBuildFile: TheProject ModuleList: TheProject
--- 1035,1039 ----
                                  true to Modified
                  then
!                 fClear if Clear: TheProject then
                  s" " SetText: ProjStatus
                  GetBuildFile: TheProject ModuleList: TheProject
***************
*** 1030,1034 ****
                  true to Modified
  
- \                 clear-status-bar
                  GetBuildFile: TheProject BuildNeededFiles
                  #addedfiles Modified or to Modified
--- 1041,1044 ----
***************
*** 1043,1046 ****
--- 1053,1058 ----
  
                  SortParentLists: TheProject
+ 
+                 old-path$ count path-ptr place \ restore current search path
                  ;   IDM_BUILD_PRJ SetCommand
  

Index: EdToolbar.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/EdToolbar.f,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EdToolbar.f	30 Jun 2006 04:17:13 -0000	1.4
--- EdToolbar.f	16 Jul 2006 11:54:34 -0000	1.5
***************
*** 273,277 ****
                  to cx
                  to fstyle
!                 to hWndChild 
  
         [ RBBIM_CHILD RBBIM_CHILDSIZE or RBBIM_STYLE or RBBIM_SIZE or RBBIM_TEXT or ] LITERAL
--- 273,277 ----
                  to cx
                  to fstyle
!                 to hWndChild
  
         [ RBBIM_CHILD RBBIM_CHILDSIZE or RBBIM_STYLE or RBBIM_SIZE or RBBIM_TEXT or ] LITERAL
***************
*** 284,288 ****
  \                450 to cx           \ band width
                  InsertBand: self ;
!                 
  
  : add-toolbars  ( -- )
--- 284,288 ----
  \                450 to cx           \ band width
                  InsertBand: self ;
! 
  
  : add-toolbars  ( -- )
***************
*** 290,294 ****
                  self Start: ControlToolBar
  
!                 eraseband-info GetHandle: ControlToolBar 
                  [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 450 insert-band
                  ;
--- 290,294 ----
                  self Start: ControlToolBar
  
!                 eraseband-info GetHandle: ControlToolBar
                  [ RBBS_GRIPPERALWAYS RBBS_CHILDEDGE or ] literal 450 insert-band
                  ;
***************
*** 306,310 ****
                  self Start: ProjInfo
                  true ReadOnly: ProjInfo
!                 
                  eraseband-info GetHandle: ProjInfo
                  z" Build File:" to lptext
--- 306,310 ----
                  self Start: ProjInfo
                  true ReadOnly: ProjInfo
! 
                  eraseband-info GetHandle: ProjInfo
                  z" Build File:" to lptext
***************
*** 356,360 ****
--- 356,375 ----
  \ -----------------------------------------------------------------------------------
  
+ : CompileActiveChild? ( -- f )
+                 ActiveChild
+                 if   GetTextLength: ActiveChild
+                 else false
+                 then ;
+ 
+ : Compile?      ( -- f )
+                 CompileProject?
+                 if   GetBuildFile: TheProject nip 0=
+                      if CompileActiveChild? else true then
+                 else CompileActiveChild?
+                 then ;
+ 
  : EnableToolbar ( -- )
+ 
+                 \ Editor toolbar
                  ActiveChild
                  if   GetFileType: ActiveChild FT_SOURCE =
***************
*** 368,372 ****
                            GetTextLength: ActiveChild    IDM_FIND_TEXT   EnableButton: ControlToolbar
                            ?Find:         ActiveChild    IDM_FIND_NEXT   EnableButton: ControlToolbar
-                           GetTextLength:   ActiveChild  IDM_COMPILE     EnableButton: ControlToolbar
                       else
                            false IDM_SAVE        EnableButton: ControlToolbar
--- 383,386 ----
***************
*** 379,383 ****
                            false IDM_FIND_NEXT   EnableButton: ControlToolbar
                            false IDM_REDO        EnableButton: ControlToolbar
-                           false IDM_COMPILE     EnableButton: ControlToolbar
                       then
  
--- 393,396 ----
***************
*** 403,411 ****
                       false IDM_REDO      EnableButton: ControlToolbar
  
-                      false IDM_COMPILE   EnableButton: ControlToolbar
- 
                       false IDM_BACK      EnableButton: ControlToolbar
                       false IDM_FORWARD   EnableButton: ControlToolbar
!                 then ;
  
  MODULE
--- 416,439 ----
                       false IDM_REDO      EnableButton: ControlToolbar
  
                       false IDM_BACK      EnableButton: ControlToolbar
                       false IDM_FORWARD   EnableButton: ControlToolbar
!                 then
! 
!                 Compile? IDM_COMPILE EnableButton: ControlToolbar
! 
!                 \ Project toolbar
!                 true IDM_NEW_PRJ EnableButton: ptoolbar
!                 true IDM_OPEN_PRJ EnableButton: ptoolbar
!                 GetBuildFile: TheProject nip 0<>
!                 dup IDM_SAVE_PRJ   EnableButton: ptoolbar
!                 dup IDM_DELETE_PRJ EnableButton: ptoolbar
!                 dup IDM_BUILD_PRJ  EnableButton: ptoolbar
!                 dup IDM_ADD_PRJ    EnableButton: ptoolbar
! \                dup IDM_ZIP_PRJ    EnableButton: ptoolbar
! \                    IDM_COPY_PRJ   EnableButton: ptoolbar
!                 drop
!                 false IDM_ZIP_PRJ  EnableButton: ptoolbar
!                 false IDM_COPY_PRJ EnableButton: ptoolbar
!                 ;
  
  MODULE

Index: Main.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/Main.f,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Main.f	10 Jul 2006 19:29:02 -0000	1.21
--- Main.f	16 Jul 2006 11:54:34 -0000	1.22
***************
*** 383,386 ****
--- 383,387 ----
                  find-buf count s" SearchText" "SetDefault
                  path-ptr count s" SearchPath" "SetDefault
+                 path-ptr: TheProject count s" ProjectSearchPath" "SetDefault
  
                  SaveRecentFiles
***************
*** 419,422 ****
--- 420,424 ----
                  s" SearchPath"     "GetDefault -IF 2dup "CLIP" path-ptr place THEN 2drop
                  s" SearchMask"     "GetDefault -IF 2dup "CLIP" mask-ptr place THEN 2drop
+                 s" ProjectSearchPath" "GetDefault -IF 2dup "CLIP" path-ptr: TheProject place THEN 2drop
  
                  s" ShowToolbar"    "GetDefaultValue 0= IF drop true           THEN dup to ShowToolbar? Show: TheRebar

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ScintillaMDI.f,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScintillaMDI.f	15 Jul 2006 16:07:35 -0000	1.3
--- ScintillaMDI.f	16 Jul 2006 11:54:34 -0000	1.4
***************
*** 551,555 ****
                  then ;
  
! :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
                  0 GetSelText: ChildWindow MAXSTRING CHARS <
                  if   MAXSTRING CHARS 1+ LocalAlloc: buf$
--- 551,555 ----
                  then ;
  
! :m OpenHighlightedFile: { \ buf$ old-path$ -- }
                  0 GetSelText: ChildWindow MAXSTRING CHARS <
                  if   MAXSTRING CHARS 1+ LocalAlloc: buf$
***************
*** 565,574 ****
                            if   \ search for the file in the Forth search path
                                 buf$ count "to-pathend" buf$ place
!                                path-ptr program-path-init
!                                buf$ count "path-file       \ search through the Forth path
!                                0= if   buf$ place
!                                        buf$ IDM_OPEN_RECENT_FILE DoCommand
!                                   else 2drop beep
!                                   then
                            then
                       then
--- 565,580 ----
                            if   \ search for the file in the Forth search path
                                 buf$ count "to-pathend" buf$ place
! 
!                                MAXSTRING CHARS 1+ LocalAlloc: old-path$
!                                path-ptr count old-path$ place \ save current path
! 
!                                path-ptr program-path-init  \ init forth search path
!                                buf$ count "path-file 0=    \ search through the Forth path
!                                if   buf$ place
!                                     buf$ IDM_OPEN_RECENT_FILE DoCommand
!                                else 2drop beep
!                                then
! 
!                                old-path$ count path-ptr place \ restore path
                            then
                       then

[Win32forth-cvs] win32forth/apps/SciEdit ScintillaMDI.f,1.10,1.11

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

Update of /cvsroot/win32forth/win32forth/apps/SciEdit
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10682/apps/SciEdit

Modified Files:
	ScintillaMDI.f 
Log Message:
- Fixed some smal search path problems in SciEdit and the IDE.
- Added new Menu entry "Set search path for build..." in the Project menu of the IDE
- Fixed some smal bugs in the toolbars of the IDE.

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ScintillaMDI.f	15 Jul 2006 16:08:07 -0000	1.10
--- ScintillaMDI.f	16 Jul 2006 11:54:34 -0000	1.11
***************
*** 545,549 ****
                  then ;
  
! :M OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
               0 GetSelText: ChildWindow MAXSTRING CHARS <
                  if   MAXSTRING CHARS 1+ LocalAlloc: buf$
--- 545,549 ----
                  then ;
  
! :M OpenHighlightedFile: { \ buf$ old-path$ -- }
               0 GetSelText: ChildWindow MAXSTRING CHARS <
                  if   MAXSTRING CHARS 1+ LocalAlloc: buf$
***************
*** 559,568 ****
                            if   \ search for the file in the Forth search path
                                 buf$ count "to-pathend" buf$ place
!                                path-ptr program-path-init
!                                buf$ count "path-file       \ search through the Forth path
!                                0= if   buf$ place
!                                        buf$ IDM_OPEN_RECENT_FILE DoCommand
!                                   else 2drop beep
!                                   then
                            then
                       then
--- 559,574 ----
                            if   \ search for the file in the Forth search path
                                 buf$ count "to-pathend" buf$ place
! 
!                                MAXSTRING CHARS 1+ LocalAlloc: old-path$
!                                path-ptr count old-path$ place \ save current path
! 
!                                path-ptr program-path-init  \ init forth search path
!                                buf$ count "path-file 0=    \ search through the Forth path
!                                if   buf$ place
!                                     buf$ IDM_OPEN_RECENT_FILE DoCommand
!                                else 2drop beep
!                                then
! 
!                                old-path$ count path-ptr place \ restore path
                            then
                       then

[Win32forth-cvs] win32forth/apps/WinEd Ed_Defaults.F, 1.4, 1.5 Ed_HyperLink.F, 1.3, 1.4

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/WinEd
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3072/apps/WinEd

Modified Files:
	Ed_Defaults.F Ed_HyperLink.F 
Log Message:
Jos: WinEd uses the Forth-path as its own path and and as a search path to search files. So the search path to search files was not saved in my previous update. Now I changed it so that it is not destoyed anymore and in a way that shift-ctrl-o is still working.

Index: Ed_Defaults.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_Defaults.F,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Ed_Defaults.F	15 Jul 2006 14:38:04 -0000	1.4
--- Ed_Defaults.F	15 Jul 2006 16:30:19 -0000	1.5
***************
*** 163,168 ****
      s" WindowFont"   "GetDefault -IF 2dup SetFaceName: vFont THEN 2drop
      R> BASE ! \ restore base
-     program-path-init \ >>>
- 
  ;
  
--- 163,166 ----

Index: Ed_HyperLink.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_HyperLink.F,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ed_HyperLink.F	28 Aug 2005 07:28:06 -0000	1.3
--- Ed_HyperLink.F	15 Jul 2006 16:30:19 -0000	1.4
***************
*** 327,333 ****
  
  
! : open-text-highlighted { \ highlight$ -- }
          bitImage? ?EXIT
          MAXSTRING LocalAlloc: highlight$
          highlighting? 0=                \ something is highlighted
          IF      highlight-word
--- 327,336 ----
  
  
! : open-text-highlighted { \ highlight$ Oldpath$ -- }
          bitImage? ?EXIT
          MAXSTRING LocalAlloc: highlight$
+         MAXSTRING LocalAlloc: Oldpath$
+         path-ptr count  Oldpath$ place  \ Save the current path
+         program-path-init               \ Get the Forth path
          highlighting? 0=                \ something is highlighted
          IF      highlight-word
***************
*** 336,339 ****
--- 339,343 ----
          hlst hled = and                 \ but only on one line
          IF                              \ get the screen text
+ 
                  highlight"  highlight$ place
                  >E
***************
*** 342,346 ****
                  highlight$ count "-blanks" "+open-text
          ELSE    open-text
!         THEN    ;
  
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
--- 346,352 ----
                  highlight$ count "-blanks" "+open-text
          ELSE    open-text
!         THEN
!         Oldpath$ count path-ptr place   \ Restore the old path
!         ;
  
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\

[Win32forth-cvs] win32forth/src/lib FileLister.f,1.4,1.5

[George H. <geo...@us...>]

Update of /cvsroot/win32forth/win32forth/src/lib
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28027/win32forth/src/lib

Modified Files:
	FileLister.f 
Log Message:
gah: made thespecs an ivar rather than global (in case 2 instances of the class are in use).

Index: FileLister.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/lib/FileLister.f,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FileLister.f	10 Jul 2006 19:29:05 -0000	1.4
--- FileLister.f	15 Jul 2006 16:11:27 -0000	1.5
***************
*** 295,299 ****
  2 cells bytes rootname
  max-path 1+ bytes Treepath
! path: thespecs
  
  : free-recbuffer  ( -- )
--- 295,302 ----
  2 cells bytes rootname
  max-path 1+ bytes Treepath
! \ path: thespecs
! 2 cells class-allot
! max-path 1+ bytes thespecs
! 
  
  : free-recbuffer  ( -- )
***************
*** 480,483 ****
--- 483,488 ----
                  s" .." setrootname: self
                  treepath off
+                 -1 thespecs 2 cells - !
+                 0 thespecs cell- !
                  s" *.*" thespecs place
                  ['] drop to tree-click

[Win32forth-cvs] win32forth/apps/SciEdit ScintillaMDI.f,1.9,1.10

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/SciEdit
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26784/apps/SciEdit

Modified Files:
	ScintillaMDI.f 
Log Message:
Jos: The stack was not right when a non existing file was opened using ctrl-shift-o

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ScintillaMDI.f	10 Jul 2006 21:35:55 -0000	1.9
--- ScintillaMDI.f	15 Jul 2006 16:08:07 -0000	1.10
***************
*** 545,550 ****
                  then ;
  
! :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
!                 0 GetSelText: ChildWindow MAXSTRING CHARS <
                  if   MAXSTRING CHARS 1+ LocalAlloc: buf$
                       buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c!
--- 545,550 ----
                  then ;
  
! :M OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
!              0 GetSelText: ChildWindow MAXSTRING CHARS <
                  if   MAXSTRING CHARS 1+ LocalAlloc: buf$
                       buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c!
***************
*** 567,572 ****
                            then
                       then
!                 else drop beep
!                 then ;M
  
  Record: scn \ struct SCNotification
--- 567,573 ----
                            then
                       then
!                 else 2drop beep
!                 then
!   ;M
  
  Record: scn \ struct SCNotification

[Win32forth-cvs] win32forth/apps/Win32ForthIDE ScintillaMDI.f, 1.2, 1.3

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26414/apps/Win32ForthIDE

Modified Files:
	ScintillaMDI.f 
Log Message:
Jos: The stack was not right when a non existing file was opened using ctrl-shift-o

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ScintillaMDI.f,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScintillaMDI.f	12 Jul 2006 08:43:19 -0000	1.2
--- ScintillaMDI.f	15 Jul 2006 16:07:35 -0000	1.3
***************
*** 573,577 ****
                            then
                       then
!                 else drop beep
                  then ;M
  
--- 573,577 ----
                            then
                       then
!                 else 2drop beep
                  then ;M
  

[Win32forth-cvs] win32forth/apps/WinEd Ed_Defaults.F,1.3,1.4

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/WinEd
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24741/apps/WinEd

Modified Files:
	Ed_Defaults.F 
Log Message:
Jos: Wined forgot to set the search path. As a result SHIFT-CTRL-O did not always work.

Index: Ed_Defaults.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_Defaults.F,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ed_Defaults.F	28 Aug 2005 07:28:06 -0000	1.3
--- Ed_Defaults.F	15 Jul 2006 14:38:04 -0000	1.4
***************
*** 163,166 ****
--- 163,168 ----
      s" WindowFont"   "GetDefault -IF 2dup SetFaceName: vFont THEN 2drop
      R> BASE ! \ restore base
+     program-path-init \ >>>
+ 
  ;
  

[Win32forth-cvs] win32forth/apps/WinEd Ed_FileFuncs.F, 1.3, 1.4 WinEd.f, 1.8, 1.9

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/WinEd
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11382/apps/WinEd

Modified Files:
	Ed_FileFuncs.F WinEd.f 
Log Message:
Jos: Repaired WinEd.

Index: WinEd.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/WinEd.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WinEd.f	28 Aug 2005 07:28:07 -0000	1.8
--- WinEd.f	12 Jul 2006 11:23:09 -0000	1.9
***************
*** 14,19 ****
  anew -wined.f
  
! 1 value CreateTurnkey
! \ 1 value (WinEdDbg)
  
  s" apps\WinEd"     "fpath+
--- 14,20 ----
  anew -wined.f
  
! 
!   1 value CreateTurnkey
! \ 1 value (WinEdDbg)     \ Enable to debug
  
  s" apps\WinEd"     "fpath+
***************
*** 148,153 ****
                  1 pause-seconds bye
          [else]
!                 s" src\res\WinEd.ico" s" WinEd.exe" AddAppIcon
!                 WinEd
          [then]
  [then]
--- 149,154 ----
                  1 pause-seconds bye
          [else]
!               s" src\res\WinEd.ico" s" WinEd.exe" AddAppIcon
!               WinEd
          [then]
  [then]
***************
*** 223,225 ****
     same file.  It seems preferable to me that ONLY the desired text should be
     highlighted. rls
!  
\ No newline at end of file
--- 224,226 ----
     same file.  It seems preferable to me that ONLY the desired text should be
     highlighted. rls
! 

Index: Ed_FileFuncs.F
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/WinEd/Ed_FileFuncs.F,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Ed_FileFuncs.F	28 Aug 2005 07:28:06 -0000	1.3
--- Ed_FileFuncs.F	12 Jul 2006 11:23:09 -0000	1.4
***************
*** 101,109 ****
          name-buf count "+open-text ;
  
! : *-open-file   { sadr slen \ spath$ smask$ -- }
!         MAXSTRING LocalAlloc: spath$
          MAXSTRING LocalAlloc: smask$
          mask-ptr >r
-         path-ptr >r
          spath$ MAXSTRING erase
          smask$ MAXSTRING erase
--- 101,109 ----
          name-buf count "+open-text ;
  
! : *-open-file   { sadr slen \ SpathSource spath$ smask$ -- }
!         MAXSTRING 2 cells+ LocalAlloc: SpathSource
          MAXSTRING LocalAlloc: smask$
+         SpathSource 2 cells+ to spath$
          mask-ptr >r
          spath$ MAXSTRING erase
          smask$ MAXSTRING erase
***************
*** 112,116 ****
          IF      current-dir$ count spath$ place
          THEN
-         spath$ to path-ptr
          sadr slen "to-pathend" smask$ place
          smask$ to mask-ptr
--- 112,115 ----
***************
*** 119,125 ****
          1 seconds
          FALSE to search-aborted?
!         do-files-process
          message-off
-         r> to path-ptr
          r> to mask-ptr ;
  
--- 118,123 ----
          1 seconds
          FALSE to search-aborted?
!         spath$ (do-files-process
          message-off
          r> to mask-ptr ;
  
***************
*** 205,213 ****
                  THEN    ;
  
! : word-count-file { sadr slen \ spath$ smask$ -- }
!                 MAXSTRING LocalAlloc: spath$
                  MAXSTRING LocalAlloc: smask$
                  mask-ptr >r
-                 path-ptr >r
                  spath$ MAXSTRING erase
                  smask$ MAXSTRING erase
--- 203,211 ----
                  THEN    ;
  
! : word-count-file { sadr slen \ SpathSource spath$ smask$ -- }
!                 MAXSTRING 2 cells+ LocalAlloc: SpathSource
                  MAXSTRING LocalAlloc: smask$
+                 SpathSource 2 cells+ to spath$
                  mask-ptr >r
                  spath$ MAXSTRING erase
                  smask$ MAXSTRING erase
***************
*** 216,229 ****
                  IF      current-dir$ count spath$ place
                  THEN
-                 spath$ to path-ptr
                  sadr slen "to-pathend" smask$ place
                  smask$ to mask-ptr
!                 ['] count-1-file is process-1file 
                  1 seconds
                  FALSE to search-aborted?
                  word-storage TO append-pointer
                  0 to words-found
!                 do-files-process
!                 r> to path-ptr
                  r> to mask-ptr
                  s" WORDCOUNTS.TXT" 2dup 2>r "save-counts
--- 214,225 ----
                  IF      current-dir$ count spath$ place
                  THEN
                  sadr slen "to-pathend" smask$ place
                  smask$ to mask-ptr
!                 ['] count-1-file is process-1file
                  1 seconds
                  FALSE to search-aborted?
                  word-storage TO append-pointer
                  0 to words-found
!                 spath$ (do-files-process
                  r> to mask-ptr
                  s" WORDCOUNTS.TXT" 2dup 2>r "save-counts
***************
*** 329,338 ****
                    nadr nlen "to-pathend"
                    "CLIP" open$ place
- ( dbu )           path-ptr to org-path-ptr    \ save search path
- ( dbu )           MAXSTRING localAlloc: path$ \ set default search path
- ( dbu )           path$ to path-ptr program-path-init
                    open$ count "path-file    \ search through the Forth path
                    drop "CLIP" open$ place
- ( dbu )           org-path-ptr to path-ptr  \ restore search path
                    open$ ?defext             \ make sure it has an extension
              ELSE  close-file drop           \ else close if we opened it
--- 325,330 ----

[Win32forth-cvs] win32forth/apps/Win32ForthIDE ScintillaMDI.f, 1.1, 1.2

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Win32ForthIDE
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12946/apps/Win32ForthIDE

Modified Files:
	ScintillaMDI.f 
Log Message:
Jos: Repaired OpenHighlightedFile: ( Note: duplicate file )

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Win32ForthIDE/ScintillaMDI.f,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ScintillaMDI.f	5 Jun 2006 09:19:00 -0000	1.1
--- ScintillaMDI.f	12 Jul 2006 08:43:19 -0000	1.2
***************
*** 33,41 ****
  int EnsureFinalNewLine?
  
! :M ?Modified:	( -- f )
!  		GetModify: ChildWindow ;M
  
! :M GetFileType:	( -- n )
!  		FT_SOURCE ;M
  
  fload ScintillaLexer.f
--- 33,41 ----
  int EnsureFinalNewLine?
  
! :M ?Modified:   ( -- f )
!                 GetModify: ChildWindow ;M
  
! :M GetFileType: ( -- n )
!                 FT_SOURCE ;M
  
  fload ScintillaLexer.f
***************
*** 74,81 ****
  WordChars count + dup 34 swap c! ( " ) char+ dup 39 swap c! ( ' ) char+ 0 swap c!
  
! :M Start:	( parent -- )
!  		New> ScintillaControl to ChildWindow
!  		self to ChildParent
!  		Start: super
                  0 to FindMode
                  true to CreateBackup?
--- 74,81 ----
  WordChars count + dup 34 swap c! ( " ) char+ dup 39 swap c! ( ' ) char+ 0 swap c!
  
! :M Start:       ( parent -- )
!                 New> ScintillaControl to ChildWindow
!                 self to ChildParent
!                 Start: super
                  0 to FindMode
                  true to CreateBackup?
***************
*** 84,91 ****
                  FindText$ off
                  InitLexer: self
! 		STYLE_DEFAULT z" Fixedsys" StyleSetFont: ChildWindow
                  WordChars 1+ SetWordChars: ChildWindow
! 		ShowLineNumbers: ChildWindow	\ Monday, August 16 2004 - EAB
! 		;M
  
  :M GetFileName: ( -- addr )
--- 84,91 ----
                  FindText$ off
                  InitLexer: self
!                 STYLE_DEFAULT z" Fixedsys" StyleSetFont: ChildWindow
                  WordChars 1+ SetWordChars: ChildWindow
!                 ShowLineNumbers: ChildWindow    \ Monday, August 16 2004 - EAB
!                 ;M
  
  :M GetFileName: ( -- addr )
***************
*** 101,105 ****
                  SetName: EditFile
                  UpdateFileName: super
! 		;M
  
  : MessageBox    ( n a1 n1 -- n2 )
--- 101,105 ----
                  SetName: EditFile
                  UpdateFileName: super
!                 ;M
  
  : MessageBox    ( n a1 n1 -- n2 )
***************
*** 114,118 ****
  : GetSaveFilename ( -- addr len )
                  GetHandle: self Start: SaveSourceFileDialog count
! ; \		pad place pad ?DEFEXT pad count ; \ add default extension (.f) if needed
  
  :M GetTextLength: ( -- n )
--- 114,118 ----
  : GetSaveFilename ( -- addr len )
                  GetHandle: self Start: SaveSourceFileDialog count
! ; \             pad place pad ?DEFEXT pad count ; \ add default extension (.f) if needed
  
  :M GetTextLength: ( -- n )
***************
*** 255,259 ****
                  CanUndo: ChildWindow ;M
  
! :M Undo:	( -- )
                  Undo: ChildWindow ;M
  
--- 255,259 ----
                  CanUndo: ChildWindow ;M
  
! :M Undo:        ( -- )
                  Undo: ChildWindow ;M
  
***************
*** 261,271 ****
                  CanRedo: ChildWindow ;M
  
! :M Redo:	( -- )
                  Redo: ChildWindow ;M
  
! :M Cut:		( -- )
                  Cut: ChildWindow ;M
  
! :M Copy:	( -- )
                  Copy: ChildWindow ;M
  
--- 261,271 ----
                  CanRedo: ChildWindow ;M
  
! :M Redo:        ( -- )
                  Redo: ChildWindow ;M
  
! :M Cut:         ( -- )
                  Cut: ChildWindow ;M
  
! :M Copy:        ( -- )
                  Copy: ChildWindow ;M
  
***************
*** 273,294 ****
                  CanPaste: ChildWindow ;M
  
! :M Paste:	( -- )
                  Paste: ChildWindow ;M
  
! :M SelectAll:	( -- )
                  SelectAll: ChildWindow ;M
  
! :M GotoLine:	( n -- )
! 		GotoLine: ChildWindow ;M
  
  :M GetLineCount: ( -- n )
! 		GetLineCount: ChildWindow ;M
  
! :M GetSelText:	( addr -- n )
  \ *G Copy the selected text to the memory pointed by \i addr \d
  \ ** and return the length of the selected text (including terminating
  \ ** 0 byte. If \i addr \d is NULL no text is copied and only the
  \ ** length is returned.
! 		GetSelText: ChildWindow ;M
  
  :M EnableBackup: ( f -- )
--- 273,294 ----
                  CanPaste: ChildWindow ;M
  
! :M Paste:       ( -- )
                  Paste: ChildWindow ;M
  
! :M SelectAll:   ( -- )
                  SelectAll: ChildWindow ;M
  
! :M GotoLine:    ( n -- )
!                 GotoLine: ChildWindow ;M
  
  :M GetLineCount: ( -- n )
!                 GetLineCount: ChildWindow ;M
  
! :M GetSelText:  ( addr -- n )
  \ *G Copy the selected text to the memory pointed by \i addr \d
  \ ** and return the length of the selected text (including terminating
  \ ** 0 byte. If \i addr \d is NULL no text is copied and only the
  \ ** length is returned.
!                 GetSelText: ChildWindow ;M
  
  :M EnableBackup: ( f -- )
***************
*** 311,323 ****
                  SetWhiteSpace: ChildWindow ;M
  
! :M Colorize:	( f -- )
! 		if   SCLEX_FORTH
! 		else SCLEX_NULL
! 		then dup Lexer <>
! 		if   dup to Lexer
                       SetLexer: ChildWindow
! 		     0 -1 Colourise: ChildWindow
! 		else drop
! 		then ;M
  
  :M ViewLineNumbers: ( f -- )
--- 311,323 ----
                  SetWhiteSpace: ChildWindow ;M
  
! :M Colorize:    ( f -- )
!                 if   SCLEX_FORTH
!                 else SCLEX_NULL
!                 then dup Lexer <>
!                 if   dup to Lexer
                       SetLexer: ChildWindow
!                      0 -1 Colourise: ChildWindow
!                 else drop
!                 then ;M
  
  :M ViewLineNumbers: ( f -- )
***************
*** 406,413 ****
  :M SaveFileAs:  ( -- )          \ save the file under a new name
                  GetSaveFilename ?dup
! 		if	SetFileName: self
! 			SaveText
! 		else	drop
! 		then	;M
  
  : CreateBackup  ( -- ) \ create a Backup of the active file (*.BAK)
--- 406,413 ----
  :M SaveFileAs:  ( -- )          \ save the file under a new name
                  GetSaveFilename ?dup
!                 if      SetFileName: self
!                         SaveText
!                 else    drop
!                 then    ;M
  
  : CreateBackup  ( -- ) \ create a Backup of the active file (*.BAK)
***************
*** 481,485 ****
  \ ----------------------------------------------------------------------------
  
! : DexBlock 	{ addr \ FirstLine? -- }
                  ?Selection: self
                  if   true to FirstLine?
--- 481,485 ----
  \ ----------------------------------------------------------------------------
  
! : DexBlock      { addr \ FirstLine? -- }
                  ?Selection: self
                  if   true to FirstLine?
***************
*** 499,515 ****
                  then ;
  
! :M DexGlossary:	( -- )
  \ *G Turn a block of lines into a Glossary entry.
! 		z" \ *G " DexBlock ;M
  
  :M DexParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph.
! 		z" \ *P " DexBlock ;M
  
  :M DexCodeParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph which is a code example.
! 		z" \ *E " DexBlock ;M
  
! : DexStyle	{ addr len \ slen $buf1 $buf2 -- }
                  0 GetSelText: ChildWindow dup to slen
                  if   slen LocalAlloc: $buf1 $buf1 GetSelText: ChildWindow
--- 499,515 ----
                  then ;
  
! :M DexGlossary: ( -- )
  \ *G Turn a block of lines into a Glossary entry.
!                 z" \ *G " DexBlock ;M
  
  :M DexParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph.
!                 z" \ *P " DexBlock ;M
  
  :M DexCodeParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph which is a code example.
!                 z" \ *E " DexBlock ;M
  
! : DexStyle      { addr len \ slen $buf1 $buf2 -- }
                  0 GetSelText: ChildWindow dup to slen
                  if   slen LocalAlloc: $buf1 $buf1 GetSelText: ChildWindow
***************
*** 545,581 ****
  \ ----------------------------------------------------------------------------
  
! : OpenFile	( adr -- f ) \ f=false = file is opend
! 		dup count FILE-STATUS nip 0=
! 		if   IDM_OPEN_RECENT_FILE DoCommand false
! 		else drop true
! 		then ;
  
  :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
! 		0 GetSelText: ChildWindow MAXSTRING CHARS <
! 		if   MAXSTRING CHARS 1+ LocalAlloc: buf$
! 		     buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c!
  
                       \ try to open the file with the given path
! 		     buf$ ?defext buf$ OpenFile
! 		     if   \ try to find the file in the folder of the current file
                            buf$ count "to-pathend" pad place
! 			  GetName: EditFile count "path-only"
! 			  buf$ place buf$ ?+\ pad count buf$ +place
! 			  buf$ OpenFile
                            if   \ search for the file in the Forth search path
! 			       buf$ count "to-pathend" buf$ place
! 			       path-ptr to org-path-ptr    \ save search path
! 		               MAXSTRING localAlloc: path$ \ set default search path
! 			       path$ to path-ptr program-path-init
! 			       buf$ count "path-file       \ search through the Forth path
! 			       org-path-ptr to path-ptr    \ restore search path
! 		               0= if   buf$ place
                                         buf$ IDM_OPEN_RECENT_FILE DoCommand
! 			          else 2drop beep
! 			          then
! 			  then
! 		     then
! 		else drop beep
! 		then ;M
  
  Record: scn \ struct SCNotification
--- 545,578 ----
  \ ----------------------------------------------------------------------------
  
! : OpenFile      ( adr -- f ) \ f=false = file is opend
!                 dup count FILE-STATUS nip 0=
!                 if   IDM_OPEN_RECENT_FILE DoCommand false
!                 else drop true
!                 then ;
  
  :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
!                 0 GetSelText: ChildWindow MAXSTRING CHARS <
!                 if   MAXSTRING CHARS 1+ LocalAlloc: buf$
!                      buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c!
  
                       \ try to open the file with the given path
!                      buf$ ?defext buf$ OpenFile
!                      if   \ try to find the file in the folder of the current file
                            buf$ count "to-pathend" pad place
!                           GetName: EditFile count "path-only"
!                           buf$ place buf$ ?+\ pad count buf$ +place
!                           buf$ OpenFile
                            if   \ search for the file in the Forth search path
!                                buf$ count "to-pathend" buf$ place
!                                path-ptr program-path-init
!                                buf$ count "path-file       \ search through the Forth path
!                                0= if   buf$ place
                                         buf$ IDM_OPEN_RECENT_FILE DoCommand
!                                   else 2drop beep
!                                   then
!                           then
!                      then
!                 else drop beep
!                 then ;M
  
  Record: scn \ struct SCNotification

[Win32forth-cvs] win32forth/apps/SciEdit ScintillaMDI.f,1.8,1.9

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/SciEdit
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23399/apps/SciEdit

Modified Files:
	ScintillaMDI.f 
Log Message:
Jos: Repaired Scintilla

Index: ScintillaMDI.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/SciEdit/ScintillaMDI.f,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ScintillaMDI.f	21 Jan 2006 08:59:41 -0000	1.8
--- ScintillaMDI.f	10 Jul 2006 21:35:55 -0000	1.9
***************
*** 33,41 ****
  int EnsureFinalNewLine?
  
! :M ?Modified:	( -- f )
!  		GetModify: ChildWindow ;M
  
! :M GetFileType:	( -- n )
!  		FT_SOURCE ;M
  
  fload ScintillaLexer.f
--- 33,41 ----
  int EnsureFinalNewLine?
  
! :M ?Modified:   ( -- f )
!                 GetModify: ChildWindow ;M
  
! :M GetFileType: ( -- n )
!                 FT_SOURCE ;M
  
  fload ScintillaLexer.f
***************
*** 74,81 ****
  WordChars count + dup 34 swap c! ( " ) char+ dup 39 swap c! ( ' ) char+ 0 swap c!
  
! :M Start:	( parent -- )
!  		New> ScintillaControl to ChildWindow
!  		self to ChildParent
!  		Start: super
                  0 to FindMode
                  true to CreateBackup?
--- 74,81 ----
  WordChars count + dup 34 swap c! ( " ) char+ dup 39 swap c! ( ' ) char+ 0 swap c!
  
! :M Start:       ( parent -- )
!                 New> ScintillaControl to ChildWindow
!                 self to ChildParent
!                 Start: super
                  0 to FindMode
                  true to CreateBackup?
***************
*** 84,91 ****
                  FindText$ off
                  InitLexer: self
! 		STYLE_DEFAULT z" Fixedsys" StyleSetFont: ChildWindow
                  WordChars 1+ SetWordChars: ChildWindow
! 		ShowLineNumbers: ChildWindow	\ Monday, August 16 2004 - EAB
! 		;M
  
  :M GetFileName: ( -- addr )
--- 84,91 ----
                  FindText$ off
                  InitLexer: self
!                 STYLE_DEFAULT z" Fixedsys" StyleSetFont: ChildWindow
                  WordChars 1+ SetWordChars: ChildWindow
!                 ShowLineNumbers: ChildWindow    \ Monday, August 16 2004 - EAB
!                 ;M
  
  :M GetFileName: ( -- addr )
***************
*** 100,104 ****
  :M SetFileName: ( addr len -- )
                  SetName: EditFile
! 		;M
  
  : MessageBox    ( n a1 n1 -- n2 )
--- 100,104 ----
  :M SetFileName: ( addr len -- )
                  SetName: EditFile
!                 ;M
  
  : MessageBox    ( n a1 n1 -- n2 )
***************
*** 113,117 ****
  : GetSaveFilename ( -- addr len )
                  GetHandle: self Start: SaveSourceFileDialog count
! ; \		pad place pad ?DEFEXT pad count ; \ add default extension (.f) if needed
  
  :M GetTextLength: ( -- n )
--- 113,117 ----
  : GetSaveFilename ( -- addr len )
                  GetHandle: self Start: SaveSourceFileDialog count
! ; \             pad place pad ?DEFEXT pad count ; \ add default extension (.f) if needed
  
  :M GetTextLength: ( -- n )
***************
*** 254,258 ****
                  CanUndo: ChildWindow ;M
  
! :M Undo:	( -- )
                  Undo: ChildWindow ;M
  
--- 254,258 ----
                  CanUndo: ChildWindow ;M
  
! :M Undo:        ( -- )
                  Undo: ChildWindow ;M
  
***************
*** 260,270 ****
                  CanRedo: ChildWindow ;M
  
! :M Redo:	( -- )
                  Redo: ChildWindow ;M
  
! :M Cut:		( -- )
                  Cut: ChildWindow ;M
  
! :M Copy:	( -- )
                  Copy: ChildWindow ;M
  
--- 260,270 ----
                  CanRedo: ChildWindow ;M
  
! :M Redo:        ( -- )
                  Redo: ChildWindow ;M
  
! :M Cut:         ( -- )
                  Cut: ChildWindow ;M
  
! :M Copy:        ( -- )
                  Copy: ChildWindow ;M
  
***************
*** 272,293 ****
                  CanPaste: ChildWindow ;M
  
! :M Paste:	( -- )
                  Paste: ChildWindow ;M
  
! :M SelectAll:	( -- )
                  SelectAll: ChildWindow ;M
  
! :M GotoLine:	( n -- )
! 		GotoLine: ChildWindow ;M
  
  :M GetLineCount: ( -- n )
! 		GetLineCount: ChildWindow ;M
  
! :M GetSelText:	( addr -- n )
  \ *G Copy the selected text to the memory pointed by \i addr \d
  \ ** and return the length of the selected text (including terminating
  \ ** 0 byte. If \i addr \d is NULL no text is copied and only the
  \ ** length is returned.
! 		GetSelText: ChildWindow ;M
  
  :M EnableBackup: ( f -- )
--- 272,293 ----
                  CanPaste: ChildWindow ;M
  
! :M Paste:       ( -- )
                  Paste: ChildWindow ;M
  
! :M SelectAll:   ( -- )
                  SelectAll: ChildWindow ;M
  
! :M GotoLine:    ( n -- )
!                 GotoLine: ChildWindow ;M
  
  :M GetLineCount: ( -- n )
!                 GetLineCount: ChildWindow ;M
  
! :M GetSelText:  ( addr -- n )
  \ *G Copy the selected text to the memory pointed by \i addr \d
  \ ** and return the length of the selected text (including terminating
  \ ** 0 byte. If \i addr \d is NULL no text is copied and only the
  \ ** length is returned.
!                 GetSelText: ChildWindow ;M
  
  :M EnableBackup: ( f -- )
***************
*** 310,322 ****
                  SetWhiteSpace: ChildWindow ;M
  
! :M Colorize:	( f -- )
! 		if   SCLEX_FORTH
! 		else SCLEX_NULL
! 		then dup Lexer <>
! 		if   dup to Lexer
                       SetLexer: ChildWindow
! 		     0 -1 Colourise: ChildWindow
! 		else drop
! 		then ;M
  
  :M ViewLineNumbers: ( f -- )
--- 310,322 ----
                  SetWhiteSpace: ChildWindow ;M
  
! :M Colorize:    ( f -- )
!                 if   SCLEX_FORTH
!                 else SCLEX_NULL
!                 then dup Lexer <>
!                 if   dup to Lexer
                       SetLexer: ChildWindow
!                      0 -1 Colourise: ChildWindow
!                 else drop
!                 then ;M
  
  :M ViewLineNumbers: ( f -- )
***************
*** 405,412 ****
  :M SaveFileAs:  ( -- )          \ save the file under a new name
                  GetSaveFilename ?dup
! 		if	SetFileName: self
! 			SaveText
! 		else	drop
! 		then	;M
  
  : CreateBackup  ( -- ) \ create a Backup of the active file (*.BAK)
--- 405,412 ----
  :M SaveFileAs:  ( -- )          \ save the file under a new name
                  GetSaveFilename ?dup
!                 if      SetFileName: self
!                         SaveText
!                 else    drop
!                 then    ;M
  
  : CreateBackup  ( -- ) \ create a Backup of the active file (*.BAK)
***************
*** 475,479 ****
  \ ----------------------------------------------------------------------------
  
! : DexBlock 	{ addr \ FirstLine? -- }
                  ?Selection: self
                  if   true to FirstLine?
--- 475,479 ----
  \ ----------------------------------------------------------------------------
  
! : DexBlock      { addr \ FirstLine? -- }
                  ?Selection: self
                  if   true to FirstLine?
***************
*** 493,509 ****
                  then ;
  
! :M DexGlossary:	( -- )
  \ *G Turn a block of lines into a Glossary entry.
! 		z" \ *G " DexBlock ;M
  
  :M DexParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph.
! 		z" \ *P " DexBlock ;M
  
  :M DexCodeParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph which is a code example.
! 		z" \ *E " DexBlock ;M
  
! : DexStyle	{ addr len \ slen $buf1 $buf2 -- }
                  0 GetSelText: ChildWindow dup to slen
                  if   slen LocalAlloc: $buf1 $buf1 GetSelText: ChildWindow
--- 493,509 ----
                  then ;
  
! :M DexGlossary: ( -- )
  \ *G Turn a block of lines into a Glossary entry.
!                 z" \ *G " DexBlock ;M
  
  :M DexParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph.
!                 z" \ *P " DexBlock ;M
  
  :M DexCodeParagraph: ( -- )
  \ *G Turn a block of lines into a Paragraph which is a code example.
!                 z" \ *E " DexBlock ;M
  
! : DexStyle      { addr len \ slen $buf1 $buf2 -- }
                  0 GetSelText: ChildWindow dup to slen
                  if   slen LocalAlloc: $buf1 $buf1 GetSelText: ChildWindow
***************
*** 539,575 ****
  \ ----------------------------------------------------------------------------
  
! : OpenFile	( adr -- f ) \ f=false = file is opend
! 		dup count FILE-STATUS nip 0=
! 		if   IDM_OPEN_RECENT_FILE DoCommand false
! 		else drop true
! 		then ;
  
  :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
! 		0 GetSelText: ChildWindow MAXSTRING CHARS <
! 		if   MAXSTRING CHARS 1+ LocalAlloc: buf$
! 		     buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c!
  
                       \ try to open the file with the given path
! 		     buf$ ?defext buf$ OpenFile
! 		     if   \ try to find the file in the folder of the current file
                            buf$ count "to-pathend" pad place
! 			  GetName: EditFile count "path-only"
! 			  buf$ place buf$ ?+\ pad count buf$ +place
! 			  buf$ OpenFile
                            if   \ search for the file in the Forth search path
! 			       buf$ count "to-pathend" buf$ place
! 			       path-ptr to org-path-ptr    \ save search path
! 		               MAXSTRING localAlloc: path$ \ set default search path
! 			       path$ to path-ptr program-path-init
! 			       buf$ count "path-file       \ search through the Forth path
! 			       org-path-ptr to path-ptr    \ restore search path
! 		               0= if   buf$ place
                                         buf$ IDM_OPEN_RECENT_FILE DoCommand
! 			          else 2drop beep
! 			          then
! 			  then
! 		     then
! 		else drop beep
! 		then ;M
  
  Record: scn \ struct SCNotification
--- 539,572 ----
  \ ----------------------------------------------------------------------------
  
! : OpenFile      ( adr -- f ) \ f=false = file is opend
!                 dup count FILE-STATUS nip 0=
!                 if   IDM_OPEN_RECENT_FILE DoCommand false
!                 else drop true
!                 then ;
  
  :m OpenHighlightedFile: { \ buf$ path$ org-path-ptr -- }
!                 0 GetSelText: ChildWindow MAXSTRING CHARS <
!                 if   MAXSTRING CHARS 1+ LocalAlloc: buf$
!                      buf$ 1+ GetSelText: ChildWindow 1- 255 min buf$ c!
  
                       \ try to open the file with the given path
!                      buf$ ?defext buf$ OpenFile
!                      if   \ try to find the file in the folder of the current file
                            buf$ count "to-pathend" pad place
!                           GetName: EditFile count "path-only"
!                           buf$ place buf$ ?+\ pad count buf$ +place
!                           buf$ OpenFile
                            if   \ search for the file in the Forth search path
!                                buf$ count "to-pathend" buf$ place
!                                path-ptr program-path-init
!                                buf$ count "path-file       \ search through the Forth path
!                                0= if   buf$ place
                                         buf$ IDM_OPEN_RECENT_FILE DoCommand
!                                   else 2drop beep
!                                   then
!                           then
!                      then
!                 else drop beep
!                 then ;M
  
  Record: scn \ struct SCNotification

[Win32forth-cvs] win32forth/src paths.f,1.11,1.12

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21259/src

Modified Files:
	paths.f 
Log Message:
Jos: Update to get the path right

Index: paths.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/paths.f,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** paths.f	10 Jul 2006 19:29:06 -0000	1.11
--- paths.f	10 Jul 2006 21:31:36 -0000	1.12
***************
*** 46,49 ****
--- 46,52 ----
                  /parse-word count "chdir cr .dir ;
  
+ 
+ IN-APPLICATION
+ 
  : path:  ( - )                   \ map:  2variable_path-source counted_path
          create  -1 , 0 , MAX-PATH 1+ allot  does>   \ run-time: ( - path-ptr )
***************
*** 51,56 ****
          ;
  
- IN-APPLICATION
- 
  \ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
  \       Multiple directory path search capability for file open
--- 54,57 ----