Don't use GUI_POINTERs in content handlers.

4 files changed, 53 insertions, 23 deletions

diff --git a/desktop/browser.c b/desktop/browser.c
index af2c2ff4f..779f7082f 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -1920,14 +1920,22 @@ void browser_window_set_status(struct browser_window *bw, const char *text)
  */
 
 void browser_window_set_pointer(struct browser_window *bw,
-		gui_pointer_shape shape)
+		browser_pointer_shape shape)
 {
 	struct browser_window *root = browser_window_get_root(bw);
+	gui_pointer_shape gui_shape;
 
 	assert(root);
 	assert(root->window);
 
-	gui_window_set_pointer(root->window, shape);
+	if (shape == BROWSER_POINTER_AUTO) {
+		gui_shape = GUI_POINTER_DEFAULT;
+
+	} else {
+		gui_shape = (gui_pointer_shape)shape;
+	}
+
+	gui_window_set_pointer(root->window, gui_shape);
 }
 
 
@@ -2400,7 +2408,7 @@ void browser_window_mouse_track(struct browser_window *bw,
 {
 	hlcache_handle *c = bw->current_content;
 	const char *status = NULL;
-	gui_pointer_shape pointer = GUI_POINTER_DEFAULT;
+	browser_pointer_shape pointer = BROWSER_POINTER_DEFAULT;
 
 	if (bw->window != NULL && bw->drag_window && bw != bw->drag_window) {
 		/* This is the root browser window and there's an active drag
@@ -2481,7 +2489,7 @@ void browser_window_mouse_track(struct browser_window *bw,
 			/* Start a scrollbar drag, or continue existing drag */
 			status = scrollbar_mouse_action(bw->scroll_x, mouse,
 					scr_x, scr_y);
-			pointer = GUI_POINTER_DEFAULT;
+			pointer = BROWSER_POINTER_DEFAULT;
 
 			if (status != NULL)
 				browser_window_set_status(bw, status);
@@ -2506,7 +2514,7 @@ void browser_window_mouse_track(struct browser_window *bw,
 			/* Start a scrollbar drag, or continue existing drag */
 			status = scrollbar_mouse_action(bw->scroll_y, mouse,
 					scr_x, scr_y);
-			pointer = GUI_POINTER_DEFAULT;
+			pointer = BROWSER_POINTER_DEFAULT;
 
 			if (status != NULL)
 				browser_window_set_status(bw, status);
@@ -2552,7 +2560,7 @@ void browser_window_mouse_click(struct browser_window *bw,
 {
 	hlcache_handle *c = bw->current_content;
 	const char *status = NULL;
-	gui_pointer_shape pointer = GUI_POINTER_DEFAULT;
+	browser_pointer_shape pointer = BROWSER_POINTER_DEFAULT;
 
 	if (bw->children) {
 		/* Browser window has children (frames) */
@@ -2600,7 +2608,7 @@ void browser_window_mouse_click(struct browser_window *bw,
 				scr_y > 0 && scr_y < SCROLLBAR_WIDTH) {
 			status = scrollbar_mouse_action(bw->scroll_x, mouse,
 					scr_x, scr_y);
-			pointer = GUI_POINTER_DEFAULT;
+			pointer = BROWSER_POINTER_DEFAULT;
 
 			if (status != NULL)
 				browser_window_set_status(bw, status);
@@ -2621,7 +2629,7 @@ void browser_window_mouse_click(struct browser_window *bw,
 				scr_x > 0 && scr_x < SCROLLBAR_WIDTH) {
 			status = scrollbar_mouse_action(bw->scroll_y, mouse,
 					scr_x, scr_y);
-			pointer = GUI_POINTER_DEFAULT;
+			pointer = BROWSER_POINTER_DEFAULT;
 
 			if (status != NULL)
 				browser_window_set_status(bw, status);
@@ -2648,7 +2656,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(bw, GUI_POINTER_MOVE);
+			browser_window_set_pointer(bw, BROWSER_POINTER_MOVE);
 		}
 		break;
 	}
diff --git a/desktop/browser.h b/desktop/browser.h
index c8af7889c..be5628880 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -68,6 +68,29 @@ typedef enum {
 	DRAGGING_OTHER
 } browser_drag_type;
 
+typedef enum {
+	BROWSER_POINTER_DEFAULT		= GUI_POINTER_DEFAULT,
+	BROWSER_POINTER_POINT		= GUI_POINTER_POINT,
+	BROWSER_POINTER_CARET		= GUI_POINTER_CARET,
+	BROWSER_POINTER_MENU		= GUI_POINTER_MENU,
+	BROWSER_POINTER_UP		= GUI_POINTER_UP,
+	BROWSER_POINTER_DOWN		= GUI_POINTER_DOWN,
+	BROWSER_POINTER_LEFT		= GUI_POINTER_LEFT,
+	BROWSER_POINTER_RIGHT		= GUI_POINTER_RIGHT,
+	BROWSER_POINTER_RU		= GUI_POINTER_RU,
+	BROWSER_POINTER_LD		= GUI_POINTER_LD,
+	BROWSER_POINTER_LU		= GUI_POINTER_LU,
+	BROWSER_POINTER_RD		= GUI_POINTER_RD,
+	BROWSER_POINTER_CROSS		= GUI_POINTER_CROSS,
+	BROWSER_POINTER_MOVE		= GUI_POINTER_MOVE,
+	BROWSER_POINTER_WAIT		= GUI_POINTER_WAIT,
+	BROWSER_POINTER_HELP		= GUI_POINTER_HELP,
+	BROWSER_POINTER_NO_DROP		= GUI_POINTER_NO_DROP,
+	BROWSER_POINTER_NOT_ALLOWED	= GUI_POINTER_NOT_ALLOWED,
+	BROWSER_POINTER_PROGRESS	= GUI_POINTER_PROGRESS,
+	BROWSER_POINTER_AUTO
+} browser_pointer_shape;
+
 /** Browser window data. */
 struct browser_window {
 	/** Page currently displayed, or 0. Must have status READY or DONE. */
@@ -301,7 +324,7 @@ void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
 
 void browser_window_set_status(struct browser_window *bw, const char *text);
 void browser_window_set_pointer(struct browser_window *bw,
-		gui_pointer_shape shape);
+		browser_pointer_shape shape);
 void browser_window_page_drag_start(struct browser_window *bw, int x, int y);
 
 bool browser_window_back_available(struct browser_window *bw);
diff --git a/desktop/frames.c b/desktop/frames.c
index 836108aa3..0d67ad8c5 100644
--- a/desktop/frames.c
+++ b/desktop/frames.c
@@ -91,7 +91,7 @@ void browser_window_scroll_callback(void *client_data,
 	case SCROLLBAR_MSG_SCROLL_FINISHED:
 		browser_window_set_drag_type(bw, DRAGGING_NONE, NULL);
 
-		browser_window_set_pointer(bw, GUI_POINTER_DEFAULT);
+		browser_window_set_pointer(bw, BROWSER_POINTER_DEFAULT);
 		break;
 	}
 }
@@ -800,7 +800,7 @@ bool browser_window_resolve_frame_dimension(struct browser_window *bw,
 
 static bool browser_window_resize_frames(struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y,
-		gui_pointer_shape *pointer)
+		browser_pointer_shape *pointer)
 {
 	struct browser_window *parent;
 	bool left, right, up, down;
@@ -878,22 +878,22 @@ static bool browser_window_resize_frames(struct browser_window *bw,
 		if (left || right || up || down) {
 			if (left) {
 				if (down)
-					*pointer = GUI_POINTER_LD;
+					*pointer = BROWSER_POINTER_LD;
 				else if (up)
-					*pointer = GUI_POINTER_LU;
+					*pointer = BROWSER_POINTER_LU;
 				else
-					*pointer = GUI_POINTER_LEFT;
+					*pointer = BROWSER_POINTER_LEFT;
 			} else if (right) {
 				if (down)
-					*pointer = GUI_POINTER_RD;
+					*pointer = BROWSER_POINTER_RD;
 				else if (up)
-					*pointer = GUI_POINTER_RU;
+					*pointer = BROWSER_POINTER_RU;
 				else
-					*pointer = GUI_POINTER_RIGHT;
+					*pointer = BROWSER_POINTER_RIGHT;
 			} else if (up) {
-				*pointer = GUI_POINTER_UP;
+				*pointer = BROWSER_POINTER_UP;
 			} else {
-				*pointer = GUI_POINTER_DOWN;
+				*pointer = BROWSER_POINTER_DOWN;
 			}
 			if (mouse & (BROWSER_MOUSE_DRAG_1 |
 					BROWSER_MOUSE_DRAG_2)) {
@@ -931,7 +931,7 @@ static bool browser_window_resize_frames(struct browser_window *bw,
 
 bool browser_window_frame_resize_start(struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y,
-		gui_pointer_shape *pointer)
+		browser_pointer_shape *pointer)
 {
 	struct browser_window *root = browser_window_get_root(bw);
 	int offx, offy;
diff --git a/desktop/frames.h b/desktop/frames.h
index efbe6a8c2..149921641 100644
--- a/desktop/frames.h
+++ b/desktop/frames.h
@@ -24,7 +24,6 @@
 #define _NETSURF_DESKTOP_FRAMES_H_
 
 #include "desktop/browser.h"
-#include "desktop/gui.h"
 
 
 void browser_window_create_iframes(struct browser_window *bw,
@@ -35,7 +34,7 @@ void browser_window_create_frameset(struct browser_window *bw,
 void browser_window_recalculate_frameset(struct browser_window *bw);
 bool browser_window_frame_resize_start(struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y,
-		gui_pointer_shape *pointer);
+		browser_pointer_shape *pointer);
 void browser_window_resize_frame(struct browser_window *bw, int x, int y);
 
 void browser_window_scroll_callback(void *client_data,