shithub: vdir

Info  •  Files  •  Log  •  Branches

display ellipsis at the beginning of text (thanks igor)

	the most interesting part of a path or filename is at the
	end so we now put the ellipsis at the beginning of the string
	instead of the end.

--- a/vdir.c

+++ b/vdir.c

@@ -279,19 +279,17 @@

 Point

 drawtext(Point p, Image *i, char* t, int n)

 {

-	int d;

 	char *s;

 	Rune  rn;

-	d = stringwidth(font, " ")+stringwidth(font, ellipsis);

-	for(s = t; *s; s++){

-		if(p.x+d>=n){

-			string(screen, p, i, ZP, font, ellipsis);

-			break;

-		}else{

-			s += chartorune(&rn, s) - 1;

-			p = runestringn(screen, p, i, ZP, font, &rn, 1);

-		} 

+	s = t;

+	if(*s && (p.x+stringwidth(font, s)) > n){

+		p = string(screen, p, i, ZP, font, ellipsis);

+		while (*s && (p.x+stringwidth(font, s)) > n) s++;

+	}

+	for( ; *s; s++){

+		s += chartorune(&rn, s) - 1;

+		p = runestringn(screen, p, i, ZP, font, &rn, 1);

 	}

 	return p;

 }