August 2011 - netsurf-commits - listmaster.pepperfish.net

r12665 tlsa - /trunk/netsurf/desktop/browser.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 15:44:47 2011 New Revision: 12665 URL: http://source.netsurf-browser.org?rev=12665&view=rev Log: During drags, prevent mouse interaction with other widgets. Modified: trunk/netsurf/desktop/browser.c Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=126... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Wed Aug 24 15:44:47 2011 @@ -1890,7 +1890,7 @@ } /* Browser window's horizontal scrollbar */ - if (bw->scroll_x != NULL) { + if (bw->scroll_x != NULL && bw->drag_type != DRAGGING_SCR_Y) { int scr_x, scr_y; browser_window_get_scrollbar_pos(bw, true, &scr_x, &scr_y); scr_x = x - scr_x - scrollbar_get_offset(bw->scroll_x); @@ -1898,8 +1898,10 @@ if ((scr_x > 0 && scr_x < browser_window_get_scrollbar_len(bw, true) && - scr_y > 0 && scr_y < SCROLLBAR_WIDTH) || + scr_y > 0 && scr_y < SCROLLBAR_WIDTH && + bw->drag_type == DRAGGING_NONE) || bw->drag_type == DRAGGING_SCR_X) { + /* Start a scrollbar drag, or continue existing drag */ status = scrollbar_mouse_action(bw->scroll_x, mouse, scr_x, scr_y); pointer = GUI_POINTER_DEFAULT; @@ -1921,9 +1923,10 @@ if ((scr_y > 0 && scr_y < browser_window_get_scrollbar_len(bw, false) && - scr_x > 0 && scr_x < SCROLLBAR_WIDTH) || + scr_x > 0 && scr_x < SCROLLBAR_WIDTH && + bw->drag_type == DRAGGING_NONE) || bw->drag_type == DRAGGING_SCR_Y) { - + /* Start a scrollbar drag, or continue existing drag */ status = scrollbar_mouse_action(bw->scroll_y, mouse, scr_x, scr_y); pointer = GUI_POINTER_DEFAULT;

11 years, 5 months

1
0
0 / 0

r12664 tlsa - /trunk/netsurf/desktop/browser.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 14:26:45 2011 New Revision: 12664 URL: http://source.netsurf-browser.org?rev=12664&view=rev Log: Set up page drag start in iframes. Modified: trunk/netsurf/desktop/browser.c Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=126... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Wed Aug 24 14:26:45 2011 @@ -2142,7 +2142,8 @@ gui_window_scroll_start(bw->window); break; case BROWSER_WINDOW_IFRAME: - /* TODO */ + bw->drag_start_scroll_x = scrollbar_get_offset(bw->scroll_x); + bw->drag_start_scroll_y = scrollbar_get_offset(bw->scroll_y); break; } }

11 years, 5 months

1
0
0 / 0

r12663 tlsa - in /trunk/netsurf/desktop: browser.c browser.h

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 13:22:22 2011 New Revision: 12663 URL: http://source.netsurf-browser.org?rev=12663&view=rev Log: Improve browser window drag tracking, so that drags in internal browser windows (iframes) carry on if pointer goes outside the bw that owns the drag. Modified: trunk/netsurf/desktop/browser.c trunk/netsurf/desktop/browser.h Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=126... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Wed Aug 24 13:22:22 2011 @@ -324,6 +324,13 @@ void browser_window_set_drag_type(struct browser_window *bw, browser_drag_type type) { + struct browser_window *top_bw = browser_window_get_root(bw); + + if (type == DRAGGING_NONE) + top_bw->drag_window = NULL; + else + top_bw->drag_window = bw; + bw->drag_type = type; } @@ -1857,6 +1864,24 @@ const char *status = NULL; gui_pointer_shape pointer = GUI_POINTER_DEFAULT; + if (bw->window != NULL) { + /* root browser window */ + if (bw->drag_window) { + /* There's an active drag in a sub window. + * Pass the mouse action straight on to that bw. */ + int off_x = 0; + int off_y = 0; + + browser_window_get_position(bw->drag_window, true, + &off_x, &off_y); + + browser_window_mouse_track(bw->drag_window, mouse, + x - off_x / bw->scale, + y - off_y / bw->scale); + return; + } + } + if (c == NULL && bw->drag_type != DRAGGING_FRAME) return; Modified: trunk/netsurf/desktop/browser.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.h?rev=126... ============================================================================== --- trunk/netsurf/desktop/browser.h (original) +++ trunk/netsurf/desktop/browser.h Wed Aug 24 13:22:22 2011 @@ -103,6 +103,9 @@ /** Current drag status. */ browser_drag_type drag_type; + + /** Current drag's browser window, when not in root bw. */ + struct browser_window *drag_window; /** Mouse position at start of current scroll drag. */ int drag_start_x;

11 years, 5 months

1
0
0 / 0

r12662 tlsa - /trunk/netsurf/desktop/tree.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 10:03:02 2011 New Revision: 12662 URL: http://source.netsurf-browser.org?rev=12662&view=rev Log: Fix treeview deselection redraw issue. Modified: trunk/netsurf/desktop/tree.c Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=12662&... ============================================================================== --- trunk/netsurf/desktop/tree.c (original) +++ trunk/netsurf/desktop/tree.c Wed Aug 24 10:03:02 2011 @@ -1269,11 +1269,12 @@ if (node->selected != selected) { node->selected = selected; if (tree != NULL && tree->redraw) - tree->callbacks->redraw_request(node->box.x, - node->box.y, - node->box.width, - node->data.box.height, - tree->client_data); + tree->callbacks->redraw_request( + node->data.box.x, + node->data.box.y, + node->data.box.width, + node->data.box.height, + tree->client_data); } if (all && (node->child != NULL) && (node->expanded)) tree_set_node_selected(tree, node->child, all,

11 years, 5 months

1
0
0 / 0

r12661 tlsa - in /trunk/netsurf/desktop: browser.c browser.h

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 08:48:12 2011 New Revision: 12661 URL: http://source.netsurf-browser.org?rev=12661&view=rev Log: Remove current_redraw_browser global. Modified: trunk/netsurf/desktop/browser.c trunk/netsurf/desktop/browser.h Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=126... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Wed Aug 24 08:48:12 2011 @@ -64,9 +64,6 @@ #include "utils/url.h" #include "utils/utils.h" #include "utils/utf8.h" - -/** browser window which is being redrawn. Valid only during redraw. */ -struct browser_window *current_redraw_browser; /** one or more windows require a reformat */ bool browser_reformat_pending; Modified: trunk/netsurf/desktop/browser.h URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.h?rev=126... ============================================================================== --- trunk/netsurf/desktop/browser.h (original) +++ trunk/netsurf/desktop/browser.h Wed Aug 24 08:48:12 2011 @@ -200,7 +200,6 @@ int status_miss; /**< Number of times status was really updated. */ }; -extern struct browser_window *current_redraw_browser; extern bool browser_reformat_pending; struct browser_window * browser_window_create(const char *url,

11 years, 5 months

1
0
0 / 0

r12660 tlsa - /trunk/netsurf/desktop/thumbnail.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 08:45:46 2011 New Revision: 12660 URL: http://source.netsurf-browser.org?rev=12660&view=rev Log: Don't need to set current_redraw_browser any more. Modified: trunk/netsurf/desktop/thumbnail.c Modified: trunk/netsurf/desktop/thumbnail.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/thumbnail.c?rev=1... ============================================================================== --- trunk/netsurf/desktop/thumbnail.c (original) +++ trunk/netsurf/desktop/thumbnail.c Wed Aug 24 08:45:46 2011 @@ -70,9 +70,6 @@ if (ctx->plot->option_knockout) knockout_plot_start(ctx, &new_ctx); - /* No selection */ - current_redraw_browser = NULL; - /* Set clip rectangle to required thumbnail size */ clip.x0 = 0; clip.y0 = 0;

11 years, 5 months

1
0
0 / 0

r12659 tlsa - /trunk/netsurf/beos/beos_window.cpp

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 08:43:54 2011 New Revision: 12659 URL: http://source.netsurf-browser.org?rev=12659&view=rev Log: Don't need to set current_redraw_browser any more. Modified: trunk/netsurf/beos/beos_window.cpp Modified: trunk/netsurf/beos/beos_window.cpp URL: http://source.netsurf-browser.org/trunk/netsurf/beos/beos_window.cpp?rev=... ============================================================================== --- trunk/netsurf/beos/beos_window.cpp (original) +++ trunk/netsurf/beos/beos_window.cpp Wed Aug 24 08:43:54 2011 @@ -952,16 +952,12 @@ if (view->Window()) view->Window()->BeginViewTransaction(); - current_redraw_browser = g->bw; - clip.x0 = (int)updateRect.left; clip.y0 = (int)updateRect.top; clip.x1 = (int)updateRect.right + 1; clip.y1 = (int)updateRect.bottom + 1; browser_window_redraw(g->bw, 0, 0, &clip, &ctx); - - current_redraw_browser = NULL; if (g->careth != 0) nsbeos_plot_caret(g->caretx, g->carety, g->careth);

11 years, 5 months

1
0
0 / 0

r12658 tlsa - /trunk/netsurf/atari/browser.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 08:42:59 2011 New Revision: 12658 URL: http://source.netsurf-browser.org?rev=12658&view=rev Log: Don't need to set current_redraw_browser any more. Modified: trunk/netsurf/atari/browser.c Modified: trunk/netsurf/atari/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/atari/browser.c?rev=12658... ============================================================================== --- trunk/netsurf/atari/browser.c (original) +++ trunk/netsurf/atari/browser.c Wed Aug 24 08:42:59 2011 @@ -189,7 +189,7 @@ void browser_update_rects(struct gui_window * gw ) { short buff[8]; - LGRECT cmprect; + LGRECT cmprect; mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH, (GRECT*)&buff[4]); buff[0] = CM_REFLOW; buff[1] = _AESapid; @@ -846,7 +846,6 @@ b->redraw.area.y0, b->redraw.area.x1, b->redraw.area.y1 )); - current_redraw_browser = b->bw; struct rect a; a.x0 = b->redraw.area.x0; a.y0 = b->redraw.area.y0; @@ -856,7 +855,6 @@ browser_window_redraw( b->bw, -b->scroll.current.x, -b->scroll.current.y, &a, &ctx ); - current_redraw_browser = NULL; }

11 years, 5 months

1
0
0 / 0

r12657 tlsa - /trunk/netsurf/cocoa/BrowserView.m

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 08:39:28 2011 New Revision: 12657 URL: http://source.netsurf-browser.org?rev=12657&view=rev Log: Don't need to set current_redraw_browser any more. Modified: trunk/netsurf/cocoa/BrowserView.m Modified: trunk/netsurf/cocoa/BrowserView.m URL: http://source.netsurf-browser.org/trunk/netsurf/cocoa/BrowserView.m?rev=1... ============================================================================== --- trunk/netsurf/cocoa/BrowserView.m (original) +++ trunk/netsurf/cocoa/BrowserView.m Wed Aug 24 08:39:28 2011 @@ -146,8 +146,6 @@ { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - current_redraw_browser = browser; - struct redraw_context ctx = { .interactive = true, .plot = &cocoa_plotters @@ -167,7 +165,6 @@ browser_window_redraw(browser, 0, 0, &clip, &ctx); } - current_redraw_browser = NULL; NSRect caretRect = cocoa_get_caret_rect( self ); if (hasCaret && caretVisible && [self needsToDrawRect: caretRect]) {

11 years, 5 months

1
0
0 / 0

r12656 tlsa - in /trunk/netsurf/riscos: print.c window.c

by netsurf＠semichrome.net

Author: tlsa Date: Wed Aug 24 08:38:09 2011 New Revision: 12656 URL: http://source.netsurf-browser.org?rev=12656&view=rev Log: Don't need to set current_redraw_browser any more. Modified: trunk/netsurf/riscos/print.c trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/print.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/print.c?rev=12656&... ============================================================================== --- trunk/netsurf/riscos/print.c (original) +++ trunk/netsurf/riscos/print.c Wed Aug 24 08:38:09 2011 @@ -619,8 +619,6 @@ } ro_gui_current_redraw_gui = g; - current_redraw_browser = NULL; /* we don't want to print the - selection */ /* print is now active */ print_active = true; Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=12656... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Wed Aug 24 08:38:09 2011 @@ -1672,7 +1672,6 @@ return; ro_gui_current_redraw_gui = g; - current_redraw_browser = g->bw; error = xwimp_redraw_window(redraw, &more); if (error) { @@ -1723,12 +1722,10 @@ error->errnum, error->errmess)); warn_user("WimpError", error->errmess); ro_gui_current_redraw_gui = NULL; - current_redraw_browser = NULL; return; } } ro_gui_current_redraw_gui = NULL; - current_redraw_browser = NULL; } @@ -4344,7 +4341,6 @@ /* Set the current redraw gui_window to get options from */ ro_gui_current_redraw_gui = g; - current_redraw_browser = g->bw; ro_plot_origin_x = update.box.x0 - update.xscroll; ro_plot_origin_y = update.box.y1 - update.yscroll; @@ -4375,7 +4371,6 @@ error->errnum, error->errmess)); warn_user("WimpError", error->errmess); ro_gui_current_redraw_gui = NULL; - current_redraw_browser = NULL; continue; } } @@ -4383,7 +4378,6 @@ /* Reset the current redraw gui_window to prevent * thumbnails from retaining options */ ro_gui_current_redraw_gui = NULL; - current_redraw_browser = NULL; } while (pending_updates) { cur = pending_updates;

11 years, 5 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits August 2011