From 19c26ca1829e94ea7abbadea50707a4ee5441d10 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 16 Oct 2014 21:23:51 +0100 Subject: update atari includes to accomodate gui operation table refactor --- atari/certview.c | 9 ++++----- atari/cookies.c | 8 ++++---- atari/ctxmenu.c | 7 +++---- atari/download.c | 20 +++++++++++--------- atari/encoding.c | 3 ++- atari/file.c | 6 +++--- atari/gui.c | 9 ++++++--- atari/history.c | 10 +++++----- atari/hotlist.c | 8 ++++---- atari/login.c | 12 ++++++------ atari/plot/plot.c | 1 - atari/rootwin.c | 1 - atari/search.c | 12 ++++-------- atari/statusbar.c | 1 - atari/toolbar.c | 2 +- 15 files changed, 53 insertions(+), 56 deletions(-) (limited to 'atari') diff --git a/atari/certview.c b/atari/certview.c index 548637de3..e9ad941db 100644 --- a/atari/certview.c +++ b/atari/certview.c @@ -23,16 +23,15 @@ #include #include +#include "utils/nsoption.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "desktop/browser.h" #include "content/urldb.h" #include "content/hlcache.h" #include "desktop/sslcert_viewer.h" -#include "desktop/gui.h" #include "desktop/core_window.h" -#include "utils/nsoption.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "atari/gui.h" #include "atari/misc.h" diff --git a/atari/cookies.c b/atari/cookies.c index 193be4176..ec7b93628 100644 --- a/atari/cookies.c +++ b/atari/cookies.c @@ -23,6 +23,9 @@ #include #include +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "desktop/browser.h" #include "content/content.h" #include "content/hlcache.h" @@ -30,11 +33,8 @@ #include "utils/nsoption.h" #include "desktop/cookie_manager.h" #include "desktop/tree.h" -#include "desktop/gui.h" #include "desktop/core_window.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" + #include "atari/gui.h" #include "atari/misc.h" #include "atari/treeview.h" diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c index 79ed65d97..93035bfc1 100644 --- a/atari/ctxmenu.c +++ b/atari/ctxmenu.c @@ -28,7 +28,9 @@ #include #include -#include "desktop/gui.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "desktop/browser.h" #include "desktop/browser_private.h" #include "desktop/mouse.h" @@ -36,9 +38,6 @@ #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "atari/gui.h" #include "atari/rootwin.h" diff --git a/atari/download.c b/atari/download.c index 11a84347f..f5c9120ca 100755 --- a/atari/download.c +++ b/atari/download.c @@ -25,17 +25,20 @@ #include #include +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/nsoption.h" +#include "utils/types.h" #include "content/urldb.h" #include "content/fetch.h" -#include "desktop/gui.h" -#include "utils/nsoption.h" #include "desktop/save_complete.h" #include "desktop/textinput.h" #include "desktop/download.h" +#include "desktop/browser.h" +#include "desktop/gui_download.h" #include "render/html.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" + #include "atari/gui.h" #include "atari/misc.h" #include "atari/res/netsurf.rsh" @@ -50,9 +53,8 @@ static void on_abort_click(struct gui_download_window *dw); static void on_cbrdy_click(struct gui_download_window *dw); static void on_close(struct gui_download_window * dw); static void on_redraw(struct gui_download_window *dw, GRECT *clip); -static void toolbar_redraw_cb(GUIWIN *win, uint16_t msg, GRECT *clip); -static void toolbar_redraw_cb(GUIWIN *win, uint16_t msg, GRECT *clip) +static void toolbar_redraw_cb(GUIWIN *win, uint16_t msg, GRECT *clip) { struct gui_download_window *data; @@ -387,7 +389,7 @@ static nserror gui_download_window_data(struct gui_download_window *dw, uint32_t p = 0; p = ((double)dw->size_downloaded / (double)dw->size_total * 100); snprintf( (char*)&dw->lbl_percent, MAX_SLEN_LBL_PERCENT, - "%lu%s", p, "%" + "%"PRIu32"%s", p, "%" ); } else { snprintf( (char*)&dw->lbl_percent, MAX_SLEN_LBL_PERCENT, @@ -434,7 +436,7 @@ static void gui_download_window_done(struct gui_download_window *dw) gemtk_wm_send_msg(dw->guiwin, WM_CLOSED, 0, 0, 0, 0); } else { snprintf( (char*)&dw->lbl_percent, MAX_SLEN_LBL_PERCENT, - "%lu%s", 100, "%" + "%u%s", 100, "%" ); snprintf( (char*)&dw->lbl_done, MAX_SLEN_LBL_DONE, "%s / %s", human_friendly_bytesize(dw->size_downloaded), diff --git a/atari/encoding.c b/atari/encoding.c index 7a60eeeb9..8afcbb650 100644 --- a/atari/encoding.c +++ b/atari/encoding.c @@ -18,7 +18,8 @@ #include -#include "desktop/gui.h" +#include "utils/errors.h" +#include "desktop/gui_utf8.h" #include "atari/encoding.h" diff --git a/atari/file.c b/atari/file.c index 907fc0645..53c9c8a79 100644 --- a/atari/file.c +++ b/atari/file.c @@ -24,8 +24,6 @@ #include #include -#include "desktop/gui_factory.h" - #include "utils/utils.h" #include "utils/corestrings.h" #include "utils/url.h" @@ -33,9 +31,11 @@ #include "utils/file.h" /** + * \file * Atari file handling callbacks. + * * Most of this code was taken from windows/gui.c -*/ + */ /** * Generate a GEMDOS path from one or more component elemnts. diff --git a/atari/gui.c b/atari/gui.c index f0c4ab709..135a991e0 100644 --- a/atari/gui.c +++ b/atari/gui.c @@ -40,16 +40,19 @@ #include "content/fetch.h" #include "content/fetchers/resource.h" #include "content/backing_store.h" -#include "desktop/gui.h" +#include "desktop/mouse.h" #include "desktop/plotters.h" -#include "desktop/netsurf.h" #include "desktop/save_complete.h" #include "desktop/textinput.h" #include "desktop/treeview.h" #include "desktop/browser.h" #include "desktop/browser_private.h" -#include "desktop/mouse.h" #include "desktop/font.h" +#include "desktop/gui_window.h" +#include "desktop/gui_clipboard.h" +#include "desktop/gui_fetch.h" +#include "desktop/gui_misc.h" +#include "desktop/netsurf.h" #include "atari/gemtk/gemtk.h" #include "atari/gui.h" diff --git a/atari/history.c b/atari/history.c index 0de863ca2..26d571826 100644 --- a/atari/history.c +++ b/atari/history.c @@ -25,18 +25,18 @@ #include #include +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/nsoption.h" #include "desktop/browser.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "utils/nsoption.h" #include "desktop/global_history.h" #include "desktop/tree.h" -#include "desktop/gui.h" #include "desktop/core_window.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" + #include "atari/gui.h" #include "atari/misc.h" #include "atari/treeview.h" diff --git a/atari/hotlist.c b/atari/hotlist.c index 762a68f27..c2209e448 100644 --- a/atari/hotlist.c +++ b/atari/hotlist.c @@ -24,6 +24,9 @@ #include #include +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" #include "desktop/browser.h" #include "content/content.h" #include "content/hlcache.h" @@ -31,11 +34,8 @@ #include "utils/nsoption.h" #include "desktop/hotlist.h" #include "desktop/tree.h" -#include "desktop/gui.h" #include "desktop/core_window.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" + #include "atari/gui.h" #include "atari/misc.h" #include "atari/treeview.h" diff --git a/atari/login.c b/atari/login.c index 687512ed1..4beae6ebb 100755 --- a/atari/login.c +++ b/atari/login.c @@ -16,24 +16,24 @@ * along with this program. If not, see . */ +#include "utils/config.h" #include #include #include #include #include -#include "utils/config.h" -#include "content/content.h" -#include "content/hlcache.h" -#include "content/urldb.h" -#include "desktop/browser.h" -#include "desktop/gui.h" #include "utils/errors.h" #include "utils/utils.h" #include "utils/messages.h" #include "utils/log.h" +#include "content/content.h" +#include "content/hlcache.h" +#include "content/urldb.h" +#include "desktop/browser.h" #include "content/urldb.h" #include "content/fetch.h" + #include "atari/misc.h" #include "atari/login.h" #include "atari/res/netsurf.rsh" diff --git a/atari/plot/plot.c b/atari/plot/plot.c index cfec7b424..feeb5f9f7 100755 --- a/atari/plot/plot.c +++ b/atari/plot/plot.c @@ -29,7 +29,6 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" -#include "desktop/gui.h" #include "desktop/plotters.h" #include "atari/bitmap.h" diff --git a/atari/rootwin.c b/atari/rootwin.c index c1b9096bc..0258bc2d2 100755 --- a/atari/rootwin.c +++ b/atari/rootwin.c @@ -37,7 +37,6 @@ #include #include "utils/log.h" -#include "desktop/gui.h" #include "desktop/browser.h" #include "desktop/browser_private.h" #include "desktop/mouse.h" diff --git a/atari/search.c b/atari/search.c index f79891aa5..072ba1d49 100644 --- a/atari/search.c +++ b/atari/search.c @@ -15,13 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * Module Description: - * - * - * */ - #include #include #include @@ -30,12 +25,13 @@ #include #include -#include "desktop/gui.h" +#include "utils/log.h" +#include "utils/messages.h" #include "desktop/browser.h" #include "desktop/browser_private.h" #include "desktop/search.h" -#include "utils/log.h" -#include "utils/messages.h" +#include "desktop/gui_search.h" + #include "atari/gui.h" #include "atari/rootwin.h" #include "atari/misc.h" diff --git a/atari/statusbar.c b/atari/statusbar.c index 7036c0ffe..0730b7ef2 100755 --- a/atari/statusbar.c +++ b/atari/statusbar.c @@ -28,7 +28,6 @@ #include #include "utils/log.h" -#include "desktop/gui.h" #include "desktop/browser.h" #include "desktop/mouse.h" #include "desktop/plotters.h" diff --git a/atari/toolbar.c b/atari/toolbar.c index 3e0d6d396..e939be81c 100644 --- a/atari/toolbar.c +++ b/atari/toolbar.c @@ -28,7 +28,6 @@ #include #include "utils/log.h" -#include "desktop/gui.h" #include "desktop/browser.h" #include "desktop/browser_history.h" #include "desktop/browser_private.h" @@ -37,6 +36,7 @@ #include "desktop/plotters.h" #include "desktop/tree.h" #include "desktop/hotlist.h" + #include "utils/nsoption.h" #include "utils/nsurl.h" #include "utils/utf8.h" -- cgit v1.2.3