summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-07-02 16:43:20 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-07-02 16:43:20 +0000
commita6d4f9cb30f5e046d861ef85bab033208fbd549a (patch)
tree53eebee97a451fa68c05a72c81a815f285f91469
parent3f485e083d0484fb009d33222710625d62b8b77f (diff)
downloadnetsurf-a6d4f9cb30f5e046d861ef85bab033208fbd549a.tar.gz
netsurf-a6d4f9cb30f5e046d861ef85bab033208fbd549a.tar.bz2
Function to find out if browser window has a selection. Front ends should use this API. RISC OS front end updated.
svn path=/trunk/netsurf/; revision=12556
-rw-r--r--desktop/browser.c14
-rw-r--r--desktop/browser.h8
-rw-r--r--riscos/window.c18
3 files changed, 31 insertions, 9 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index cc19ccdc0..a6e80d0f2 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -257,6 +257,20 @@ struct browser_window * browser_window_get_root(struct browser_window *bw)
}
return bw;
}
+/* exported interface, documented in browser.h */
+bool browser_window_has_selection(struct browser_window *bw)
+{
+ assert(bw->window);
+
+ /* TODO: handle selections in (i)frames */
+
+ if (bw->current_content != NULL && bw->sel != NULL &&
+ selection_defined(bw->sel)) {
+ return true;
+ } else {
+ return false;
+ }
+}
/**
* Create and open a new root browser window with the given page.
diff --git a/desktop/browser.h b/desktop/browser.h
index 136f97f0f..0949e856e 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -339,6 +339,14 @@ void browser_window_set_drag_type(struct browser_window *bw,
*/
struct browser_window * browser_window_get_root(struct browser_window *bw);
+/**
+ * Check whether browser window contains a selection
+ *
+ * \param bw The browser window
+ * \return true if browser window contains a selection
+ */
+bool browser_window_has_selection(struct browser_window *bw);
+
/* In platform specific hotlist.c. */
void hotlist_visited(struct hlcache_handle *c);
diff --git a/riscos/window.c b/riscos/window.c
index 3caf12cd3..b502fc8b0 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -2577,21 +2577,21 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
/* make menu available if there's anything that /could/
* be selected */
- ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_SAVE, h == NULL ||
- bw->sel == NULL || !selection_defined(bw->sel));
+ ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_SAVE,
+ !browser_window_has_selection(bw));
- ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_COPY, h == NULL ||
- bw->sel == NULL || !selection_defined(bw->sel));
+ ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_COPY,
+ !browser_window_has_selection(bw));
- ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_CUT, h == NULL ||
- bw->sel == NULL || !selection_defined(bw->sel) ||
+ ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_CUT,
+ !browser_window_has_selection(bw) ||
selection_read_only(bw->sel));
ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_PASTE,
h == NULL || bw->paste_callback == NULL);
- ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_CLEAR, h == NULL ||
- bw->sel == NULL || !selection_defined(bw->sel));
+ ro_gui_menu_set_entry_shaded(menu, BROWSER_SELECTION_CLEAR,
+ !browser_window_has_selection(bw));
/* Navigate Submenu */
@@ -2729,7 +2729,7 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu,
break;
case BROWSER_SELECTION_SAVE:
- if (bw->sel != NULL && selection_defined(bw->sel))
+ if (browser_window_has_selection(bw))
ro_gui_save_prepare(GUI_SAVE_TEXT_SELECTION, NULL,
bw->sel, NULL, NULL);
break;