From f478ee4db70f36b4a3231832ff5bdfcc98c60c7e Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 20 Aug 2012 18:54:57 +0100 Subject: Remove a bunch of unused includes. --- atari/browser.c | 78 ++++++++++++++++++++++++++--------------------------- atari/browser_win.c | 18 ++++++------- atari/gui.c | 46 +++++++++++++++---------------- cocoa/selection.m | 1 - gtk/search.c | 2 -- riscos/menus.c | 2 -- 6 files changed, 68 insertions(+), 79 deletions(-) diff --git a/atari/browser.c b/atari/browser.c index c8efe3dd0..0c043b358 100755 --- a/atari/browser.c +++ b/atari/browser.c @@ -40,8 +40,6 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "css/css.h" -#include "render/box.h" -#include "render/form.h" #include "utils/log.h" #include "utils/messages.h" @@ -58,9 +56,9 @@ #include "atari/ctxmenu.h" #include "cflib.h" -extern struct gui_window *input_window; - -extern long atari_plot_flags; +extern struct gui_window *input_window; + +extern long atari_plot_flags; extern int atari_plot_vdi_handle; static void browser_process_scroll( struct gui_window * gw, LGRECT bwrect ); @@ -253,7 +251,7 @@ static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], void * da 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; + short prev_x=sx_origin, prev_y=sy_origin; bool dragmode = 0; /* Detect left mouse button state and compare with event state: */ @@ -271,14 +269,14 @@ static void __CDECL browser_evnt_mbutton( COMPONENT * c, long buff[8], void * da BROWSER_MOUSE_DRAG_ON|BROWSER_MOUSE_DRAG_1, rel_cur_x, rel_cur_y); prev_x = rel_cur_x; - prev_y = rel_cur_y; + prev_y = rel_cur_y; dragmode = true; - } else { - if( dragmode == false ){ + } else { + if( dragmode == false ){ browser_window_mouse_track( gw->browser->bw,BROWSER_MOUSE_PRESS_1, - rel_cur_x, rel_cur_y); - } - } + rel_cur_x, rel_cur_y); + } + } if( browser_redraw_required( gw ) ){ browser_redraw( gw ); } @@ -726,7 +724,7 @@ void browser_redraw_caret( struct gui_window * gw, LGRECT * area ) /* restore old clip area: */ plot_clip( &old_clip ); /* restore the mouse */ - v_show_c ( app.graf.handle, 1); + v_show_c ( app.graf.handle, 1); 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; @@ -748,7 +746,7 @@ void browser_redraw( struct gui_window * gw ) } browser_get_rect(gw, BR_CONTENT, &bwrect); - + plot_set_dimensions(bwrect.g_x, bwrect.g_y, bwrect.g_w, bwrect.g_h); clip.x0 = 0; clip.y0 = 0; @@ -764,26 +762,26 @@ void browser_redraw( struct gui_window * gw ) } if ((b->redraw.areas_used > 0) && b->bw->current_content != NULL ) { - if( (atari_plot_flags & PLOT_FLAG_OFFSCREEN) == 0 ) { + if( (atari_plot_flags & PLOT_FLAG_OFFSCREEN) == 0 ) { int i; GRECT area; - GRECT fbwork; + GRECT fbwork; short wf_top[4]; todo[0] = bwrect.g_x; todo[1] = bwrect.g_y; todo[2] = todo[0] + bwrect.g_w-1; todo[3] = todo[1] + bwrect.g_h-1; - vs_clip(atari_plot_vdi_handle, 1, (short*)&todo[0]); - - wind_get( 0, WF_TOP, &wf_top[0], &wf_top[1], - &wf_top[2], &wf_top[3] ); - - if( wf_top[0] == gw->root->handle->handle - && wf_top[1] == _AESapid ){ - /* The window is on top, so there is no need to walk the */ - /* AES rectangle list. */ - for( i=0; iredraw.areas_used; i++ ){ + vs_clip(atari_plot_vdi_handle, 1, (short*)&todo[0]); + + wind_get( 0, WF_TOP, &wf_top[0], &wf_top[1], + &wf_top[2], &wf_top[3] ); + + if( wf_top[0] == gw->root->handle->handle + && wf_top[1] == _AESapid ){ + /* The window is on top, so there is no need to walk the */ + /* AES rectangle list. */ + for( i=0; iredraw.areas_used; i++ ){ fbwork.g_x = todo[0] - bwrect.g_x; fbwork.g_y = todo[1] - bwrect.g_y; if( fbwork.g_x < 0 ){ @@ -809,13 +807,13 @@ void browser_redraw( struct gui_window * gw ) redraw_area.y1 = area.g_y + area.g_h; browser_redraw_content( gw, 0, 0, &redraw_area ); } else { - /* the area should be kept scheduled for later redraw,*/ - /* but because this is onscreen plotter, it doesn't */ + /* the area should be kept scheduled for later redraw,*/ + /* but because this is onscreen plotter, it doesn't */ /* make much sense anyway... */ } - } - } else { - /* walk the AES rectangle list: */ + } + } else { + /* walk the AES rectangle list: */ if( wind_get(gw->root->handle->handle, WF_FIRSTXYWH, &todo[0], &todo[1], &todo[2], &todo[3] )!=0 ) { while (todo[2] && todo[3]) { @@ -847,8 +845,8 @@ void browser_redraw( struct gui_window * gw ) redraw_area.y1 = area.g_y + area.g_h; browser_redraw_content( gw, 0, 0, &redraw_area ); } else { - /* the area should be kept scheduled for later redraw,*/ - /* but because this is onscreen plotter, it doesn't */ + /* the area should be kept scheduled for later redraw,*/ + /* but because this is onscreen plotter, it doesn't */ /* make much sense anyway... */ } @@ -858,13 +856,13 @@ void browser_redraw( struct gui_window * gw ) break; } } - } - } + } + } vs_clip(atari_plot_vdi_handle, 0, (short*)&todo); - } else { + } else { - /* its save to do a complete redraw without knowledge about GEM windows :) */ - /* walk the redraw requests: */ + /* its save to do a complete redraw without knowledge about GEM windows :) */ + /* walk the redraw requests: */ int i; for( i=0; iredraw.areas_used; i++ ){ struct redraw_context ctx = { @@ -874,12 +872,12 @@ void browser_redraw( struct gui_window * gw ) }; browser_window_redraw( b->bw, -b->scroll.current.x, -b->scroll.current.y, &b->redraw.areas[i], &ctx ); - } + } GRECT area; area.g_x = bwrect.g_x; area.g_y = bwrect.g_y; area.g_w = bwrect.g_w; - area.g_h = bwrect.g_h; + area.g_h = bwrect.g_h; //plot_blit( plotter, &area ); } b->redraw.areas_used = 0; diff --git a/atari/browser_win.c b/atari/browser_win.c index 087710170..1babbad38 100755 --- a/atari/browser_win.c +++ b/atari/browser_win.c @@ -41,12 +41,10 @@ #include "content/hlcache.h" #include "content/urldb.h" #include "css/css.h" -#include "render/box.h" -#include "render/form.h" #include "atari/gui.h" #include "atari/browser_win.h" #include "atari/browser.h" -#include "atari/misc.h" +#include "atari/misc.h" #include "atari/plot/plot.h" #include "atari/global_evnt.h" #include "atari/res/netsurf.rsh" @@ -154,7 +152,7 @@ int window_create( struct gui_window * gw, EvntDataAttach( gw->root->handle, WM_CLOSED, evnt_window_close, gw ); /* capture resize/move events so we can handle that manually */ EvntDataAdd( gw->root->handle, WM_SIZED, evnt_window_rt_resize, gw, EV_BOT ); - EvntDataAdd( gw->root->handle, WM_MOVED, evnt_window_rt_resize, gw, EV_BOT ); + EvntDataAdd( gw->root->handle, WM_MOVED, evnt_window_rt_resize, gw, EV_BOT ); EvntDataAdd( gw->root->handle, WM_FULLED, evnt_window_rt_resize, gw, EV_BOT ); EvntDataAdd( gw->root->handle, WM_DESTROY,evnt_window_destroy, gw, EV_TOP ); EvntDataAdd( gw->root->handle, WM_ARROWED,evnt_window_arrowed, gw, EV_TOP ); @@ -162,7 +160,7 @@ int window_create( struct gui_window * gw, EvntDataAdd( gw->root->handle, WM_TOPPED, evnt_window_newtop, gw, EV_BOT); EvntDataAdd( gw->root->handle, WM_ICONIFY, evnt_window_iconify, gw, EV_BOT); EvntDataAdd( gw->root->handle, WM_UNICONIFY, evnt_window_uniconify, gw, EV_BOT); - EvntDataAttach( gw->root->handle, AP_DRAGDROP, evnt_window_dd, gw ); + EvntDataAttach( gw->root->handle, AP_DRAGDROP, evnt_window_dd, gw ); EvntDataAttach( gw->root->handle, WM_ICONDRAW, evnt_window_icondraw, gw); EvntDataAttach( gw->root->handle, WM_SLIDEXY, evnt_window_slider, gw ); @@ -227,16 +225,16 @@ void window_open( struct gui_window * gw, GRECT pos ) /* recompute the nested component sizes and positions: */ browser_update_rects( gw ); mt_WindGetGrect( &app, gw->root->handle, WF_CURRXYWH, (GRECT*)&gw->root->loc); - browser_get_rect( gw, BR_CONTENT, &br ); + browser_get_rect( gw, BR_CONTENT, &br ); plot_set_dimensions(br.g_x, br.g_y, br.g_w, br.g_h); gw->browser->attached = true; if( gw->root->statusbar != NULL ){ gw->root->statusbar->attached = true; } - tb_adjust_size( gw ); + tb_adjust_size( gw ); /*TBD: get already present content and set size? */ input_window = gw; - window_set_focus( gw, BROWSER, gw->browser ); + window_set_focus( gw, BROWSER, gw->browser ); } @@ -499,9 +497,9 @@ static void __CDECL evnt_window_icondraw( WINDOW *win, short buff[8], void * dat tree->ob_height = h; mt_objc_draw( tree, 0, 8, buff[4], buff[5], buff[6], buff[7], app.aes_global ); } else { - struct rect clip = { 0,0,w,h }; + struct rect clip = { 0,0,w,h }; plot_set_dimensions( x,y,w,h ); - plot_clip(&clip); + plot_clip(&clip); atari_plotters.bitmap(0, 0, w, h, gw->icon, 0xffffff, 0); } } diff --git a/atari/gui.c b/atari/gui.c index 2df8ca0c9..81423942b 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -46,10 +46,8 @@ #include "desktop/selection.h" #include "desktop/textinput.h" #include "desktop/browser.h" -#include "desktop/mouse.h" -#include "render/html.h" +#include "desktop/mouse.h" #include "render/font.h" -#include "render/box.h" #include "utils/schedule.h" #include "utils/url.h" #include "utils/log.h" @@ -65,7 +63,7 @@ #include "atari/statusbar.h" #include "atari/toolbar.h" #include "atari/verify_ssl.h" -#include "atari/hotlist.h" +#include "atari/hotlist.h" #include "atari/history.h" #include "atari/login.h" #include "atari/global_evnt.h" @@ -92,8 +90,8 @@ bool rendering = false; /* Comandline / Options: */ int option_window_width; -int option_window_height; -int option_window_x; +int option_window_height; +int option_window_x; int option_window_y; /* Defaults to option_homepage_url, commandline options overwrites that value */ @@ -151,7 +149,7 @@ void gui_poll(bool active) if( evnt.timer != 0 && !active ){ /* this suits for stuff with lower priority */ /* TBD: really be spare on redraws??? */ - hotlist_redraw(); + hotlist_redraw(); global_history_redraw(); } } @@ -792,10 +790,10 @@ void gui_quit(void) browser_window_destroy(gw->browser->bw); gw = tmp; } - + global_history_destroy(); hotlist_destroy(); - toolbar_exit(); + toolbar_exit(); urldb_save_cookies(nsoption_charp(cookie_file)); urldb_save(nsoption_charp(url_file)); @@ -821,34 +819,34 @@ void gui_quit(void) static bool process_cmdline(int argc, char** argv) { - int opt; + int opt; bool set_default_dimensions = true; LOG(("argc %d, argv %p", argc, argv)); if ((nsoption_int(window_width) != 0) && (nsoption_int(window_height) != 0)) { - + option_window_width = nsoption_int(window_width); - option_window_height = nsoption_int(window_height); + option_window_height = nsoption_int(window_height); option_window_x = nsoption_int(window_x); - option_window_y = nsoption_int(window_y); - - if (option_window_width <= app.w && option_window_height < app.h) { - set_default_dimensions = false; + option_window_y = nsoption_int(window_y); + + if (option_window_width <= app.w && option_window_height < app.h) { + set_default_dimensions = false; } - } - + } + if (set_default_dimensions) { if( sys_type() == SYS_TOS ){ /* on single tasking OS, start as fulled window: */ option_window_width = app.w; - option_window_height = app.h-20; - option_window_x = app.w/2-(option_window_width/2); + option_window_height = app.h-20; + option_window_x = app.w/2-(option_window_width/2); option_window_y = (app.h/2)-(option_window_height/2); } else { option_window_width = 600; - option_window_height = 360; - option_window_x = 10; + option_window_height = 360; + option_window_x = 10; option_window_y = 30; } } @@ -977,9 +975,9 @@ static void gui_init2(int argc, char** argv) if (sys_type() & (SYS_MAGIC|SYS_NAES|SYS_XAAES)) { menu_register( _AESapid, (char*)" NetSurf "); } - tree_set_icon_dir( nsoption_charp(tree_icons_path) ); + tree_set_icon_dir( nsoption_charp(tree_icons_path) ); global_history_init(); - hotlist_init(); + hotlist_init(); toolbar_init(); } diff --git a/cocoa/selection.m b/cocoa/selection.m index 76617d23f..1e3fe19cc 100644 --- a/cocoa/selection.m +++ b/cocoa/selection.m @@ -21,7 +21,6 @@ #import "cocoa/BrowserViewController.h" #import "desktop/selection.h" -#import "render/box.h" static NSMutableString *cocoa_clipboard_string; diff --git a/gtk/search.c b/gtk/search.c index 3cdeb0ab1..52bf1c147 100644 --- a/gtk/search.c +++ b/gtk/search.c @@ -37,8 +37,6 @@ #include "desktop/search.h" #include "desktop/searchweb.h" #include "desktop/selection.h" -#include "render/box.h" -#include "render/html.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/riscos/menus.c b/riscos/menus.c index 35a011bef..550091061 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -43,9 +43,7 @@ #include "desktop/netsurf.h" #include "desktop/selection.h" #include "desktop/textinput.h" -#include "render/form.h" #include "riscos/dialog.h" -#include "render/form.h" #include "riscos/configure.h" #include "riscos/cookies.h" #include "riscos/gui.h" -- cgit v1.2.3