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

Allow to build the webbrowser without history support - by setting WWW_CONF_HISTORY_SIZE to 0.

Browse source
This commit is contained in:
oliverschmidt 2010-02-13 10:39:57 +00:00
parent 8603f0f0f6
commit 340de209c7
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
apps/webbrowser/www.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: www.c,v 1.11 2010/02/01 19:44:30 oliverschmidt Exp $ * $Id: www.c,v 1.12 2010/02/13 10:39:57 oliverschmidt Exp $
* *
*/ */
@ -70,10 +70,15 @@ static char webpage[WWW_CONF_WEBPAGE_WIDTH *
/* The CTK widgets for the main window. */ /* The CTK widgets for the main window. */
static struct ctk_window mainwindow; static struct ctk_window mainwindow;
#if WWW_CONF_HISTORY_SIZE > 0
static struct ctk_button backbutton = static struct ctk_button backbutton =
{CTK_BUTTON(0, 0, 4, "Back")}; {CTK_BUTTON(0, 0, 4, "Back")};
static struct ctk_button downbutton = static struct ctk_button downbutton =
{CTK_BUTTON(10, 0, 4, "Down")}; {CTK_BUTTON(10, 0, 4, "Down")};
#else /* WWW_CONF_HISTORY_SIZE > 0 */
static struct ctk_button downbutton =
{CTK_BUTTON(0, 0, 4, "Down")};
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
static struct ctk_button stopbutton = static struct ctk_button stopbutton =
{CTK_BUTTON(WWW_CONF_WEBPAGE_WIDTH - 16, 0, 4, "Stop")}; {CTK_BUTTON(WWW_CONF_WEBPAGE_WIDTH - 16, 0, 4, "Stop")};
static struct ctk_button gobutton = static struct ctk_button gobutton =
@ -110,10 +115,11 @@ static struct ctk_button wgetyesbutton =
{CTK_BUTTON(11, 5, 24, "Close browser & download")}; {CTK_BUTTON(11, 5, 24, "Close browser & download")};
#endif /* WWW_CONF_WITH_WGET */ #endif /* WWW_CONF_WITH_WGET */
#if WWW_CONF_HISTORY_SIZE > 0
/* The char arrays that hold the history of visited URLs. */ /* The char arrays that hold the history of visited URLs. */
static char history[WWW_CONF_HISTORY_SIZE][WWW_CONF_MAX_URLLEN]; static char history[WWW_CONF_HISTORY_SIZE][WWW_CONF_MAX_URLLEN];
static char history_last; static char history_last;
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
/* The CTK widget definitions for the hyperlinks and the char arrays /* The CTK widget definitions for the hyperlinks and the char arrays
that hold the link URLs. */ that hold the link URLs. */
@ -177,7 +183,9 @@ static void formsubmit(struct formattribs *attribs);
static void static void
make_window(void) make_window(void)
{ {
#if WWW_CONF_HISTORY_SIZE > 0
CTK_WIDGET_ADD(&mainwindow, &backbutton); CTK_WIDGET_ADD(&mainwindow, &backbutton);
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
CTK_WIDGET_ADD(&mainwindow, &downbutton); CTK_WIDGET_ADD(&mainwindow, &downbutton);
CTK_WIDGET_ADD(&mainwindow, &stopbutton); CTK_WIDGET_ADD(&mainwindow, &stopbutton);
CTK_WIDGET_ADD(&mainwindow, &gobutton); CTK_WIDGET_ADD(&mainwindow, &gobutton);
@ -374,6 +382,7 @@ open_link(char *link)
start_loading(); start_loading();
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if WWW_CONF_HISTORY_SIZE > 0
/* log_back(): /* log_back():
* *
* Copies the current URL from the url variable and into the log for * Copies the current URL from the url variable and into the log for
@ -390,6 +399,7 @@ log_back(void)
} }
} }
} }
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
static void static void
quit(void) quit(void)
@ -443,10 +453,21 @@ PROCESS_THREAD(www_process, ev, data)
if(ev == tcpip_event) { if(ev == tcpip_event) {
webclient_appcall(data); webclient_appcall(data);
} else if(ev == ctk_signal_widget_activate) { } else if(ev == ctk_signal_widget_activate) {
if(w == (struct ctk_widget *)&backbutton) { if(w == (struct ctk_widget *)&gobutton ||
w == (struct ctk_widget *)&urlentry) {
start_loading();
firsty = 0;
#if WWW_CONF_HISTORY_SIZE > 0
log_back();
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
memcpy(url, editurl, WWW_CONF_MAX_URLLEN);
petsciiconv_toascii(url, WWW_CONF_MAX_URLLEN);
open_url();
CTK_WIDGET_FOCUS(&mainwindow, &gobutton);
#if WWW_CONF_HISTORY_SIZE > 0
} else if(w == (struct ctk_widget *)&backbutton) {
firsty = 0; firsty = 0;
start_loading(); start_loading();
--history_last; --history_last;
if(history_last > WWW_CONF_HISTORY_SIZE) { if(history_last > WWW_CONF_HISTORY_SIZE) {
history_last = WWW_CONF_HISTORY_SIZE - 1; history_last = WWW_CONF_HISTORY_SIZE - 1;
@ -454,21 +475,12 @@ PROCESS_THREAD(www_process, ev, data)
memcpy(url, history[(int)history_last], WWW_CONF_MAX_URLLEN); memcpy(url, history[(int)history_last], WWW_CONF_MAX_URLLEN);
open_url(); open_url();
CTK_WIDGET_FOCUS(&mainwindow, &backbutton); CTK_WIDGET_FOCUS(&mainwindow, &backbutton);
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
} else if(w == (struct ctk_widget *)&downbutton) { } else if(w == (struct ctk_widget *)&downbutton) {
firsty = pagey + WWW_CONF_WEBPAGE_HEIGHT - 4; firsty = pagey + WWW_CONF_WEBPAGE_HEIGHT - 4;
start_loading(); start_loading();
open_url(); open_url();
CTK_WIDGET_FOCUS(&mainwindow, &downbutton); CTK_WIDGET_FOCUS(&mainwindow, &downbutton);
} else if(w == (struct ctk_widget *)&gobutton ||
w == (struct ctk_widget *)&urlentry) {
start_loading();
firsty = 0;
log_back();
memcpy(url, editurl, WWW_CONF_MAX_URLLEN);
petsciiconv_toascii(url, WWW_CONF_MAX_URLLEN);
open_url();
CTK_WIDGET_FOCUS(&mainwindow, &gobutton);
} else if(w == (struct ctk_widget *)&stopbutton) { } else if(w == (struct ctk_widget *)&stopbutton) {
loading = 0; loading = 0;
webclient_close(); webclient_close();
@ -502,7 +514,9 @@ PROCESS_THREAD(www_process, ev, data)
} }
} else if(ev == ctk_signal_hyperlink_activate) { } else if(ev == ctk_signal_hyperlink_activate) {
firsty = 0; firsty = 0;
#if WWW_CONF_HISTORY_SIZE > 0
log_back(); log_back();
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
open_link(w->widget.hyperlink.url); open_link(w->widget.hyperlink.url);
CTK_WIDGET_FOCUS(&mainwindow, &stopbutton); CTK_WIDGET_FOCUS(&mainwindow, &stopbutton);
/* ctk_window_open(&mainwindow);*/ /* ctk_window_open(&mainwindow);*/
@ -865,8 +879,8 @@ htmlparser_renderstate(unsigned char s)
} }
#endif /* WWW_CONF_RENDERSTATE */ #endif /* WWW_CONF_RENDERSTATE */
#if WWW_CONF_FORMS
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if WWW_CONF_FORMS
void void
htmlparser_submitbutton(char *text, char *name, htmlparser_submitbutton(char *text, char *name,
char *formname, char *formaction) char *formname, char *formaction)
@ -960,8 +974,10 @@ formsubmit(struct formattribs *attribs)
} }
--urlptr; --urlptr;
*urlptr = 0; *urlptr = 0;
#if WWW_CONF_HISTORY_SIZE > 0
log_back(); log_back();
#endif /* WWW_CONF_HISTORY_SIZE > 0 */
open_link(tmpurl); open_link(tmpurl);
} }
/*-----------------------------------------------------------------------------------*/
#endif /* WWW_CONF_FORMS */ #endif /* WWW_CONF_FORMS */
/*-----------------------------------------------------------------------------------*/