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

Converting the last screen line from ASCII to PETSCII as it was done up to now almost never makes sense. Either the conent to be converted is not the last screen line or the last screen line was already converted (and is incorrectly converted back). Therefore now only a partial line not already converted before gets converted.

Browse source
This commit is contained in:
oliverschmidt 2010-07-21 21:03:06 +00:00
parent 8a6f7a1dcf
commit 05f938e7c1
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
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.13 2010/05/31 15:22:08 nifi Exp $ * $Id: www.c,v 1.14 2010/07/21 21:03:06 oliverschmidt Exp $
* *
*/ */
@ -598,19 +598,18 @@ webclient_timedout(void)
* *
* Callback function. Called from the webclient when the HTTP * Callback function. Called from the webclient when the HTTP
* connection was closed after a request from the "webclient_close()" * connection was closed after a request from the "webclient_close()"
* function. . * function.
*/ */
void void
webclient_closed(void) webclient_closed(void)
{ {
show_statustext("Stopped."); show_statustext("Stopped.");
petsciiconv_topetscii(&webpage[(WWW_CONF_WEBPAGE_HEIGHT - 1) * petsciiconv_topetscii(webpageptr - x, x);
WWW_CONF_WEBPAGE_WIDTH], WWW_CONF_WEBPAGE_WIDTH);
CTK_WIDGET_FOCUS(&mainwindow, &downbutton); CTK_WIDGET_FOCUS(&mainwindow, &downbutton);
redraw_window(); redraw_window();
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
/* webclient_closed(): /* webclient_connected():
* *
* Callback function. Called from the webclient when the HTTP * Callback function. Called from the webclient when the HTTP
* connection is connected. * connection is connected.
@ -659,8 +658,7 @@ webclient_datahandler(char *data, u16_t len)
if(data == NULL) { if(data == NULL) {
loading = 0; loading = 0;
show_statustext("Done."); show_statustext("Done.");
petsciiconv_topetscii(&webpage[(WWW_CONF_WEBPAGE_HEIGHT - 1) * petsciiconv_topetscii(webpageptr - x, x);
WWW_CONF_WEBPAGE_WIDTH], WWW_CONF_WEBPAGE_WIDTH);
CTK_WIDGET_FOCUS(&mainwindow, &urlentry); CTK_WIDGET_FOCUS(&mainwindow, &urlentry);
redraw_window(); redraw_window();
} }