diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2013-02-22 12:19:35 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2013-02-22 12:19:35 +0000 |
| commit | c2a718075ad321a9cf4678e72645acda5c3471a9 (patch) | |
| tree | a634c4c47c579aab35839ee3861ef90f92d89b48 /gtk | |
| parent | 2b0cc398bb5b8e5dc90fcc0a71a9a154dd9f2d74 (diff) | |
| download | netsurf-c2a718075ad321a9cf4678e72645acda5c3471a9.tar.gz netsurf-c2a718075ad321a9cf4678e72645acda5c3471a9.tar.bz2 | |
A load of refactoring of how content selection and input work.
Keypresses now go via content interface.
Contents don't shove the selection object into browser windows any more.
Contents report selection existence by sending message.
HTML content keeps track of where selections in it exist.
Contents report whether they have input focus via caret setting msg.
Caret can be hidden (can still input/paste) or removed.
Consolidate textarea selection handling.
Make textarea report its selection status changes to client.
Various textarea fixes.
Changed how we decide when to clear selections, and give focus.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/scaffolding.c | 14 | ||||
| -rw-r--r-- | gtk/window.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 6ab058269..4097837a9 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -374,13 +374,15 @@ static guint nsgtk_scaffolding_update_edit_actions_sensitivity( } else { struct browser_window *bw = nsgtk_get_browser_window(g->top_level); - has_selection = browser_window_has_selection(bw); + browser_editor_flags edit_f = + browser_window_get_editor_flags(bw); - g->buttons[COPY_BUTTON]->sensitivity = has_selection; - g->buttons[CUT_BUTTON]->sensitivity = (has_selection && - bw->caret_callback != 0); + g->buttons[COPY_BUTTON]->sensitivity = + edit_f & BW_EDITOR_CAN_COPY; + g->buttons[CUT_BUTTON]->sensitivity = + edit_f & BW_EDITOR_CAN_CUT; g->buttons[PASTE_BUTTON]->sensitivity = - (bw->paste_callback != 0); + edit_f & BW_EDITOR_CAN_PASTE; } nsgtk_scaffolding_set_sensitivity(g); @@ -1120,7 +1122,7 @@ MULTIHANDLER(selectall) gtk_editable_select_region(GTK_EDITABLE(g->url_bar), 0, -1); } else { LOG(("Selecting all document text")); - selection_select_all(browser_window_get_selection(bw)); + browser_window_key_press(bw, KEY_SELECT_ALL); } return TRUE; diff --git a/gtk/window.c b/gtk/window.c index d8a9dd43d..7a66c5111 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -312,7 +312,7 @@ static gboolean nsgtk_window_button_press_event(GtkWidget *widget, break; case 3: /* Right button, usually. Action button, context menu. */ - browser_window_remove_caret(g->bw); + browser_window_remove_caret(g->bw, true); nsgtk_scaffolding_popup_menu(g->scaffold, g->mouse.pressed_x, g->mouse.pressed_y); return TRUE; |