mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-31 11:41:51 +02:00
Code Issues Projects Releases Wiki Activity

Better text wrapping

Browse Source
This commit is contained in:
jacksonmj
2011-02-05 15:44:29 +00:00
parent 196ccd1e36
commit 21d0dd0ca2
1 changed files with 86 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/graphics.c
View File

@@ -855,7 +855,20 @@ int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, i
int rh = 12; int rh = 12;
int rw = 0; int rw = 0;
int cw = x; int cw = x;
for (; *s; s++) int wordlen;
int charspace;
while (*s)
{
wordlen = strcspn(s," .,!?\n");
charspace = textwidthx(s, w-(x-cw));
if (charspace<wordlen && wordlen && w-(x-cw)<w/3)
{
x = sx;
rw = 0;
y+=FONT_H+2;
rh+=FONT_H+2;
}
for (; *s && --wordlen>=-1; s++)
{ {
if (*s == '\n') if (*s == '\n')
{ {
@@ -891,7 +904,9 @@ int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, i
} }
else else
{ {
if (x-cw>=w) {
if (x-cw>=w)
{
x = sx; x = sx;
rw = 0; rw = 0;
y+=FONT_H+2; y+=FONT_H+2;
@@ -900,6 +915,7 @@ int drawtextwrap(pixel *vid, int x, int y, int w, const char *s, int r, int g, i
x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a); x = drawchar(vid, x, y, *(unsigned char *)s, r, g, b, a);
} }
} }
}
#endif #endif
return rh; return rh;
} }
@@ -1009,19 +1025,30 @@ void textnpos(char *s, int n, int w, int *cx, int *cy)
{ {
int x = 0; int x = 0;
int y = 0; int y = 0;
//TODO: Implement Textnheight for wrapped text int wordlen, charspace;
for (; *s; s++) while (*s&&n)
{
wordlen = strcspn(s," .,!?\n");
charspace = textwidthx(s, w-x);
if (charspace<wordlen && wordlen && w-x<w/3)
{
x = 0;
y += FONT_H+2;
}
for (; *s && --wordlen>=-1; s++)
{ {
if (!n) { if (!n) {
break; break;
} }
x += font_data[font_ptrs[(int)(*(unsigned char *)s)]]; x += font_data[font_ptrs[(int)(*(unsigned char *)s)]];
if (x>=w) { if (x>=w)
{
x = 0; x = 0;
y += FONT_H+2; y += FONT_H+2;
} }
n--; n--;
} }
}
*cx = x-1; *cx = x-1;
*cy = y; *cy = y;
} }
@@ -1041,12 +1068,21 @@ int textwidthx(char *s, int w)
} }
int textposxy(char *s, int width, int w, int h) int textposxy(char *s, int width, int w, int h)
{ {
int x=0,y=0,n=0,cw; int x=0,y=0,n=0,cw, wordlen, charspace;
for (; *s; s++) while (*s)
{
wordlen = strcspn(s," .,!?\n");
charspace = textwidthx(s, width-x);
if (charspace<wordlen && wordlen && width-x<width/3)
{
x = 0;
y += FONT_H+2;
}
for (; *s && --wordlen>=-1; s++)
{ {
cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]]; cw = font_data[font_ptrs[(int)(*(unsigned char *)s)]];
if (x+(cw/2) >= w && y+6 >= h) if ((x+(cw/2) >= w && y+6 >= h)||(y+6 >= h+FONT_H+2))
break; return n++;
x += cw; x += cw;
if (x>=width) { if (x>=width) {
x = 0; x = 0;
@@ -1054,6 +1090,7 @@ int textposxy(char *s, int width, int w, int h)
} }
n++; n++;
} }
}
return n; return n;
} }