X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2dc6356a02ebe2e5c0428cefc18e64882d85b4a6..HEAD:/charset/sbcsgen.pl

diff --git a/charset/sbcsgen.pl b/charset/sbcsgen.pl
index 0d6ebc9c..56eb61e3 100644
--- a/charset/sbcsgen.pl
+++ b/charset/sbcsgen.pl
@@ -27,21 +27,28 @@ my $charsetname = undef;
 my @vals = ();
 
 my @charsetnames = ();
+my @sortpriority = ();
 
 while (<FOO>) {
     chomp;
     if (/^charset (.*)$/) {
 	$charsetname = $1;
 	@vals = ();
+	@sortpriority = map { 0 } 0..255;
+    } elsif (/^sortpriority ([^-]*)-([^-]*) (.*)$/) {
+	for ($i = hex $1; $i <= hex $2; $i++) {
+	    $sortpriority[$i] += $3;
+	}
     } elsif (/^[0-9a-fA-FX]/) {
 	push @vals, map { $_ eq "XXXX" ? -1 : hex $_ } split / +/, $_;
 	if (scalar @vals > 256) {
 	    die "$infile:$.: charset $charsetname has more than 256 values\n";
 	} elsif (scalar @vals == 256) {
-	    &outcharset($charsetname, @vals);
+	    &outcharset($charsetname, \@vals, \@sortpriority);
 	    push @charsetnames, $charsetname;
 	    $charsetname = undef;
 	    @vals = ();
+	    @sortpriority = map { 0 } 0..255;
 	}
     }
 }
@@ -56,8 +63,8 @@ foreach $i (@charsetnames) {
 print "\n";
 print "#endif /* ENUM_CHARSETS */\n";
 
-sub outcharset($@) {
-    my ($name, @vals) = @_;
+sub outcharset($$$) {
+    my ($name, $vals, $sortpriority) = @_;
     my ($prefix, $i, @sorted);
 
     print "static const sbcs_data data_$name = {\n";
@@ -65,11 +72,12 @@ sub outcharset($@) {
     $prefix = "    ";
     @sorted = ();
     for ($i = 0; $i < 256; $i++) {
-	if ($vals[$i] < 0) {
+	if ($vals->[$i] < 0) {
 	    printf "%sERROR ", $prefix;
 	} else {
-	    printf "%s0x%04x", $prefix, $vals[$i];
-	    push @sorted, [$i, $vals[$i]];
+	    printf "%s0x%04x", $prefix, $vals->[$i];
+	    die "ooh? $i\n" unless defined $sortpriority->[$i];
+	    push @sorted, [$i, $vals->[$i], 0+$sortpriority->[$i]];
 	}
 	if ($i % 8 == 7) {
 	    $prefix = ",\n    ";
@@ -78,17 +86,24 @@ sub outcharset($@) {
 	}
     }
     print "\n    },\n    {\n";
-    @sorted = sort { $a->[1] <=> $b->[1] } @sorted;
+    @sorted = sort { ($a->[1] == $b->[1] ?
+	              $b->[2] <=> $a->[2] :
+	              $a->[1] <=> $b->[1]) ||
+                     $a->[0] <=> $b->[0] } @sorted;
     $prefix = "    ";
-    for ($i = 0; $i < scalar @sorted; $i++) {
+    $uval = -1;
+    for ($i = $j = 0; $i < scalar @sorted; $i++) {
+	next if ($uval == $sorted[$i]->[1]); # low-priority alternative
+	$uval = $sorted[$i]->[1];
 	printf "%s0x%02x", $prefix, $sorted[$i]->[0];
-	if ($i % 8 == 7) {
+	if ($j % 8 == 7) {
 	    $prefix = ",\n    ";
 	} else {
 	    $prefix = ", ";
 	}
+	$j++;
     }
-    printf "\n    },\n    %d\n", scalar @sorted;
+    printf "\n    },\n    %d\n", $j;
     print "};\n";
     print "const charset_spec charset_$name = {\n" .
           "    $name, read_sbcs, write_sbcs, &data_$name\n};\n\n";