summaryrefslogtreecommitdiff
path: root/atari
diff options
context:
space:
mode:
Diffstat (limited to 'atari')
-rwxr-xr-xatari/res/netsurf.rscbin34792 -> 34570 bytes
-rwxr-xr-xatari/res/netsurf.rsh98
-rwxr-xr-xatari/res/netsurf.rsm106
-rw-r--r--atari/settings.c7
4 files changed, 100 insertions, 111 deletions
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 5b39919a6..db6971c62 100755
--- a/atari/res/netsurf.rsc
+++ b/atari/res/netsurf.rsc
Binary files differ
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 5ab368212..572015e5b 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -42,7 +42,7 @@
#define TOOLBAR 1 /* form/dial */
#define TOOLBAR_AREA_SEARCH 1 /* BOX in tree TOOLBAR */
-#define TOOLBAR_BT_SEARCH 2 /* BUTTON in tree TOOLBAR */
+#define TOOLBAR_BT_SEARCH_FWD 2 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_BT_SEARCH_BACK 3 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_CB_CASESENSE 5 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_CB_SHOWALL 6 /* BUTTON in tree TOOLBAR */
@@ -142,56 +142,52 @@
#define SETTINGS_EDIT_EDITOR 9 /* FTEXT in tree SETTINGS */
/* Make sure that initial value is large enough! */
#define SETTINGS_BT_SEL_FONT_RENDERER 16 /* BUTTON in tree SETTINGS */
-#define SETTINGS_CB_ANTI_ALIASING 17 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_CB_TRANSPARENCY 19 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_DEF_FONT_SIZE 23 /* FTEXT in tree SETTINGS */
-#define SETTINGS_DEC_DEF_FONT_SIZE 24 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_INC_DEF_FONT_SIZE 25 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_FONT_SIZE 27 /* FTEXT in tree SETTINGS */
-#define SETTINGS_DEC_MIN_FONT_SIZE 28 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_INC_MIN_FONT_SIZE 29 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_GIF_DELAY 34 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_GIF_DELAY 35 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_GIF_DELAY 36 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_CB_ENABLE_ANIMATION 39 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_CB_BG_IMAGES 42 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_CB_FG_IMAGES 45 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MIN_REFLOW_PERIOD 49 /* FTEXT in tree SETTINGS */
-#define SETTINGS_DEC_INCREMENTAL_REFLOW 50 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_INC_INCREMENTAL_REFLOW 51 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_CB_USE_PROXY 53 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_LBL_USE_PROXY 54 /* STRING in tree SETTINGS */
-#define SETTINGS_EDIT_PROXY_HOST 55 /* FTEXT in tree SETTINGS */
-#define SETTINGS_EDIT_PROXY_PORT 57 /* FTEXT in tree SETTINGS */
-#define SETTINGS_CB_PROXY_AUTH 58 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_LBL_PROXY_AUTH 59 /* STRING in tree SETTINGS */
-#define SETTINGS_EDIT_PROXY_USERNAME 60 /* FTEXT in tree SETTINGS */
-#define SETTINGS_EDIT_PROXY_PASSWORD 61 /* FTEXT in tree SETTINGS */
-#define SETTINGS_EDIT_MAX_FETCHERS 66 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_MAX_FETCHERS 67 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_MAX_FETCHERS 68 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_MAX_FETCHERS_PER_HOST 70 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MAX_FETCHERS_PER_HOST 71 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_MAX_FETCHERS_PER_HOST 72 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_CACHED_CONNECTIONS 74 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_MAX_CACHED_CONNECTIONS 75 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_CACHED_CONNECTIONS 76 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_HOMEPAGE 78 /* FTEXT in tree SETTINGS */
-#define SETTINGS_CB_HIDE_ADVERTISEMENT 79 /* BUTTON in tree SETTINGS */
-#define SETTINGS_CB_DISABLE_POPUP_WINDOWS 80 /* BUTTON in tree SETTINGS */
-#define SETTINGS_LBL_CB_SEND_HTTP_REFERRER 81 /* STRING in tree SETTINGS */
-#define SETTINGS_CB_SEND_HTTP_REFERRER 82 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_LBL_CB_SEND_DO_NOT_TRACK 83 /* STRING in tree SETTINGS */
-#define SETTINGS_CB_SEND_DO_NOT_TRACK 84 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_BT_CLEAR_HISTORY 86 /* BUTTON in tree SETTINGS */
-#define SETTINGS_BT_SEL_LOCALE 88 /* BUTTON in tree SETTINGS */
-#define SETTINGS_BT_GUI_LANG 90 /* BUTTON in tree SETTINGS */
-#define SETTINGS_INC_MEM_CACHE 93 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_DEC_MEM_CACHE 94 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_STR_MAX_MEM_CACHE 95 /* STRING in tree SETTINGS */
-#define SETTINGS_DEC_HISTORY_AGE 98 /* BOXCHAR in tree SETTINGS */
-#define SETTINGS_EDIT_HISTORY_AGE 99 /* FTEXT in tree SETTINGS */
-#define SETTINGS_INC_HISTORY_AGE 100 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_CB_ANTI_ALIASING 17 /* BUTTON in tree SETTINGS */
+#define SETTINGS_CB_TRANSPARENCY 18 /* BUTTON in tree SETTINGS */
+#define SETTINGS_EDIT_DEF_FONT_SIZE 21 /* FTEXT in tree SETTINGS */
+#define SETTINGS_DEC_DEF_FONT_SIZE 22 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_INC_DEF_FONT_SIZE 23 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_EDIT_MIN_FONT_SIZE 25 /* FTEXT in tree SETTINGS */
+#define SETTINGS_DEC_MIN_FONT_SIZE 26 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_INC_MIN_FONT_SIZE 27 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_EDIT_MIN_GIF_DELAY 32 /* FTEXT in tree SETTINGS */
+#define SETTINGS_INC_GIF_DELAY 33 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_DEC_GIF_DELAY 34 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_CB_ENABLE_ANIMATION 37 /* BUTTON in tree SETTINGS */
+#define SETTINGS_CB_BG_IMAGES 39 /* BUTTON in tree SETTINGS */
+#define SETTINGS_CB_FG_IMAGES 41 /* BUTTON in tree SETTINGS */
+#define SETTINGS_EDIT_MIN_REFLOW_PERIOD 44 /* FTEXT in tree SETTINGS */
+#define SETTINGS_DEC_INCREMENTAL_REFLOW 45 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_INC_INCREMENTAL_REFLOW 46 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_CB_USE_PROXY 48 /* BUTTON in tree SETTINGS */
+#define SETTINGS_EDIT_PROXY_HOST 49 /* FTEXT in tree SETTINGS */
+#define SETTINGS_EDIT_PROXY_PORT 51 /* FTEXT in tree SETTINGS */
+#define SETTINGS_CB_PROXY_AUTH 52 /* BUTTON in tree SETTINGS */
+#define SETTINGS_EDIT_PROXY_USERNAME 53 /* FTEXT in tree SETTINGS */
+#define SETTINGS_EDIT_PROXY_PASSWORD 54 /* FTEXT in tree SETTINGS */
+#define SETTINGS_EDIT_MAX_FETCHERS 59 /* FTEXT in tree SETTINGS */
+#define SETTINGS_INC_MAX_FETCHERS 60 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_DEC_MAX_FETCHERS 61 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_DEC_MAX_FETCHERS_PER_HOST 63 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_EDIT_MAX_FETCHERS_PER_HOST 64 /* FTEXT in tree SETTINGS */
+#define SETTINGS_INC_MAX_FETCHERS_PER_HOST 65 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_DEC_CACHED_CONNECTIONS 67 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_EDIT_MAX_CACHED_CONNECTIONS 68 /* FTEXT in tree SETTINGS */
+#define SETTINGS_INC_CACHED_CONNECTIONS 69 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_EDIT_HOMEPAGE 71 /* FTEXT in tree SETTINGS */
+#define SETTINGS_CB_HIDE_ADVERTISEMENT 72 /* BUTTON in tree SETTINGS */
+#define SETTINGS_CB_DISABLE_POPUP_WINDOWS 73 /* BUTTON in tree SETTINGS */
+#define SETTINGS_CB_SEND_HTTP_REFERRER 74 /* BUTTON in tree SETTINGS */
+#define SETTINGS_CB_SEND_DO_NOT_TRACK 75 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_CLEAR_HISTORY 77 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_LOCALE 79 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_GUI_LANG 81 /* BUTTON in tree SETTINGS */
+#define SETTINGS_INC_MEM_CACHE 84 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_DEC_MEM_CACHE 85 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_STR_MAX_MEM_CACHE 86 /* STRING in tree SETTINGS */
+#define SETTINGS_DEC_HISTORY_AGE 89 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_EDIT_HISTORY_AGE 90 /* FTEXT in tree SETTINGS */
+#define SETTINGS_INC_HISTORY_AGE 91 /* BOXCHAR in tree SETTINGS */
#define POP_LANGUAGE 14 /* form/dial */
#define POP_LANGUAGE_CS 1 /* STRING in tree POP_LANGUAGE */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index e4d04f199..8c429efd0 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -2,8 +2,8 @@ ResourceMaster v3.65
#C 16@0@0@0@
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
-#R 0@0@2@1@2@1@
-#M 20010100@0@7728@637@
+#R 0@0@1@1@2@1@
+#M 20010100@0@7728@638@
#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
@@ -45,7 +45,7 @@ ResourceMaster v3.65
#O 61@28@M_HELP_CONTENT@@
#T 1@2@TOOLBAR@@19@@
#O 1@20@AREA_SEARCH@@
-#O 2@26@BT_SEARCH@@
+#O 2@26@BT_SEARCH_FWD@@
#O 3@26@BT_SEARCH_BACK@@
#O 5@26@CB_CASESENSE@@
#O 6@26@CB_SHOWALL@@
@@ -122,7 +122,7 @@ ResourceMaster v3.65
#O 5@33@BT_DOWN_PIC@@
#O 6@25@BT_UP@@
#O 4@33@BT_UP_PIC@@
-#T 13@2@SETTINGS@@102@@
+#T 13@2@SETTINGS@@93@@
#O 1@26@SAVE@@
#O 2@26@ABORT@@
#O 5@29@EDIT_DOWNLOAD_PATH@@
@@ -131,56 +131,52 @@ ResourceMaster v3.65
#O 8@29@EDIT_CA_CERTS_PATH@@
#O 9@29@EDIT_EDITOR@@
#O 16@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@
-#O 17@27@CB_ANTI_ALIASING@@
-#O 19@27@CB_TRANSPARENCY@@
-#O 23@29@EDIT_DEF_FONT_SIZE@@
-#O 24@27@DEC_DEF_FONT_SIZE@@
-#O 25@27@INC_DEF_FONT_SIZE@@
-#O 27@29@EDIT_MIN_FONT_SIZE@@
-#O 28@27@DEC_MIN_FONT_SIZE@@
-#O 29@27@INC_MIN_FONT_SIZE@@
-#O 34@29@EDIT_MIN_GIF_DELAY@@
-#O 35@27@INC_GIF_DELAY@@
-#O 36@27@DEC_GIF_DELAY@@
-#O 39@27@CB_ENABLE_ANIMATION@@
-#O 42@27@CB_BG_IMAGES@@
-#O 45@27@CB_FG_IMAGES@@
-#O 49@29@EDIT_MIN_REFLOW_PERIOD@@
-#O 50@27@DEC_INCREMENTAL_REFLOW@@
-#O 51@27@INC_INCREMENTAL_REFLOW@@
-#O 53@27@CB_USE_PROXY@@
-#O 54@28@LBL_USE_PROXY@@
-#O 55@29@EDIT_PROXY_HOST@@
-#O 57@29@EDIT_PROXY_PORT@@
-#O 58@27@CB_PROXY_AUTH@@
-#O 59@28@LBL_PROXY_AUTH@@
-#O 60@29@EDIT_PROXY_USERNAME@@
-#O 61@29@EDIT_PROXY_PASSWORD@@
-#O 66@29@EDIT_MAX_FETCHERS@@
-#O 67@27@INC_MAX_FETCHERS@@
-#O 68@27@DEC_MAX_FETCHERS@@
-#O 70@27@DEC_MAX_FETCHERS_PER_HOST@@
-#O 71@29@EDIT_MAX_FETCHERS_PER_HOST@@
-#O 72@27@INC_MAX_FETCHERS_PER_HOST@@
-#O 74@27@DEC_CACHED_CONNECTIONS@@
-#O 75@29@EDIT_MAX_CACHED_CONNECTIONS@@
-#O 76@27@INC_CACHED_CONNECTIONS@@
-#O 78@29@EDIT_HOMEPAGE@@
-#O 79@26@CB_HIDE_ADVERTISEMENT@@
-#O 80@26@CB_DISABLE_POPUP_WINDOWS@@
-#O 81@28@LBL_CB_SEND_HTTP_REFERRER@@
-#O 82@27@CB_SEND_HTTP_REFERRER@@
-#O 83@28@LBL_CB_SEND_DO_NOT_TRACK@@
-#O 84@27@CB_SEND_DO_NOT_TRACK@@
-#O 86@26@BT_CLEAR_HISTORY@@
-#O 88@26@BT_SEL_LOCALE@@
-#O 90@26@BT_GUI_LANG@@
-#O 93@27@INC_MEM_CACHE@@
-#O 94@27@DEC_MEM_CACHE@@
-#O 95@28@STR_MAX_MEM_CACHE@@
-#O 98@27@DEC_HISTORY_AGE@@
-#O 99@29@EDIT_HISTORY_AGE@@
-#O 100@27@INC_HISTORY_AGE@@
+#O 17@26@CB_ANTI_ALIASING@@
+#O 18@26@CB_TRANSPARENCY@@
+#O 21@29@EDIT_DEF_FONT_SIZE@@
+#O 22@27@DEC_DEF_FONT_SIZE@@
+#O 23@27@INC_DEF_FONT_SIZE@@
+#O 25@29@EDIT_MIN_FONT_SIZE@@
+#O 26@27@DEC_MIN_FONT_SIZE@@
+#O 27@27@INC_MIN_FONT_SIZE@@
+#O 32@29@EDIT_MIN_GIF_DELAY@@
+#O 33@27@INC_GIF_DELAY@@
+#O 34@27@DEC_GIF_DELAY@@
+#O 37@26@CB_ENABLE_ANIMATION@@
+#O 39@26@CB_BG_IMAGES@@
+#O 41@26@CB_FG_IMAGES@@
+#O 44@29@EDIT_MIN_REFLOW_PERIOD@@
+#O 45@27@DEC_INCREMENTAL_REFLOW@@
+#O 46@27@INC_INCREMENTAL_REFLOW@@
+#O 48@26@CB_USE_PROXY@@
+#O 49@29@EDIT_PROXY_HOST@@
+#O 51@29@EDIT_PROXY_PORT@@
+#O 52@26@CB_PROXY_AUTH@@
+#O 53@29@EDIT_PROXY_USERNAME@@
+#O 54@29@EDIT_PROXY_PASSWORD@@
+#O 59@29@EDIT_MAX_FETCHERS@@
+#O 60@27@INC_MAX_FETCHERS@@
+#O 61@27@DEC_MAX_FETCHERS@@
+#O 63@27@DEC_MAX_FETCHERS_PER_HOST@@
+#O 64@29@EDIT_MAX_FETCHERS_PER_HOST@@
+#O 65@27@INC_MAX_FETCHERS_PER_HOST@@
+#O 67@27@DEC_CACHED_CONNECTIONS@@
+#O 68@29@EDIT_MAX_CACHED_CONNECTIONS@@
+#O 69@27@INC_CACHED_CONNECTIONS@@
+#O 71@29@EDIT_HOMEPAGE@@
+#O 72@26@CB_HIDE_ADVERTISEMENT@@
+#O 73@26@CB_DISABLE_POPUP_WINDOWS@@
+#O 74@26@CB_SEND_HTTP_REFERRER@@
+#O 75@26@CB_SEND_DO_NOT_TRACK@@
+#O 77@26@BT_CLEAR_HISTORY@@
+#O 79@26@BT_SEL_LOCALE@@
+#O 81@26@BT_GUI_LANG@@
+#O 84@27@INC_MEM_CACHE@@
+#O 85@27@DEC_MEM_CACHE@@
+#O 86@28@STR_MAX_MEM_CACHE@@
+#O 89@27@DEC_HISTORY_AGE@@
+#O 90@29@EDIT_HISTORY_AGE@@
+#O 91@27@INC_HISTORY_AGE@@
#T 14@2@POP_LANGUAGE@@16@@
#O 1@28@CS@@
#O 2@28@DE@@
@@ -200,4 +196,4 @@ ResourceMaster v3.65
#T 15@2@POP_FONT_RENDERER@@3@@
#O 1@28@INTERNAL@@
#O 2@28@FREETYPE@@
-#c 27715@
+#c 22626@
diff --git a/atari/settings.c b/atari/settings.c
index 08cb56b01..77e4c6293 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -42,10 +42,9 @@ static OBJECT * dlgtree;
#define OBJ_SELECTED(idx) ((bool)((dlgtree[idx].ob_state & OS_SELECTED)!=0))
-#define OBJ_CHECK(idx) (dlgtree[idx].ob_state |= (OS_SELECTED | OS_CROSSED));
+#define OBJ_CHECK(idx) (dlgtree[idx].ob_state |= (OS_SELECTED));
-#define OBJ_UNCHECK(idx) (dlgtree[idx].ob_state &= ~(OS_SELECTED)); \
- (dlgtree[idx].ob_state &= ~(OS_CROSSED));
+#define OBJ_UNCHECK(idx) (dlgtree[idx].ob_state &= ~(OS_SELECTED));
#define OBJ_REDRAW(idx) guiwin_send_redraw(settings_guiwin, \
obj_screen_rect(dlgtree, idx));
@@ -286,12 +285,10 @@ static void form_event(int index, int external)
ENABLE_OBJ(SETTINGS_EDIT_PROXY_HOST);
ENABLE_OBJ(SETTINGS_EDIT_PROXY_PORT);
ENABLE_OBJ(SETTINGS_CB_PROXY_AUTH);
- ENABLE_OBJ(SETTINGS_LBL_PROXY_AUTH);
} else {
DISABLE_OBJ(SETTINGS_EDIT_PROXY_HOST);
DISABLE_OBJ(SETTINGS_EDIT_PROXY_PORT);
DISABLE_OBJ(SETTINGS_CB_PROXY_AUTH);
- DISABLE_OBJ(SETTINGS_LBL_PROXY_AUTH);
}
FORMEVENT(SETTINGS_CB_PROXY_AUTH);
OBJ_REDRAW(SETTINGS_CB_USE_PROXY);