Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/66d0f14b32d11042872f6bfe33152521bf470e6a
...commit
http://git.netsurf-browser.org/netsurf.git/commit/66d0f14b32d11042872f6bfe33152521bf470e6a
...tree
http://git.netsurf-browser.org/netsurf.git/tree/66d0f14b32d11042872f6bfe33152521bf470e6a
The branch, master has been updated
via 66d0f14b32d11042872f6bfe33152521bf470e6a (commit)
from a60c4749ff734168d773d1b527b83ce7ce6d83a1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=66d0f14b32d11042872f6bfe33152521bf470e6a
commit 66d0f14b32d11042872f6bfe33152521bf470e6a
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
move the public form API
diff --git a/desktop/selection.c b/desktop/selection.c
index b2c7837..7506af0 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -31,8 +31,8 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
+#include "netsurf/form.h"
#include "render/box.h"
-#include "render/form.h"
#include "render/html_internal.h"
#include "render/font.h"
#include "render/textplain.h"
diff --git a/desktop/textinput.c b/desktop/textinput.c
index 0e98e03..d4a8bf8 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -33,8 +33,8 @@
#include "utils/talloc.h"
#include "utils/utf8.h"
#include "utils/utils.h"
+#include "netsurf/form.h"
#include "render/box.h"
-#include "render/form.h"
#include "render/html_internal.h"
#include "render/layout.h"
diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index ffd4803..f3a11b6 100644
--- a/frontends/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
@@ -28,7 +28,7 @@
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "render/form.h"
+#include "netsurf/form.h"
#include "netsurf/mouse.h"
#include "amiga/gui.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index b3e4293..8f3baac 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -57,19 +57,19 @@ extern "C" {
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsurl.h"
+#include "utils/nsoption.h"
#include "netsurf/netsurf.h"
#include "netsurf/plotters.h"
#include "netsurf/clipboard.h"
#include "netsurf/content.h"
#include "netsurf/content_type.h"
-#include "desktop/browser_history.h"
#include "netsurf/browser_window.h"
+#include "netsurf/form.h"
+#include "desktop/browser_history.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
#include "desktop/search.h"
-#include "utils/nsoption.h"
#include "desktop/textinput.h"
-#include "render/form.h"
}
#include "beos/about.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index ab8add9..3ffd4cb 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -21,7 +21,7 @@
#import "utils/utils.h"
#import "netsurf/browser_window.h"
-#import "render/form.h"
+#import "netsurf/form.h"
static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct
form_control *control)
{
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index a98d529..b4af648 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -41,9 +41,9 @@
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/plotters.h"
+#include "netsurf/form.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
-#include "render/form.h"
#include "gtk/window.h"
#include "gtk/selection.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index af74b51..37474b8 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -46,12 +46,12 @@
#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "netsurf/content.h"
+#include "netsurf/form.h"
#include "desktop/hotlist.h"
#include "desktop/global_history.h"
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
-#include "render/form.h"
#include "riscos/bitmap.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 152bff3..fe36da5 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -58,11 +58,11 @@
#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "netsurf/url_db.h"
+#include "netsurf/form.h"
#include "desktop/browser_history.h"
#include "desktop/cookie_manager.h"
#include "desktop/scrollbar.h"
#include "desktop/textinput.h"
-#include "render/form.h"
#include "riscos/bitmap.h"
#include "riscos/buffer.h"
diff --git a/include/netsurf/form.h b/include/netsurf/form.h
new file mode 100644
index 0000000..bffa13e
--- /dev/null
+++ b/include/netsurf/form.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2003 Phil Mellor <[email protected]>
+ * Copyright 2003 James Bursa <[email protected]>
+ * Copyright 2009 Paul Blokus <[email protected]>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file
+ * Form handling public interface.
+ */
+
+#ifndef _NETSURF_FORM_H_
+#define _NETSURF_FORM_H_
+
+struct form_control;
+struct rect;
+
+/** Option in a select. */
+struct form_option {
+ void *node; /**< Corresponding DOM node */
+ bool selected;
+ bool initial_selected;
+ char *value;
+ char *text; /**< NUL terminated. */
+ struct form_option* next;
+};
+
+/**
+ * Process a selection from a form select menu.
+ *
+ * \param control form control with menu.
+ * \param item index of item selected from the menu.
+ */
+nserror form_select_process_selection(struct form_control *control, int item);
+
+/**
+ * get a form select menus option.
+ *
+ * \param control The form control.
+ * \param item The index of the menu entry to return.
+ * \return The form option at that index.
+ */
+struct form_option *form_select_get_option(struct form_control *control, int
item);
+
+/**
+ * Get a form control name
+ *
+ * \param control The form control
+ * \return The form control name
+ */
+char *form_control_get_name(struct form_control *control);
+
+
+/**
+ * Get a form control bounding rectangle
+ *
+ * \param[in] control The form control
+ * \param[out] r The rectangle to place the bounds in.
+ * \return NSERROR_OK on success or error code.
+ */
+nserror form_control_bounding_rect(struct form_control *control, struct rect
*r);
+
+#endif
diff --git a/render/form.c b/render/form.c
index a994426..f8d0ce5 100644
--- a/render/form.c
+++ b/render/form.c
@@ -1402,7 +1402,7 @@ static nserror
form__select_process_selection(html_content *html,
return ret;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
nserror form_select_process_selection(struct form_control *control, int item)
{
assert(control != NULL);
@@ -1410,7 +1410,7 @@ nserror form_select_process_selection(struct form_control
*control, int item)
return form__select_process_selection(control->html, control, item);
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
struct form_option *
form_select_get_option(struct form_control *control, int item)
{
@@ -1424,13 +1424,13 @@ form_select_get_option(struct form_control *control,
int item)
return opt;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
char *form_control_get_name(struct form_control *control)
{
return control->name;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
nserror form_control_bounding_rect(struct form_control *control, struct rect
*r)
{
box_bounds( control->box, r );
diff --git a/render/form.h b/render/form.h
deleted file mode 100644
index 744ac32..0000000
--- a/render/form.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright 2003 Phil Mellor <[email protected]>
- * Copyright 2003 James Bursa <[email protected]>
- * Copyright 2009 Paul Blokus <[email protected]>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Form handling functions (interface).
- */
-
-#ifndef _NETSURF_RENDER_FORM_H_
-#define _NETSURF_RENDER_FORM_H_
-
-struct form_control;
-struct rect;
-
-/** Option in a select. */
-struct form_option {
- void *node; /**< Corresponding DOM node */
- bool selected;
- bool initial_selected;
- char *value;
- char *text; /**< NUL terminated. */
- struct form_option* next;
-};
-
-/**
- * Process a selection from a form select menu.
- *
- * \param control form control with menu.
- * \param item index of item selected from the menu.
- */
-nserror form_select_process_selection(struct form_control *control, int item);
-
-/**
- * get a form select menus option.
- *
- * \param control The form control.
- * \param item The index of the menu entry to return.
- * \return The form option at that index.
- */
-struct form_option *form_select_get_option(struct form_control *control, int
item);
-
-/**
- * Get a form control name
- *
- * \param control The form control
- * \return The form control name
- */
-char *form_control_get_name(struct form_control *control);
-
-
-/**
- * Get a form control bounding rectangle
- *
- * \param[in] control The form control
- * \param[out] r The rectangle to place the bounds in.
- * \return NSERROR_OK on success or error code.
- */
-nserror form_control_bounding_rect(struct form_control *control, struct rect
*r);
-
-#endif
diff --git a/render/form_internal.h b/render/form_internal.h
index ea46b6a..0ffb6b4 100644
--- a/render/form_internal.h
+++ b/render/form_internal.h
@@ -24,10 +24,10 @@
#ifndef _NETSURF_RENDER_FORM_INTERNAL_H_
#define _NETSURF_RENDER_FORM_INTERNAL_H_
-#include "render/form.h"
-
#include <stdbool.h>
+#include "netsurf/form.h"
+
struct box;
struct form_control;
struct form_option;
-----------------------------------------------------------------------
Summary of changes:
desktop/selection.c | 2 +-
desktop/textinput.c | 2 +-
frontends/amiga/selectmenu.c | 2 +-
frontends/beos/scaffolding.cpp | 6 +++---
frontends/cocoa/FormSelectMenu.m | 2 +-
frontends/gtk/window.c | 2 +-
frontends/riscos/save.c | 2 +-
frontends/riscos/window.c | 2 +-
{render => include/netsurf}/form.h | 11 ++++++-----
render/form.c | 8 ++++----
render/form_internal.h | 4 ++--
11 files changed, 22 insertions(+), 21 deletions(-)
rename {render => include/netsurf}/form.h (91%)
diff --git a/desktop/selection.c b/desktop/selection.c
index b2c7837..7506af0 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -31,8 +31,8 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
+#include "netsurf/form.h"
#include "render/box.h"
-#include "render/form.h"
#include "render/html_internal.h"
#include "render/font.h"
#include "render/textplain.h"
diff --git a/desktop/textinput.c b/desktop/textinput.c
index 0e98e03..d4a8bf8 100644
--- a/desktop/textinput.c
+++ b/desktop/textinput.c
@@ -33,8 +33,8 @@
#include "utils/talloc.h"
#include "utils/utf8.h"
#include "utils/utils.h"
+#include "netsurf/form.h"
#include "render/box.h"
-#include "render/form.h"
#include "render/html_internal.h"
#include "render/layout.h"
diff --git a/frontends/amiga/selectmenu.c b/frontends/amiga/selectmenu.c
index ffd4803..f3a11b6 100644
--- a/frontends/amiga/selectmenu.c
+++ b/frontends/amiga/selectmenu.c
@@ -28,7 +28,7 @@
#include "utils/errors.h"
#include "utils/log.h"
#include "utils/messages.h"
-#include "render/form.h"
+#include "netsurf/form.h"
#include "netsurf/mouse.h"
#include "amiga/gui.h"
diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp
index b3e4293..8f3baac 100644
--- a/frontends/beos/scaffolding.cpp
+++ b/frontends/beos/scaffolding.cpp
@@ -57,19 +57,19 @@ extern "C" {
#include "utils/utils.h"
#include "utils/log.h"
#include "utils/nsurl.h"
+#include "utils/nsoption.h"
#include "netsurf/netsurf.h"
#include "netsurf/plotters.h"
#include "netsurf/clipboard.h"
#include "netsurf/content.h"
#include "netsurf/content_type.h"
-#include "desktop/browser_history.h"
#include "netsurf/browser_window.h"
+#include "netsurf/form.h"
+#include "desktop/browser_history.h"
#include "desktop/version.h"
#include "desktop/searchweb.h"
#include "desktop/search.h"
-#include "utils/nsoption.h"
#include "desktop/textinput.h"
-#include "render/form.h"
}
#include "beos/about.h"
diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m
index ab8add9..3ffd4cb 100644
--- a/frontends/cocoa/FormSelectMenu.m
+++ b/frontends/cocoa/FormSelectMenu.m
@@ -21,7 +21,7 @@
#import "utils/utils.h"
#import "netsurf/browser_window.h"
-#import "render/form.h"
+#import "netsurf/form.h"
static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct
form_control *control)
{
diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c
index a98d529..b4af648 100644
--- a/frontends/gtk/window.c
+++ b/frontends/gtk/window.c
@@ -41,9 +41,9 @@
#include "netsurf/mouse.h"
#include "netsurf/window.h"
#include "netsurf/plotters.h"
+#include "netsurf/form.h"
#include "desktop/searchweb.h"
#include "desktop/textinput.h"
-#include "render/form.h"
#include "gtk/window.h"
#include "gtk/selection.h"
diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c
index af74b51..37474b8 100644
--- a/frontends/riscos/save.c
+++ b/frontends/riscos/save.c
@@ -46,12 +46,12 @@
#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "netsurf/content.h"
+#include "netsurf/form.h"
#include "desktop/hotlist.h"
#include "desktop/global_history.h"
#include "desktop/version.h"
#include "desktop/save_complete.h"
#include "desktop/save_text.h"
-#include "render/form.h"
#include "riscos/bitmap.h"
#include "riscos/dialog.h"
diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c
index 152bff3..fe36da5 100644
--- a/frontends/riscos/window.c
+++ b/frontends/riscos/window.c
@@ -58,11 +58,11 @@
#include "netsurf/window.h"
#include "netsurf/bitmap.h"
#include "netsurf/url_db.h"
+#include "netsurf/form.h"
#include "desktop/browser_history.h"
#include "desktop/cookie_manager.h"
#include "desktop/scrollbar.h"
#include "desktop/textinput.h"
-#include "render/form.h"
#include "riscos/bitmap.h"
#include "riscos/buffer.h"
diff --git a/render/form.h b/include/netsurf/form.h
similarity index 91%
rename from render/form.h
rename to include/netsurf/form.h
index 744ac32..bffa13e 100644
--- a/render/form.h
+++ b/include/netsurf/form.h
@@ -1,7 +1,7 @@
/*
* Copyright 2003 Phil Mellor <[email protected]>
* Copyright 2003 James Bursa <[email protected]>
- * Copyright 2009 Paul Blokus <[email protected]>
+ * Copyright 2009 Paul Blokus <[email protected]>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -18,12 +18,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Form handling functions (interface).
+/**
+ * \file
+ * Form handling public interface.
*/
-#ifndef _NETSURF_RENDER_FORM_H_
-#define _NETSURF_RENDER_FORM_H_
+#ifndef _NETSURF_FORM_H_
+#define _NETSURF_FORM_H_
struct form_control;
struct rect;
diff --git a/render/form.c b/render/form.c
index a994426..f8d0ce5 100644
--- a/render/form.c
+++ b/render/form.c
@@ -1402,7 +1402,7 @@ static nserror
form__select_process_selection(html_content *html,
return ret;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
nserror form_select_process_selection(struct form_control *control, int item)
{
assert(control != NULL);
@@ -1410,7 +1410,7 @@ nserror form_select_process_selection(struct form_control
*control, int item)
return form__select_process_selection(control->html, control, item);
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
struct form_option *
form_select_get_option(struct form_control *control, int item)
{
@@ -1424,13 +1424,13 @@ form_select_get_option(struct form_control *control,
int item)
return opt;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
char *form_control_get_name(struct form_control *control)
{
return control->name;
}
-/* exported interface documented in render/form.h */
+/* exported interface documented in netsurf/form.h */
nserror form_control_bounding_rect(struct form_control *control, struct rect
*r)
{
box_bounds( control->box, r );
diff --git a/render/form_internal.h b/render/form_internal.h
index ea46b6a..0ffb6b4 100644
--- a/render/form_internal.h
+++ b/render/form_internal.h
@@ -24,10 +24,10 @@
#ifndef _NETSURF_RENDER_FORM_INTERNAL_H_
#define _NETSURF_RENDER_FORM_INTERNAL_H_
-#include "render/form.h"
-
#include <stdbool.h>
+#include "netsurf/form.h"
+
struct box;
struct form_control;
struct form_option;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
