fixed a bug in search functions (introduced in v1.6)

1 files changed, 8 insertions, 6 deletions

diff --git a/src/ivymon b/src/ivymon
index b72c6fc..7c35546 100755
--- a/src/ivymon
+++ b/src/ivymon
@@ -1294,7 +1294,8 @@ sub afterUpdatingMessages {
 
 
 sub highlightString {
-    my ($i1, $i2) = @_;   
+    my ($i1, $i2) = @_;
+    # hidden data
     $messagesText->tagConfigure('found',
 				-background => 'sienna',
 				-foreground => 'ivory');
@@ -1730,10 +1731,11 @@ sub searchOnTheFly {
 	$index0 = '0.0';
     }
     &highlightStringOff;
-    my @searchopts = (-count => \$strlen, -forwards);
+    my @searchopts = (-hidden, -count => \$strlen, -forwards);
     push(@searchopts, -nocase) unless ($casesensitiveflag);
     push(@searchopts, -regexp) if ($regexpflag);
     my $index = $messagesText->search(@searchopts, $string, $index0);
+    print "index=$index strlen=$strlen\n";
     if ($index) {
 	&highlightStringOff if $searchString and $string eq $searchString;
 	$searchString = $messagesText->get($index, "$index + $strlen chars");
@@ -1751,11 +1753,11 @@ sub searchNext {
     my $strlen;
     return unless $string;
     my $index0 = ($searchIndex) ? "$searchIndex + 1 chars": '0.0';
-    my @searchopts = (-count => \$strlen, -forwards);
+    my @searchopts = (-hidden, -count => \$strlen, -forwards);
     push(@searchopts, -nocase) unless ($casesensitiveflag);
     push(@searchopts, -regexp) if ($regexpflag);
     my $index = $messagesText->search(@searchopts, $string, $index0);
-    #print "index=$index searchIndex=$searchIndex\n";
+    #print "index=$index searchIndex=$searchIndex strlen=$strlen\n";
     &highlightStringOff;
     if ($index) {
 	&highlightString($index, "$index + $strlen chars");
@@ -1779,7 +1781,7 @@ sub searchPrev {
     return unless $string;
     #my $index0 = ($searchIndex) ? "$searchIndex - 1 chars": '0.0';
     my $index0 = ($searchIndex) ? $searchIndex : '0.0';
-    my @searchopts = (-count => \$strlen, -backwards);
+    my @searchopts = (-hidden, -count => \$strlen, -backwards);
     push(@searchopts, -nocase) unless ($casesensitiveflag);
     push(@searchopts, -regexp) if ($regexpflag);
     my $index = $messagesText->search(@searchopts, $string, $index0);
@@ -1810,7 +1812,7 @@ sub searchAll {
 				-foreground => 'ivory');
     my $index = '0.0';
     my $found = 0;
-    my @searchopts = (-count => \$strlen, -forwards);
+    my @searchopts = (-hidden, -count => \$strlen, -forwards);
     push(@searchopts, -nocase) unless ($casesensitiveflag);
     push(@searchopts, -regexp) if ($regexpflag);