commit 8bb5cca03291e5ea17f6c42f798eec6ae529e3c7
author adamdunkels <adamdunkels> dim. août 24 22:41:31 2003 +0000
committer adamdunkels <adamdunkels> dim. août 24 22:41:31 2003 +0000
tree fbb741d4ef139cfa849ff3e69b812b23626d2103
parent 3ea09e6be48ef964dcf41684893ff4d35e13118f

Added the ability to pass an argument pointer to newly created processes

contiki/apps/www.c

diff --git a/contiki/apps/www.c b/contiki/apps/www.c
index 42569ed..24018d6 100644
--- a/contiki/apps/www.c
+++ b/contiki/apps/www.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: www.c,v 1.18 2003/08/22 19:24:40 adamdunkels Exp $
+ * $Id: www.c,v 1.19 2003/08/24 22:41:31 adamdunkels Exp $
  *
  */
 
@@ -46,6 +46,9 @@
 
 #include "petsciiconv.h"
 
+#include "program-handler.h"
+
+
 #include "loader.h"
 
 #include "www-conf.h"
@@ -223,8 +226,10 @@
  * Initializes and starts the web browser. Called either at startup or
  * to open the browser window.
  */
-LOADER_INIT_FUNC(www_init)
+LOADER_INIT_FUNC(www_init, arg)
 {
+  arg_free(arg);
+  
   if(id == EK_ID_NONE) {
     id = dispatcher_start(&p);
     
@@ -449,6 +454,8 @@
 {
   static struct ctk_widget *w;
   static unsigned char i;
+  static char *argptr;
+  
   DISPATCHER_SIGHANDLER_ARGS(s, data);
 
   
@@ -488,9 +495,13 @@
     } else if(w == (struct ctk_widget *)&wgetnobutton) {
       ctk_dialog_close();
     } else if(w == (struct ctk_widget *)&wgetyesbutton) {
-      ctk_dialog_close();
+      ctk_dialog_close();      
       quit();
-      program_handler_load("wget.prg");
+      argptr = arg_alloc(WWW_CONF_MAX_URLLEN);
+      if(argptr != NULL) {
+	strncpy(argptr, url, WWW_CONF_MAX_URLLEN);
+      } 
+      program_handler_load("wget.prg", argptr);
       
 #if WWW_CONF_FORMS
     } else {
@@ -609,12 +620,12 @@
 {
   x = nextwordptr = 0;
   starty = scrolly;
+  
 #if WWW_CONF_PAGEVIEW
-  if(starty == 0) {
-    scrollend = WWW_CONF_WEBPAGE_HEIGHT - 4;
-  } else {
-    scrollend = starty + WWW_CONF_WEBPAGE_HEIGHT - 4;
+  if(starty > 4) {
+    starty = scrolly - 4;
   }
+  scrollend = starty + WWW_CONF_WEBPAGE_HEIGHT - 4;
 #endif /* WWW_CONF_PAGEVIEW */
   
   nextword[0] = 0;
@@ -797,7 +808,7 @@
       show_statustext(receivingmsgs[count]);
       htmlparser_parse(data, len);
     } else {
-      uip_close();
+      uip_abort();
       ctk_dialog_open(&wgetdialog);
     }
   } else {