From 67f2470d5a13109af213714efa99e42a4473cfd2 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 23 Dec 2011 22:39:25 +0000 Subject: Pass whether background images are wanted in redraw_context. svn path=/trunk/netsurf/; revision=13335 --- atari/browser.c | 567 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 284 insertions(+), 283 deletions(-) (limited to 'atari/browser.c') diff --git a/atari/browser.c b/atari/browser.c index 2ee8fcfe0..89e557d75 100755 --- a/atari/browser.c +++ b/atari/browser.c @@ -13,12 +13,12 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * Module Description: - * - * This WinDom compo - * + * along with this program. If not, see . + * + * Module Description: + * + * This WinDom compo + * * */ @@ -33,9 +33,9 @@ #include "desktop/gui.h" #include "desktop/netsurf.h" -#include "desktop/browser.h" +#include "desktop/browser.h" #include "desktop/mouse.h" -#include "desktop/textinput.h" +#include "desktop/textinput.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" @@ -49,34 +49,34 @@ #include "atari/browser_win.h" #include "atari/misc.h" #include "atari/global_evnt.h" -#include "atari/res/netsurf.rsh" +#include "atari/res/netsurf.rsh" #include "atari/redrawslots.h" #include "atari/browser.h" #include "atari/plot/plotter.h" #include "atari/plot.h" -#include "atari/encoding.h" -#include "atari/ctxmenu.h" +#include "atari/encoding.h" +#include "atari/ctxmenu.h" #include "cflib.h" extern GEM_PLOTTER plotter; extern struct gui_window *input_window; - -static void browser_process_scroll( struct gui_window * gw, LGRECT bwrect ); -static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff, - struct rect * area ); -static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], + +static void browser_process_scroll( struct gui_window * gw, LGRECT bwrect ); +static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff, + struct rect * area ); +static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * data); -static void __CDECL browser_evnt_redraw( COMPONENT * c, long buff[8], +static void __CDECL browser_evnt_redraw( COMPONENT * c, long buff[8], void * data); -static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], +static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], void * data); -/* - Create an browser component. - Currently, this area is the area which is used to display HTML content. - However, it could also contains other areas, these need to be handled within - "browser_get_rect" function. +/* + Create an browser component. + Currently, this area is the area which is used to display HTML content. + However, it could also contains other areas, these need to be handled within + "browser_get_rect" function. */ struct s_browser * browser_create ( @@ -95,34 +95,34 @@ struct s_browser * browser_create if(clone) bw->scale = clone->scale; else - bw->scale = 1; + bw->scale = 1; redraw_slots_init( &bnew->redraw, MAX_REDRW_SLOTS ); bnew->comp = (COMPONENT*)mt_CompCreate(&app, CLT_HORIZONTAL, 100, 1); if( bnew->comp == NULL ) { free(bnew); return(NULL); - } - + } + /* Attach events to the component: */ mt_CompEvntDataAdd( &app, bnew->comp, WM_XBUTTON, - browser_evnt_mbutton, (void*)gw, EV_BOT + browser_evnt_mbutton, (void*)gw, EV_BOT ); mt_CompEvntDataAttach( &app, bnew->comp, WM_REDRAW, - browser_evnt_redraw, (void*)gw + browser_evnt_redraw, (void*)gw ); mt_CompEvntDataAttach( &app, bnew->comp, WM_DESTROY, - browser_evnt_destroy, (void*)bnew - ); - - /* Set the gui_window owner. */ + browser_evnt_destroy, (void*)bnew + ); + + /* Set the gui_window owner. */ /* it is an link to the netsurf window system */ mt_CompDataAttach( &app, bnew->comp, CDT_OWNER, gw ); - + bnew->scroll.requested.y = 0; bnew->scroll.requested.x = 0; bnew->scroll.current.x = 0; - bnew->scroll.current.y = 0; - bnew->reformat_pending = false; + bnew->scroll.current.y = 0; + bnew->reformat_pending = false; } return( bnew ); @@ -131,37 +131,37 @@ struct s_browser * browser_create bool browser_destroy( struct s_browser * b ) { - LOG(("%s\n", b->bw->name )); + LOG(("%s\n", b->bw->name )); assert( b != NULL ); assert( b->comp != NULL ); assert( b->bw != NULL ); - - if( b->comp != NULL ){ - mt_CompDelete(&app, b->comp ); + + if( b->comp != NULL ){ + mt_CompDelete(&app, b->comp ); } return( true ); } - -/* - Query the browser component for widget rectangles. + +/* + Query the browser component for widget rectangles. */ void browser_get_rect( struct gui_window * gw, enum browser_rect type, LGRECT * out) -{ - LGRECT cur; - - /* Query component for it's current size: */ - mt_CompGetLGrect(&app, gw->browser->comp, WF_WORKXYWH, &cur); - - /* And extract the different widget dimensions: */ +{ + LGRECT cur; + + /* Query component for it's current size: */ + mt_CompGetLGrect(&app, gw->browser->comp, WF_WORKXYWH, &cur); + + /* And extract the different widget dimensions: */ if( type == BR_CONTENT ){ out->g_w = cur.g_w; out->g_h = cur.g_h; out->g_x = cur.g_x; out->g_y = cur.g_y; } - - return; + + return; } /* Report an resize to the COMPONENT interface */ @@ -172,18 +172,18 @@ void browser_update_rects(struct gui_window * gw ) buff[0] = CM_REFLOW; buff[1] = _AESapid; buff[2] = 0; - EvntExec(gw->root->handle, buff); -} + EvntExec(gw->root->handle, buff); +} void browser_set_content_size(struct gui_window * gw, int w, int h) { CMP_BROWSER b = gw->browser; LGRECT work; - browser_get_rect( gw, BR_CONTENT, &work ); - - gw->root->handle->xpos_max = w; - gw->root->handle->ypos_max = h; - + browser_get_rect( gw, BR_CONTENT, &work ); + + gw->root->handle->xpos_max = w; + gw->root->handle->ypos_max = h; + if( w < work.g_w + b->scroll.current.x || w < work.g_h + b->scroll.current.y ) { /* let the scroll routine detect invalid scroll values... */ browser_scroll(gw, WA_LFLINE, b->scroll.current.x, true ); @@ -191,8 +191,8 @@ void browser_set_content_size(struct gui_window * gw, int w, int h) /* force update of scrollbars: */ b->scroll.required = true; } -} - +} + static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * data) { @@ -206,29 +206,29 @@ static void __CDECL browser_evnt_destroy( COMPONENT * c, long buff[8], void * da gw->browser = NULL; LOG(("evnt_destroy done!")); } - -/* - Mouse Button handler for browser component. -*/ - + +/* + Mouse Button handler for browser component. +*/ + static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], void * data) -{ +{ short mx, my, dummy, mbut; - LGRECT cwork; + LGRECT cwork; browser_mouse_state bmstate = 0; - struct gui_window * gw = data; - - if( input_window != gw ){ - input_window = gw; - } + struct gui_window * gw = data; + + if( input_window != gw ){ + input_window = gw; + } window_set_focus( gw, BROWSER, (void*)gw->browser ); - browser_get_rect( gw, BR_CONTENT, &cwork ); - + browser_get_rect( gw, BR_CONTENT, &cwork ); + /* convert screen coords to component coords: */ mx = evnt.mx - cwork.g_x; - my = evnt.my - cwork.g_y; - + my = evnt.my - cwork.g_y; + /* Translate GEM key state to netsurf mouse modifier */ if( evnt.mkstate & (K_RSHIFT | K_LSHIFT) ){ bmstate |= BROWSER_MOUSE_MOD_1; @@ -244,60 +244,60 @@ static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], void * da bmstate |= BROWSER_MOUSE_MOD_3; } else { bmstate &= ~(BROWSER_MOUSE_MOD_3); - } - + } + /* convert component coords to scrolled content coords: */ int sx_origin = (mx + gw->browser->scroll.current.x); - int sy_origin = (my + gw->browser->scroll.current.y); - - short rel_cur_x, rel_cur_y; - short prev_x=sx_origin, prev_y=sy_origin; - + int sy_origin = (my + gw->browser->scroll.current.y); + + short rel_cur_x, rel_cur_y; + short prev_x=sx_origin, prev_y=sy_origin; + /* Detect left mouse button state and compare with event state: */ - graf_mkstate(&rel_cur_x, &rel_cur_y, &mbut, &dummy); - if( (mbut & 1) && (evnt.mbut & 1) ){ - /* Mouse still pressed, report drag */ + graf_mkstate(&rel_cur_x, &rel_cur_y, &mbut, &dummy); + if( (mbut & 1) && (evnt.mbut & 1) ){ + /* Mouse still pressed, report drag */ rel_cur_x = (rel_cur_x - cwork.g_x) + gw->browser->scroll.current.x; - rel_cur_y = (rel_cur_y - cwork.g_y) + gw->browser->scroll.current.y; - browser_window_mouse_click( gw->browser->bw, - BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_DRAG_1, + rel_cur_y = (rel_cur_y - cwork.g_y) + gw->browser->scroll.current.y; + browser_window_mouse_click( gw->browser->bw, + BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_DRAG_1, sx_origin, sy_origin); - do{ - if( abs(prev_x-rel_cur_x) > 5 || abs(prev_y-rel_cur_y) > 5 ){ - browser_window_mouse_track( gw->browser->bw, - BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_HOLDING_1, - rel_cur_x, rel_cur_y); - prev_x = rel_cur_x; - prev_y = rel_cur_y; - if( browser_redraw_required( gw ) ){ - browser_redraw( gw ); - } - } - graf_mkstate(&rel_cur_x, &rel_cur_y, &mbut, &dummy); + do{ + if( abs(prev_x-rel_cur_x) > 5 || abs(prev_y-rel_cur_y) > 5 ){ + browser_window_mouse_track( gw->browser->bw, + BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_HOLDING_1, + rel_cur_x, rel_cur_y); + prev_x = rel_cur_x; + prev_y = rel_cur_y; + if( browser_redraw_required( gw ) ){ + browser_redraw( gw ); + } + } + graf_mkstate(&rel_cur_x, &rel_cur_y, &mbut, &dummy); rel_cur_x = (rel_cur_x - cwork.g_x) + gw->browser->scroll.current.x; - rel_cur_y = (rel_cur_y - cwork.g_y) + gw->browser->scroll.current.y; - } while( mbut & 1 ); - browser_window_mouse_track(gw->browser->bw, 0, rel_cur_x,rel_cur_y); - } else { - /* Right button pressed? */ - if( (evnt.mbut & 2 ) ) { - context_popup( gw, evnt.mx, evnt.my ); - } else { - browser_window_mouse_click(gw->browser->bw, - bmstate|BROWSER_MOUSE_PRESS_1, + rel_cur_y = (rel_cur_y - cwork.g_y) + gw->browser->scroll.current.y; + } while( mbut & 1 ); + browser_window_mouse_track(gw->browser->bw, 0, rel_cur_x,rel_cur_y); + } else { + /* Right button pressed? */ + if( (evnt.mbut & 2 ) ) { + context_popup( gw, evnt.mx, evnt.my ); + } else { + browser_window_mouse_click(gw->browser->bw, + bmstate|BROWSER_MOUSE_PRESS_1, + sx_origin,sy_origin); + browser_window_mouse_click(gw->browser->bw, + bmstate|BROWSER_MOUSE_CLICK_1, sx_origin,sy_origin); - browser_window_mouse_click(gw->browser->bw, - bmstate|BROWSER_MOUSE_CLICK_1, - sx_origin,sy_origin); - } - } - - -} - - -/* - Report scroll event to the browser component. + } + } + + +} + + +/* + Report scroll event to the browser component. */ void browser_scroll( struct gui_window * gw, short mode, int value, bool abs ) { @@ -474,80 +474,80 @@ static void browser_process_scroll( struct gui_window * gw, LGRECT bwrect ) browser_schedule_redraw( gw, bwrect.g_w - w, 0, bwrect.g_w, bwrect.g_h ); } b->scroll.requested.y = 0; - b->scroll.requested.x = 0; - if( b->caret.requested.g_w > 0 ){ - b->caret.redraw = true; + b->scroll.requested.x = 0; + if( b->caret.requested.g_w > 0 ){ + b->caret.redraw = true; } - + gw->root->handle->xpos = b->scroll.current.x; gw->root->handle->ypos = b->scroll.current.y; - + mt_WindSlider( &app, gw->root->handle, HSLIDER|VSLIDER ); } -/* - Report keypress to browser component. - The browser component doesn't listen for keyinput by itself. - parameter: - - gui_window ( compocnent owner ). - - unsigned short nkc ( CFLIB normalised key code ) +/* + Report keypress to browser component. + The browser component doesn't listen for keyinput by itself. + parameter: + - gui_window ( compocnent owner ). + - unsigned short nkc ( CFLIB normalised key code ) */ bool browser_input( struct gui_window * gw, unsigned short nkc ) { LGRECT work; bool r = false; unsigned char ascii = (nkc & 0xFF); - long ucs4; - long ik = nkc_to_input_key( nkc, &ucs4 ); - - // pass event to specific control? - - if( ik == 0 ){ + long ucs4; + long ik = nkc_to_input_key( nkc, &ucs4 ); + + // pass event to specific control? + + if( ik == 0 ){ if (ascii >= 9 ) { r = browser_window_key_press(gw->browser->bw, ucs4 ); - } - } else { - r = browser_window_key_press(gw->browser->bw, ik ); - if( r == false ){ - browser_get_rect(gw, BR_CONTENT, &work); - switch( ik ){ - case KEY_LINE_START: - browser_scroll( gw, WA_LFPAGE, work.g_w, false ); - break; - - case KEY_LINE_END: - browser_scroll( gw, WA_RTPAGE, work.g_w, false ); - break; - - case KEY_PAGE_UP: - browser_scroll( gw, WA_UPPAGE, work.g_h, false ); - break; - - case KEY_PAGE_DOWN: - browser_scroll( gw, WA_DNPAGE, work.g_h, false ); - break; - - case KEY_RIGHT: - browser_scroll( gw, WA_RTLINE, 16, false ); - break; - - case KEY_LEFT: - browser_scroll( gw, WA_LFLINE, 16, false ); - break; - - case KEY_UP: - browser_scroll( gw, WA_UPLINE, 16, false); - break; - - case KEY_DOWN: - browser_scroll( gw, WA_DNLINE, 16, false); - break; - - default: - break; - } - } - } + } + } else { + r = browser_window_key_press(gw->browser->bw, ik ); + if( r == false ){ + browser_get_rect(gw, BR_CONTENT, &work); + switch( ik ){ + case KEY_LINE_START: + browser_scroll( gw, WA_LFPAGE, work.g_w, false ); + break; + + case KEY_LINE_END: + browser_scroll( gw, WA_RTPAGE, work.g_w, false ); + break; + + case KEY_PAGE_UP: + browser_scroll( gw, WA_UPPAGE, work.g_h, false ); + break; + + case KEY_PAGE_DOWN: + browser_scroll( gw, WA_DNPAGE, work.g_h, false ); + break; + + case KEY_RIGHT: + browser_scroll( gw, WA_RTLINE, 16, false ); + break; + + case KEY_LEFT: + browser_scroll( gw, WA_LFLINE, 16, false ); + break; + + case KEY_UP: + browser_scroll( gw, WA_UPLINE, 16, false); + break; + + case KEY_DOWN: + browser_scroll( gw, WA_DNLINE, 16, false); + break; + + default: + break; + } + } + } return( r ); } @@ -559,10 +559,10 @@ bool browser_redraw_required( struct gui_window * gw) CMP_BROWSER b = gw->browser; if( b->bw->current_content == NULL ) - return ( false ); - - /* disable redraws when the browser awaits WM_REDRAW caused by resize */ - if( b->reformat_pending ) + return ( false ); + + /* disable redraws when the browser awaits WM_REDRAW caused by resize */ + if( b->reformat_pending ) return( false ); ret = ( ((b->redraw.areas_used > 0) ) @@ -607,18 +607,19 @@ void browser_schedule_redraw(struct gui_window * gw, short x0, short y0, short x if( y0 > work.g_h ) return; - redraw_slot_schedule( &b->redraw, x0, y0, x1, y1 ); + redraw_slot_schedule( &b->redraw, x0, y0, x1, y1 ); return; } -static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff, +static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff, struct rect * area ) { CMP_BROWSER b = gw->browser; struct redraw_context ctx = { .interactive = true, + .background_images = true, .plot = &atari_plotters }; @@ -631,80 +632,80 @@ static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff, -b->scroll.current.y, area, &ctx ); } - -/* - area: the browser canvas -*/ -void browser_restore_caret_background( struct gui_window * gw, LGRECT * area) -{ - CMP_BROWSER b = gw->browser; - LGRECT rect; - if( area == NULL ){ - browser_get_rect( gw, BR_CONTENT, &rect ); - area = ▭ - } - /* This call restores the background and releases the memory: */ - // TODO: only release memory/clear flag when the caret is not clipped. - // TODO: apply clipping. - w_put_bkgr( &app, - area->g_x-b->scroll.current.x+b->caret.current.g_x, - area->g_y-b->scroll.current.y+b->caret.current.g_y, - gw->browser->caret.current.g_w, - gw->browser->caret.current.g_h, - &gw->browser->caret.background - ); - gw->browser->caret.background.fd_addr = NULL; + +/* + area: the browser canvas +*/ +void browser_restore_caret_background( struct gui_window * gw, LGRECT * area) +{ + CMP_BROWSER b = gw->browser; + LGRECT rect; + if( area == NULL ){ + browser_get_rect( gw, BR_CONTENT, &rect ); + area = ▭ + } + /* This call restores the background and releases the memory: */ + // TODO: only release memory/clear flag when the caret is not clipped. + // TODO: apply clipping. + w_put_bkgr( &app, + area->g_x-b->scroll.current.x+b->caret.current.g_x, + area->g_y-b->scroll.current.y+b->caret.current.g_y, + gw->browser->caret.current.g_w, + gw->browser->caret.current.g_h, + &gw->browser->caret.background + ); + gw->browser->caret.background.fd_addr = NULL; } - -/* - area: the browser canvas + +/* + area: the browser canvas */ void browser_redraw_caret( struct gui_window * gw, LGRECT * area ) { // TODO: only redraw caret when window is topped. - if( gw->browser->caret.redraw && gw->browser->caret.requested.g_w > 0 ){ + if( gw->browser->caret.redraw && gw->browser->caret.requested.g_w > 0 ){ LGRECT caret; struct s_browser * b = gw->browser; struct rect old_clip; - struct rect clip; - - if( b->caret.current.g_w > 0 && b->caret.background.fd_addr != NULL ){ - browser_restore_caret_background( gw, area ); - } + struct rect clip; + + if( b->caret.current.g_w > 0 && b->caret.background.fd_addr != NULL ){ + browser_restore_caret_background( gw, area ); + } caret = b->caret.requested; caret.g_x -= b->scroll.current.x - area->g_x; - caret.g_y -= b->scroll.current.y - area->g_y; - - if( !rc_lintersect( area, &caret ) ) { - return; - } - - MFDB screen; - short pxy[8]; - - /* save background: */ - //assert( b->caret.background.fd_addr == NULL ); - init_mfdb( app.nplanes, caret.g_w, caret.g_h, 0, - &b->caret.background ); - init_mfdb( 0, caret.g_w, caret.g_h, 0, &screen ); - pxy[0] = caret.g_x; - pxy[1] = caret.g_y; - pxy[2] = caret.g_x + caret.g_w - 1; - pxy[3] = caret.g_y + caret.g_h - 1; - pxy[4] = 0; - pxy[5] = 0; - pxy[6] = caret.g_w - 1; - pxy[7] = caret.g_h - 1; - /* hide the mouse */ - v_hide_c ( app.graf.handle); - /* copy screen image */ - vro_cpyfm ( app.graf.handle, S_ONLY, pxy, &screen, &b->caret.background); - /* restore the mouse */ - v_show_c ( app.graf.handle, 1); - /* draw caret: */ - caret.g_x -= area->g_x; - caret.g_y -= area->g_y; + caret.g_y -= b->scroll.current.y - area->g_y; + + if( !rc_lintersect( area, &caret ) ) { + return; + } + + MFDB screen; + short pxy[8]; + + /* save background: */ + //assert( b->caret.background.fd_addr == NULL ); + init_mfdb( app.nplanes, caret.g_w, caret.g_h, 0, + &b->caret.background ); + init_mfdb( 0, caret.g_w, caret.g_h, 0, &screen ); + pxy[0] = caret.g_x; + pxy[1] = caret.g_y; + pxy[2] = caret.g_x + caret.g_w - 1; + pxy[3] = caret.g_y + caret.g_h - 1; + pxy[4] = 0; + pxy[5] = 0; + pxy[6] = caret.g_w - 1; + pxy[7] = caret.g_h - 1; + /* hide the mouse */ + v_hide_c ( app.graf.handle); + /* copy screen image */ + vro_cpyfm ( app.graf.handle, S_ONLY, pxy, &screen, &b->caret.background); + /* restore the mouse */ + v_show_c ( app.graf.handle, 1); + /* draw caret: */ + caret.g_x -= area->g_x; + caret.g_y -= area->g_y; clip.x0 = caret.g_x; clip.y0 = caret.g_y; clip.x1 = caret.g_x + caret.g_w-1; @@ -712,14 +713,14 @@ void browser_redraw_caret( struct gui_window * gw, LGRECT * area ) /* store old clip before adjusting it: */ plot_get_clip( &old_clip ); /* clip to cursor: */ - plot_clip( &clip ); - plot_line( caret.g_x, caret.g_y, caret.g_x, caret.g_y + caret.g_h, + plot_clip( &clip ); + plot_line( caret.g_x, caret.g_y, caret.g_x, caret.g_y + caret.g_h, plot_style_caret ); /* restore old clip area: */ plot_clip( &old_clip ); b->caret.current.g_x = caret.g_x + gw->browser->scroll.current.x; b->caret.current.g_y = caret.g_y + gw->browser->scroll.current.y; - b->caret.current.g_w = caret.g_w; + b->caret.current.g_w = caret.g_w; b->caret.current.g_h = caret.g_h; } } @@ -729,7 +730,7 @@ void browser_redraw( struct gui_window * gw ) LGRECT bwrect; struct s_browser * b = gw->browser; short todo[4]; - struct rect clip; + struct rect clip; /* used for clipping of content redraw: */ struct rect redraw_area; @@ -737,7 +738,7 @@ void browser_redraw( struct gui_window * gw ) return; } - browser_get_rect(gw, BR_CONTENT, &bwrect); + browser_get_rect(gw, BR_CONTENT, &bwrect); plotter->resize(plotter, bwrect.g_w, bwrect.g_h); plotter->move(plotter, bwrect.g_x, bwrect.g_y ); @@ -746,7 +747,7 @@ void browser_redraw( struct gui_window * gw ) clip.x1 = bwrect.g_w; clip.y1 = bwrect.g_h; plotter->clip( plotter, &clip ); - if( plotter->lock(plotter) == 0 ) + if( plotter->lock(plotter) == 0 ) return; if( b->scroll.required == true && b->bw->current_content != NULL) { @@ -792,7 +793,7 @@ void browser_redraw( struct gui_window * gw ) redraw_area.x0 = area.g_x; redraw_area.y0 = area.g_y; redraw_area.x1 = area.g_x + area.g_w; - redraw_area.y1 = area.g_y + area.g_h; + redraw_area.y1 = area.g_y + area.g_h; browser_redraw_content( gw, 0, 0, &redraw_area ); } else { /* @@ -814,7 +815,7 @@ void browser_redraw( struct gui_window * gw ) } b->redraw.areas_used = 0; } - if( b->caret.redraw == true && b->bw->current_content != NULL ) { + if( b->caret.redraw == true && b->bw->current_content != NULL ) { LGRECT area; todo[0] = bwrect.g_x; todo[1] = bwrect.g_y; @@ -842,19 +843,19 @@ static void __CDECL browser_evnt_redraw( COMPONENT * c, long buff[8], void * dat browser_get_rect( gw, BR_CONTENT, &work ); lclip = work; if ( !rc_lintersect( (LGRECT*)&buff[4], &lclip ) ) return; - - if( b->bw->current_content == NULL ){ - short pxy[4]; - pxy[0] = lclip.g_x; - pxy[1] = lclip.g_y; - pxy[2] = lclip.g_x + lclip.g_w - 1; - pxy[3] = lclip.g_y + lclip.g_h - 1; + + if( b->bw->current_content == NULL ){ + short pxy[4]; + pxy[0] = lclip.g_x; + pxy[1] = lclip.g_y; + pxy[2] = lclip.g_x + lclip.g_w - 1; + pxy[3] = lclip.g_y + lclip.g_h - 1; vsf_color( gw->root->handle->graf->handle, WHITE ); vsf_perimeter( gw->root->handle->graf->handle, 0); vsf_interior( gw->root->handle->graf->handle, FIS_SOLID ); vsf_style( gw->root->handle->graf->handle, 1); - v_bar( gw->root->handle->graf->handle, (short*)&pxy ); - return; + v_bar( gw->root->handle->graf->handle, (short*)&pxy ); + return; } /* convert redraw coords to framebuffer coords: */ @@ -871,22 +872,22 @@ static void __CDECL browser_evnt_redraw( COMPONENT * c, long buff[8], void * dat lclip.g_y = 0; } - if( lclip.g_h > 0 && lclip.g_w > 0 ) { - - if( gw->browser->reformat_pending == true ){ - LGRECT newsize; - gw->browser->reformat_pending = false; - browser_get_rect(gw, BR_CONTENT, &newsize); - /* this call will also schedule an redraw for the complete */ - /* area. */ - /* Resize must be handled here, because otherwise */ - /* a redraw is scheduled twice (1. by the frontend, 2. by AES) */ - browser_window_reformat(b->bw, false, newsize.g_w, newsize.g_h ); - } else { + if( lclip.g_h > 0 && lclip.g_w > 0 ) { + + if( gw->browser->reformat_pending == true ){ + LGRECT newsize; + gw->browser->reformat_pending = false; + browser_get_rect(gw, BR_CONTENT, &newsize); + /* this call will also schedule an redraw for the complete */ + /* area. */ + /* Resize must be handled here, because otherwise */ + /* a redraw is scheduled twice (1. by the frontend, 2. by AES) */ + browser_window_reformat(b->bw, false, newsize.g_w, newsize.g_h ); + } else { browser_schedule_redraw( gw, lclip.g_x, lclip.g_y, lclip.g_x + lclip.g_w, lclip.g_y + lclip.g_h - ); - } + ); + } } return; -- cgit v1.2.3