From c7e7c816341bfa56b5ef5e93714038f746f124cd Mon Sep 17 00:00:00 2001
From: Chris Morgan <me@chrismorgan.info>
Date: Sat, 8 Jan 2022 18:16:55 +1100
Subject: [PATCH] Search highlighting <mark>, diff recolouring

---
 gitweb.cgi        | 18 +++++++++---------
 static/gitweb.css | 20 ++++++++------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/gitweb.cgi b/gitweb.cgi
index 1aba48a..91047b0 100755
--- a/gitweb.cgi
+++ b/gitweb.cgi
@@ -1862,7 +1862,7 @@ sub esc_html_hl_regions {
 
 		$out .= esc_html(substr($str, $pos, $begin - $pos), %opts)
 			if ($begin - $pos > 0);
-		$out .= $cgi->span({-class => $css_class}, $escaped);
+		$out .= "<mark class=\"$css_class\">$escaped</mark>";
 
 		$pos = $end;
 	}
@@ -1892,7 +1892,7 @@ sub esc_html_match_hl {
 	my @matches = matchpos_list($str, $regexp);
 	return esc_html($str) unless @matches;
 
-	return esc_html_hl_regions($str, 'match', @matches);
+	return esc_html_hl_regions($str, undef, @matches);
 }
 
 
@@ -1924,7 +1924,7 @@ sub esc_html_match_hl_chopped {
 		push @filtered, $m;
 	}
 
-	return esc_html_hl_regions($chopped . $tail, 'match', @filtered);
+	return esc_html_hl_regions($chopped . $tail, undef, @filtered);
 }
 
 ## ----------------------------------------------------------------------
@@ -3032,7 +3032,7 @@ sub git_populate_project_tagcloud {
 			$title =~ s/^/&nbsp;/g;
 			$title =~ s/$/&nbsp;/g;
 			if (defined $matched && $matched eq $ctag) {
-				$title = qq(<span class="match">$title</span>);
+				$title = qq(<mark>$title</mark>);
 			}
 			$cloud->add($title, href(project=>undef, ctag=>$ctag),
 			            $ctags_lc{$ctag}->{count});
@@ -3042,7 +3042,7 @@ sub git_populate_project_tagcloud {
 		foreach my $ctag (keys %ctags_lc) {
 			my $title = esc_html($ctags_lc{$ctag}->{topname}, -nbsp=>1);
 			if (defined $matched && $matched eq $ctag) {
-				$title = qq(<span class="match">$title</span>);
+				$title = qq(<mark>$title</mark>);
 			}
 			$cloud->{$ctag}{count} = $ctags_lc{$ctag}->{count};
 			$cloud->{$ctag}{ctag} =
@@ -6323,7 +6323,7 @@ sub git_search_changes {
 			print $cgi->a({-href => href(action=>"blob", hash_base=>$co{'id'},
 			                             hash=>$set{'to_id'}, file_name=>$set{'to_file'}),
 			              -class => "list"},
-			              "<span class=\"match\">" . esc_path($set{'file'}) . "</span>") .
+			              "<mark>" . esc_path($set{'file'}) . "</mark>") .
 			      "<br/>\n";
 		}
 	}
@@ -6398,9 +6398,9 @@ sub git_search_files {
 			$ltext = untabify($ltext);
 			if ($ltext =~ m/^(.*)($search_regexp)(.*)$/i) {
 				$ltext = esc_html($1, -nbsp=>1);
-				$ltext .= '<span class="match">';
+				$ltext .= '<mark>';
 				$ltext .= esc_html($2, -nbsp=>1);
-				$ltext .= '</span>';
+				$ltext .= '</mark>';
 				$ltext .= esc_html($3, -nbsp=>1);
 			} else {
 				$ltext = esc_html($ltext, -nbsp=>1);
@@ -6465,7 +6465,7 @@ sub git_search_grep_body {
 				$match = esc_html($match);
 				$trail = esc_html($trail);
 
-				print "$lead<span class=\"match\">$match</span>$trail<br />";
+				print "$lead<mark>$match</mark>$trail<br />";
 			}
 		}
 		print "</td>\n" .
diff --git a/static/gitweb.css b/static/gitweb.css
index b3bf60b..5560823 100644
--- a/static/gitweb.css
+++ b/static/gitweb.css
@@ -472,28 +472,28 @@ div.diff a.hash:hover {
 
 div.diff.to_file a.path,
 div.diff.to_file {
-	color: #007000;
+	color: #060;
 }
 
 div.diff.add {
-	color: #008800;
+	background-color: #dfd;
 }
 
-div.diff.add span.marked {
-	background-color: #aaffaa;
+div.diff.add mark {
+	background-color: #afa;
 }
 
 div.diff.from_file a.path,
 div.diff.from_file {
-	color: #aa0000;
+	color: #900;
 }
 
 div.diff.rem {
-	color: #cc0000;
+	background-color: #fdd;
 }
 
-div.diff.rem span.marked {
-	background-color: #ffaaaa;
+div.diff.rem mark {
+	background-color: #faa;
 }
 
 div.diff.chunk_header a,
@@ -643,10 +643,6 @@ span.refs span.head {
 	border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
 }
 
-span.match {
-	color: #e00000;
-}
-
 div.binary {
 	font-style: italic;
 }
-- 
2.42.0