deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Filter excessive newlines.

Browse source 
The way our HTML parser triggers newlines is a guess at best. On the other hand our screen estate is severely limited. Instead of trying to (further) improve the way we translate tags to newlines it seems more reasonable to simply never render more than two successive empty lines.
This commit is contained in:
Oliver Schmidt 2015-05-26 16:45:52 +02:00
parent cdd289a7ff
commit 8b0a7a697f
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/webbrowser/www.c
View file

@ -182,6 +182,7 @@ static char *webpageptr;
static unsigned char x, y;
static unsigned char loading;
static unsigned short firsty, pagey;
static unsigned char newlines;
static unsigned char count;
static char receivingmsgs[4][23] = {
@ -278,6 +279,7 @@ start_loading(void)
loading = 1;
x = y = 0;
pagey = 0;
newlines = 0;
webpageptr = webpage;
clear_page();
@ -732,6 +734,8 @@ add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
char *wptr;
static unsigned char maxwidth;
newlines = 0;
if(!loading) {
return;
}
@ -838,6 +842,10 @@ htmlparser_newline(void)
{
char *wptr;
if(++newlines > 2) {
return;
}
if(pagey < firsty) {
++pagey;
x = 0;
@ -864,6 +872,8 @@ htmlparser_newline(void)
void
htmlparser_word(char *word, unsigned char wordlen)
{
newlines = 0;
if(loading) {
if(wordlen + 1 > WWW_CONF_WEBPAGE_WIDTH - x) {
htmlparser_newline();