netsurf: branch master updated. release/3.0-811-g7395aa1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/7395aa14ff0f0364bd3ef...
...commit http://git.netsurf-browser.org/netsurf.git/commit/7395aa14ff0f0364bd3ef0f...
...tree http://git.netsurf-browser.org/netsurf.git/tree/7395aa14ff0f0364bd3ef0f14...
The branch, master has been updated
via 7395aa14ff0f0364bd3ef0f14933daf06a40937f (commit)
from 103270938bf679730db5120a8945efcfb79d7db4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7395aa14ff0f0364bd3...
commit 7395aa14ff0f0364bd3ef0f14933daf06a40937f
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Prepared changelof for 3.1 release
diff --git a/atari/doc/changes.txt b/atari/doc/changes.txt
index 30879c8..f913bda 100755
--- a/atari/doc/changes.txt
+++ b/atari/doc/changes.txt
@@ -1,3 +1,42 @@
+
+
+ ===========================
+ FreeMiNT Frontend Changelog
+ ===========================
+
+
+ NetSurf 3.1
+========================================
+
+As there was no atari NetSurf 3.0 Release FreeMiNT, this Changelog contains
+the FreeMint specific changes from
+NetSurf 2.9-PL1 Release (Sunday, April 15 2012) to Netsurf 3.1 Release.
+
+
+ - Removed WinDom dependency (heavy GUI code change)
+ - Implemented "paste clipboard" for toolbar URL textbox.
+ - Implemented global history window.
+ - Implemented file drop on browser window handling when netsurf core
+ ignores the file drop event.
+ - Implemented basic browser window scaling
+ - Integrated "search page" dialog into browser window
+ - New settings dialog
+ - New treeview implementation
+ - Added SSL information treeview
+ - Added about dialog
+ - Improved keyboard-shortcut handling
+ - Improved caret redraw
+ - Improved favicon display
+ - Improved warning display (now shows a message box)
+ - Improved bitmap blitting
+ - Fixed FreeMiNT's unified filesystem handling (it's not Linux! - but DOS!)
+ - Fixed default download directoy
+ - Fixed integer overflow in download completed calculation
+ - Fixed commandline filepath handling
+
+
+ NetSurf 2.9
+========================================
- Fixed redraw of rectangle outlines.
- Fixed redraw of Hotlist, looks better now.
- Use netsurfs textarea implementation for URL, to reduce code size.
-----------------------------------------------------------------------
Summary of changes:
atari/doc/changes.txt | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/atari/doc/changes.txt b/atari/doc/changes.txt
index 30879c8..f913bda 100755
--- a/atari/doc/changes.txt
+++ b/atari/doc/changes.txt
@@ -1,3 +1,42 @@
+
+
+ ===========================
+ FreeMiNT Frontend Changelog
+ ===========================
+
+
+ NetSurf 3.1
+========================================
+
+As there was no atari NetSurf 3.0 Release FreeMiNT, this Changelog contains
+the FreeMint specific changes from
+NetSurf 2.9-PL1 Release (Sunday, April 15 2012) to Netsurf 3.1 Release.
+
+
+ - Removed WinDom dependency (heavy GUI code change)
+ - Implemented "paste clipboard" for toolbar URL textbox.
+ - Implemented global history window.
+ - Implemented file drop on browser window handling when netsurf core
+ ignores the file drop event.
+ - Implemented basic browser window scaling
+ - Integrated "search page" dialog into browser window
+ - New settings dialog
+ - New treeview implementation
+ - Added SSL information treeview
+ - Added about dialog
+ - Improved keyboard-shortcut handling
+ - Improved caret redraw
+ - Improved favicon display
+ - Improved warning display (now shows a message box)
+ - Improved bitmap blitting
+ - Fixed FreeMiNT's unified filesystem handling (it's not Linux! - but DOS!)
+ - Fixed default download directoy
+ - Fixed integer overflow in download completed calculation
+ - Fixed commandline filepath handling
+
+
+ NetSurf 2.9
+========================================
- Fixed redraw of rectangle outlines.
- Fixed redraw of Hotlist, looks better now.
- Use netsurfs textarea implementation for URL, to reduce code size.
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-810-g1032709
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/103270938bf679730db51...
...commit http://git.netsurf-browser.org/netsurf.git/commit/103270938bf679730db5120...
...tree http://git.netsurf-browser.org/netsurf.git/tree/103270938bf679730db5120a8...
The branch, master has been updated
via 103270938bf679730db5120a8945efcfb79d7db4 (commit)
from 9118f3c8cc37cf2902c78f12c8b676d911653573 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=103270938bf679730db...
commit 103270938bf679730db5120a8945efcfb79d7db4
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Check for null pointer before setting label
diff --git a/atari/settings.c b/atari/settings.c
index 30ad20a..fa835bf 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -369,7 +369,9 @@ static bool handle_filesystem_select_button(short rsc_bt)
if (require_path == false) {
path = file_select(title, "");
- gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ if (path != NULL) {
+ gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ }
}
else {
do {
@@ -388,6 +390,7 @@ static bool handle_filesystem_select_button(short rsc_bt)
}
}
+ OBJ_UNCHECK(rsc_bt);
OBJ_REDRAW(rsc_bt);
OBJ_REDRAW(rsc_te);
}
-----------------------------------------------------------------------
Summary of changes:
atari/settings.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/atari/settings.c b/atari/settings.c
index 30ad20a..fa835bf 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -369,7 +369,9 @@ static bool handle_filesystem_select_button(short rsc_bt)
if (require_path == false) {
path = file_select(title, "");
- gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ if (path != NULL) {
+ gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ }
}
else {
do {
@@ -388,6 +390,7 @@ static bool handle_filesystem_select_button(short rsc_bt)
}
}
+ OBJ_UNCHECK(rsc_bt);
OBJ_REDRAW(rsc_bt);
OBJ_REDRAW(rsc_te);
}
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-809-g9118f3c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9118f3c8cc37cf2902c78...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9118f3c8cc37cf2902c78f1...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9118f3c8cc37cf2902c78f12c...
The branch, master has been updated
via 9118f3c8cc37cf2902c78f12c8b676d911653573 (commit)
from b4cef781eff108e79cf210b6b6881de2dfed1681 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9118f3c8cc37cf2902c...
commit 9118f3c8cc37cf2902c78f12c8b676d911653573
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added "select file/path" buttons to path configuration groupbox.
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 84e70d2..a889102 100755
Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 5ae722e..68ecf64 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -134,6 +134,11 @@
#define SETTINGS_EDIT_CA_BUNDLE 7 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_CA_CERTS_PATH 8 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_EDITOR 9 /* FTEXT in tree SETTINGS */
+#define SETTINGS_BT_SEL_DOWNLOAD_DIR 96 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_HOTLIST 97 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_CA_BUNDLE 98 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_CA_CERTS 99 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_EDITOR 100 /* BUTTON 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 /* BUTTON in tree SETTINGS */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 5b71686..ff647d1 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.651
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@2@1@
-#M 11110100@0@7728@660@
+#M 11110100@0@7728@662@
#T 0@2@TOOLBAR@@20@@
#O 1@20@AREA_SEARCH@@
#O 2@26@BT_SEARCH_FWD@@
@@ -112,7 +112,7 @@ ResourceMaster v3.651
#T 15@2@TOOLBAR_HISTORY@@1@@
#T 16@2@TOOLBAR_SSL_CERT@@2@@
#O 1@26@TRUSTED@@
-#T 17@2@SETTINGS@@96@@
+#T 17@2@SETTINGS@@101@@
#O 1@26@SAVE@@
#O 2@26@ABORT@@
#O 5@29@EDIT_DOWNLOAD_PATH@@
@@ -120,6 +120,11 @@ ResourceMaster v3.651
#O 7@29@EDIT_CA_BUNDLE@@
#O 8@29@EDIT_CA_CERTS_PATH@@
#O 9@29@EDIT_EDITOR@@
+#O 96@26@BT_SEL_DOWNLOAD_DIR@@
+#O 97@26@BT_SEL_HOTLIST@@
+#O 98@26@BT_SEL_CA_BUNDLE@@
+#O 99@26@BT_SEL_CA_CERTS@@
+#O 100@26@BT_SEL_EDITOR@@
#O 16@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@
#O 17@26@CB_ANTI_ALIASING@@
#O 18@26@CB_TRANSPARENCY@@
@@ -209,4 +214,4 @@ ResourceMaster v3.651
#O 61@28@M_CHOICES@@
#O 62@28@M_VLOG@@
#O 64@28@M_HELP_CONTENT@@
-#c 4908@
+#c 3798@
diff --git a/atari/settings.c b/atari/settings.c
index b16e274..30ad20a 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -91,7 +91,7 @@ static const char *gui_timeouts[] = {
#define INPUT_PROXY_PORT_MAX_LEN 5
#define INPUT_MIN_REFLOW_PERIOD_MAX_LEN 4
#define LABEL_FONT_RENDERER_MAX_LEN 8
-#define LABEL_PATH_MAX_LEN 43
+#define LABEL_PATH_MAX_LEN 40
#define LABEL_ICONSET_MAX_LEN 8
#define INPUT_TOOLBAR_COLOR_MAX_LEN 6
@@ -322,6 +322,76 @@ static void display_settings(void)
toggle_objects();
}
+static bool handle_filesystem_select_button(short rsc_bt)
+{
+ bool require_path = false;
+ bool is_folder = false;
+ short rsc_te = 0; // The textarea that is bound to the button
+ const char * title = "";
+ const char * path = NULL;
+
+ // TODO: localize String:
+ switch (rsc_bt) {
+
+
+ case SETTINGS_BT_SEL_DOWNLOAD_DIR:
+ title = "Select Download Directory:";
+ rsc_te = SETTINGS_EDIT_DOWNLOAD_PATH;
+ require_path = true;
+ break;
+
+ case SETTINGS_BT_SEL_HOTLIST:
+ title = "Select Hotlist File:";
+ rsc_te = SETTINGS_EDIT_HOTLIST_FILE;
+ break;
+
+ case SETTINGS_BT_SEL_CA_BUNDLE:
+ title = "Select CA Bundle File:";
+ rsc_te = SETTINGS_EDIT_CA_BUNDLE;
+ break;
+
+ case SETTINGS_BT_SEL_CA_CERTS:
+ title = "Select Certs Directory:";
+ rsc_te = SETTINGS_EDIT_CA_CERTS_PATH;
+ require_path = true;
+ break;
+
+ case SETTINGS_BT_SEL_EDITOR:
+ title = "Select Editor Application:";
+ rsc_te = SETTINGS_EDIT_EDITOR;
+ break;
+
+ default:
+ break;
+ };
+
+ assert(rsc_te != 0);
+
+ if (require_path == false) {
+ path = file_select(title, "");
+ gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ }
+ else {
+ do {
+ /* display file selector: */
+ path = file_select(title, "");
+ if (path) {
+ is_folder = is_dir(path);
+ }
+ if ((is_folder == false) && (path != NULL)) {
+ gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, "Folder Required!");
+ }
+ } while ((is_folder == false) && (path != NULL));
+
+ if ((is_folder == true) && (path != NULL)) {
+ gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ }
+ }
+
+ OBJ_REDRAW(rsc_bt);
+ OBJ_REDRAW(rsc_te);
+}
+
static void form_event(int index, int external)
{
char spare[255];
@@ -486,28 +556,14 @@ static void form_event(int index, int external)
OBJ_REDRAW(SETTINGS_BT_GUI_TOUT);
break;
- /*
- case SETTINGS_INPUT_TOOLBAR_BGCOLOR:
- objc_offset( FORM(win), SETTINGS_INPUT_TOOLBAR_BGCOLOR, &x, &y );
- choice = color_popup(x, y, tmp_option_atari_toolbar_bg);
- snprintf( spare, 255, "%06x", choice );
- tmp_option_atari_toolbar_bg = choice;
- ObjcStrCpy( dlgtree, SETTINGS_INPUT_TOOLBAR_BGCOLOR,
- spare );
- is_button = true;
- OBJ_REDRAW(SETTINGS_INPUT_TOOLBAR_BGCOLOR);
- break;
- */
- /*
- case SETTINGS_BT_TOOLBAR_ICONSET:
- objc_offset( FORM(win), SETTINGS_BT_TOOLBAR_ICONSET, &x, &y );
- tmp = toolbar_iconset_popup(x,y);
- if( tmp != NULL ){
- ObjcStrCpy( dlgtree, SETTINGS_BT_TOOLBAR_ICONSET, tmp );
- }
- is_button = true;
- break;
- */
+ case SETTINGS_BT_SEL_DOWNLOAD_DIR:
+ case SETTINGS_BT_SEL_HOTLIST:
+ case SETTINGS_BT_SEL_CA_BUNDLE:
+ case SETTINGS_BT_SEL_CA_CERTS:
+ case SETTINGS_BT_SEL_EDITOR:
+ handle_filesystem_select_button(index);
+ break;
+
case SETTINGS_INC_MEM_CACHE:
case SETTINGS_DEC_MEM_CACHE:
if( index == SETTINGS_DEC_MEM_CACHE )
-----------------------------------------------------------------------
Summary of changes:
atari/res/netsurf.rsc | Bin 38236 -> 38346 bytes
atari/res/netsurf.rsh | 5 ++
atari/res/netsurf.rsm | 11 ++++-
atari/settings.c | 102 ++++++++++++++++++++++++++++++++++++++-----------
4 files changed, 92 insertions(+), 26 deletions(-)
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 84e70d2..a889102 100755
Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index 5ae722e..68ecf64 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -134,6 +134,11 @@
#define SETTINGS_EDIT_CA_BUNDLE 7 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_CA_CERTS_PATH 8 /* FTEXT in tree SETTINGS */
#define SETTINGS_EDIT_EDITOR 9 /* FTEXT in tree SETTINGS */
+#define SETTINGS_BT_SEL_DOWNLOAD_DIR 96 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_HOTLIST 97 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_CA_BUNDLE 98 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_CA_CERTS 99 /* BUTTON in tree SETTINGS */
+#define SETTINGS_BT_SEL_EDITOR 100 /* BUTTON 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 /* BUTTON in tree SETTINGS */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 5b71686..ff647d1 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -3,7 +3,7 @@ ResourceMaster v3.651
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@2@1@
-#M 11110100@0@7728@660@
+#M 11110100@0@7728@662@
#T 0@2@TOOLBAR@@20@@
#O 1@20@AREA_SEARCH@@
#O 2@26@BT_SEARCH_FWD@@
@@ -112,7 +112,7 @@ ResourceMaster v3.651
#T 15@2@TOOLBAR_HISTORY@@1@@
#T 16@2@TOOLBAR_SSL_CERT@@2@@
#O 1@26@TRUSTED@@
-#T 17@2@SETTINGS@@96@@
+#T 17@2@SETTINGS@@101@@
#O 1@26@SAVE@@
#O 2@26@ABORT@@
#O 5@29@EDIT_DOWNLOAD_PATH@@
@@ -120,6 +120,11 @@ ResourceMaster v3.651
#O 7@29@EDIT_CA_BUNDLE@@
#O 8@29@EDIT_CA_CERTS_PATH@@
#O 9@29@EDIT_EDITOR@@
+#O 96@26@BT_SEL_DOWNLOAD_DIR@@
+#O 97@26@BT_SEL_HOTLIST@@
+#O 98@26@BT_SEL_CA_BUNDLE@@
+#O 99@26@BT_SEL_CA_CERTS@@
+#O 100@26@BT_SEL_EDITOR@@
#O 16@26@BT_SEL_FONT_RENDERER@Make sure that initial value is large enough!@
#O 17@26@CB_ANTI_ALIASING@@
#O 18@26@CB_TRANSPARENCY@@
@@ -209,4 +214,4 @@ ResourceMaster v3.651
#O 61@28@M_CHOICES@@
#O 62@28@M_VLOG@@
#O 64@28@M_HELP_CONTENT@@
-#c 4908@
+#c 3798@
diff --git a/atari/settings.c b/atari/settings.c
index b16e274..30ad20a 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -91,7 +91,7 @@ static const char *gui_timeouts[] = {
#define INPUT_PROXY_PORT_MAX_LEN 5
#define INPUT_MIN_REFLOW_PERIOD_MAX_LEN 4
#define LABEL_FONT_RENDERER_MAX_LEN 8
-#define LABEL_PATH_MAX_LEN 43
+#define LABEL_PATH_MAX_LEN 40
#define LABEL_ICONSET_MAX_LEN 8
#define INPUT_TOOLBAR_COLOR_MAX_LEN 6
@@ -322,6 +322,76 @@ static void display_settings(void)
toggle_objects();
}
+static bool handle_filesystem_select_button(short rsc_bt)
+{
+ bool require_path = false;
+ bool is_folder = false;
+ short rsc_te = 0; // The textarea that is bound to the button
+ const char * title = "";
+ const char * path = NULL;
+
+ // TODO: localize String:
+ switch (rsc_bt) {
+
+
+ case SETTINGS_BT_SEL_DOWNLOAD_DIR:
+ title = "Select Download Directory:";
+ rsc_te = SETTINGS_EDIT_DOWNLOAD_PATH;
+ require_path = true;
+ break;
+
+ case SETTINGS_BT_SEL_HOTLIST:
+ title = "Select Hotlist File:";
+ rsc_te = SETTINGS_EDIT_HOTLIST_FILE;
+ break;
+
+ case SETTINGS_BT_SEL_CA_BUNDLE:
+ title = "Select CA Bundle File:";
+ rsc_te = SETTINGS_EDIT_CA_BUNDLE;
+ break;
+
+ case SETTINGS_BT_SEL_CA_CERTS:
+ title = "Select Certs Directory:";
+ rsc_te = SETTINGS_EDIT_CA_CERTS_PATH;
+ require_path = true;
+ break;
+
+ case SETTINGS_BT_SEL_EDITOR:
+ title = "Select Editor Application:";
+ rsc_te = SETTINGS_EDIT_EDITOR;
+ break;
+
+ default:
+ break;
+ };
+
+ assert(rsc_te != 0);
+
+ if (require_path == false) {
+ path = file_select(title, "");
+ gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ }
+ else {
+ do {
+ /* display file selector: */
+ path = file_select(title, "");
+ if (path) {
+ is_folder = is_dir(path);
+ }
+ if ((is_folder == false) && (path != NULL)) {
+ gemtk_msg_box_show(GEMTK_MSG_BOX_ALERT, "Folder Required!");
+ }
+ } while ((is_folder == false) && (path != NULL));
+
+ if ((is_folder == true) && (path != NULL)) {
+ gemtk_obj_set_str_safe(dlgtree, rsc_te, path);
+ }
+ }
+
+ OBJ_REDRAW(rsc_bt);
+ OBJ_REDRAW(rsc_te);
+}
+
static void form_event(int index, int external)
{
char spare[255];
@@ -486,28 +556,14 @@ static void form_event(int index, int external)
OBJ_REDRAW(SETTINGS_BT_GUI_TOUT);
break;
- /*
- case SETTINGS_INPUT_TOOLBAR_BGCOLOR:
- objc_offset( FORM(win), SETTINGS_INPUT_TOOLBAR_BGCOLOR, &x, &y );
- choice = color_popup(x, y, tmp_option_atari_toolbar_bg);
- snprintf( spare, 255, "%06x", choice );
- tmp_option_atari_toolbar_bg = choice;
- ObjcStrCpy( dlgtree, SETTINGS_INPUT_TOOLBAR_BGCOLOR,
- spare );
- is_button = true;
- OBJ_REDRAW(SETTINGS_INPUT_TOOLBAR_BGCOLOR);
- break;
- */
- /*
- case SETTINGS_BT_TOOLBAR_ICONSET:
- objc_offset( FORM(win), SETTINGS_BT_TOOLBAR_ICONSET, &x, &y );
- tmp = toolbar_iconset_popup(x,y);
- if( tmp != NULL ){
- ObjcStrCpy( dlgtree, SETTINGS_BT_TOOLBAR_ICONSET, tmp );
- }
- is_button = true;
- break;
- */
+ case SETTINGS_BT_SEL_DOWNLOAD_DIR:
+ case SETTINGS_BT_SEL_HOTLIST:
+ case SETTINGS_BT_SEL_CA_BUNDLE:
+ case SETTINGS_BT_SEL_CA_CERTS:
+ case SETTINGS_BT_SEL_EDITOR:
+ handle_filesystem_select_button(index);
+ break;
+
case SETTINGS_INC_MEM_CACHE:
case SETTINGS_DEC_MEM_CACHE:
if( index == SETTINGS_DEC_MEM_CACHE )
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-808-gb4cef78
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b4cef781eff108e79cf21...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b4cef781eff108e79cf210b...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b4cef781eff108e79cf210b6b...
The branch, master has been updated
via b4cef781eff108e79cf210b6b6881de2dfed1681 (commit)
from a2489f85d82efc57fbe02275efe5648c21ddb280 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b4cef781eff108e79cf...
commit b4cef781eff108e79cf210b6b6881de2dfed1681
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Make package: Copy netsurf.png into res folder, not into root of package
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 4a416ba..3fd4860 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -188,7 +188,7 @@ endif
$(Q)cp \!NetSurf/Resources/Icons/content.png -R $(ATARI_TARGET_DIR)res/icons/
$(Q)cp \!NetSurf/Resources/Icons/directory.png -R $(ATARI_TARGET_DIR)res/icons/dir.png
- $(Q)cp \!NetSurf/Resources/netsurf.png,b60 $(ATARI_TARGET_DIR)netsurf.png
+ $(Q)cp \!NetSurf/Resources/netsurf.png,b60 $(ATARI_TARGET_DIR)res/netsurf.png
$(Q)cp \!NetSurf/Resources/AdBlock,f79 $(ATARI_TARGET_DIR)res/adblock.css
$(Q)cp \!NetSurf/Resources/CSS,f79 $(ATARI_TARGET_DIR)res/default.css
$(Q)cp \!NetSurf/Resources/Quirks,f79 $(ATARI_TARGET_DIR)res/quirks.css
-----------------------------------------------------------------------
Summary of changes:
atari/Makefile.target | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 4a416ba..3fd4860 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -188,7 +188,7 @@ endif
$(Q)cp \!NetSurf/Resources/Icons/content.png -R $(ATARI_TARGET_DIR)res/icons/
$(Q)cp \!NetSurf/Resources/Icons/directory.png -R $(ATARI_TARGET_DIR)res/icons/dir.png
- $(Q)cp \!NetSurf/Resources/netsurf.png,b60 $(ATARI_TARGET_DIR)netsurf.png
+ $(Q)cp \!NetSurf/Resources/netsurf.png,b60 $(ATARI_TARGET_DIR)res/netsurf.png
$(Q)cp \!NetSurf/Resources/AdBlock,f79 $(ATARI_TARGET_DIR)res/adblock.css
$(Q)cp \!NetSurf/Resources/CSS,f79 $(ATARI_TARGET_DIR)res/default.css
$(Q)cp \!NetSurf/Resources/Quirks,f79 $(ATARI_TARGET_DIR)res/quirks.css
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-807-ga2489f8
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/a2489f85d82efc57fbe02...
...commit http://git.netsurf-browser.org/netsurf.git/commit/a2489f85d82efc57fbe0227...
...tree http://git.netsurf-browser.org/netsurf.git/tree/a2489f85d82efc57fbe02275e...
The branch, master has been updated
via a2489f85d82efc57fbe02275efe5648c21ddb280 (commit)
from 4abe5273c993520464b84523715b39d648ecf2d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a2489f85d82efc57fbe...
commit a2489f85d82efc57fbe02275efe5648c21ddb280
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Minor formatting fix
diff --git a/atari/misc.c b/atari/misc.c
index 90a8bee..d330859 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -487,7 +487,7 @@ long nkc_to_input_key(short nkc, long * ucs4_out)
* \param name Default file name
* \return a static char pointer or null if the user aborted the selection.
*/
-const char * file_select(const char * title, const char * name ) {
+const char * file_select(const char * title, const char * name) {
static char path[PATH_MAX]=""; // First usage : current directory
static char fullname[PATH_MAX]="";
diff --git a/atari/misc.h b/atari/misc.h
index 948b225..8d1719c 100755
--- a/atari/misc.h
+++ b/atari/misc.h
@@ -58,7 +58,7 @@ void dbg_grect(const char * str, GRECT * r);
void dbg_pxy(const char * str, short * pxy);
void dbg_rect(const char * str, int * pxy);
-const char * file_select( const char * title, const char * name );
+const char * file_select(const char * title, const char * name);
/**
* Convert NKC (atari normalized key code) to netsurf
-----------------------------------------------------------------------
Summary of changes:
atari/misc.c | 2 +-
atari/misc.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/atari/misc.c b/atari/misc.c
index 90a8bee..d330859 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -487,7 +487,7 @@ long nkc_to_input_key(short nkc, long * ucs4_out)
* \param name Default file name
* \return a static char pointer or null if the user aborted the selection.
*/
-const char * file_select(const char * title, const char * name ) {
+const char * file_select(const char * title, const char * name) {
static char path[PATH_MAX]=""; // First usage : current directory
static char fullname[PATH_MAX]="";
diff --git a/atari/misc.h b/atari/misc.h
index 948b225..8d1719c 100755
--- a/atari/misc.h
+++ b/atari/misc.h
@@ -58,7 +58,7 @@ void dbg_grect(const char * str, GRECT * r);
void dbg_pxy(const char * str, short * pxy);
void dbg_rect(const char * str, int * pxy);
-const char * file_select( const char * title, const char * name );
+const char * file_select(const char * title, const char * name);
/**
* Convert NKC (atari normalized key code) to netsurf
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-806-g4abe527
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/4abe5273c993520464b84...
...commit http://git.netsurf-browser.org/netsurf.git/commit/4abe5273c993520464b8452...
...tree http://git.netsurf-browser.org/netsurf.git/tree/4abe5273c993520464b845237...
The branch, master has been updated
via 4abe5273c993520464b84523715b39d648ecf2d7 (commit)
from ae0f5834c448b108acd19e58ee9b286c1191482f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4abe5273c993520464b...
commit 4abe5273c993520464b84523715b39d648ecf2d7
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added comments to plot API
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index b82aa36..d50922e 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -996,6 +996,17 @@ inline static bool ablend_bitmap( struct bitmap * img, struct bitmap * bg,
#ifdef WITH_8BPP_SUPPORT
+/**
+ * Convert an bitmap to an 8 bit device dependant MFDB
+ * \param img the bitmap (only tested with 32bit bitmaps)
+ * \param x screen coord of the background
+ * \param y screen coord of the background
+ * \param clip the region of the image that get's converted
+ * \param bg the background used for cheap transparency
+ * \param flags
+ * \param out receives the converted bitmap (still owned by the plot API)
+ *
+ */
static bool bitmap_convert_8(struct bitmap * img, int x,
int y, GRECT * clip, uint32_t bg, uint32_t flags,
MFDB *out )
@@ -1112,7 +1123,7 @@ static bool bitmap_convert_8(struct bitmap * img, int x,
stdform.fd_r1 = stdform.fd_r2 = stdform.fd_r3 = 0;
int img_stride = bitmap_get_rowstride(img);
- uint32_t prev_pixel = 0x12345678;
+ uint32_t prev_pixel = 0x12345678; //TODO: check for collision in first pixel
unsigned long col = 0;
unsigned char val = 0;
uint32_t * row;
@@ -1868,6 +1879,13 @@ static bool plot_polygon(const int *p, unsigned int n,
return ( true );
}
+/***
+ * Set plot origin and canvas size
+ * \param x the x origin
+ * \param y the y origin
+ * \param w the width of the plot area
+ * \param h the height of the plot area
+ */
bool plot_set_dimensions(int x, int y, int w, int h)
{
bool doupdate = false;
@@ -1893,9 +1911,13 @@ bool plot_set_dimensions(int x, int y, int w, int h)
return(true);
}
+/***
+ * Get current canvas size
+ * \param dst the GRECT * which receives the canvas size
+ *
+ */
bool plot_get_dimensions(GRECT *dst)
{
-
dst->g_x = view.x;
dst->g_y = view.y;
dst->g_w = view.w;
-----------------------------------------------------------------------
Summary of changes:
atari/plot/plot.c | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index b82aa36..d50922e 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -996,6 +996,17 @@ inline static bool ablend_bitmap( struct bitmap * img, struct bitmap * bg,
#ifdef WITH_8BPP_SUPPORT
+/**
+ * Convert an bitmap to an 8 bit device dependant MFDB
+ * \param img the bitmap (only tested with 32bit bitmaps)
+ * \param x screen coord of the background
+ * \param y screen coord of the background
+ * \param clip the region of the image that get's converted
+ * \param bg the background used for cheap transparency
+ * \param flags
+ * \param out receives the converted bitmap (still owned by the plot API)
+ *
+ */
static bool bitmap_convert_8(struct bitmap * img, int x,
int y, GRECT * clip, uint32_t bg, uint32_t flags,
MFDB *out )
@@ -1112,7 +1123,7 @@ static bool bitmap_convert_8(struct bitmap * img, int x,
stdform.fd_r1 = stdform.fd_r2 = stdform.fd_r3 = 0;
int img_stride = bitmap_get_rowstride(img);
- uint32_t prev_pixel = 0x12345678;
+ uint32_t prev_pixel = 0x12345678; //TODO: check for collision in first pixel
unsigned long col = 0;
unsigned char val = 0;
uint32_t * row;
@@ -1868,6 +1879,13 @@ static bool plot_polygon(const int *p, unsigned int n,
return ( true );
}
+/***
+ * Set plot origin and canvas size
+ * \param x the x origin
+ * \param y the y origin
+ * \param w the width of the plot area
+ * \param h the height of the plot area
+ */
bool plot_set_dimensions(int x, int y, int w, int h)
{
bool doupdate = false;
@@ -1893,9 +1911,13 @@ bool plot_set_dimensions(int x, int y, int w, int h)
return(true);
}
+/***
+ * Get current canvas size
+ * \param dst the GRECT * which receives the canvas size
+ *
+ */
bool plot_get_dimensions(GRECT *dst)
{
-
dst->g_x = view.x;
dst->g_y = view.y;
dst->g_w = view.w;
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-805-gae0f583
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/ae0f5834c448b108acd19...
...commit http://git.netsurf-browser.org/netsurf.git/commit/ae0f5834c448b108acd19e5...
...tree http://git.netsurf-browser.org/netsurf.git/tree/ae0f5834c448b108acd19e58e...
The branch, master has been updated
via ae0f5834c448b108acd19e58ee9b286c1191482f (commit)
from 340d437b3fd33a72b0894098a3cb88090980d9a8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ae0f5834c448b108acd...
commit ae0f5834c448b108acd19e58ee9b286c1191482f
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Send AP_TERM to application on menu item "Exit" click.
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 0687fcc..45b9d15 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -301,10 +301,10 @@ static void __CDECL menu_save_page(short item, short title, void *data)
path = file_select("Select folder", "");
if (path)
is_folder = is_dir(path);
- } while( !is_folder && path != NULL );
+ } while ((is_folder == false) && (path != NULL));
if( path != NULL ){
- save_complete( input_window->browser->bw->current_content, path, NULL );
+ save_complete(input_window->browser->bw->current_content, path, NULL);
}
}
@@ -313,8 +313,8 @@ static void __CDECL menu_quit(short item, short title, void *data)
{
short buff[8];
memset( &buff, 0, sizeof(short)*8 );
- LOG(("%s", __FUNCTION__));
- netsurf_quit = true;
+ LOG(("%s", __FUNCTION__));
+ gemtk_wm_send_msg(NULL, AP_TERM, 0, 0, 0, 0);
}
static void __CDECL menu_cut(short item, short title, void *data)
-----------------------------------------------------------------------
Summary of changes:
atari/deskmenu.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 0687fcc..45b9d15 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -301,10 +301,10 @@ static void __CDECL menu_save_page(short item, short title, void *data)
path = file_select("Select folder", "");
if (path)
is_folder = is_dir(path);
- } while( !is_folder && path != NULL );
+ } while ((is_folder == false) && (path != NULL));
if( path != NULL ){
- save_complete( input_window->browser->bw->current_content, path, NULL );
+ save_complete(input_window->browser->bw->current_content, path, NULL);
}
}
@@ -313,8 +313,8 @@ static void __CDECL menu_quit(short item, short title, void *data)
{
short buff[8];
memset( &buff, 0, sizeof(short)*8 );
- LOG(("%s", __FUNCTION__));
- netsurf_quit = true;
+ LOG(("%s", __FUNCTION__));
+ gemtk_wm_send_msg(NULL, AP_TERM, 0, 0, 0, 0);
}
static void __CDECL menu_cut(short item, short title, void *data)
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-804-g340d437
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/340d437b3fd33a72b0894...
...commit http://git.netsurf-browser.org/netsurf.git/commit/340d437b3fd33a72b089409...
...tree http://git.netsurf-browser.org/netsurf.git/tree/340d437b3fd33a72b0894098a...
The branch, master has been updated
via 340d437b3fd33a72b0894098a3cb88090980d9a8 (commit)
from 1970fb7bdaa30454115777122a238b4931839f0b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=340d437b3fd33a72b08...
commit 340d437b3fd33a72b0894098a3cb88090980d9a8
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Minor changes to gemtk
- check for NULL window ptr in gemtk_wm_send_msg
- use textarea template string for max textarea string length
diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h
index ba463a3..44baba4 100644
--- a/atari/gemtk/gemtk.h
+++ b/atari/gemtk/gemtk.h
@@ -272,7 +272,7 @@ void gemtk_wm_clear(GUIWIN *win);
/* -------------------------------------------------------------------------- */
/* AES OBJECT TREE TOOLS */
/* -------------------------------------------------------------------------- */
-char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt);
+char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt);
char *gemtk_obj_get_text(OBJECT * tree, short idx);
GRECT * gemtk_obj_screen_rect(OBJECT * tree, short obj);
bool gemtk_obj_is_inside(OBJECT * tree, short obj, GRECT *area);
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index 18d873c..078fb36 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -1219,7 +1219,7 @@ void gemtk_wm_send_msg(GUIWIN *win, short msg_type, short a, short b, short c,
msg[0] = msg_type;
msg[1] = gl_apid;
msg[2] = 0;
- msg[3] = win->handle;
+ msg[3] = (win != NULL) ? win->handle : NULL;
msg[4] = a;
msg[5] = b;
msg[6] = c;
diff --git a/atari/gemtk/objc.c b/atari/gemtk/objc.c
index 50d70dd..514f6b5 100644
--- a/atari/gemtk/objc.c
+++ b/atari/gemtk/objc.c
@@ -66,7 +66,7 @@ static void set_text(OBJECT *obj, short idx, char * text, int len)
set_string(obj, idx, spare);
}
-char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt)
+char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt)
{
char spare[204];
short type = 0;
@@ -77,7 +77,7 @@ char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt)
type = (tree[idx].ob_type & 0xFF);
if (type == G_FTEXT || type == G_FBOXTEXT) {
TEDINFO *ted = ((TEDINFO *)get_obspec(tree, idx));
- maxlen = ted->te_txtlen+1;
+ maxlen = ted->te_tmplen+1;
if (maxlen > 200) {
maxlen = 200;
} else if (maxlen < 0) {
-----------------------------------------------------------------------
Summary of changes:
atari/gemtk/gemtk.h | 2 +-
atari/gemtk/guiwin.c | 2 +-
atari/gemtk/objc.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/atari/gemtk/gemtk.h b/atari/gemtk/gemtk.h
index ba463a3..44baba4 100644
--- a/atari/gemtk/gemtk.h
+++ b/atari/gemtk/gemtk.h
@@ -272,7 +272,7 @@ void gemtk_wm_clear(GUIWIN *win);
/* -------------------------------------------------------------------------- */
/* AES OBJECT TREE TOOLS */
/* -------------------------------------------------------------------------- */
-char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt);
+char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt);
char *gemtk_obj_get_text(OBJECT * tree, short idx);
GRECT * gemtk_obj_screen_rect(OBJECT * tree, short obj);
bool gemtk_obj_is_inside(OBJECT * tree, short obj, GRECT *area);
diff --git a/atari/gemtk/guiwin.c b/atari/gemtk/guiwin.c
index 18d873c..078fb36 100644
--- a/atari/gemtk/guiwin.c
+++ b/atari/gemtk/guiwin.c
@@ -1219,7 +1219,7 @@ void gemtk_wm_send_msg(GUIWIN *win, short msg_type, short a, short b, short c,
msg[0] = msg_type;
msg[1] = gl_apid;
msg[2] = 0;
- msg[3] = win->handle;
+ msg[3] = (win != NULL) ? win->handle : NULL;
msg[4] = a;
msg[5] = b;
msg[6] = c;
diff --git a/atari/gemtk/objc.c b/atari/gemtk/objc.c
index 50d70dd..514f6b5 100644
--- a/atari/gemtk/objc.c
+++ b/atari/gemtk/objc.c
@@ -66,7 +66,7 @@ static void set_text(OBJECT *obj, short idx, char * text, int len)
set_string(obj, idx, spare);
}
-char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt)
+char gemtk_obj_set_str_safe(OBJECT * tree, short idx, const char *txt)
{
char spare[204];
short type = 0;
@@ -77,7 +77,7 @@ char gemtk_obj_set_str_safe(OBJECT * tree, short idx, char *txt)
type = (tree[idx].ob_type & 0xFF);
if (type == G_FTEXT || type == G_FBOXTEXT) {
TEDINFO *ted = ((TEDINFO *)get_obspec(tree, idx));
- maxlen = ted->te_txtlen+1;
+ maxlen = ted->te_tmplen+1;
if (maxlen > 200) {
maxlen = 200;
} else if (maxlen < 0) {
--
NetSurf Browser
9 years, 1 month
netsurf: branch master updated. release/3.0-803-g1970fb7
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/1970fb7bdaa3045411577...
...commit http://git.netsurf-browser.org/netsurf.git/commit/1970fb7bdaa304541157771...
...tree http://git.netsurf-browser.org/netsurf.git/tree/1970fb7bdaa30454115777122...
The branch, master has been updated
via 1970fb7bdaa30454115777122a238b4931839f0b (commit)
via d5062bd9f93f02a62ca2fc2f2bdfb7d52e1ef585 (commit)
from 5867ddc0381bb32ca4efb33c6ec39b4c0260daf9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1970fb7bdaa30454115...
commit 1970fb7bdaa30454115777122a238b4931839f0b
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Make nscss_get_style return completed computed styles. Now matches nscss_get_blank_style, and no need for anything outside css/select.c to see partial computed styles.
diff --git a/css/select.c b/css/select.c
index 1e1b47f..a69c770 100644
--- a/css/select.c
+++ b/css/select.c
@@ -108,8 +108,6 @@ static bool parse_number(const char *data, bool non_negative, bool real,
static bool parse_font_size(const char *size, uint8_t *val,
css_fixed *len, css_unit *unit);
-static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx);
-
static bool isWhitespace(char c);
static bool isHex(char c);
static uint8_t charToHex(char c);
@@ -263,28 +261,75 @@ static void nscss_dom_user_data_handler(dom_node_operation operation,
}
/**
- * Get a style selection results (partial computed styles) for an element
+ * Get style selection results for an element
*
* \param ctx CSS selection context
* \param n Element to select for
* \param media Permitted media types
* \param inline_style Inline style associated with element, or NULL
- * \return Pointer to selection results (containing partial computed styles),
+ * \return Pointer to selection results (containing computed styles),
* or NULL on failure
*/
css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
uint64_t media, const css_stylesheet *inline_style)
{
css_select_results *styles;
+ int pseudo_element;
css_error error;
/* Select style for node */
error = css_select_style(ctx->ctx, n, media, inline_style,
&selection_handler, ctx, &styles);
- if (error != CSS_OK) {
+
+ if (error != CSS_OK || styles == NULL) {
+ /* Failed selecting partial style -- bail out */
return NULL;
}
+ /* If there's a parent style, compose with partial to obtain
+ * complete computed style for element */
+ if (ctx->parent_style != NULL) {
+ /* Complete the computed style, by composing with the parent
+ * element's style */
+ error = css_computed_style_compose(ctx->parent_style,
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ nscss_compute_font_size, NULL,
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
+ if (error != CSS_OK) {
+ css_select_results_destroy(styles);
+ return NULL;
+ }
+ }
+
+ for (pseudo_element = CSS_PSEUDO_ELEMENT_NONE + 1;
+ pseudo_element < CSS_PSEUDO_ELEMENT_COUNT;
+ pseudo_element++) {
+
+ if (pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LETTER ||
+ pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LINE)
+ /* TODO: Handle first-line and first-letter pseudo
+ * element computed style completion */
+ continue;
+
+ if (styles->styles[pseudo_element] == NULL)
+ /* There were no rules concerning this pseudo element */
+ continue;
+
+ /* Complete the pseudo element's computed style, by composing
+ * with the base element's style */
+ error = css_computed_style_compose(
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ styles->styles[pseudo_element],
+ nscss_compute_font_size, NULL,
+ styles->styles[pseudo_element]);
+ if (error != CSS_OK) {
+ /* TODO: perhaps this shouldn't be quite so
+ * catastrophic? */
+ css_select_results_destroy(styles);
+ return NULL;
+ }
+ }
+
return styles;
}
@@ -294,7 +339,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
* \param ctx CSS selection context
* \return Pointer to partial computed style, or NULL on failure
*/
-css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
+static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
{
css_computed_style *style;
css_error error;
diff --git a/css/select.h b/css/select.h
index 7488ab9..083fd91 100644
--- a/css/select.h
+++ b/css/select.h
@@ -37,6 +37,7 @@ typedef struct nscss_select_ctx
bool quirks;
nsurl *base_url;
lwc_string *universal;
+ const css_computed_style *parent_style;
} nscss_select_ctx;
css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
diff --git a/render/box_construct.c b/render/box_construct.c
index 4ce2151..a72f918 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -1425,8 +1425,6 @@ css_select_results *box_get_style(html_content *c,
{
dom_string *s;
dom_exception err;
- int pseudo_element;
- css_error error;
css_stylesheet *inline_style = NULL;
css_select_results *styles;
nscss_select_ctx ctx;
@@ -1455,62 +1453,15 @@ css_select_results *box_get_style(html_content *c,
ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
ctx.base_url = c->base_url;
ctx.universal = c->universal;
+ ctx.parent_style = parent_style;
- /* Select partial style for element */
+ /* Select style for element */
styles = nscss_get_style(&ctx, n, CSS_MEDIA_SCREEN, inline_style);
/* No longer need inline style */
if (inline_style != NULL)
css_stylesheet_destroy(inline_style);
- /* Failed selecting partial style -- bail out */
- if (styles == NULL)
- return NULL;
-
- /* If there's a parent style, compose with partial to obtain
- * complete computed style for element */
- if (parent_style != NULL) {
- /* Complete the computed style, by composing with the parent
- * element's style */
- error = css_computed_style_compose(parent_style,
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- nscss_compute_font_size, NULL,
- styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
- if (error != CSS_OK) {
- css_select_results_destroy(styles);
- return NULL;
- }
- }
-
- for (pseudo_element = CSS_PSEUDO_ELEMENT_NONE + 1;
- pseudo_element < CSS_PSEUDO_ELEMENT_COUNT;
- pseudo_element++) {
-
- if (pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LETTER ||
- pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LINE)
- /* TODO: Handle first-line and first-letter pseudo
- * element computed style completion */
- continue;
-
- if (styles->styles[pseudo_element] == NULL)
- /* There were no rules concerning this pseudo element */
- continue;
-
- /* Complete the pseudo element's computed style, by composing
- * with the base element's style */
- error = css_computed_style_compose(
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- styles->styles[pseudo_element],
- nscss_compute_font_size, NULL,
- styles->styles[pseudo_element]);
- if (error != CSS_OK) {
- /* TODO: perhaps this shouldn't be quite so
- * catastrophic? */
- css_select_results_destroy(styles);
- return NULL;
- }
- }
-
return styles;
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d5062bd9f93f02a62ca...
commit d5062bd9f93f02a62ca2fc2f2bdfb7d52e1ef585
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Make view source menu option open the frame source, rather than frameset.
diff --git a/riscos/window.c b/riscos/window.c
index 35f9b20..a7c42ac 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -188,6 +188,8 @@ static wimp_menu *ro_gui_browser_window_menu = NULL;
static wimp_menu *gui_form_select_menu = NULL;
/** Browser window associated with open select menu. */
static struct browser_window *ro_gui_select_menu_bw = NULL;
+/** Main content object under menu, or 0 if none. */
+static hlcache_handle *current_menu_main = 0;
/** Object under menu, or 0 if no object. */
static hlcache_handle *current_menu_object = 0;
/** URL of link under menu, or 0 if no link. */
@@ -2206,6 +2208,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
if (pointer != NULL && g->window == w) {
ro_gui_url_complete_close();
+ current_menu_main = NULL;
current_menu_object = NULL;
current_menu_url = NULL;
@@ -2214,6 +2217,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
browser_window_get_contextual_content(bw,
pos.x, pos.y, &cont);
+ current_menu_main = cont.main;
current_menu_object = cont.object;
current_menu_url = cont.link_url;
}
@@ -2789,8 +2793,11 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
ro_gui_window_action_new_window(g);
break;
case BROWSER_VIEW_SOURCE:
- if (h != NULL)
+ if (current_menu_main != NULL) {
+ ro_gui_view_source(current_menu_main);
+ } else if (h != NULL) {
ro_gui_view_source(h);
+ }
break;
/* object actions */
-----------------------------------------------------------------------
Summary of changes:
css/select.c | 57 ++++++++++++++++++++++++++++++++++++++++++-----
css/select.h | 1 +
render/box_construct.c | 53 +------------------------------------------
riscos/window.c | 9 ++++++-
4 files changed, 62 insertions(+), 58 deletions(-)
diff --git a/css/select.c b/css/select.c
index 1e1b47f..a69c770 100644
--- a/css/select.c
+++ b/css/select.c
@@ -108,8 +108,6 @@ static bool parse_number(const char *data, bool non_negative, bool real,
static bool parse_font_size(const char *size, uint8_t *val,
css_fixed *len, css_unit *unit);
-static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx);
-
static bool isWhitespace(char c);
static bool isHex(char c);
static uint8_t charToHex(char c);
@@ -263,28 +261,75 @@ static void nscss_dom_user_data_handler(dom_node_operation operation,
}
/**
- * Get a style selection results (partial computed styles) for an element
+ * Get style selection results for an element
*
* \param ctx CSS selection context
* \param n Element to select for
* \param media Permitted media types
* \param inline_style Inline style associated with element, or NULL
- * \return Pointer to selection results (containing partial computed styles),
+ * \return Pointer to selection results (containing computed styles),
* or NULL on failure
*/
css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
uint64_t media, const css_stylesheet *inline_style)
{
css_select_results *styles;
+ int pseudo_element;
css_error error;
/* Select style for node */
error = css_select_style(ctx->ctx, n, media, inline_style,
&selection_handler, ctx, &styles);
- if (error != CSS_OK) {
+
+ if (error != CSS_OK || styles == NULL) {
+ /* Failed selecting partial style -- bail out */
return NULL;
}
+ /* If there's a parent style, compose with partial to obtain
+ * complete computed style for element */
+ if (ctx->parent_style != NULL) {
+ /* Complete the computed style, by composing with the parent
+ * element's style */
+ error = css_computed_style_compose(ctx->parent_style,
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ nscss_compute_font_size, NULL,
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
+ if (error != CSS_OK) {
+ css_select_results_destroy(styles);
+ return NULL;
+ }
+ }
+
+ for (pseudo_element = CSS_PSEUDO_ELEMENT_NONE + 1;
+ pseudo_element < CSS_PSEUDO_ELEMENT_COUNT;
+ pseudo_element++) {
+
+ if (pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LETTER ||
+ pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LINE)
+ /* TODO: Handle first-line and first-letter pseudo
+ * element computed style completion */
+ continue;
+
+ if (styles->styles[pseudo_element] == NULL)
+ /* There were no rules concerning this pseudo element */
+ continue;
+
+ /* Complete the pseudo element's computed style, by composing
+ * with the base element's style */
+ error = css_computed_style_compose(
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ styles->styles[pseudo_element],
+ nscss_compute_font_size, NULL,
+ styles->styles[pseudo_element]);
+ if (error != CSS_OK) {
+ /* TODO: perhaps this shouldn't be quite so
+ * catastrophic? */
+ css_select_results_destroy(styles);
+ return NULL;
+ }
+ }
+
return styles;
}
@@ -294,7 +339,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n,
* \param ctx CSS selection context
* \return Pointer to partial computed style, or NULL on failure
*/
-css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
+static css_computed_style *nscss_get_initial_style(nscss_select_ctx *ctx)
{
css_computed_style *style;
css_error error;
diff --git a/css/select.h b/css/select.h
index 7488ab9..083fd91 100644
--- a/css/select.h
+++ b/css/select.h
@@ -37,6 +37,7 @@ typedef struct nscss_select_ctx
bool quirks;
nsurl *base_url;
lwc_string *universal;
+ const css_computed_style *parent_style;
} nscss_select_ctx;
css_stylesheet *nscss_create_inline_style(const uint8_t *data, size_t len,
diff --git a/render/box_construct.c b/render/box_construct.c
index 4ce2151..a72f918 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -1425,8 +1425,6 @@ css_select_results *box_get_style(html_content *c,
{
dom_string *s;
dom_exception err;
- int pseudo_element;
- css_error error;
css_stylesheet *inline_style = NULL;
css_select_results *styles;
nscss_select_ctx ctx;
@@ -1455,62 +1453,15 @@ css_select_results *box_get_style(html_content *c,
ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL);
ctx.base_url = c->base_url;
ctx.universal = c->universal;
+ ctx.parent_style = parent_style;
- /* Select partial style for element */
+ /* Select style for element */
styles = nscss_get_style(&ctx, n, CSS_MEDIA_SCREEN, inline_style);
/* No longer need inline style */
if (inline_style != NULL)
css_stylesheet_destroy(inline_style);
- /* Failed selecting partial style -- bail out */
- if (styles == NULL)
- return NULL;
-
- /* If there's a parent style, compose with partial to obtain
- * complete computed style for element */
- if (parent_style != NULL) {
- /* Complete the computed style, by composing with the parent
- * element's style */
- error = css_computed_style_compose(parent_style,
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- nscss_compute_font_size, NULL,
- styles->styles[CSS_PSEUDO_ELEMENT_NONE]);
- if (error != CSS_OK) {
- css_select_results_destroy(styles);
- return NULL;
- }
- }
-
- for (pseudo_element = CSS_PSEUDO_ELEMENT_NONE + 1;
- pseudo_element < CSS_PSEUDO_ELEMENT_COUNT;
- pseudo_element++) {
-
- if (pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LETTER ||
- pseudo_element == CSS_PSEUDO_ELEMENT_FIRST_LINE)
- /* TODO: Handle first-line and first-letter pseudo
- * element computed style completion */
- continue;
-
- if (styles->styles[pseudo_element] == NULL)
- /* There were no rules concerning this pseudo element */
- continue;
-
- /* Complete the pseudo element's computed style, by composing
- * with the base element's style */
- error = css_computed_style_compose(
- styles->styles[CSS_PSEUDO_ELEMENT_NONE],
- styles->styles[pseudo_element],
- nscss_compute_font_size, NULL,
- styles->styles[pseudo_element]);
- if (error != CSS_OK) {
- /* TODO: perhaps this shouldn't be quite so
- * catastrophic? */
- css_select_results_destroy(styles);
- return NULL;
- }
- }
-
return styles;
}
diff --git a/riscos/window.c b/riscos/window.c
index 35f9b20..a7c42ac 100644
--- a/riscos/window.c
+++ b/riscos/window.c
@@ -188,6 +188,8 @@ static wimp_menu *ro_gui_browser_window_menu = NULL;
static wimp_menu *gui_form_select_menu = NULL;
/** Browser window associated with open select menu. */
static struct browser_window *ro_gui_select_menu_bw = NULL;
+/** Main content object under menu, or 0 if none. */
+static hlcache_handle *current_menu_main = 0;
/** Object under menu, or 0 if no object. */
static hlcache_handle *current_menu_object = 0;
/** URL of link under menu, or 0 if no link. */
@@ -2206,6 +2208,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
if (pointer != NULL && g->window == w) {
ro_gui_url_complete_close();
+ current_menu_main = NULL;
current_menu_object = NULL;
current_menu_url = NULL;
@@ -2214,6 +2217,7 @@ bool ro_gui_window_menu_prepare(wimp_w w, wimp_i i, wimp_menu *menu,
browser_window_get_contextual_content(bw,
pos.x, pos.y, &cont);
+ current_menu_main = cont.main;
current_menu_object = cont.object;
current_menu_url = cont.link_url;
}
@@ -2789,8 +2793,11 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
ro_gui_window_action_new_window(g);
break;
case BROWSER_VIEW_SOURCE:
- if (h != NULL)
+ if (current_menu_main != NULL) {
+ ro_gui_view_source(current_menu_main);
+ } else if (h != NULL) {
ro_gui_view_source(h);
+ }
break;
/* object actions */
--
NetSurf Browser
9 years, 1 month
netsurf-website: branch master updated. a5ebbefb7a7bbc1a4997e290e12d56d502142986
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/a5ebbefb7a7bb...
...commit http://git.netsurf-browser.org/netsurf-website.git/commit/a5ebbefb7a7bbc1...
...tree http://git.netsurf-browser.org/netsurf-website.git/tree/a5ebbefb7a7bbc1a4...
The branch, master has been updated
via a5ebbefb7a7bbc1a4997e290e12d56d502142986 (commit)
from 7f98057545bf60759cf5acd0cbd9ce2b58267d98 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf-website.git/commit/?id=a5ebbefb7a7...
commit a5ebbefb7a7bbc1a4997e290e12d56d502142986
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Fix typo.
diff --git a/contact/index.en b/contact/index.en
index dce56e5..5da600e 100644
--- a/contact/index.en
+++ b/contact/index.en
@@ -57,7 +57,7 @@
<h2 id="UserSupportTracker">User support tracker</h2>
<dl>
-<dt>[<a href="http://bugs.netsurf-browser.org/">NetSurf Bug Report System</a></dt>
+<dt><a href="http://bugs.netsurf-browser.org/">NetSurf Bug Report System</a></dt>
<dd>If you run into problems using NetSurf, please read the guidelines for reporting bugs and submit them to our bug tracker.</dd>
</dl>
@@ -115,7 +115,7 @@
<div class="footer">
-<p>Copyright 2003 - 2009 The NetSurf Developers</p>
+<p>Copyright 2003 - 2013 The NetSurf Developers</p>
</div>
</div>
-----------------------------------------------------------------------
Summary of changes:
contact/index.en | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contact/index.en b/contact/index.en
index dce56e5..5da600e 100644
--- a/contact/index.en
+++ b/contact/index.en
@@ -57,7 +57,7 @@
<h2 id="UserSupportTracker">User support tracker</h2>
<dl>
-<dt>[<a href="http://bugs.netsurf-browser.org/">NetSurf Bug Report System</a></dt>
+<dt><a href="http://bugs.netsurf-browser.org/">NetSurf Bug Report System</a></dt>
<dd>If you run into problems using NetSurf, please read the guidelines for reporting bugs and submit them to our bug tracker.</dd>
</dl>
@@ -115,7 +115,7 @@
<div class="footer">
-<p>Copyright 2003 - 2009 The NetSurf Developers</p>
+<p>Copyright 2003 - 2013 The NetSurf Developers</p>
</div>
</div>
--
NetSurf website source for *.netsurf-browser.org
9 years, 1 month