diff options
| author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2006-03-10 09:09:03 +0000 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2006-03-10 09:09:03 +0000 |
| commit | 17d059f53f00ca7815774f98e80e2ddff4442e75 (patch) | |
| tree | e87c3399cbba08c100fc13bf7d91a12acd5039cd /desktop | |
| parent | 444cb189844aab3170cb2b88a0dcd651fc60353b (diff) | |
| download | netsurf-17d059f53f00ca7815774f98e80e2ddff4442e75.tar.gz netsurf-17d059f53f00ca7815774f98e80e2ddff4442e75.tar.bz2 | |
[project @ 2006-03-10 09:09:03 by dsilvers]
Minor refactor to pass the gui_window to gui_window_set_pointer and gui_window_hide_pointer
svn path=/import/netsurf/; revision=2123
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/browser.c | 16 | ||||
| -rw-r--r-- | desktop/gui.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index f71ded55b..3ac90c1c2 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -59,7 +59,7 @@ static void browser_window_start_throbber(struct browser_window *bw); static void browser_window_stop_throbber(struct browser_window *bw); static void browser_window_set_status(struct browser_window *bw, const char *text); -static void browser_window_set_pointer(gui_pointer_shape shape); +static void browser_window_set_pointer(struct gui_window *g, gui_pointer_shape shape); static void download_window_callback(fetch_msg msg, void *p, const void *data, unsigned long size); static void browser_window_mouse_action_html(struct browser_window *bw, @@ -667,9 +667,9 @@ void browser_window_set_status(struct browser_window *bw, const char *text) * \param shape shape to use */ -void browser_window_set_pointer(gui_pointer_shape shape) +void browser_window_set_pointer(struct gui_window *g, gui_pointer_shape shape) { - gui_window_set_pointer(shape); + gui_window_set_pointer(g, shape); } @@ -784,7 +784,7 @@ void browser_window_mouse_click(struct browser_window *bw, else if (mouse & (BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2)) { browser_window_page_drag_start(bw, x, y); - browser_window_set_pointer(GUI_POINTER_MOVE); + browser_window_set_pointer(bw->window, GUI_POINTER_MOVE); } break; } @@ -1147,7 +1147,7 @@ void browser_window_mouse_action_html(struct browser_window *bw, assert(status); browser_window_set_status(bw, status); - browser_window_set_pointer(pointer); + browser_window_set_pointer(bw->window, pointer); } @@ -1204,7 +1204,7 @@ void browser_window_mouse_action_text(struct browser_window *bw, assert(status); browser_window_set_status(bw, status); - browser_window_set_pointer(pointer); + browser_window_set_pointer(bw->window, pointer); } @@ -1439,7 +1439,7 @@ void browser_window_mouse_drag_end(struct browser_window *bw, case DRAGGING_2DSCROLL: case DRAGGING_PAGE_SCROLL: - browser_window_set_pointer(GUI_POINTER_DEFAULT); + browser_window_set_pointer(bw->window, GUI_POINTER_DEFAULT); break; default: @@ -1555,7 +1555,7 @@ const char *browser_window_scrollbar_click(struct browser_window *bw, } gui_window_box_scroll_start(bw->window, x0, y0, x1, y1); if (bw->drag_type == DRAGGING_2DSCROLL) - gui_window_hide_pointer(); + gui_window_hide_pointer(bw->window); } } else if (z < w + well_size) { status = messages_get(vert ? "ScrollPDown" : "ScrollPRight"); diff --git a/desktop/gui.h b/desktop/gui.h index 8016fefd7..578e95c0a 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -66,8 +66,8 @@ int gui_window_get_width(struct gui_window *g); int gui_window_get_height(struct gui_window *g); void gui_window_set_extent(struct gui_window *g, int width, int height); void gui_window_set_status(struct gui_window *g, const char *text); -void gui_window_set_pointer(gui_pointer_shape shape); -void gui_window_hide_pointer(void); +void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape); +void gui_window_hide_pointer(struct gui_window *g); void gui_window_set_url(struct gui_window *g, const char *url); void gui_window_start_throbber(struct gui_window *g); void gui_window_stop_throbber(struct gui_window *g); |