mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-24 07:19:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use browser_window_remove_caret() instead of resetting caret-related callbacks directly.

Browse Source 
svn path=/trunk/netsurf/; revision=2896
This commit is contained in:
James Bursa 2006-08-28 19:35:12 +00:00
parent bfa7ab71d7
commit 3887fb72ae
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
desktop/browser.c
View File

@ -326,9 +326,7 @@ void browser_window_callback(content_msg msg, struct content *c,
}
bw->current_content = c;
bw->loading_content = NULL;
bw->caret_callback = NULL;
bw->paste_callback = NULL;
bw->move_callback = NULL;
browser_window_remove_caret(bw);
bw->scrolling_box = NULL;
gui_window_new_content(bw->window);
if (bw->frag_id)
@ -392,9 +390,7 @@ void browser_window_callback(content_msg msg, struct content *c,
bw->loading_content = 0;
else if (c == bw->current_content) {
bw->current_content = 0;
bw->caret_callback = NULL;
bw->paste_callback = NULL;
bw->move_callback = NULL;
browser_window_remove_caret(bw);
bw->scrolling_box = NULL;
selection_init(bw->sel, NULL);
}
@ -445,9 +441,7 @@ void browser_window_callback(content_msg msg, struct content *c,
bw->loading_content = 0;
else if (c == bw->current_content) {
bw->current_content = 0;
bw->caret_callback = NULL;
bw->paste_callback = NULL;
bw->move_callback = NULL;
browser_window_remove_caret(bw);
bw->scrolling_box = NULL;
selection_init(bw->sel, NULL);
}
@ -464,9 +458,7 @@ void browser_window_callback(content_msg msg, struct content *c,
bw->loading_content = 0;
else if (c == bw->current_content) {
bw->current_content = 0;
bw->caret_callback = NULL;
bw->paste_callback = NULL;
bw->move_callback = NULL;
browser_window_remove_caret(bw);
bw->scrolling_box = NULL;
selection_init(bw->sel, NULL);
}
@ -1145,9 +1137,7 @@ void browser_window_mouse_action_html(struct browser_window *bw,
if (selection_click(bw->sel, mouse, text_box->byte_offset + idx)) {
/* key presses must be directed at the main browser
* window, paste text operations ignored */
bw->caret_callback = NULL;
bw->paste_callback = NULL;
bw->move_callback = NULL;
browser_window_remove_caret(bw);
if (selection_dragging(bw->sel)) {
bw->drag_type = DRAGGING_SELECTION;