diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-01-13 22:54:19 +0000 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-01-13 22:54:19 +0000 |
commit | d18c8ed4521714c3fff3cca64685b8192ca0e075 (patch) | |
tree | 292ebb4a9f4f39ed8a61a33de4c8b169416214e5 /desktop/browser.c | |
parent | e82d83f1847ebc369a5f48a18217a8f5fecf3824 (diff) | |
download | netsurf-d18c8ed4521714c3fff3cca64685b8192ca0e075.tar.gz netsurf-d18c8ed4521714c3fff3cca64685b8192ca0e075.tar.bz2 |
move teh final optional window operations into the table
Diffstat (limited to 'desktop/browser.c')
-rw-r--r-- | desktop/browser.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 59cb4d44a..30aeead0c 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1484,20 +1484,23 @@ static nserror browser_window_callback(hlcache_handle *c, switch(event->data.dragsave.type) { case CONTENT_SAVE_ORIG: - gui_drag_save_object(GUI_SAVE_OBJECT_ORIG, save, - root->window); + guit->window->drag_save_object(root->window, save, + GUI_SAVE_OBJECT_ORIG); break; + case CONTENT_SAVE_NATIVE: - gui_drag_save_object(GUI_SAVE_OBJECT_NATIVE, save, - root->window); + guit->window->drag_save_object(root->window, save, + GUI_SAVE_OBJECT_NATIVE); break; + case CONTENT_SAVE_COMPLETE: - gui_drag_save_object(GUI_SAVE_COMPLETE, save, - root->window); + guit->window->drag_save_object(root->window, save, + GUI_SAVE_COMPLETE); break; + case CONTENT_SAVE_SOURCE: - gui_drag_save_object(GUI_SAVE_SOURCE, save, - root->window); + guit->window->drag_save_object(root->window, save, + GUI_SAVE_SOURCE); break; } } @@ -1563,7 +1566,7 @@ static nserror browser_window_callback(hlcache_handle *c, case CONTENT_MSG_GADGETCLICK: if (event->data.gadget_click.gadget->type == GADGET_FILE) { - gui_file_gadget_open(bw->window, c, + guit->window->file_gadget_open(bw->window, c, event->data.gadget_click.gadget); } @@ -2893,14 +2896,14 @@ void browser_window_mouse_click(struct browser_window *bw, break; default: if (mouse & BROWSER_MOUSE_MOD_2) { - if (mouse & BROWSER_MOUSE_DRAG_2) - gui_drag_save_object(GUI_SAVE_OBJECT_NATIVE, c, - bw->window); - else if (mouse & BROWSER_MOUSE_DRAG_1) - gui_drag_save_object(GUI_SAVE_OBJECT_ORIG, c, - bw->window); - } - else if (mouse & (BROWSER_MOUSE_DRAG_1 | + if (mouse & BROWSER_MOUSE_DRAG_2) { + guit->window->drag_save_object(bw->window, c, + GUI_SAVE_OBJECT_NATIVE); + } else if (mouse & BROWSER_MOUSE_DRAG_1) { + guit->window->drag_save_object(bw->window, c, + GUI_SAVE_OBJECT_ORIG); + } + } else if (mouse & (BROWSER_MOUSE_DRAG_1 | BROWSER_MOUSE_DRAG_2)) { browser_window_page_drag_start(bw, x, y); browser_window_set_pointer(bw, BROWSER_POINTER_MOVE); |