psycamp: terminal width fixes

1 files changed, 3 insertions, 2 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 770325b..f1d8c0a 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -1009,7 +1009,7 @@ sub printinfo {
 sub stringtail {
         my $s = shift;
         my $w = shift || $TWIDTH;
-        return length($s)>$w ? "...".substr($s,-$w+4) : $s;
+        return length($s)>=$w ? "...".substr($s,-$w+4) : $s;
 }
 
 sub ginxpect {
@@ -1187,7 +1187,8 @@ sub ginparse {
                   YELLOW. $CurrentSize .BLUE.'#'. $nlink .RESET:
                   YELLOW. $CurrentSize .RESET;
                 # consider color codes:
-                my $twidth = $nlink>1? $TWIDTH + 3*4 : $TWIDTH + 2*4;
+                my $twidth = $TWIDTH + length(YELLOW) + length(RESET);
+                $twidth += length(BLUE) if $nlink>1;
                 $PrintCurrentFile = $codec?
                   "<$codec> $PrintCurrentFile ": $PrintCurrentFile .' ';
                 $PrintCurrentFile .= &stringtail($nf, $twidth