mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update atari includes to accomodate gui operation table refactor

This commit is contained in:
Vincent Sanders 2014-10-16 21:23:51 +01:00
parent 0b64df140c
commit 19c26ca182
15 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
atari/certview.c
View File

@ -23,16 +23,15 @@
#include <stdlib.h>
#include <time.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 "desktop/browser.h"
#include "content/urldb.h"
#include "content/hlcache.h"
#include "desktop/sslcert_viewer.h"
#include "desktop/core_window.h"
#include "atari/gui.h"
#include "atari/misc.h"

8
atari/cookies.c
View File

@ -23,6 +23,9 @@
#include <stdlib.h>
#include <time.h>
#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"

7
atari/ctxmenu.c
View File

@ -28,7 +28,9 @@
#include <mint/osbind.h>
#include <cflib.h>
#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"

26
atari/download.c
View File

@ -25,17 +25,20 @@
#include <string.h>
#include <stdbool.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 "render/html.h"
#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/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 "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),

3
atari/encoding.c
View File

@ -18,7 +18,8 @@
#include <stdlib.h>
#include "desktop/gui.h"
#include "utils/errors.h"
#include "desktop/gui_utf8.h"
#include "atari/encoding.h"

6
atari/file.c
View File

@ -24,8 +24,6 @@
#include <sys/stat.h>
#include <unistd.h>
#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.

9
atari/gui.c
View File

@ -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"

10
atari/history.c
View File

@ -25,18 +25,18 @@
#include <stdlib.h>
#include <time.h>
#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"

8
atari/hotlist.c
View File

@ -24,6 +24,9 @@
#include <stdlib.h>
#include <time.h>
#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"

12
atari/login.c
View File

@ -16,24 +16,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "utils/config.h"
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
#include <cflib.h>
#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"

1
atari/plot/plot.c
View File

@ -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"

1
atari/rootwin.c
View File

@ -37,7 +37,6 @@
#include <mt_gem.h>
#include "utils/log.h"
#include "desktop/gui.h"
#include "desktop/browser.h"
#include "desktop/browser_private.h"
#include "desktop/mouse.h"

12
atari/search.c
View File

@ -15,13 +15,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Module Description:
*
*
*
*/
#include <limits.h>
#include <stdlib.h>
#include <stdio.h>
@ -30,12 +25,13 @@
#include <stdbool.h>
#include <assert.h>
#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"

1
atari/statusbar.c
View File

@ -28,7 +28,6 @@
#include <math.h>
#include "utils/log.h"
#include "desktop/gui.h"
#include "desktop/browser.h"
#include "desktop/mouse.h"
#include "desktop/plotters.h"

2
atari/toolbar.c
View File

@ -28,7 +28,6 @@
#include <math.h>
#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"