netsurf: branch master updated. release/3.0-1020-g3564612
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/356461244e9a31d9c22fa...
...commit http://git.netsurf-browser.org/netsurf.git/commit/356461244e9a31d9c22fab3...
...tree http://git.netsurf-browser.org/netsurf.git/tree/356461244e9a31d9c22fab358...
The branch, master has been updated
via 356461244e9a31d9c22fab358cdf95cb3f22364f (commit)
via 0114cc825d8a23ff99ce3a667aebc0ed21b0339f (commit)
from f99b17ae89ee27ff746346c17c03b1ee5ab3076b (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=356461244e9a31d9c22...
commit 356461244e9a31d9c22fab358cdf95cb3f22364f
Merge: f99b17a 0114cc8
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Merge remote-tracking branch 'origin/stevef/menus'
-----------------------------------------------------------------------
Summary of changes:
riscos/menus.c | 55 ++++++++++++++++++++++++++++----------------------
riscos/menus.h | 2 +-
riscos/print.c | 2 +-
riscos/wimp_event.c | 10 ++++----
riscos/window.c | 14 ++++++------
5 files changed, 45 insertions(+), 38 deletions(-)
diff --git a/riscos/menus.c b/riscos/menus.c
index 91232a1..d8e2f2c 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -77,7 +77,7 @@ struct menu_definition {
struct menu_definition *next; /**< next menu */
};
-
+static void ro_gui_menu_closed(void);
static void ro_gui_menu_define_menu_add(struct menu_definition *definition,
const struct ns_menu *menu, int depth,
wimp_menu_entry *parent_entry,
@@ -213,6 +213,7 @@ void ro_gui_menu_init(void)
* \param y The y position.
* \param w The window that the menu belongs to.
*/
+
void ro_gui_menu_create(wimp_menu *menu, int x, int y, wimp_w w)
{
os_error *error;
@@ -252,6 +253,7 @@ void ro_gui_menu_create(wimp_menu *menu, int x, int y, wimp_w w)
* \param w window handle
* \param i icon handle
*/
+
void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i)
{
wimp_window_state state;
@@ -286,29 +288,24 @@ void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i)
/**
- * Clean up after a menu has been closed, or forcible close an open menu.
- */
-void ro_gui_menu_closed(void)
+ * Forcibly close any menu or transient dialogue box that is currently open.
+ */
+
+void ro_gui_menu_destroy(void)
{
os_error *error;
- if (current_menu) {
- error = xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);
- if (error) {
- LOG(("xwimp_create_menu: 0x%x: %s",
- error->errnum, error->errmess));
- warn_user("MenuError", error->errmess);
- }
-
- ro_gui_wimp_event_menus_closed(current_menu_window,
- current_menu_icon, current_menu);
+ if (current_menu == NULL)
+ return;
- current_menu = NULL;
+ error = xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);
+ if (error) {
+ LOG(("xwimp_create_menu: 0x%x: %s",
+ error->errnum, error->errmess));
+ warn_user("MenuError", error->errmess);
}
- current_menu_window = NULL;
- current_menu_icon = 0;
- current_menu_open = false;
+ ro_gui_menu_closed();
}
@@ -450,15 +447,25 @@ void ro_gui_menu_warning(wimp_message_menu_warning *warning)
void ro_gui_menu_message_deleted(wimp_message_menus_deleted *deleted)
{
- if (deleted != NULL && deleted->menu == current_menu) {
+ if (deleted != NULL && deleted->menu == current_menu)
+ ro_gui_menu_closed();
+}
+
+
+/**
+ * Clean up after a menu has been closed, or forcibly close an open menu.
+ */
+
+static void ro_gui_menu_closed(void)
+{
+ if (current_menu != NULL)
ro_gui_wimp_event_menus_closed(current_menu_window,
current_menu_icon, current_menu);
- current_menu = NULL;
- current_menu_window = NULL;
- current_menu_icon = 0;
- current_menu_open = false;
- }
+ current_menu = NULL;
+ current_menu_window = NULL;
+ current_menu_icon = 0;
+ current_menu_open = false;
}
diff --git a/riscos/menus.h b/riscos/menus.h
index e2269b7..f49215f 100644
--- a/riscos/menus.h
+++ b/riscos/menus.h
@@ -168,7 +168,7 @@ struct ns_menu {
void ro_gui_menu_init(void);
void ro_gui_menu_create(wimp_menu* menu, int x, int y, wimp_w w);
-void ro_gui_menu_closed(void);
+void ro_gui_menu_destroy(void);
void ro_gui_popup_menu(wimp_menu *menu, wimp_w w, wimp_i i);
void ro_gui_menu_window_changed(wimp_w from, wimp_w to);
void ro_gui_menu_selection(wimp_selection* selection);
diff --git a/riscos/print.c b/riscos/print.c
index 09d4aae..c539f01 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -525,7 +525,7 @@ void ro_print_cleanup(void)
print_text_black = false;
print_prev_message = 0;
print_max_sheets = -1;
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
ro_gui_dialog_close(dialog_print);
}
diff --git a/riscos/wimp_event.c b/riscos/wimp_event.c
index a84c016..d048b9a 100644
--- a/riscos/wimp_event.c
+++ b/riscos/wimp_event.c
@@ -719,7 +719,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer)
}
ro_gui_dialog_add_persistent(current_menu_window,
pointer->w);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
error = xwimp_open_window(PTR_WIMP_OPEN(&open));
if (error) {
LOG(("xwimp_open_window: 0x%x: %s",
@@ -768,7 +768,7 @@ bool ro_gui_wimp_event_mouse_click(wimp_pointer *pointer)
if (pointer->buttons & wimp_CLICK_SELECT) {
ro_gui_dialog_close(pointer->w);
ro_gui_wimp_event_close_window(pointer->w);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
} else {
ro_gui_wimp_event_restore(pointer->w);
}
@@ -850,7 +850,7 @@ void ro_gui_wimp_event_ok_click(struct event_window *window,
if (state & wimp_CLICK_SELECT) {
ro_gui_dialog_close(window->w);
ro_gui_wimp_event_close_window(window->w);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
} else {
ro_gui_wimp_event_memorise(window->w);
}
@@ -1045,7 +1045,7 @@ bool ro_gui_wimp_event_keypress(wimp_key *key)
return false;
ro_gui_dialog_close(key->w);
ro_gui_wimp_event_close_window(key->w);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return true;
/* Return performs the OK action */
case wimp_KEY_RETURN:
@@ -1772,7 +1772,7 @@ bool ro_gui_wimp_event_submenu_warning(wimp_w w, wimp_i i, wimp_menu *menu,
}
/**
- * Handle menus being closed. This is called from ro_gui_menu_closed(), in
+ * Handle menus being closed. This is called from the menus modules, in
* every scenario when one of our own menus is open.
*
* \param w the window to owning the menu
diff --git a/riscos/window.c b/riscos/window.c
index 1644608..ed0f9e2 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -654,7 +654,7 @@ static void gui_window_destroy(struct gui_window *g)
ro_gui_url_complete_close();
ro_gui_dialog_close_persistent(w);
if (current_menu_window == w)
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
ro_gui_window_remove_update_boxes(g);
/* delete window */
@@ -1395,7 +1395,7 @@ void gui_create_form_select_menu(struct browser_window *bw,
LOG(("xwimp_get_pointer_info: 0x%x: %s",
error->errnum, error->errmess));
warn_user("WimpError", error->errmess);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return;
}
@@ -4811,7 +4811,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
option = option->next)
entries++;
if (entries == 0) {
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return false;
}
@@ -4835,7 +4835,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
gui_form_select_menu = malloc(wimp_SIZEOF_MENU(entries));
if (!gui_form_select_menu) {
warn_user("NoMemory", 0);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return false;
}
err = utf8_to_local_encoding(messages_get("SelectMenu"), 0,
@@ -4845,7 +4845,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
assert(err != NSERROR_BAD_ENCODING);
LOG(("utf8_to_local_encoding failed"));
warn_user("NoMemory", 0);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return false;
}
gui_form_select_menu->title_data.indirected_text.text =
@@ -4870,7 +4870,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
if (!temp) {
LOG(("cnv_space2nbsp failed"));
warn_user("NoMemory", 0);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return false;
}
@@ -4882,7 +4882,7 @@ bool ro_gui_window_prepare_form_select_menu(struct browser_window *bw,
assert(err != NSERROR_BAD_ENCODING);
LOG(("utf8_to_enc failed"));
warn_user("NoMemory", 0);
- ro_gui_menu_closed();
+ ro_gui_menu_destroy();
return false;
}
--
NetSurf Browser
9 years, 1 month
toolchains: branch chris/amiga-curl-threaded created. f41a278839fd3032eff8b070805b19ba1e9f4fd3
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/f41a278839fd3032ef...
...commit http://git.netsurf-browser.org/toolchains.git/commit/f41a278839fd3032eff8...
...tree http://git.netsurf-browser.org/toolchains.git/tree/f41a278839fd3032eff8b0...
The branch, chris/amiga-curl-threaded has been created
at f41a278839fd3032eff8b070805b19ba1e9f4fd3 (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=f41a278839fd3032...
commit f41a278839fd3032eff8b070805b19ba1e9f4fd3
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Correct patch header
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
index c663716..9a2b590 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
@@ -1,5 +1,5 @@
---- curl_orig/lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100
-+++ curl/lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000
+--- lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100
++++ lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000
@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c
* implying that only threadsafe code and function calls may be used.
*
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=2d5b184d47011098...
commit 2d5b184d470110989f18d92fe4336d74ff4a1c57
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Enable threaded resolver for ppc-amigaos target
diff --git a/sdk/Makefile b/sdk/Makefile
index 2b1ba8f..e63dd99 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -114,7 +114,7 @@ endif
ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d spidermonkey.d $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver
VERSION_SPIDERMONKEY := 1.7.0
endif
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=ce286ecc2626c736...
commit ce286ecc2626c736b2776a6983fd1f3811e231ae
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Initial threaded resolver patch from kas1e
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
new file mode 100644
index 0000000..c663716
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p
@@ -0,0 +1,61 @@
+--- curl_orig/lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100
++++ curl/lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000
+@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c
+ * implying that only threadsafe code and function calls may be used.
+ *
+ */
++#ifdef __amigaos4__
++#include <proto/exec.h>
++#include <proto/bsdsocket.h>
++#endif
++
+ Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname,
+ int port)
+ {
+@@ -132,6 +137,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+ struct hostent *h = NULL;
+ struct in_addr in;
+ struct hostent *buf = NULL;
++#ifdef __amigaos4__
++ struct SocketIFace *ISocket = NULL;
++#endif
+
+ if(Curl_inet_pton(AF_INET, hostname, &in) > 0)
+ /* This is a dotted IP address 123.123.123.123-style */
+@@ -294,7 +302,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+ * gethostbyname() is the preferred one.
+ */
+ else {
++#ifdef __amigaos4__
++ struct Library *SocketBase = IExec->OpenLibrary("bsdsocket.library", 4);
++ if (SocketBase)
++ {
++ ISocket = (struct SocketIFace *)IExec->GetInterface(SocketBase, "main", 1, NULL);
++ }
++
++ if (ISocket)
++ {
++ h = ISocket->gethostbyname((void*)hostname);
++ }
++#else
+ h = gethostbyname((void*)hostname);
++#endif
+ #endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */
+ }
+
+@@ -304,7 +325,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const
+ if(buf) /* used a *_r() function */
+ free(buf);
+ }
+-
++#ifdef __amigaos4__
++ if (ISocket)
++ {
++ struct Library *SocketBase = ISocket->Data.LibBase;
++ IExec->DropInterface((struct Interface *)ISocket);
++ IExec->CloseLibrary(SocketBase);
++ }
++#endif
+ return ai;
+ }
+ #endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) */
-----------------------------------------------------------------------
--
Cross-compilation toolchains and environments
9 years, 1 month
netsurf: branch master updated. release/3.0-1018-gf99b17a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/f99b17ae89ee27ff74634...
...commit http://git.netsurf-browser.org/netsurf.git/commit/f99b17ae89ee27ff746346c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/f99b17ae89ee27ff746346c17...
The branch, master has been updated
via f99b17ae89ee27ff746346c17c03b1ee5ab3076b (commit)
from aaecf9e1af9e8cf22324cfbbd4eb13fb64ac3975 (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=f99b17ae89ee27ff746...
commit f99b17ae89ee27ff746346c17c03b1ee5ab3076b
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
bump the maximum number of nodes in the doxygen documentation and fix a couple of small documentation errors
diff --git a/Docs/Doxyfile b/Docs/Doxyfile
index 40102ea..90cb0a3 100644
--- a/Docs/Doxyfile
+++ b/Docs/Doxyfile
@@ -1788,7 +1788,7 @@ MSCFILE_DIRS =
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-DOT_GRAPH_MAX_NODES = 50
+DOT_GRAPH_MAX_NODES = 100
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
diff --git a/riscos/window.c b/riscos/window.c
index 1f70d3d..1644608 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -399,9 +399,10 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
/**
* Create and open a new browser window.
*
- * \param bw browser_window structure to update
- * \param clone the browser window to clone options from, or NULL for default
- * \return gui_window, or 0 on error and error reported
+ * \param bw The browser window structure to update
+ * \param clone The browser window to clone options from, or NULL for default
+ * \param new_tab Determines if new browser context should be a tab or window.
+ * \return A gui window, or NULL on error and error reported
*/
static struct gui_window *gui_window_create(struct browser_window *bw,
@@ -731,8 +732,8 @@ void gui_window_redraw_window(struct gui_window *g)
/**
* Redraw an area of a window.
*
- * \param g gui_window
- * \param data content_msg_data union with filled in redraw data
+ * \param g The window to update
+ * \param rect The area of the window to update.
*/
static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
@@ -1292,8 +1293,9 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
/**
* Save the specified content as a link.
*
- * \param g gui_window containing the content
- * \param c the content to save
+ * \param g The window containing the content
+ * \param url The url of the link
+ * \param title The title of the link
*/
static void gui_window_save_link(struct gui_window *g, const char *url,
const char *title)
@@ -3106,7 +3108,7 @@ void ro_gui_window_scroll(wimp_scroll *scroll)
inc = 0.02; /* RO5 sends the msg 5 times;
* don't ask me why
*
- * \TODO -- this is liable to break if
+ * @todo this is liable to break if
* HID is configured optimally for
* frame scrolling. *5 appears to be
* an artifact of non-HID mode scrolling.
@@ -3752,8 +3754,8 @@ void ro_gui_window_toolbar_click(void *data,
/**
* Handle Message_DataLoad (file dragged in) for a toolbar
*
- * \TODO -- This belongs in the toolbar module, and should be moved there
- * once the module is able to usefully handle its own events.
+ * @todo This belongs in the toolbar module, and should be moved there
+ * once the module is able to usefully handle its own events.
*
* \param g window
* \param message Message_DataLoad block
@@ -4607,11 +4609,10 @@ void ro_gui_window_update_theme(void *data, bool ok)
*/
/**
- * Import text file into window or its toolbar
+ * Import text file into window
*
* \param g gui window containing textarea
* \param filename pathname of file to be imported
- * \param toolbar true iff imported to toolbar rather than main window
* \return true iff successful
*/
@@ -4946,8 +4947,8 @@ struct gui_window *ro_gui_window_lookup(wimp_w window)
/**
* Convert a toolbar RISC OS window handle to a gui_window.
*
- * \param w RISC OS window handle of a toolbar
- * \return pointer to a structure if found, 0 otherwise
+ * \param window RISC OS window handle of a toolbar
+ * \return pointer to a structure if found, NULL otherwise
*/
struct gui_window *ro_gui_toolbar_lookup(wimp_w window)
-----------------------------------------------------------------------
Summary of changes:
Docs/Doxyfile | 2 +-
riscos/window.c | 29 +++++++++++++++--------------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Docs/Doxyfile b/Docs/Doxyfile
index 40102ea..90cb0a3 100644
--- a/Docs/Doxyfile
+++ b/Docs/Doxyfile
@@ -1788,7 +1788,7 @@ MSCFILE_DIRS =
# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-DOT_GRAPH_MAX_NODES = 50
+DOT_GRAPH_MAX_NODES = 100
# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
# graphs generated by dot. A depth value of 3 means that only nodes reachable
diff --git a/riscos/window.c b/riscos/window.c
index 1f70d3d..1644608 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -399,9 +399,10 @@ static void gui_window_place_caret(struct gui_window *g, int x, int y, int heigh
/**
* Create and open a new browser window.
*
- * \param bw browser_window structure to update
- * \param clone the browser window to clone options from, or NULL for default
- * \return gui_window, or 0 on error and error reported
+ * \param bw The browser window structure to update
+ * \param clone The browser window to clone options from, or NULL for default
+ * \param new_tab Determines if new browser context should be a tab or window.
+ * \return A gui window, or NULL on error and error reported
*/
static struct gui_window *gui_window_create(struct browser_window *bw,
@@ -731,8 +732,8 @@ void gui_window_redraw_window(struct gui_window *g)
/**
* Redraw an area of a window.
*
- * \param g gui_window
- * \param data content_msg_data union with filled in redraw data
+ * \param g The window to update
+ * \param rect The area of the window to update.
*/
static void gui_window_update_box(struct gui_window *g, const struct rect *rect)
@@ -1292,8 +1293,9 @@ static bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
/**
* Save the specified content as a link.
*
- * \param g gui_window containing the content
- * \param c the content to save
+ * \param g The window containing the content
+ * \param url The url of the link
+ * \param title The title of the link
*/
static void gui_window_save_link(struct gui_window *g, const char *url,
const char *title)
@@ -3106,7 +3108,7 @@ void ro_gui_window_scroll(wimp_scroll *scroll)
inc = 0.02; /* RO5 sends the msg 5 times;
* don't ask me why
*
- * \TODO -- this is liable to break if
+ * @todo this is liable to break if
* HID is configured optimally for
* frame scrolling. *5 appears to be
* an artifact of non-HID mode scrolling.
@@ -3752,8 +3754,8 @@ void ro_gui_window_toolbar_click(void *data,
/**
* Handle Message_DataLoad (file dragged in) for a toolbar
*
- * \TODO -- This belongs in the toolbar module, and should be moved there
- * once the module is able to usefully handle its own events.
+ * @todo This belongs in the toolbar module, and should be moved there
+ * once the module is able to usefully handle its own events.
*
* \param g window
* \param message Message_DataLoad block
@@ -4607,11 +4609,10 @@ void ro_gui_window_update_theme(void *data, bool ok)
*/
/**
- * Import text file into window or its toolbar
+ * Import text file into window
*
* \param g gui window containing textarea
* \param filename pathname of file to be imported
- * \param toolbar true iff imported to toolbar rather than main window
* \return true iff successful
*/
@@ -4946,8 +4947,8 @@ struct gui_window *ro_gui_window_lookup(wimp_w window)
/**
* Convert a toolbar RISC OS window handle to a gui_window.
*
- * \param w RISC OS window handle of a toolbar
- * \return pointer to a structure if found, 0 otherwise
+ * \param window RISC OS window handle of a toolbar
+ * \return pointer to a structure if found, NULL otherwise
*/
struct gui_window *ro_gui_toolbar_lookup(wimp_w window)
--
NetSurf Browser
9 years, 2 months
netsurf: branch master updated. release/3.0-1017-gaaecf9e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/aaecf9e1af9e8cf22324c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/aaecf9e1af9e8cf22324cfb...
...tree http://git.netsurf-browser.org/netsurf.git/tree/aaecf9e1af9e8cf22324cfbbd...
The branch, master has been updated
via aaecf9e1af9e8cf22324cfbbd4eb13fb64ac3975 (commit)
from d5a971c281b110d8fa481fa86ccd7af10d2d3cf0 (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=aaecf9e1af9e8cf2232...
commit aaecf9e1af9e8cf22324cfbbd4eb13fb64ac3975
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
add missing include for neturf_quit symbol
diff --git a/desktop/browser.h b/desktop/browser.h
index d61e6a0..4901c11 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -243,7 +243,7 @@ bool browser_window_redraw(struct browser_window *bw, int x, int y,
*/
bool browser_window_redraw_ready(struct browser_window *bw);
-/*
+/**
* Update the extent of the inside of a browser window to that of the current
* content
*
@@ -251,7 +251,7 @@ bool browser_window_redraw_ready(struct browser_window *bw);
*/
void browser_window_update_extent(struct browser_window *bw);
-/*
+/**
* Get the position of the current browser window with respect to the root or
* parent browser window
*
@@ -263,7 +263,7 @@ void browser_window_update_extent(struct browser_window *bw);
void browser_window_get_position(struct browser_window *bw, bool root,
int *pos_x, int *pos_y);
-/*
+/**
* Set the position of the current browser window with respect to the parent
* browser window
*
@@ -273,7 +273,7 @@ void browser_window_get_position(struct browser_window *bw, bool root,
*/
void browser_window_set_position(struct browser_window *bw, int x, int y);
-/*
+/**
* Scroll the browser window to display the passed area
*
* \param bw browser window to scroll
@@ -294,7 +294,7 @@ void browser_window_scroll_visible(struct browser_window *bw,
*/
void browser_window_set_scroll(struct browser_window *bw, int x, int y);
-/*
+/**
* Set drag type for a browser window, and inform front end
*
* \param bw browser window to set the type of the current drag for
@@ -304,7 +304,7 @@ void browser_window_set_scroll(struct browser_window *bw, int x, int y);
void browser_window_set_drag_type(struct browser_window *bw,
browser_drag_type type, const struct rect *rect);
-/*
+/**
* Get type of any current drag for a browser window
*
* \param bw browser window to set the type of the current drag for
@@ -312,7 +312,7 @@ void browser_window_set_drag_type(struct browser_window *bw,
*/
browser_drag_type browser_window_get_drag_type(struct browser_window *bw);
-/*
+/**
* Get the root level browser window
*
* \param bw browser window to set the type of the current drag for
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index f6c0942..7e3d732 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <time.h>
#include <features.h>
+
#include "oslib/os.h"
#include "oslib/osbyte.h"
#include "oslib/wimp.h"
@@ -37,6 +38,7 @@
#include "riscos/global_history.h"
#include "riscos/hotlist.h"
#include "riscos/iconbar.h"
+#include "desktop/netsurf.h"
#include "desktop/browser.h"
#include "utils/nsoption.h"
#include "riscos/wimp_event.h"
-----------------------------------------------------------------------
Summary of changes:
desktop/browser.h | 14 +++++++-------
riscos/iconbar.c | 2 ++
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/desktop/browser.h b/desktop/browser.h
index d61e6a0..4901c11 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -243,7 +243,7 @@ bool browser_window_redraw(struct browser_window *bw, int x, int y,
*/
bool browser_window_redraw_ready(struct browser_window *bw);
-/*
+/**
* Update the extent of the inside of a browser window to that of the current
* content
*
@@ -251,7 +251,7 @@ bool browser_window_redraw_ready(struct browser_window *bw);
*/
void browser_window_update_extent(struct browser_window *bw);
-/*
+/**
* Get the position of the current browser window with respect to the root or
* parent browser window
*
@@ -263,7 +263,7 @@ void browser_window_update_extent(struct browser_window *bw);
void browser_window_get_position(struct browser_window *bw, bool root,
int *pos_x, int *pos_y);
-/*
+/**
* Set the position of the current browser window with respect to the parent
* browser window
*
@@ -273,7 +273,7 @@ void browser_window_get_position(struct browser_window *bw, bool root,
*/
void browser_window_set_position(struct browser_window *bw, int x, int y);
-/*
+/**
* Scroll the browser window to display the passed area
*
* \param bw browser window to scroll
@@ -294,7 +294,7 @@ void browser_window_scroll_visible(struct browser_window *bw,
*/
void browser_window_set_scroll(struct browser_window *bw, int x, int y);
-/*
+/**
* Set drag type for a browser window, and inform front end
*
* \param bw browser window to set the type of the current drag for
@@ -304,7 +304,7 @@ void browser_window_set_scroll(struct browser_window *bw, int x, int y);
void browser_window_set_drag_type(struct browser_window *bw,
browser_drag_type type, const struct rect *rect);
-/*
+/**
* Get type of any current drag for a browser window
*
* \param bw browser window to set the type of the current drag for
@@ -312,7 +312,7 @@ void browser_window_set_drag_type(struct browser_window *bw,
*/
browser_drag_type browser_window_get_drag_type(struct browser_window *bw);
-/*
+/**
* Get the root level browser window
*
* \param bw browser window to set the type of the current drag for
diff --git a/riscos/iconbar.c b/riscos/iconbar.c
index f6c0942..7e3d732 100644
--- a/riscos/iconbar.c
+++ b/riscos/iconbar.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <time.h>
#include <features.h>
+
#include "oslib/os.h"
#include "oslib/osbyte.h"
#include "oslib/wimp.h"
@@ -37,6 +38,7 @@
#include "riscos/global_history.h"
#include "riscos/hotlist.h"
#include "riscos/iconbar.h"
+#include "desktop/netsurf.h"
#include "desktop/browser.h"
#include "utils/nsoption.h"
#include "riscos/wimp_event.h"
--
NetSurf Browser
9 years, 2 months
netsurf: branch master updated. release/3.0-1016-gd5a971c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d5a971c281b110d8fa481...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d5a971c281b110d8fa481fa...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d5a971c281b110d8fa481fa86...
The branch, master has been updated
via d5a971c281b110d8fa481fa86ccd7af10d2d3cf0 (commit)
from e353973518839245edfb9c00d2fb9c6ef14032e8 (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=d5a971c281b110d8fa4...
commit d5a971c281b110d8fa481fa86ccd7af10d2d3cf0
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
move verbose log global into logging module and remove netsurf.h include
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 76da91a..c3653b5 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -73,7 +73,6 @@
#define HL_CACHE_CLEAN_TIME (2 * IMAGE_CACHE_CLEAN_TIME)
bool netsurf_quit = false;
-bool verbose_log = false;
static void netsurf_lwc_iterator(lwc_string *str, void *pw)
{
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
index e6858ad..77589c7 100644
--- a/desktop/netsurf.h
+++ b/desktop/netsurf.h
@@ -23,7 +23,6 @@
#include "utils/errors.h"
extern bool netsurf_quit;
-extern bool verbose_log;
extern const char * const netsurf_version;
extern const int netsurf_version_major;
extern const int netsurf_version_minor;
diff --git a/utils/log.c b/utils/log.c
index 2aa39ee..8ec42c1 100644
--- a/utils/log.c
+++ b/utils/log.c
@@ -23,10 +23,11 @@
#include <stdarg.h>
#include <stdio.h>
#include <sys/time.h>
-#include "desktop/netsurf.h"
#include "utils/log.h"
+bool verbose_log = false;
+
nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
{
nserror ret = NSERROR_OK;
diff --git a/utils/log.h b/utils/log.h
index ed953f3..673419b 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -21,9 +21,12 @@
#define _NETSURF_LOG_H_
#include <stdio.h>
-#include "desktop/netsurf.h"
+#include <stdbool.h>
+
#include "utils/errors.h"
+extern bool verbose_log;
+
/**
* Ensures the FILE handle is available to write logging to.
*
-----------------------------------------------------------------------
Summary of changes:
desktop/netsurf.c | 1 -
desktop/netsurf.h | 1 -
utils/log.c | 3 ++-
utils/log.h | 5 ++++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 76da91a..c3653b5 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -73,7 +73,6 @@
#define HL_CACHE_CLEAN_TIME (2 * IMAGE_CACHE_CLEAN_TIME)
bool netsurf_quit = false;
-bool verbose_log = false;
static void netsurf_lwc_iterator(lwc_string *str, void *pw)
{
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
index e6858ad..77589c7 100644
--- a/desktop/netsurf.h
+++ b/desktop/netsurf.h
@@ -23,7 +23,6 @@
#include "utils/errors.h"
extern bool netsurf_quit;
-extern bool verbose_log;
extern const char * const netsurf_version;
extern const int netsurf_version_major;
extern const int netsurf_version_minor;
diff --git a/utils/log.c b/utils/log.c
index 2aa39ee..8ec42c1 100644
--- a/utils/log.c
+++ b/utils/log.c
@@ -23,10 +23,11 @@
#include <stdarg.h>
#include <stdio.h>
#include <sys/time.h>
-#include "desktop/netsurf.h"
#include "utils/log.h"
+bool verbose_log = false;
+
nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
{
nserror ret = NSERROR_OK;
diff --git a/utils/log.h b/utils/log.h
index ed953f3..673419b 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -21,9 +21,12 @@
#define _NETSURF_LOG_H_
#include <stdio.h>
-#include "desktop/netsurf.h"
+#include <stdbool.h>
+
#include "utils/errors.h"
+extern bool verbose_log;
+
/**
* Ensures the FILE handle is available to write logging to.
*
--
NetSurf Browser
9 years, 2 months
netsurf: branch master updated. release/3.0-1015-ge353973
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e353973518839245edfb9...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e353973518839245edfb9c0...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e353973518839245edfb9c00d...
The branch, master has been updated
via e353973518839245edfb9c00d2fb9c6ef14032e8 (commit)
from db33103fa3d0e7b4623dc321792963969e15e683 (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=e353973518839245edf...
commit e353973518839245edfb9c00d2fb9c6ef14032e8
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
fix missing includes
diff --git a/riscos/download.c b/riscos/download.c
index 526f301..b89334f 100644
--- a/riscos/download.c
+++ b/riscos/download.c
@@ -33,6 +33,7 @@
#include <sys/time.h>
#include <time.h>
#include <curl/curl.h>
+
#include "oslib/mimemap.h"
#include "oslib/osargs.h"
#include "oslib/osfile.h"
@@ -43,6 +44,7 @@
#include "oslib/wimpspriteop.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
+#include "desktop/download.h"
#include "riscos/dialog.h"
#include "utils/nsoption.h"
#include "riscos/mouse.h"
diff --git a/riscos/gui.h b/riscos/gui.h
index 051834a..56cb70e 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -27,6 +27,7 @@
#include "oslib/wimp.h"
#include "rufl.h"
#include "desktop/browser.h"
+#include "desktop/gui.h"
#include "content/content_type.h"
#include "utils/config.h"
diff --git a/windows/download.c b/windows/download.c
index 189baa8..8bdff3a 100644
--- a/windows/download.c
+++ b/windows/download.c
@@ -26,6 +26,7 @@
#include "content/fetch.h"
#include "desktop/gui.h"
+#include "desktop/download.h"
#include "utils/schedule.h"
#include "utils/log.h"
#include "utils/messages.h"
-----------------------------------------------------------------------
Summary of changes:
riscos/download.c | 2 ++
riscos/gui.h | 1 +
windows/download.c | 1 +
3 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/riscos/download.c b/riscos/download.c
index 526f301..b89334f 100644
--- a/riscos/download.c
+++ b/riscos/download.c
@@ -33,6 +33,7 @@
#include <sys/time.h>
#include <time.h>
#include <curl/curl.h>
+
#include "oslib/mimemap.h"
#include "oslib/osargs.h"
#include "oslib/osfile.h"
@@ -43,6 +44,7 @@
#include "oslib/wimpspriteop.h"
#include "desktop/gui.h"
#include "desktop/netsurf.h"
+#include "desktop/download.h"
#include "riscos/dialog.h"
#include "utils/nsoption.h"
#include "riscos/mouse.h"
diff --git a/riscos/gui.h b/riscos/gui.h
index 051834a..56cb70e 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -27,6 +27,7 @@
#include "oslib/wimp.h"
#include "rufl.h"
#include "desktop/browser.h"
+#include "desktop/gui.h"
#include "content/content_type.h"
#include "utils/config.h"
diff --git a/windows/download.c b/windows/download.c
index 189baa8..8bdff3a 100644
--- a/windows/download.c
+++ b/windows/download.c
@@ -26,6 +26,7 @@
#include "content/fetch.h"
#include "desktop/gui.h"
+#include "desktop/download.h"
#include "utils/schedule.h"
#include "utils/log.h"
#include "utils/messages.h"
--
NetSurf Browser
9 years, 2 months