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

Changed the maximum length of a single word from 40 to match the page width. Browsers wider than 40 cols can now render longer words. Browsers smaller than 40 cols avoid display inconsistencies on long words (and save memory). Additionally simplified word truncation code.

Browse source
This commit is contained in:
oliverschmidt 2006-10-06 21:34:59 +00:00
parent 0a1e2d7b3e
commit eac68071eb
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/webbrowser/htmlparser.c
View file

@ -29,7 +29,7 @@
* *
* This file is part of the Contiki desktop environment * This file is part of the Contiki desktop environment
* *
* $Id: htmlparser.c,v 1.5 2006/10/06 21:30:41 oliverschmidt Exp $ * $Id: htmlparser.c,v 1.6 2006/10/06 21:34:59 oliverschmidt Exp $
* *
*/ */
@ -155,11 +155,9 @@ struct htmlparser_state {
unsigned char majorstate, lastmajorstate; unsigned char majorstate, lastmajorstate;
char linkurl[WWW_CONF_MAX_URLLEN]; char linkurl[WWW_CONF_MAX_URLLEN];
#define MAX_WORDLEN 40 char word[WWW_CONF_WEBPAGE_WIDTH];
char word[MAX_WORDLEN];
unsigned char wordlen; unsigned char wordlen;
#if WWW_CONF_FORMS #if WWW_CONF_FORMS
char formaction[WWW_CONF_MAX_FORMACTIONLEN]; char formaction[WWW_CONF_MAX_FORMACTIONLEN];
char formname[WWW_CONF_MAX_FORMNAMELEN]; char formname[WWW_CONF_MAX_FORMNAMELEN];
@ -283,13 +281,9 @@ switch_majorstate(unsigned char newstate)
static void CC_FASTCALL static void CC_FASTCALL
add_char(unsigned char c) add_char(unsigned char c)
{ {
if(s.wordlen < MAX_WORDLEN && if(s.wordlen < WWW_CONF_WEBPAGE_WIDTH - 1 && c < 0x80) {
c < 0x80) {
s.word[s.wordlen] = c; s.word[s.wordlen] = c;
++s.wordlen; ++s.wordlen;
if(s.wordlen == MAX_WORDLEN) {
s.wordlen = MAX_WORDLEN - 1;
}
} }
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/