Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/1c4025e92c8da488e6c931009725e0e1d6902d01
...commit
http://git.netsurf-browser.org/netsurf.git/commit/1c4025e92c8da488e6c931009725e0e1d6902d01
...tree
http://git.netsurf-browser.org/netsurf.git/tree/1c4025e92c8da488e6c931009725e0e1d6902d01
The branch, master has been updated
via 1c4025e92c8da488e6c931009725e0e1d6902d01 (commit)
from cb44b5637872b23050eaa80403dd79e9a60fc5cb (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=1c4025e92c8da488e6c931009725e0e1d6902d01
commit 1c4025e92c8da488e6c931009725e0e1d6902d01
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
RISC OS: Prevent closed corewindows opening on scroll requests.
diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c
index 4398fca..bc1fb77 100644
--- a/frontends/riscos/corewindow.c
+++ b/frontends/riscos/corewindow.c
@@ -144,10 +144,24 @@ static void ro_cw_scroll(wimp_scroll *scroll)
int page_y;
struct ro_corewindow *ro_cw;
wimp_open open;
+ wimp_window_state state;
ro_cw = (struct ro_corewindow
*)ro_gui_wimp_event_get_user_data(scroll->w);
NSLOG(netsurf, INFO, "RO corewindow context %p", ro_cw);
+ state.w = ro_cw->wh;
+ error = xwimp_get_window_state(&state);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_get_window_state: 0x%x: %s",
+ error->errnum, error->errmess);
+ return;
+ }
+
+ /* Don't try to update window if it's closed */
+ if (!(state.flags & wimp_WINDOW_OPEN)) {
+ return;
+ }
+
page_x = scroll->visible.x1 - scroll->visible.x0 - 32;
page_y = scroll->visible.y1 - scroll->visible.y0 - 32;
-----------------------------------------------------------------------
Summary of changes:
frontends/riscos/corewindow.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/frontends/riscos/corewindow.c b/frontends/riscos/corewindow.c
index 4398fca..bc1fb77 100644
--- a/frontends/riscos/corewindow.c
+++ b/frontends/riscos/corewindow.c
@@ -144,10 +144,24 @@ static void ro_cw_scroll(wimp_scroll *scroll)
int page_y;
struct ro_corewindow *ro_cw;
wimp_open open;
+ wimp_window_state state;
ro_cw = (struct ro_corewindow
*)ro_gui_wimp_event_get_user_data(scroll->w);
NSLOG(netsurf, INFO, "RO corewindow context %p", ro_cw);
+ state.w = ro_cw->wh;
+ error = xwimp_get_window_state(&state);
+ if (error) {
+ NSLOG(netsurf, INFO, "xwimp_get_window_state: 0x%x: %s",
+ error->errnum, error->errmess);
+ return;
+ }
+
+ /* Don't try to update window if it's closed */
+ if (!(state.flags & wimp_WINDOW_OPEN)) {
+ return;
+ }
+
page_x = scroll->visible.x1 - scroll->visible.x0 - 32;
page_y = scroll->visible.y1 - scroll->visible.y0 - 32;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
