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

Merge pull request #310 from oliverschmidt/master

Browse source 
Minor code style fix
This commit is contained in:
Oliver Schmidt 2013-07-30 13:51:52 -07:00
parent b85579ef72 49fb300aa0
commit 3f2fd36d8a
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/webbrowser/www.c
View file

@ -698,7 +698,7 @@ add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
} }
maxwidth = size ? WWW_CONF_WEBPAGE_WIDTH - (1 + 2 * border) maxwidth = size ? WWW_CONF_WEBPAGE_WIDTH - (1 + 2 * border)
: WWW_CONF_WEBPAGE_WIDTH; : WWW_CONF_WEBPAGE_WIDTH;
/* If the text of the link is too long so that it does not fit into /* If the text of the link is too long so that it does not fit into
the width of the current window, counting from the current x the width of the current window, counting from the current x
@ -734,7 +734,7 @@ add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
switch(type) { switch(type) {
case CTK_WIDGET_HYPERLINK: { case CTK_WIDGET_HYPERLINK: {
struct linkattrib *linkptr = struct linkattrib *linkptr =
(struct linkattrib *)add_pageattrib(sizeof(struct linkattrib) /* incl 1 attrib char */ + attriblen); (struct linkattrib *)add_pageattrib(sizeof(struct linkattrib) /* incl 1 attrib char */ + attriblen);
if(linkptr != NULL) { if(linkptr != NULL) {
CTK_HYPERLINK_NEW(&linkptr->hyperlink, x, y + 3, size, wptr, linkptr->url); CTK_HYPERLINK_NEW(&linkptr->hyperlink, x, y + 3, size, wptr, linkptr->url);
strcpy(linkptr->url, attrib); strcpy(linkptr->url, attrib);
@ -746,7 +746,7 @@ add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
#if WWW_CONF_FORMS #if WWW_CONF_FORMS
case CTK_WIDGET_BUTTON: { case CTK_WIDGET_BUTTON: {
struct submitattrib *submitptr = struct submitattrib *submitptr =
(struct submitattrib *)add_pageattrib(sizeof(struct submitattrib) /* incl 1 attrib char */ + attriblen); (struct submitattrib *)add_pageattrib(sizeof(struct submitattrib) /* incl 1 attrib char */ + attriblen);
if(submitptr != NULL) { if(submitptr != NULL) {
CTK_BUTTON_NEW((struct ctk_button *)&submitptr->button, x, y + 3, size, wptr); CTK_BUTTON_NEW((struct ctk_button *)&submitptr->button, x, y + 3, size, wptr);
add_forminput((struct inputattrib *)submitptr); add_forminput((struct inputattrib *)submitptr);
@ -759,8 +759,8 @@ add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
} }
case CTK_WIDGET_TEXTENTRY: { case CTK_WIDGET_TEXTENTRY: {
struct textattrib *textptr = struct textattrib *textptr =
(struct textattrib *)add_pageattrib(sizeof(struct textattrib) /* incl 1 attrib char */ + attriblen (struct textattrib *)add_pageattrib(sizeof(struct textattrib) /* incl 1 attrib char */ + attriblen
+ (size ? WWW_CONF_MAX_INPUTVALUELEN : strlen(text)) + 1); + (size ? WWW_CONF_MAX_INPUTVALUELEN : strlen(text)) + 1);
if(textptr != NULL) { if(textptr != NULL) {
CTK_TEXTENTRY_NEW((struct ctk_textentry *)&textptr->textentry, x, y + 3, size, 1, CTK_TEXTENTRY_NEW((struct ctk_textentry *)&textptr->textentry, x, y + 3, size, 1,
textptr->name + attriblen + 1, WWW_CONF_MAX_INPUTVALUELEN); textptr->name + attriblen + 1, WWW_CONF_MAX_INPUTVALUELEN);
@ -768,10 +768,10 @@ add_pagewidget(char *text, unsigned char size, char *attrib, unsigned char type,
textptr->formptr = formptr; textptr->formptr = formptr;
strcpy(textptr->textentry.text, text); strcpy(textptr->textentry.text, text);
strcpy(textptr->name, attrib); strcpy(textptr->name, attrib);
if(size) { if(size) {
CTK_WIDGET_SET_FLAG(&textptr->textentry, CTK_WIDGET_FLAG_MONOSPACE); CTK_WIDGET_SET_FLAG(&textptr->textentry, CTK_WIDGET_FLAG_MONOSPACE);
CTK_WIDGET_ADD(&mainwindow, &textptr->textentry); CTK_WIDGET_ADD(&mainwindow, &textptr->textentry);
} }
} }
break; break;
} }