summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--atari/gemtk/gemtk.h2
-rw-r--r--atari/gemtk/guiwin.c20
-rwxr-xr-xatari/res/netsurf.rsh1
-rwxr-xr-xatari/res/netsurf.rsm3
4 files changed, 25 insertions, 1 deletions
diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h
index f931e62c6..c77b0d958 100644
--- a/atari/gemtk/gemtk.h
+++ b/atari/gemtk/gemtk.h
@@ -137,6 +137,8 @@ void guiwin_set_event_handler(GUIWIN *win,guiwin_event_handler_f cb);
void guiwin_set_user_data(GUIWIN *win, void *data);
void *guiwin_get_user_data(GUIWIN *win);
struct guiwin_scroll_info_s * guiwin_get_scroll_info(GUIWIN *win);
+void guiwin_set_scroll_grid(GUIWIN * win, short x, short y);
+void guiwin_set_content_units(GUIWIN * win, short x, short y);
bool guiwin_update_slider(GUIWIN *win, short mode);
void guiwin_scroll(GUIWIN *gw, short orientation, int units, bool refresh);
void guiwin_send_msg(GUIWIN *win, short msgtype, short a, short b, short c,
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index 4371fa3b1..a471fc92d 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -675,6 +675,26 @@ struct guiwin_scroll_info_s *guiwin_get_scroll_info(GUIWIN *win) {
return(&win->scroll_info);
}
+void guiwin_set_scroll_grid(GUIWIN * win, short x, short y)
+{
+ struct guiwin_scroll_info_s *slid = guiwin_get_scroll_info(win);
+
+ assert(slid != NULL);
+
+ slid->y_unit_px = x;
+ slid->x_unit_px = y;
+}
+
+void guiwin_set_content_units(GUIWIN * win, short x, short y)
+{
+ struct guiwin_scroll_info_s *slid = guiwin_get_scroll_info(win);
+
+ assert(slid != NULL);
+
+ slid->x_units = x;
+ slid->y_units = y;
+}
+
void guiwin_send_msg(GUIWIN *win, short msg_type, short a, short b, short c,
short d)
{
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 70426ba7e..d1ba0370c 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -215,6 +215,7 @@
#define SETTINGS_EDIT_PROXY_HOST 36 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_PROXY_PORT 38 /* FTEXT in tree SETTINGS */
#define SETTINGS_CB_PROXY_AUTH 39 /* BOXCHAR in tree SETTINGS */
+#define SETTINGS_LBL_PROXY_AUTH 40 /* STRING in tree SETTINGS */
#define SETTINGS_EDIT_PROXY_USERNAME 41 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_PROXY_PASSWORD 42 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_MAX_FETCHERS 47 /* FTEXT in tree SETTINGS */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index b9bbe7128..b759953f6 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.65
#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@628@
+#M 20010100@0@7728@629@
#T 0@1@MAINMENU@@62@@
#O 4@32@T_FILE@@
#O 5@32@T_EDIT@@
@@ -204,6 +204,7 @@ ResourceMaster v3.65
#O 36@29@EDIT_PROXY_HOST@@
#O 38@29@EDIT_PROXY_PORT@@
#O 39@27@CB_PROXY_AUTH@@
+#O 40@28@LBL_PROXY_AUTH@@
#O 41@29@EDIT_PROXY_USERNAME@@
#O 42@29@EDIT_PROXY_PASSWORD@@
#O 47@29@EDIT_MAX_FETCHERS@@