Changeset 3734

Timestamp:

Dec 7, 2019, 2:43:57 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Fixed search direction processing on changing between search dialog and search commands or keys. Previously, a backward search is executed after Sh+F3 and pressing the 'Find' button of the search dialog, even when the 'Reverse search' check box wans't checked.

File:

• trunk/src/netlabs/macros/locate.e (modified) (13 diffs)

trunk/src/netlabs/macros/locate.e ¶

@@ -264 +264 @@
    fOnlyDirectionChanged = 0
    do once = 1 to 1
-      -- Remove FR+- from LastOpts and NextOpts for comparison
+      -- Remove FR+-D from LastOpts and NextOpts for comparison
       -- with LastSearchOptions and SearchOptions
       LastOpts = LastSearchOptions
       do forever
-         pv = verify( LastOpts, 'FR+-', 'M')
+         pv = verify( LastOpts, 'FR+-D', 'M')
          if pv = 0 then
             leave
@@ -276 +276 @@
       NextOpts = SearchOptions
       do forever
-         pv = verify( NextOpts, 'FR+-', 'M')
+         pv = verify( NextOpts, 'FR+-D', 'M')
          if pv = 0 then
             leave
@@ -484 +484 @@
 
    if not fSearch then
-      return  - 1
+      return  -1
    else
       return FilteredSearchOptions
@@ -572 +572 @@
 
 ; ---------------------------------------------------------------------------
+defproc GetLastSearchDialogOptions
+   KeyPath = '\NEPMD\Var\Search\LastSearchDialogOptions'
+   LastSearchDialogOptions = QueryConfigKey( KeyPath)
+   --dprintf( 'GetLastSearchDialogOptions: LastSearchDialogOptions = 'LastSearchDialogOptions)
+   return LastSearchDialogOptions
+
+; ---------------------------------------------------------------------------
 defproc SetLastSearchArgs
    KeyPath = '\NEPMD\Var\Search\LastSearchArgs'
@@ -584 +591 @@
    LastChangeArgs = arg( 1)
    call WriteConfigKey( KeyPath, LastChangeArgs)
+   return
+
+; ---------------------------------------------------------------------------
+defproc SetLastSearchDialogOptions
+   KeyPath = '\NEPMD\Var\Search\LastSearchDialogOptions'
+   LastSearchDialogOptions = arg( 1)
+   call WriteConfigKey( KeyPath, LastSearchDialogOptions)
+   --dprintf( 'SetLastSearchDialogOptions: LastSearchDialogOptions = 'LastSearchDialogOptions)
    return
 
@@ -617 +632 @@
    LastSearchArgs = GetLastSearchArgs()
    LastChangeArgs = GetLastChangeArgs()
+   LastSearchDialogOptions = GetLastSearchDialogOptions()
 
    args = strip( arg( 1), 'L')
+
+   -- Filter out 'D' arg from search dialog for RepeatFind
+   fDialogRepeat = 0
+   if args = \1\1\1\1'D' then
+      fDialogRepeat = 1
+      args = ''
+   endif
+
+   -- Handle RepeatFind
    if args = '' then  -- If no args, query args
-      args = LastSearchArgs
+      SearchArgs = LastSearchArgs
+
+      tmpdelim = substr( SearchArgs, 1, 1)  -- get 1st delimiter
+      parse value SearchArgs with (tmpdelim)SearchString(tmpdelim)SearchOptions
+      next = SearchOptions
+
+      -- Ensure that option D is removed if not coming from the search dialog
+      if not fDialogRepeat then
+         do forever
+            Dpos = pos( 'D', next)
+            if Dpos = 0 then
+               leave
+            endif
+            next = delstr( next, Dpos, 1)
+         enddo
+      endif
+      -- Ensure that last options from the dialog are used, not from elsewhere
+      if fDialogRepeat then
+         next = LastSearchDialogOptions
+      endif
+
+      -- Rebuild SearchArgs
+      SearchOptions = next
+      SearchArgs = tmpdelim''SearchString''tmpdelim''SearchOptions
+
+      args = SearchArgs
       -- Process the parsing of args again to recognize a possible change of
       -- default_search_options in the meantime.
@@ -628 +678 @@
    parse value args with (delim)SearchString(delim)UserOptions
    UserOptions = strip( UserOptions, 'T', delim)
+
    AddSearchChangeOptions = GetAddSearchChangeOptions()
    UserOptions = UserOptions''AddSearchChangeOptions
@@ -649 +700 @@
    SearchArgs = delim''SearchString''delim''SearchOptions
    --dprintf( overlay( ' Locate ', copies( '-', 60), 4))
-   --dprintf( '--- SearchArgs = 'SearchArgs', arg( 1) = 'arg( 1))
-   --dprintf( 'LastSearchArgs = 'LastSearchArgs)
+   --dprintf( '--- SearchArgs = 'SearchArgs', arg( 1) = 'arg( 1)', fDialogRepeat = 'fDialogRepeat)
+   --dprintf( 'LastSearchArgs = 'LastSearchArgs', LastSearchDialogOptions = 'LastSearchDialogOptions)
 
    parse value lastsearchpos with LastLine LastCol LastFid LastSearchLen LastSearchMode LastSearchRc
@@ -676 +727 @@
    -- Save last and cur args
    call SetLastSearchArgs( SearchArgs)
+   if pos( 'D', SearchOptions) then
+      call SetLastSearchDialogOptions( SearchOptions)
+   endif
 
    if SearchString = cSearchString then
@@ -778 +832 @@
    LastSearchArgs = GetLastSearchArgs()
    LastChangeArgs = GetLastChangeArgs()
+   LastSearchDialogOptions = GetLastSearchDialogOptions()
 
    args = strip( arg( 1), 'L')
+
+   -- Filter out 'D' arg from search dialog for RepeatChange
+   fDialogRepeat = 0
+   if args = \1\1\1\1'D' then
+      fDialogRepeat = 1
+      args = ''
+   endif
+
+   -- Handle RepeatChange
    if args = '' then   -- If no args, query lastchangeargs
-      args = LastChangeArgs
+      ChangeArgs = LastChangeArgs
+
+      tmpdelim = substr( ChangeArgs, 1, 1)  -- get 1st delimiter
+      parse value ChangeArgs with (tmpdelim)SearchString(tmpdelim)ReplaceString(tmpdelim)SearchOptions
+      next = SearchOptions
+
+      -- Ensure that option D is removed if not coming from the search dialog
+      if not fDialogRepeat then
+         do forever
+            Dpos = pos( 'D', next)
+            if Dpos = 0 then
+               leave
+            endif
+            next = delstr( next, Dpos, 1)
+         enddo
+      endif
+      -- Ensure that last options from the dialog are used, not from elsewhere
+      if fDialogRepeat then
+         next = LastSearchDialogOptions
+      endif
+
+      -- Rebuild LastChangeArgs
+      SearchOptions = next
+      ChangeArgs = tmpdelim''SearchString''tmpdelim''ReplaceString''tmpdelim''SearchOptions
+
+      args = ChangeArgs
       -- Process the parsing of args again to recognize a possible change of
       -- default_search_options in the meantime.
@@ -799 +888 @@
    parse value args with (delim)SearchString(delim)ReplaceString(delim)UserOptions
    UserOptions = strip( UserOptions, 'T', delim)
+
    AddSearchChangeOptions = GetAddSearchChangeOptions()
    UserOptions = UserOptions''AddSearchChangeOptions
@@ -826 +916 @@
    SearchArgs = delim''SearchString''delim''SearchOptions
    --dprintf( overlay( ' Change ', copies( '-', 60), 4))
-   --dprintf( '--- ChangeArgs = 'ChangeArgs', arg( 1) = 'arg( 1))
+   --dprintf( '--- ChangeArgs = 'ChangeArgs', arg( 1) = 'arg( 1)', fDialogRepeat = 'fDialogRepeat)
    --dprintf( '--- SearchArgs = 'SearchArgs', arg( 1) = 'arg( 1))
-   --dprintf( 'LastChangeArgs = 'LastChangeArgs', LastSearchArgs = 'LastSearchArgs)
+   --dprintf( 'LastChangeArgs = 'LastChangeArgs', LastSearchArgs = 'LastSearchArgs', LastSearchDialogOptions = 'LastSearchDialogOptions)
 
    -- Save last args
    call SetLastChangeArgs( ChangeArgs)
    call SetLastSearchArgs( SearchArgs)
+   if pos( 'D', SearchOptions) then
+      call SetLastSearchDialogOptions( SearchOptions)
+   endif
 
    SearchMode = 'c'
@@ -1175 +1268 @@
 
    if uparg = 'C' then
-      'RepeatChange'
+      'RepeatChange '\1\1\1\1'D'
    elseif uparg = 'F' then
-      'RepeatFind'
+      'RepeatFind '\1\1\1\1'D'
 
    else