diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2008-08-24 10:31:38 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2008-08-24 10:31:38 +0000 |
| commit | afdf592637e488beeceba371234035c14235322f (patch) | |
| tree | 5c742af11c01c48bdd7e2fd4e6b6080663defde4 /desktop/browser.c | |
| parent | 11d7e4574a06a2c34e53e2ce31b17576fba9520a (diff) | |
| download | netsurf-afdf592637e488beeceba371234035c14235322f.tar.gz netsurf-afdf592637e488beeceba371234035c14235322f.tar.bz2 | |
Merge Mike's tabs changes. Still needs some cleaning.
svn path=/trunk/netsurf/; revision=5189
Diffstat (limited to 'desktop/browser.c')
| -rw-r--r-- | desktop/browser.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 899457b74..ce9e79ce1 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -140,7 +140,7 @@ static void browser_window_scroll_box(struct browser_window *bw, struct browser_window *browser_window_create(const char *url, struct browser_window *clone, - const char *referer, bool history_add) + const char *referer, bool history_add, bool new_tab) { struct browser_window *bw; @@ -156,12 +156,12 @@ struct browser_window *browser_window_create(const char *url, /* window characteristics */ bw->browser_window_type = BROWSER_WINDOW_NORMAL; - bw->scrolling = SCROLLING_YES; + bw->scrolling = SCROLLING_AUTO; bw->border = true; bw->no_resize = true; /* gui window */ - if ((bw->window = gui_create_browser_window(bw, clone)) == NULL) { + if ((bw->window = gui_create_browser_window(bw, clone, new_tab)) == NULL) { browser_window_destroy(bw); return NULL; } @@ -1096,7 +1096,7 @@ struct browser_window *browser_window_find_target(struct browser_window *bw, con /* handle reserved keywords */ if ((new_window) || ((target == TARGET_BLANK) || (!strcasecmp(target, "_blank")))) { - bw_target = browser_window_create(NULL, bw, NULL, false); + bw_target = browser_window_create(NULL, bw, NULL, false, false); if (!bw_target) return bw; return bw_target; @@ -1127,7 +1127,7 @@ struct browser_window *browser_window_find_target(struct browser_window *bw, con /* we require a new window using the target name */ if (!option_target_blank) return bw; - bw_target = browser_window_create(NULL, bw, NULL, false); + bw_target = browser_window_create(NULL, bw, NULL, false, false); if (!bw_target) return bw; @@ -1539,7 +1539,10 @@ void browser_window_mouse_action_html(struct browser_window *bw, /* force download of link */ browser_window_go_post(bw, url, 0, 0, false, c->url, true, true, 0); - + } else if (mouse & BROWSER_MOUSE_CLICK_1 && + mouse & BROWSER_MOUSE_MOD_2) { + /* open link in new tab */ + browser_window_create(url, bw, c->url, true, true); } else if (mouse & BROWSER_MOUSE_CLICK_2 && mouse & BROWSER_MOUSE_MOD_1) { free(browser_window_href_content.url); |