Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/f39ce1a26229a392f193e463b70ae88d0dc11508
...commit
http://git.netsurf-browser.org/netsurf.git/commit/f39ce1a26229a392f193e463b70ae88d0dc11508
...tree
http://git.netsurf-browser.org/netsurf.git/tree/f39ce1a26229a392f193e463b70ae88d0dc11508
The branch, master has been updated
via f39ce1a26229a392f193e463b70ae88d0dc11508 (commit)
via 194dfad4a5ca36bf39bd1c20c874747991f9281c (commit)
from e87bc1bfdacd145f106bc2598997b91f4b177092 (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=f39ce1a26229a392f193e463b70ae88d0dc11508
commit f39ce1a26229a392f193e463b70ae88d0dc11508
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Browser window: Constify the bw in the URL access function.
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index dba3d31..838e62d 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -3788,7 +3788,7 @@ nserror browser_window_navigate_up(struct browser_window
*bw, bool new_window)
/* Exported interface, documented in include/netsurf/browser_window.h */
-nsurl* browser_window_access_url(struct browser_window *bw)
+nsurl* browser_window_access_url(const struct browser_window *bw)
{
assert(bw != NULL);
diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h
index f8b86d0..7b2f652 100644
--- a/include/netsurf/browser_window.h
+++ b/include/netsurf/browser_window.h
@@ -231,7 +231,7 @@ nserror browser_window_navigate_up(struct browser_window
*bw, bool new_window);
*
* \note guaranteed to return a valid nsurl ptr, never returns NULL.
*/
-struct nsurl* browser_window_access_url(struct browser_window *bw);
+struct nsurl* browser_window_access_url(const struct browser_window *bw);
/**
* Access a browser window's URL.
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=194dfad4a5ca36bf39bd1c20c874747991f9281c
commit 194dfad4a5ca36bf39bd1c20c874747991f9281c
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Core window: Constify the core_window handle through the getters.
diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c
index 44798d2..bfb0eb2 100644
--- a/frontends/amiga/corewindow.c
+++ b/frontends/amiga/corewindow.c
@@ -826,7 +826,8 @@ ami_cw_invalidate_area(struct core_window *cw, const struct
rect *r)
static nserror
-ami_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+ami_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw;
@@ -867,7 +868,7 @@ ami_cw_update_size(struct core_window *cw, int width, int
height)
static nserror
-ami_cw_get_scroll(struct core_window *cw, int *x, int *y)
+ami_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw;
ULONG win_x0, win_y0;
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 49d26ef..6ab0999 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -484,7 +484,7 @@ atari_treeview_set_scroll(struct core_window *cw, int x,
int y)
}
static nserror
-atari_treeview_get_scroll(struct core_window *cw, int *x, int *y)
+atari_treeview_get_scroll(const struct core_window *cw, int *x, int *y)
{
/* TODO */
return NSERROR_NOT_IMPLEMENTED;
@@ -499,7 +499,7 @@ atari_treeview_get_scroll(struct core_window *cw, int *x,
int *y)
* \param height to be set to viewport height in px, if non NULL
*/
static nserror
-atari_treeview_get_window_dimensions(struct core_window *cw,
+atari_treeview_get_window_dimensions(const struct core_window *cw,
int *width,
int *height)
{
diff --git a/frontends/framebuffer/corewindow.c
b/frontends/framebuffer/corewindow.c
index a27d666..dbd8d01 100644
--- a/frontends/framebuffer/corewindow.c
+++ b/frontends/framebuffer/corewindow.c
@@ -160,7 +160,7 @@ fb_cw_set_scroll(struct core_window *cw, int x, int y)
static nserror
-fb_cw_get_scroll(struct core_window *cw, int *x, int *y)
+fb_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
/* struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw;
@@ -171,7 +171,8 @@ fb_cw_get_scroll(struct core_window *cw, int *x, int *y)
static nserror
-fb_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+fb_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw;
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index cb78212..fc26f13 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -633,7 +633,7 @@ nsgtk_cw_set_scroll(struct core_window *cw, int x, int y)
* \param r rectangle that needs scrolling.
*/
static nserror
-nsgtk_cw_get_scroll(struct core_window *cw, int *x, int *y)
+nsgtk_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
GtkAdjustment *vadj;
@@ -660,7 +660,8 @@ nsgtk_cw_get_scroll(struct core_window *cw, int *x, int *y)
* \param[out] height to be set to viewport height in px
*/
static nserror
-nsgtk_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+nsgtk_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
GtkAdjustment *vadj;
diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c
index 8004dcc..4398fca 100644
--- a/frontends/riscos/corewindow.c
+++ b/frontends/riscos/corewindow.c
@@ -832,7 +832,7 @@ ro_cw_update_size(struct core_window *cw, int width, int
height)
* Callback from the core to scroll the visible content.
*/
static nserror
-ro_cw_get_scroll(struct core_window *cw, int *x, int *y)
+ro_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct ro_corewindow *ro_cw = (struct ro_corewindow *)cw;
wimp_window_state state = {
@@ -888,7 +888,8 @@ ro_cw_set_scroll(struct core_window *cw, int x, int y)
* \param[out] height to be set to viewport height in px
*/
static nserror
-ro_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+ro_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct ro_corewindow *ro_cw = (struct ro_corewindow *)cw;
os_error *error;
diff --git a/frontends/windows/corewindow.c b/frontends/windows/corewindow.c
index be2891f..7d6dc69 100644
--- a/frontends/windows/corewindow.c
+++ b/frontends/windows/corewindow.c
@@ -466,7 +466,7 @@ nsw32_cw_set_scroll(struct core_window *cw, int x, int y)
static nserror
-nsw32_cw_get_scroll(struct core_window *cw, int *x, int *y)
+nsw32_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
/** /todo call getscroll apropriately */
return NSERROR_NOT_IMPLEMENTED;
@@ -481,7 +481,8 @@ nsw32_cw_get_scroll(struct core_window *cw, int *x, int *y)
* \param[out] height to be set to viewport height in px
*/
static nserror
-nsw32_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+nsw32_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct nsw32_corewindow *nsw32_cw = (struct nsw32_corewindow *)cw;
diff --git a/include/netsurf/core_window.h b/include/netsurf/core_window.h
index 7eabda1..8cbd8ef 100644
--- a/include/netsurf/core_window.h
+++ b/include/netsurf/core_window.h
@@ -100,7 +100,7 @@ struct core_window_callback_table {
* \param[out] returns vertical scroll in px
* \return NSERROR_OK on success or appropriate error code
*/
- nserror (*get_scroll)(struct core_window *cw, int *x, int *y);
+ nserror (*get_scroll)(const struct core_window *cw, int *x, int *y);
/**
* Get window viewport dimensions
@@ -110,7 +110,7 @@ struct core_window_callback_table {
* \param[out] height to be set to viewport height in px
* \return NSERROR_OK on success or appropriate error code
*/
- nserror (*get_window_dimensions)(struct core_window *cw,
+ nserror (*get_window_dimensions)(const struct core_window *cw,
int *width, int *height);
/**
-----------------------------------------------------------------------
Summary of changes:
desktop/browser_window.c | 2 +-
frontends/amiga/corewindow.c | 5 +++--
frontends/atari/treeview.c | 4 ++--
frontends/framebuffer/corewindow.c | 5 +++--
frontends/gtk/corewindow.c | 5 +++--
frontends/riscos/corewindow.c | 5 +++--
frontends/windows/corewindow.c | 5 +++--
include/netsurf/browser_window.h | 2 +-
include/netsurf/core_window.h | 4 ++--
9 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index dba3d31..838e62d 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -3788,7 +3788,7 @@ nserror browser_window_navigate_up(struct browser_window
*bw, bool new_window)
/* Exported interface, documented in include/netsurf/browser_window.h */
-nsurl* browser_window_access_url(struct browser_window *bw)
+nsurl* browser_window_access_url(const struct browser_window *bw)
{
assert(bw != NULL);
diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c
index 44798d2..bfb0eb2 100644
--- a/frontends/amiga/corewindow.c
+++ b/frontends/amiga/corewindow.c
@@ -826,7 +826,8 @@ ami_cw_invalidate_area(struct core_window *cw, const struct
rect *r)
static nserror
-ami_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+ami_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw;
@@ -867,7 +868,7 @@ ami_cw_update_size(struct core_window *cw, int width, int
height)
static nserror
-ami_cw_get_scroll(struct core_window *cw, int *x, int *y)
+ami_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct ami_corewindow *ami_cw = (struct ami_corewindow *)cw;
ULONG win_x0, win_y0;
diff --git a/frontends/atari/treeview.c b/frontends/atari/treeview.c
index 49d26ef..6ab0999 100644
--- a/frontends/atari/treeview.c
+++ b/frontends/atari/treeview.c
@@ -484,7 +484,7 @@ atari_treeview_set_scroll(struct core_window *cw, int x,
int y)
}
static nserror
-atari_treeview_get_scroll(struct core_window *cw, int *x, int *y)
+atari_treeview_get_scroll(const struct core_window *cw, int *x, int *y)
{
/* TODO */
return NSERROR_NOT_IMPLEMENTED;
@@ -499,7 +499,7 @@ atari_treeview_get_scroll(struct core_window *cw, int *x,
int *y)
* \param height to be set to viewport height in px, if non NULL
*/
static nserror
-atari_treeview_get_window_dimensions(struct core_window *cw,
+atari_treeview_get_window_dimensions(const struct core_window *cw,
int *width,
int *height)
{
diff --git a/frontends/framebuffer/corewindow.c
b/frontends/framebuffer/corewindow.c
index a27d666..dbd8d01 100644
--- a/frontends/framebuffer/corewindow.c
+++ b/frontends/framebuffer/corewindow.c
@@ -160,7 +160,7 @@ fb_cw_set_scroll(struct core_window *cw, int x, int y)
static nserror
-fb_cw_get_scroll(struct core_window *cw, int *x, int *y)
+fb_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
/* struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw;
@@ -171,7 +171,8 @@ fb_cw_get_scroll(struct core_window *cw, int *x, int *y)
static nserror
-fb_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+fb_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct fb_corewindow *fb_cw = (struct fb_corewindow *)cw;
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index cb78212..fc26f13 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -633,7 +633,7 @@ nsgtk_cw_set_scroll(struct core_window *cw, int x, int y)
* \param r rectangle that needs scrolling.
*/
static nserror
-nsgtk_cw_get_scroll(struct core_window *cw, int *x, int *y)
+nsgtk_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
GtkAdjustment *vadj;
@@ -660,7 +660,8 @@ nsgtk_cw_get_scroll(struct core_window *cw, int *x, int *y)
* \param[out] height to be set to viewport height in px
*/
static nserror
-nsgtk_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+nsgtk_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
GtkAdjustment *vadj;
diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c
index 8004dcc..4398fca 100644
--- a/frontends/riscos/corewindow.c
+++ b/frontends/riscos/corewindow.c
@@ -832,7 +832,7 @@ ro_cw_update_size(struct core_window *cw, int width, int
height)
* Callback from the core to scroll the visible content.
*/
static nserror
-ro_cw_get_scroll(struct core_window *cw, int *x, int *y)
+ro_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct ro_corewindow *ro_cw = (struct ro_corewindow *)cw;
wimp_window_state state = {
@@ -888,7 +888,8 @@ ro_cw_set_scroll(struct core_window *cw, int x, int y)
* \param[out] height to be set to viewport height in px
*/
static nserror
-ro_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+ro_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct ro_corewindow *ro_cw = (struct ro_corewindow *)cw;
os_error *error;
diff --git a/frontends/windows/corewindow.c b/frontends/windows/corewindow.c
index be2891f..7d6dc69 100644
--- a/frontends/windows/corewindow.c
+++ b/frontends/windows/corewindow.c
@@ -466,7 +466,7 @@ nsw32_cw_set_scroll(struct core_window *cw, int x, int y)
static nserror
-nsw32_cw_get_scroll(struct core_window *cw, int *x, int *y)
+nsw32_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
/** /todo call getscroll apropriately */
return NSERROR_NOT_IMPLEMENTED;
@@ -481,7 +481,8 @@ nsw32_cw_get_scroll(struct core_window *cw, int *x, int *y)
* \param[out] height to be set to viewport height in px
*/
static nserror
-nsw32_cw_get_window_dimensions(struct core_window *cw, int *width, int *height)
+nsw32_cw_get_window_dimensions(const struct core_window *cw,
+ int *width, int *height)
{
struct nsw32_corewindow *nsw32_cw = (struct nsw32_corewindow *)cw;
diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h
index f8b86d0..7b2f652 100644
--- a/include/netsurf/browser_window.h
+++ b/include/netsurf/browser_window.h
@@ -231,7 +231,7 @@ nserror browser_window_navigate_up(struct browser_window
*bw, bool new_window);
*
* \note guaranteed to return a valid nsurl ptr, never returns NULL.
*/
-struct nsurl* browser_window_access_url(struct browser_window *bw);
+struct nsurl* browser_window_access_url(const struct browser_window *bw);
/**
* Access a browser window's URL.
diff --git a/include/netsurf/core_window.h b/include/netsurf/core_window.h
index 7eabda1..8cbd8ef 100644
--- a/include/netsurf/core_window.h
+++ b/include/netsurf/core_window.h
@@ -100,7 +100,7 @@ struct core_window_callback_table {
* \param[out] returns vertical scroll in px
* \return NSERROR_OK on success or appropriate error code
*/
- nserror (*get_scroll)(struct core_window *cw, int *x, int *y);
+ nserror (*get_scroll)(const struct core_window *cw, int *x, int *y);
/**
* Get window viewport dimensions
@@ -110,7 +110,7 @@ struct core_window_callback_table {
* \param[out] height to be set to viewport height in px
* \return NSERROR_OK on success or appropriate error code
*/
- nserror (*get_window_dimensions)(struct core_window *cw,
+ nserror (*get_window_dimensions)(const struct core_window *cw,
int *width, int *height);
/**
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
