diff options
-rw-r--r-- | content/handlers/html/html_interaction.c | 6 | ||||
-rw-r--r-- | desktop/browser_private.h | 9 | ||||
-rw-r--r-- | desktop/browser_window.c | 8 | ||||
-rw-r--r-- | include/netsurf/browser_window.h | 36 |
4 files changed, 31 insertions, 28 deletions
diff --git a/content/handlers/html/html_interaction.c b/content/handlers/html/html_interaction.c index 992796c25..5f165e362 100644 --- a/content/handlers/html/html_interaction.c +++ b/content/handlers/html/html_interaction.c @@ -412,11 +412,13 @@ void html_mouse_action(struct content *c, struct browser_window *bw, content_broadcast(c, CONTENT_MSG_STATUS, &msg_data); } else { int width, height; + struct hlcache_handle *bw_content; form_select_get_dimensions(html->visible_select_menu, &width, &height); html->visible_select_menu = NULL; - browser_window_redraw_rect(bw, box_x, box_y, - width, height); + bw_content = browser_window_get_content(bw); + content_request_redraw(bw_content,box_x, box_y, + width, height); } return; } diff --git a/desktop/browser_private.h b/desktop/browser_private.h index 68487ea80..31c261f87 100644 --- a/desktop/browser_private.h +++ b/desktop/browser_private.h @@ -270,6 +270,15 @@ void browser_window_update_extent(struct browser_window *bw); /** + * update an area of a browser window. + * + * \param bw The browser window to update. + * \param rect The area to redraw + */ +void browser_window_update_box(struct browser_window *bw, struct rect *rect); + + +/** * Change the status bar of a browser window. * * \param bw browser window diff --git a/desktop/browser_window.c b/desktop/browser_window.c index 56b9477f9..920004aa2 100644 --- a/desktop/browser_window.c +++ b/desktop/browser_window.c @@ -3535,14 +3535,6 @@ browser_window_mouse_click(struct browser_window *bw, /* exported interface documented in netsurf/browser_window.h */ -void browser_window_redraw_rect(struct browser_window *bw, int x, int y, - int width, int height) -{ - content_request_redraw(bw->current_content, x, y, width, height); -} - - -/* exported interface documented in netsurf/browser_window.h */ void browser_window_page_drag_start(struct browser_window *bw, int x, int y) { assert(bw != NULL); diff --git a/include/netsurf/browser_window.h b/include/netsurf/browser_window.h index a14545f23..1c4740d6b 100644 --- a/include/netsurf/browser_window.h +++ b/include/netsurf/browser_window.h @@ -265,6 +265,7 @@ bool browser_window_has_content(struct browser_window *bw); */ struct hlcache_handle *browser_window_get_content(struct browser_window *bw); + /** * Set the dimensions of the area a browser window occupies * @@ -275,6 +276,7 @@ struct hlcache_handle *browser_window_get_content(struct browser_window *bw); void browser_window_set_dimensions(struct browser_window *bw, int width, int height); + /** * Redraw browser window, set extent to content, and update title. * @@ -283,13 +285,6 @@ void browser_window_set_dimensions(struct browser_window *bw, */ void browser_window_update(struct browser_window *bw, bool scroll_to_top); -/** - * update an area of a browser window. - * - * \param bw The browser window to update. - * \param rect The area to redraw - */ -void browser_window_update_box(struct browser_window *bw, struct rect *rect); /** * Stop all fetching activity in a browser window. @@ -298,6 +293,7 @@ void browser_window_update_box(struct browser_window *bw, struct rect *rect); */ void browser_window_stop(struct browser_window *bw); + /** * Reload the page in a browser window. * @@ -306,6 +302,7 @@ void browser_window_stop(struct browser_window *bw); */ void browser_window_reload(struct browser_window *bw, bool all); + /** * Close and destroy a browser window. * @@ -351,6 +348,7 @@ nserror browser_window_set_scale(struct browser_window *bw, float scale, bool ab */ float browser_window_get_scale(struct browser_window *bw); + /** * Get access to any page features at the given coordinates. * @@ -369,6 +367,7 @@ float browser_window_get_scale(struct browser_window *bw); nserror browser_window_get_features(struct browser_window *bw, int x, int y, struct browser_window_features *data); + /** * Send a scroll request to a browser window at a particular point. The * 'deepest' scrollable object which can be scrolled in the requested @@ -384,6 +383,7 @@ nserror browser_window_get_features(struct browser_window *bw, bool browser_window_scroll_at_point(struct browser_window *bw, int x, int y, int scrx, int scry); + /** * Drop a file onto a browser window at a particular point, or determine if a * file may be dropped onto the content at given point. @@ -397,6 +397,7 @@ bool browser_window_scroll_at_point(struct browser_window *bw, bool browser_window_drop_file_at_point(struct browser_window *bw, int x, int y, char *file); + /** * set filename on form control. * @@ -407,6 +408,7 @@ bool browser_window_drop_file_at_point(struct browser_window *bw, void browser_window_set_gadget_filename(struct browser_window *bw, struct form_control *gadget, const char *fn); + /** * Update URL bar for a given browser window to bw's content's URL * @@ -414,6 +416,7 @@ void browser_window_set_gadget_filename(struct browser_window *bw, */ nserror browser_window_refresh_url_bar(struct browser_window *bw); + /** * Handle mouse clicks in a browser window. * @@ -425,6 +428,7 @@ nserror browser_window_refresh_url_bar(struct browser_window *bw); void browser_window_mouse_click(struct browser_window *bw, browser_mouse_state mouse, int x, int y); + /** * Handle non-click mouse action in a browser window. (drag ends, movements) * @@ -474,17 +478,6 @@ nserror browser_window_schedule_reformat(struct browser_window *bw); void browser_select_menu_callback(void *client_data, int x, int y, int width, int height); -/** - * Redraw a rectangular region of a browser window. - * - * \param bw browser window to be redrawn - * \param x x co-ord of top-left - * \param y y co-ord of top-left - * \param width width of rectangle - * \param height height of rectangle - */ -void browser_window_redraw_rect(struct browser_window *bw, int x, int y, - int width, int height); /** * Change the shape of the mouse pointer @@ -495,6 +488,7 @@ void browser_window_redraw_rect(struct browser_window *bw, int x, int y, void browser_window_set_pointer(struct browser_window *bw, browser_pointer_shape shape); + /** * Start drag scrolling the contents of the browser window * @@ -504,6 +498,7 @@ void browser_window_set_pointer(struct browser_window *bw, */ void browser_window_page_drag_start(struct browser_window *bw, int x, int y); + /** * Check availability of Back action for a given browser window * @@ -512,6 +507,7 @@ void browser_window_page_drag_start(struct browser_window *bw, int x, int y); */ bool browser_window_back_available(struct browser_window *bw); + /** * Check availability of Forward action for a given browser window * @@ -520,6 +516,7 @@ bool browser_window_back_available(struct browser_window *bw); */ bool browser_window_forward_available(struct browser_window *bw); + /** * Check availability of Reload action for a given browser window * @@ -528,6 +525,7 @@ bool browser_window_forward_available(struct browser_window *bw); */ bool browser_window_reload_available(struct browser_window *bw); + /** * Check availability of Stop action for a given browser window * @@ -536,6 +534,7 @@ bool browser_window_reload_available(struct browser_window *bw); */ bool browser_window_stop_available(struct browser_window *bw); + /** * Redraw an area of a window. * @@ -560,6 +559,7 @@ bool browser_window_stop_available(struct browser_window *bw); bool browser_window_redraw(struct browser_window *bw, int x, int y, const struct rect *clip, const struct redraw_context *ctx); + /** * Check whether browser window is ready for redraw * |