Set/unset selection context's browser window on content_open/content_close.

svn path=/trunk/netsurf/; revision=12551

1 files changed, 29 insertions, 39 deletions

diff --git a/desktop/selection.c b/desktop/selection.c
index 6b30a8781..17e97c7fc 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -94,12 +94,16 @@ static struct box *get_box(struct box *b, unsigned offset, size_t *pidx);
  * \param  bw   browser window
  */
 
-void selection_set_browser_window(struct selection *s,
-		struct browser_window *bw)
+struct selection *selection_create(void)
 {
-	assert(s);
-
-	s->bw = bw;
+	struct selection *s = calloc(1, sizeof(struct selection));
+	if (s) {
+		s->bw = NULL;
+		s->root = NULL;
+		s->drag_state = DRAG_NONE;
+		selection_clear(s, false);
+	}
+	return s;
 }
 
 /**
@@ -109,16 +113,12 @@ void selection_set_browser_window(struct selection *s,
  * \param  bw   browser window
  */
 
-struct selection *selection_create(void)
+void selection_set_browser_window(struct selection *s,
+		struct browser_window *bw)
 {
-	struct selection *s = calloc(1, sizeof(struct selection));
-	if (s) {
-		s->bw = NULL;
-		s->root = NULL;
-		s->drag_state = DRAG_NONE;
-		selection_clear(s, false);
-	}
-	return s;
+	assert(s);
+
+	s->bw = bw;
 }
 
 
@@ -277,7 +277,10 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
 	browser_mouse_state modkeys =
 			(mouse & (BROWSER_MOUSE_MOD_1 | BROWSER_MOUSE_MOD_2));
 	int pos = -1;  /* 0 = inside selection, 1 = after it */
-	struct browser_window *bw;
+	struct browser_window *top;
+
+	assert(s->bw);
+	top = browser_window_get_root(s->bw);
 
 	if (!SAME_SPACE(s, idx))
 		return false;	/* not our problem */
@@ -295,13 +298,8 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
 		((mouse & BROWSER_MOUSE_DRAG_1) ||
 		 (modkeys && (mouse & BROWSER_MOUSE_DRAG_2)))) {
 		/* drag-saving selection */
-		assert(s->bw);
-
-		bw = s->bw;
-		while (bw && !bw->window && bw->parent)
-			bw = bw->parent;
 
-		gui_drag_save_selection(s, bw->window);
+		gui_drag_save_selection(s, top->window);
 	}
 	else if (!modkeys) {
 		if (pos && (mouse & BROWSER_MOUSE_PRESS_1))
@@ -317,11 +315,7 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
 
 			s->drag_state = DRAG_END;
 
-			bw = s->bw;
-			while (bw && !bw->window && bw->parent)
-				bw = bw->parent;
-
-			gui_start_selection(bw->window);
+			gui_start_selection(top->window);
 		}
 		else if (mouse & BROWSER_MOUSE_DRAG_2) {
 
@@ -340,11 +334,7 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
 				s->drag_state = DRAG_START;
 			}
 
-			bw = s->bw;
-			while (bw && !bw->window && bw->parent)
-				bw = bw->parent;
-
-			gui_start_selection(bw->window);
+			gui_start_selection(top->window);
 		}
 		/* Selection should be cleared when button is released but in
 		 * the RO interface click is the same as press */
@@ -605,16 +595,18 @@ bool selection_traverse(struct selection *s, seln_traverse_handler handler,
 	if (!selection_defined(s))
 		return true;	/* easy case, nothing to do */
 
-	if (s->root)
+	if (s->root) {
+		/* HTML */
 		return traverse_tree(s->root, s->start_idx, s->end_idx,
 				NUMBER_SPACE(s->max_idx), handler, handle,
 				&before, &first, false);
+	}
 
+	/* Text */
 	c = s->bw->current_content;
 	if (!c) return true;
 
-	text = textplain_get_raw_data(c, s->start_idx,
-							s->end_idx, &length);
+	text = textplain_get_raw_data(c, s->start_idx, s->end_idx, &length);
 
 	if (text && !handler(text, length, NULL, handle, NULL, 0))
 		return false;
@@ -726,7 +718,7 @@ void selection_clear(struct selection *s, bool redraw)
 {
 	int old_start, old_end;
 	bool was_defined;
-	struct browser_window *bw;
+	struct browser_window *top;
 
 	assert(s);
 	was_defined = selection_defined(s);
@@ -740,11 +732,9 @@ void selection_clear(struct selection *s, bool redraw)
 	if (!s->bw)
 		return;
 
-	bw = s->bw;
-	while (bw && !bw->window && bw->parent)
-		bw = bw->parent;
+	top = browser_window_get_root(s->bw);
 
-	gui_clear_selection(bw->window);
+	gui_clear_selection(top->window);
 
 	if (redraw && was_defined)
 		selection_redraw(s, old_start, old_end);