diff options
author | James Bursa <james@netsurf-browser.org> | 2003-10-25 00:35:49 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2003-10-25 00:35:49 +0000 |
commit | f1375fe19db064fcebf00433ce73eab99be038ef (patch) | |
tree | 19e239a41a8a68baab5b444447adc3aae5bf04fa /riscos | |
parent | 099d537267e8e4114128e59e2614c99d77dd4feb (diff) | |
download | netsurf-f1375fe19db064fcebf00433ce73eab99be038ef.tar.gz netsurf-f1375fe19db064fcebf00433ce73eab99be038ef.tar.bz2 |
[project @ 2003-10-25 00:35:49 by bursa]
Split out and clean up form submit code.
svn path=/import/netsurf/; revision=374
Diffstat (limited to 'riscos')
-rw-r--r-- | riscos/gui.c | 7 | ||||
-rw-r--r-- | riscos/gui.h | 2 | ||||
-rw-r--r-- | riscos/htmlredraw.c | 8 |
3 files changed, 7 insertions, 10 deletions
diff --git a/riscos/gui.c b/riscos/gui.c index ca21c4e83..328d40691 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -25,6 +25,7 @@ #include "netsurf/desktop/netsurf.h" #include "netsurf/desktop/options.h" #include "netsurf/render/font.h" +#include "netsurf/render/form.h" #include "netsurf/render/html.h" #include "netsurf/riscos/about.h" #include "netsurf/riscos/gui.h" @@ -71,7 +72,7 @@ int ro_save_data(void *data, unsigned long length, char *file_name, bits file_ty wimp_menu* combo_menu; -struct gui_gadget* current_gadget; +struct form_control* current_gadget; int TOOLBAR_HEIGHT = 128; @@ -1282,10 +1283,10 @@ void gui_window_stop_throbber(gui_window* g) wimp_set_icon_state(g->data.browser.toolbar, ro_theme_icon(current_theme, THEME_TOOLBAR, "TOOLBAR_THROBBER"), 0, 0); } -void gui_gadget_combo(struct browser_window* bw, struct gui_gadget* g, unsigned long mx, unsigned long my) +void gui_gadget_combo(struct browser_window* bw, struct form_control* g, unsigned long mx, unsigned long my) { int count = 0; - struct formoption* o; + struct form_option* o; wimp_pointer pointer; if (combo_menu != NULL) diff --git a/riscos/gui.h b/riscos/gui.h index 3ad54ed0a..a88ff0476 100644 --- a/riscos/gui.h +++ b/riscos/gui.h @@ -22,7 +22,7 @@ extern wimp_w dialog_info, dialog_saveas, dialog_config, dialog_config_br, extern wimp_menu *current_menu, *iconbar_menu, *browser_menu, *combo_menu, *theme_menu; extern int current_menu_x, current_menu_y, iconbar_menu_height; -extern struct gui_gadget *current_gadget; +extern struct form_control *current_gadget; extern const char *HOME_URL; extern gui_window *window_list; diff --git a/riscos/htmlredraw.c b/riscos/htmlredraw.c index 83e7b4009..d60d97a31 100644 --- a/riscos/htmlredraw.c +++ b/riscos/htmlredraw.c @@ -13,6 +13,7 @@ #include "oslib/font.h" #include "netsurf/css/css.h" #include "netsurf/content/content.h" +#include "netsurf/render/form.h" #include "netsurf/render/html.h" #include "netsurf/riscos/gui.h" #include "netsurf/utils/log.h" @@ -56,14 +57,9 @@ void html_redraw(struct content *c, long x, long y, /* validation strings can't be const */ -static char validation_textarea[] = "R7;L"; -static char validation_textbox[] = ""; -static char validation_password[] = "D*"; static char validation_select[] = "R2"; static char validation_checkbox_selected[] = "Sopton"; static char validation_checkbox_unselected[] = "Soptoff"; -static char validation_radio_selected[] = "Sradioon"; -static char validation_radio_unselected[] = "Sradiooff"; static char select_text_multiple[] = "<Multiple>"; /* TODO: read from messages */ static char select_text_none[] = "<None>"; @@ -79,7 +75,7 @@ void html_redraw_box(struct content *content, struct box * box, { struct box *c; char *select_text; - struct formoption *opt; + struct form_option *opt; int width, height, x0, y0, x1, y1; x += box->x * 2; |