netsurf: branch master updated. ba7fba824d8b3dfcaa7da4c74a3d7d5c75c811e6
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/ba7fba824d8b3dfcaa7da...
...commit http://git.netsurf-browser.org/netsurf.git/commit/ba7fba824d8b3dfcaa7da4c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/ba7fba824d8b3dfcaa7da4c74...
The branch, master has been updated
via ba7fba824d8b3dfcaa7da4c74a3d7d5c75c811e6 (commit)
from 5c53f01ead20a9dee302cd43654ae25c1bbcc15e (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/commitdiff/ba7fba824d8b3dfcaa7...
commit ba7fba824d8b3dfcaa7da4c74a3d7d5c75c811e6
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
Cope with missing/empty href attribute
diff --git a/render/imagemap.c b/render/imagemap.c
index fb1b8cd..ef79e35 100644
--- a/render/imagemap.c
+++ b/render/imagemap.c
@@ -425,7 +425,7 @@ imagemap_addtolist(dom_node *n, nsurl *base_url,
}
exc = dom_element_get_attribute(n, corestring_dom_href, &href);
- if (exc != DOM_NO_ERR) {
+ if (exc != DOM_NO_ERR || href == NULL) {
/* No href="" attribute, skip this element */
goto ok_out;
}
-----------------------------------------------------------------------
Summary of changes:
render/imagemap.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/render/imagemap.c b/render/imagemap.c
index fb1b8cd..ef79e35 100644
--- a/render/imagemap.c
+++ b/render/imagemap.c
@@ -425,7 +425,7 @@ imagemap_addtolist(dom_node *n, nsurl *base_url,
}
exc = dom_element_get_attribute(n, corestring_dom_href, &href);
- if (exc != DOM_NO_ERR) {
+ if (exc != DOM_NO_ERR || href == NULL) {
/* No href="" attribute, skip this element */
goto ok_out;
}
--
NetSurf Browser
10 years, 7 months
libhubbub: branch master updated. 1dee56a7494a71a73dfc83a605d02e9450bf7e25
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libhubbub.git/shortlog/1dee56a7494a71a73df...
...commit http://git.netsurf-browser.org/libhubbub.git/commit/1dee56a7494a71a73dfc8...
...tree http://git.netsurf-browser.org/libhubbub.git/tree/1dee56a7494a71a73dfc83a...
The branch, master has been updated
via 1dee56a7494a71a73dfc83a605d02e9450bf7e25 (commit)
from 797d66f3dc9bee99903ccad15c0064a4c1afc292 (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/libhubbub.git/commitdiff/1dee56a7494a71a73...
commit 1dee56a7494a71a73dfc83a605d02e9450bf7e25
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
Fix up for json-c 0.10
diff --git a/test/tokeniser3.c b/test/tokeniser3.c
index d61d21a..58a1f34 100644
--- a/test/tokeniser3.c
+++ b/test/tokeniser3.c
@@ -81,10 +81,9 @@ int main(int argc, char **argv)
printf("Test: %s\n",
json_object_get_string(val));
} else if (strcmp(key, "input") == 0) {
- int len;
+ int len = json_object_get_string_len(val);
ctx.input = (const uint8_t *)
- json_object_get_string_len(val,
- &len);
+ json_object_get_string(val);
ctx.input_len = len;
} else if (strcmp(key, "output") == 0) {
ctx.output = json_object_get_array(val);
@@ -170,7 +169,7 @@ void run_test(context *ctx)
params.content_model.model =
HUBBUB_CONTENT_MODEL_PCDATA;
} else {
- char *cm = json_object_get_string(
+ const char *cm = json_object_get_string(
(struct json_object *)
array_list_get_idx(ctx->content_model, i));
@@ -273,11 +272,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
switch (token->type) {
case HUBBUB_TOKEN_DOCTYPE:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
- char *exppub = json_object_get_string(
+ const char *exppub = json_object_get_string(
array_list_get_idx(items, 2));
- char *expsys = json_object_get_string(
+ const char *expsys = json_object_get_string(
array_list_get_idx(items, 3));
bool expquirks = !json_object_get_boolean(
array_list_get_idx(items, 4));
@@ -337,7 +336,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_START_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
struct lh_entry *expattrs = json_object_get_object(
array_list_get_idx(items, 2))->head;
@@ -371,7 +370,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
for (i = 0; i < token->data.tag.n_attributes; i++) {
char *expname = (char *) expattrs->k;
- char *expval = json_object_get_string(
+ const char *expval = json_object_get_string(
(struct json_object *) expattrs->v);
const char *gotname = (const char *)
token->data.tag.attributes[i].name.ptr;
@@ -400,7 +399,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_END_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
const char *tagname = (const char *)
token->data.tag.name.ptr;
@@ -417,7 +416,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_COMMENT:
{
- char *expstr = json_object_get_string(
+ const char *expstr = json_object_get_string(
array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.comment.ptr;
@@ -432,9 +431,10 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_CHARACTER:
{
- int expstrlen;
- char *expstr = json_object_get_string_len(
- array_list_get_idx(items, 1), &expstrlen);
+ int expstrlen = json_object_get_string_len(
+ array_list_get_idx(items, 1));
+ const char *expstr = json_object_get_string(
+ array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.character.ptr;
size_t len = min(token->data.character.len,
-----------------------------------------------------------------------
Summary of changes:
test/tokeniser3.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/test/tokeniser3.c b/test/tokeniser3.c
index d61d21a..58a1f34 100644
--- a/test/tokeniser3.c
+++ b/test/tokeniser3.c
@@ -81,10 +81,9 @@ int main(int argc, char **argv)
printf("Test: %s\n",
json_object_get_string(val));
} else if (strcmp(key, "input") == 0) {
- int len;
+ int len = json_object_get_string_len(val);
ctx.input = (const uint8_t *)
- json_object_get_string_len(val,
- &len);
+ json_object_get_string(val);
ctx.input_len = len;
} else if (strcmp(key, "output") == 0) {
ctx.output = json_object_get_array(val);
@@ -170,7 +169,7 @@ void run_test(context *ctx)
params.content_model.model =
HUBBUB_CONTENT_MODEL_PCDATA;
} else {
- char *cm = json_object_get_string(
+ const char *cm = json_object_get_string(
(struct json_object *)
array_list_get_idx(ctx->content_model, i));
@@ -273,11 +272,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
switch (token->type) {
case HUBBUB_TOKEN_DOCTYPE:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
- char *exppub = json_object_get_string(
+ const char *exppub = json_object_get_string(
array_list_get_idx(items, 2));
- char *expsys = json_object_get_string(
+ const char *expsys = json_object_get_string(
array_list_get_idx(items, 3));
bool expquirks = !json_object_get_boolean(
array_list_get_idx(items, 4));
@@ -337,7 +336,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_START_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
struct lh_entry *expattrs = json_object_get_object(
array_list_get_idx(items, 2))->head;
@@ -371,7 +370,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
for (i = 0; i < token->data.tag.n_attributes; i++) {
char *expname = (char *) expattrs->k;
- char *expval = json_object_get_string(
+ const char *expval = json_object_get_string(
(struct json_object *) expattrs->v);
const char *gotname = (const char *)
token->data.tag.attributes[i].name.ptr;
@@ -400,7 +399,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_END_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
const char *tagname = (const char *)
token->data.tag.name.ptr;
@@ -417,7 +416,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_COMMENT:
{
- char *expstr = json_object_get_string(
+ const char *expstr = json_object_get_string(
array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.comment.ptr;
@@ -432,9 +431,10 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_CHARACTER:
{
- int expstrlen;
- char *expstr = json_object_get_string_len(
- array_list_get_idx(items, 1), &expstrlen);
+ int expstrlen = json_object_get_string_len(
+ array_list_get_idx(items, 1));
+ const char *expstr = json_object_get_string(
+ array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.character.ptr;
size_t len = min(token->data.character.len,
--
HTML5 parser library
10 years, 7 months
libhubbub: branch master updated. 797d66f3dc9bee99903ccad15c0064a4c1afc292
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libhubbub.git/shortlog/797d66f3dc9bee99903...
...commit http://git.netsurf-browser.org/libhubbub.git/commit/797d66f3dc9bee99903cc...
...tree http://git.netsurf-browser.org/libhubbub.git/tree/797d66f3dc9bee99903ccad...
The branch, master has been updated
via 797d66f3dc9bee99903ccad15c0064a4c1afc292 (commit)
from e3e74235de5a800fe421b4c74059d926a298361d (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/libhubbub.git/commitdiff/797d66f3dc9bee999...
commit 797d66f3dc9bee99903ccad15c0064a4c1afc292
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
Sprinkle some const correctness around
diff --git a/test/tokeniser2.c b/test/tokeniser2.c
index 59c9cb9..cf0311d 100644
--- a/test/tokeniser2.c
+++ b/test/tokeniser2.c
@@ -171,7 +171,7 @@ void run_test(context *ctx)
params.content_model.model =
HUBBUB_CONTENT_MODEL_PCDATA;
} else {
- char *cm = json_object_get_string(
+ const char *cm = json_object_get_string(
(struct json_object *)
array_list_get_idx(ctx->content_model, i));
@@ -269,11 +269,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
switch (token->type) {
case HUBBUB_TOKEN_DOCTYPE:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
- char *exppub = json_object_get_string(
+ const char *exppub = json_object_get_string(
array_list_get_idx(items, 2));
- char *expsys = json_object_get_string(
+ const char *expsys = json_object_get_string(
array_list_get_idx(items, 3));
bool expquirks = !json_object_get_boolean(
array_list_get_idx(items, 4));
@@ -330,7 +330,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_START_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
struct lh_entry *expattrs = json_object_get_object(
array_list_get_idx(items, 2))->head;
@@ -364,7 +364,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
for (i = 0; i < token->data.tag.n_attributes; i++) {
char *expname = (char *) expattrs->k;
- char *expval = json_object_get_string(
+ const char *expval = json_object_get_string(
(struct json_object *) expattrs->v);
const char *gotname = (const char *)
token->data.tag.attributes[i].name.ptr;
@@ -393,7 +393,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_END_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
const char *tagname = (const char *)
token->data.tag.name.ptr;
@@ -410,7 +410,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_COMMENT:
{
- char *expstr = json_object_get_string(
+ const char *expstr = json_object_get_string(
array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.comment.ptr;
@@ -427,7 +427,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
{
int expstrlen = json_object_get_string_len(
array_list_get_idx(items, 1));
- char *expstr =json_object_get_string(
+ const char *expstr =json_object_get_string(
array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.character.ptr;
-----------------------------------------------------------------------
Summary of changes:
test/tokeniser2.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/tokeniser2.c b/test/tokeniser2.c
index 59c9cb9..cf0311d 100644
--- a/test/tokeniser2.c
+++ b/test/tokeniser2.c
@@ -171,7 +171,7 @@ void run_test(context *ctx)
params.content_model.model =
HUBBUB_CONTENT_MODEL_PCDATA;
} else {
- char *cm = json_object_get_string(
+ const char *cm = json_object_get_string(
(struct json_object *)
array_list_get_idx(ctx->content_model, i));
@@ -269,11 +269,11 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
switch (token->type) {
case HUBBUB_TOKEN_DOCTYPE:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
- char *exppub = json_object_get_string(
+ const char *exppub = json_object_get_string(
array_list_get_idx(items, 2));
- char *expsys = json_object_get_string(
+ const char *expsys = json_object_get_string(
array_list_get_idx(items, 3));
bool expquirks = !json_object_get_boolean(
array_list_get_idx(items, 4));
@@ -330,7 +330,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_START_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
struct lh_entry *expattrs = json_object_get_object(
array_list_get_idx(items, 2))->head;
@@ -364,7 +364,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
for (i = 0; i < token->data.tag.n_attributes; i++) {
char *expname = (char *) expattrs->k;
- char *expval = json_object_get_string(
+ const char *expval = json_object_get_string(
(struct json_object *) expattrs->v);
const char *gotname = (const char *)
token->data.tag.attributes[i].name.ptr;
@@ -393,7 +393,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_END_TAG:
{
- char *expname = json_object_get_string(
+ const char *expname = json_object_get_string(
array_list_get_idx(items, 1));
const char *tagname = (const char *)
token->data.tag.name.ptr;
@@ -410,7 +410,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_COMMENT:
{
- char *expstr = json_object_get_string(
+ const char *expstr = json_object_get_string(
array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.comment.ptr;
@@ -427,7 +427,7 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
{
int expstrlen = json_object_get_string_len(
array_list_get_idx(items, 1));
- char *expstr =json_object_get_string(
+ const char *expstr =json_object_get_string(
array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.character.ptr;
--
HTML5 parser library
10 years, 7 months
libhubbub: branch master updated. e3e74235de5a800fe421b4c74059d926a298361d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/libhubbub.git/shortlog/e3e74235de5a800fe42...
...commit http://git.netsurf-browser.org/libhubbub.git/commit/e3e74235de5a800fe421b...
...tree http://git.netsurf-browser.org/libhubbub.git/tree/e3e74235de5a800fe421b4c...
The branch, master has been updated
via e3e74235de5a800fe421b4c74059d926a298361d (commit)
from f6953cb68e18521361e18b6b7d504742263998ea (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/libhubbub.git/commitdiff/e3e74235de5a800fe...
commit e3e74235de5a800fe421b4c74059d926a298361d
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
update for json-c 0.10 API
diff --git a/test/tokeniser2.c b/test/tokeniser2.c
index 82caf20..59c9cb9 100644
--- a/test/tokeniser2.c
+++ b/test/tokeniser2.c
@@ -83,11 +83,9 @@ int main(int argc, char **argv)
printf("Test: %s\n",
json_object_get_string(val));
} else if (strcmp(key, "input") == 0) {
- int len;
ctx.input = (const uint8_t *)
- json_object_get_string_len(val,
- &len);
- ctx.input_len = len;
+ json_object_get_string(val);
+ ctx.input_len = json_object_get_string_len(val);
} else if (strcmp(key, "output") == 0) {
ctx.output = json_object_get_array(val);
ctx.output_index = 0;
@@ -427,9 +425,10 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_CHARACTER:
{
- int expstrlen;
- char *expstr = json_object_get_string_len(
- array_list_get_idx(items, 1), &expstrlen);
+ int expstrlen = json_object_get_string_len(
+ array_list_get_idx(items, 1));
+ char *expstr =json_object_get_string(
+ array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.character.ptr;
size_t len = min(token->data.character.len,
-----------------------------------------------------------------------
Summary of changes:
test/tokeniser2.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/test/tokeniser2.c b/test/tokeniser2.c
index 82caf20..59c9cb9 100644
--- a/test/tokeniser2.c
+++ b/test/tokeniser2.c
@@ -83,11 +83,9 @@ int main(int argc, char **argv)
printf("Test: %s\n",
json_object_get_string(val));
} else if (strcmp(key, "input") == 0) {
- int len;
ctx.input = (const uint8_t *)
- json_object_get_string_len(val,
- &len);
- ctx.input_len = len;
+ json_object_get_string(val);
+ ctx.input_len = json_object_get_string_len(val);
} else if (strcmp(key, "output") == 0) {
ctx.output = json_object_get_array(val);
ctx.output_index = 0;
@@ -427,9 +425,10 @@ hubbub_error token_handler(const hubbub_token *token, void *pw)
break;
case HUBBUB_TOKEN_CHARACTER:
{
- int expstrlen;
- char *expstr = json_object_get_string_len(
- array_list_get_idx(items, 1), &expstrlen);
+ int expstrlen = json_object_get_string_len(
+ array_list_get_idx(items, 1));
+ char *expstr =json_object_get_string(
+ array_list_get_idx(items, 1));
const char *gotstr = (const char *)
token->data.character.ptr;
size_t len = min(token->data.character.len,
--
HTML5 parser library
10 years, 7 months
netsurf: branch master updated. 5c53f01ead20a9dee302cd43654ae25c1bbcc15e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/5c53f01ead20a9dee302c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/5c53f01ead20a9dee302cd4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/5c53f01ead20a9dee302cd436...
The branch, master has been updated
via 5c53f01ead20a9dee302cd43654ae25c1bbcc15e (commit)
from 0200ba1ed27e46f00e822387788bad871e938526 (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/commitdiff/5c53f01ead20a9dee30...
commit 5c53f01ead20a9dee302cd43654ae25c1bbcc15e
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added netsurf.png to package, now the welcome page displays correctly.
Altough I don't like to have netsurf.png floating around
in the root directory of netsurf.
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 80e14d9..51facc3 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -151,6 +151,7 @@ $(PKGNAME): $(EXETARGET)
$(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/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 | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/atari/Makefile.target b/atari/Makefile.target
index 80e14d9..51facc3 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -151,6 +151,7 @@ $(PKGNAME): $(EXETARGET)
$(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/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
10 years, 7 months
netsurf: branch master updated. 0200ba1ed27e46f00e822387788bad871e938526
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/0200ba1ed27e46f00e822...
...commit http://git.netsurf-browser.org/netsurf.git/commit/0200ba1ed27e46f00e82238...
...tree http://git.netsurf-browser.org/netsurf.git/tree/0200ba1ed27e46f00e8223877...
The branch, master has been updated
via 0200ba1ed27e46f00e822387788bad871e938526 (commit)
via ad2552ddb0165d6051563751db6986fad2cf8e38 (commit)
from 17c9641b38e558a4e01ef9173af6770b115a8f59 (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/commitdiff/0200ba1ed27e46f00e8...
commit 0200ba1ed27e46f00e822387788bad871e938526
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Revert positioning Fix dated 2012-08-07
diff --git a/atari/settings.c b/atari/settings.c
index 010680a..787eee7 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -123,8 +123,8 @@ WINDOW * open_settings()
if( dlgwin == NULL){
// TODO: localize title
- dlgwin = FormCreate( dlgtree, WAT_FORM, NULL, (char*)"Settings",
- NULL, TRUE, 1);
+ dlgwin = FormCreate(dlgtree, WAT_FORM, NULL, (char*)"Settings",
+ NULL, TRUE, FALSE);
if( !dlgwin ){
return( NULL );
}
@@ -172,10 +172,12 @@ WINDOW * open_settings()
clear_history, NULL);
EvntAdd( dlgwin, WM_CLOSED, onclose, EV_TOP );
- display_settings();
+ display_settings();
+ toggle_objects();
} else {
- WindTop( dlgwin );
+ WindTop( dlgwin );
+ display_settings();
toggle_objects();
}
return( dlgwin );
@@ -185,7 +187,6 @@ void close_settings(void)
{
if( dlgwin != NULL ){
/* Duplicated form tree must be free'd manualy? */
- ObjcFree(ObjcTree(OC_FORM, dlgwin));
WindClose(dlgwin);
dlgwin = NULL;
}
@@ -320,13 +321,6 @@ static colour color_popup(int x, int y, colour current)
/* copy screen image */
vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg);
- /*
- plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
- y+(GRID_ROWS*boxheight)+3, &outline);
-
- plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
- &outline);
- */
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
&outline);
@@ -466,11 +460,11 @@ form_event( WINDOW *win, int index, int external, void *unused2)
};
int num_locales = (sizeof(locales)/sizeof(char*));
short x, y;
- int choice;
-
+ int choice;
+
switch( index ){
- case CHOICES_CB_USE_PROXY:
+ case CHOICES_CB_USE_PROXY:
if( checked ){
ENABLE_OBJ( CHOICES_EDIT_PROXY_HOST );
ENABLE_OBJ( CHOICES_CB_PROXY_AUTH );
@@ -479,7 +473,8 @@ form_event( WINDOW *win, int index, int external, void *unused2)
DISABLE_OBJ( CHOICES_EDIT_PROXY_HOST );
DISABLE_OBJ( CHOICES_CB_PROXY_AUTH );
}
- FORMEVENT( CHOICES_CB_PROXY_AUTH );
+ FORMEVENT( CHOICES_CB_PROXY_AUTH );
+ ObjcDrawParent(OC_FORM, dlgwin, index, 9, 1 );
break;
case CHOICES_CB_PROXY_AUTH:
@@ -880,7 +875,7 @@ static void apply_settings( void )
nsoption_set_charp(http_proxy_auth_pass,
ObjcString( dlgtree, CHOICES_EDIT_PROXY_PASSWORD, NULL));
nsoption_set_charp(http_proxy_auth_user,
- ObjcString( dlgtree, CHOICES_EDIT_PROXY_USERNAME, NULL));
+ ObjcString( dlgtree, CHOICES_EDIT_PROXY_USERNAME, NULL));
nsoption_set_charp(http_proxy_host,
ObjcString( dlgtree, CHOICES_EDIT_PROXY_HOST, NULL));
nsoption_set_int(http_proxy_port,
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/ad2552ddb0165d60515...
commit ad2552ddb0165d6051563751db6986fad2cf8e38
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Set default download path "downloads"
diff --git a/atari/options.h b/atari/options.h
index 56be492..f48a0e8 100755
--- a/atari/options.h
+++ b/atari/options.h
@@ -67,7 +67,7 @@
.atari_face_cursive = NULL, \
.atari_face_fantasy = NULL, \
.atari_editor = (char*)"", \
- .downloads_path = (char*)"", \
+ .downloads_path = (char*)"downloads", \
.url_file = (char*)"url.db", \
.hotlist_file = (char*)"hotlist", \
.tree_icons_path = (char*)"./res/icons"
-----------------------------------------------------------------------
Summary of changes:
atari/options.h | 2 +-
atari/settings.c | 29 ++++++++++++-----------------
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/atari/options.h b/atari/options.h
index 56be492..f48a0e8 100755
--- a/atari/options.h
+++ b/atari/options.h
@@ -67,7 +67,7 @@
.atari_face_cursive = NULL, \
.atari_face_fantasy = NULL, \
.atari_editor = (char*)"", \
- .downloads_path = (char*)"", \
+ .downloads_path = (char*)"downloads", \
.url_file = (char*)"url.db", \
.hotlist_file = (char*)"hotlist", \
.tree_icons_path = (char*)"./res/icons"
diff --git a/atari/settings.c b/atari/settings.c
index 010680a..787eee7 100644
--- a/atari/settings.c
+++ b/atari/settings.c
@@ -123,8 +123,8 @@ WINDOW * open_settings()
if( dlgwin == NULL){
// TODO: localize title
- dlgwin = FormCreate( dlgtree, WAT_FORM, NULL, (char*)"Settings",
- NULL, TRUE, 1);
+ dlgwin = FormCreate(dlgtree, WAT_FORM, NULL, (char*)"Settings",
+ NULL, TRUE, FALSE);
if( !dlgwin ){
return( NULL );
}
@@ -172,10 +172,12 @@ WINDOW * open_settings()
clear_history, NULL);
EvntAdd( dlgwin, WM_CLOSED, onclose, EV_TOP );
- display_settings();
+ display_settings();
+ toggle_objects();
} else {
- WindTop( dlgwin );
+ WindTop( dlgwin );
+ display_settings();
toggle_objects();
}
return( dlgwin );
@@ -185,7 +187,6 @@ void close_settings(void)
{
if( dlgwin != NULL ){
/* Duplicated form tree must be free'd manualy? */
- ObjcFree(ObjcTree(OC_FORM, dlgwin));
WindClose(dlgwin);
dlgwin = NULL;
}
@@ -320,13 +321,6 @@ static colour color_popup(int x, int y, colour current)
/* copy screen image */
vro_cpyfm (app.graf.handle, S_ONLY, pxy, &screen, &bg);
- /*
- plot_rectangle(x+1, y+1, x+(GRID_COLS*boxwidth)+3,
- y+(GRID_ROWS*boxheight)+3, &outline);
-
- plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y+(GRID_ROWS*boxheight)+2,
- &outline);
- */
plot_line(x, y, x+(GRID_COLS*boxwidth)+2, y,
&outline);
@@ -466,11 +460,11 @@ form_event( WINDOW *win, int index, int external, void *unused2)
};
int num_locales = (sizeof(locales)/sizeof(char*));
short x, y;
- int choice;
-
+ int choice;
+
switch( index ){
- case CHOICES_CB_USE_PROXY:
+ case CHOICES_CB_USE_PROXY:
if( checked ){
ENABLE_OBJ( CHOICES_EDIT_PROXY_HOST );
ENABLE_OBJ( CHOICES_CB_PROXY_AUTH );
@@ -479,7 +473,8 @@ form_event( WINDOW *win, int index, int external, void *unused2)
DISABLE_OBJ( CHOICES_EDIT_PROXY_HOST );
DISABLE_OBJ( CHOICES_CB_PROXY_AUTH );
}
- FORMEVENT( CHOICES_CB_PROXY_AUTH );
+ FORMEVENT( CHOICES_CB_PROXY_AUTH );
+ ObjcDrawParent(OC_FORM, dlgwin, index, 9, 1 );
break;
case CHOICES_CB_PROXY_AUTH:
@@ -880,7 +875,7 @@ static void apply_settings( void )
nsoption_set_charp(http_proxy_auth_pass,
ObjcString( dlgtree, CHOICES_EDIT_PROXY_PASSWORD, NULL));
nsoption_set_charp(http_proxy_auth_user,
- ObjcString( dlgtree, CHOICES_EDIT_PROXY_USERNAME, NULL));
+ ObjcString( dlgtree, CHOICES_EDIT_PROXY_USERNAME, NULL));
nsoption_set_charp(http_proxy_host,
ObjcString( dlgtree, CHOICES_EDIT_PROXY_HOST, NULL));
nsoption_set_int(http_proxy_port,
--
NetSurf Browser
10 years, 7 months
netsurf: branch master updated. 17c9641b38e558a4e01ef9173af6770b115a8f59
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/17c9641b38e558a4e01ef...
...commit http://git.netsurf-browser.org/netsurf.git/commit/17c9641b38e558a4e01ef91...
...tree http://git.netsurf-browser.org/netsurf.git/tree/17c9641b38e558a4e01ef9173...
The branch, master has been updated
via 17c9641b38e558a4e01ef9173af6770b115a8f59 (commit)
from 34a3901501f12d9c7ed82332f79590ca62a094d1 (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/commitdiff/17c9641b38e558a4e01...
commit 17c9641b38e558a4e01ef9173af6770b115a8f59
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
is_process_running: Check for zombie status.
diff --git a/atari/misc.c b/atari/misc.c
index 054684a..55b9612 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -201,6 +201,7 @@ static int proc_running_callback(int pid, void * arg)
data = (struct is_process_running_callback_data *)arg;
sprintf(fnamepath, "U:\\kern\\%d\\fname", pid);
+ printf("checking: %s\n", fnamepath);
fp = fopen(fnamepath, "r");
if(!fp)
@@ -208,6 +209,7 @@ static int proc_running_callback(int pid, void * arg)
nread = fread(buf, 1, PATH_MAX-1, fp);
fclose(fp);
+ nread = MIN(PATH_MAX-1, nread);
if (nread > 0) {
buf[nread] = 0;
@@ -223,8 +225,22 @@ static int proc_running_callback(int pid, void * arg)
lastslash++;
if(strcasecmp(lastslash, data->fname)==0){
- data->found = true;
- return(-1);
+ /* found process, check status: */
+ sprintf(fnamepath, "U:\\kern\\%d\\status", pid);
+ fp = fopen(fnamepath, "r");
+ if (fp) {
+ nread = fread(buf, 1, PATH_MAX-1, fp);
+ fclose(fp);
+ if (nread>0) {
+ nread = MIN(PATH_MAX-1,nread);
+ }
+ buf[nread] = 0;
+ if (strstr(buf, "zombie")==NULL) {
+ data->found = true;
+ return(-1);
+ }
+ }
+
}
}
return(0);
-----------------------------------------------------------------------
Summary of changes:
atari/misc.c | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/atari/misc.c b/atari/misc.c
index 054684a..55b9612 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -201,6 +201,7 @@ static int proc_running_callback(int pid, void * arg)
data = (struct is_process_running_callback_data *)arg;
sprintf(fnamepath, "U:\\kern\\%d\\fname", pid);
+ printf("checking: %s\n", fnamepath);
fp = fopen(fnamepath, "r");
if(!fp)
@@ -208,6 +209,7 @@ static int proc_running_callback(int pid, void * arg)
nread = fread(buf, 1, PATH_MAX-1, fp);
fclose(fp);
+ nread = MIN(PATH_MAX-1, nread);
if (nread > 0) {
buf[nread] = 0;
@@ -223,8 +225,22 @@ static int proc_running_callback(int pid, void * arg)
lastslash++;
if(strcasecmp(lastslash, data->fname)==0){
- data->found = true;
- return(-1);
+ /* found process, check status: */
+ sprintf(fnamepath, "U:\\kern\\%d\\status", pid);
+ fp = fopen(fnamepath, "r");
+ if (fp) {
+ nread = fread(buf, 1, PATH_MAX-1, fp);
+ fclose(fp);
+ if (nread>0) {
+ nread = MIN(PATH_MAX-1,nread);
+ }
+ buf[nread] = 0;
+ if (strstr(buf, "zombie")==NULL) {
+ data->found = true;
+ return(-1);
+ }
+ }
+
}
}
return(0);
--
NetSurf Browser
10 years, 7 months
netsurf: branch master updated. 34a3901501f12d9c7ed82332f79590ca62a094d1
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/34a3901501f12d9c7ed82...
...commit http://git.netsurf-browser.org/netsurf.git/commit/34a3901501f12d9c7ed8233...
...tree http://git.netsurf-browser.org/netsurf.git/tree/34a3901501f12d9c7ed82332f...
The branch, master has been updated
via 34a3901501f12d9c7ed82332f79590ca62a094d1 (commit)
via b806c94c1d6c98cc3e5461f06032aacff6c00b42 (commit)
from 02593d170a7163a141acf6f2f72686a7bdbfb828 (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/commitdiff/34a3901501f12d9c7ed...
commit 34a3901501f12d9c7ed82332f79590ca62a094d1
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
A new window can now be opened in background mode.
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 29e78ca..3b987bb 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -165,8 +165,9 @@ int window_create( struct gui_window * gw,
EvntDataAttach( gw->root->handle, WM_ICONDRAW, evnt_window_icondraw, gw);
EvntDataAttach( gw->root->handle, WM_SLIDEXY, evnt_window_slider, gw );
- /* TODO: check if window is openend as "foreground" window... */
- window_set_focus( gw, BROWSER, gw->browser);
+ if (inflags & WIN_TOP) {
+ window_set_focus( gw, BROWSER, gw->browser);
+ }
return (err);
}
diff --git a/atari/browser_win.h b/atari/browser_win.h
index 9d56226..4cf8a26 100755
--- a/atari/browser_win.h
+++ b/atari/browser_win.h
@@ -22,10 +22,12 @@
#define GUIWIN_VISIBLE(gw) (gw->root->handle->status & WS_OPEN)
#define GEMWIN_VISIBLE(win) (win->status & WS_OPEN)
-#define WIDGET_STATUSBAR 0x1
-#define WIDGET_TOOLBAR 0x2
-#define WIDGET_SCROLL 0x4
-#define WIDGET_RESIZE 0x8
+#define WIDGET_STATUSBAR 0x1
+#define WIDGET_TOOLBAR 0x2
+#define WIDGET_SCROLL 0x4
+#define WIDGET_RESIZE 0x8
+
+#define WIN_TOP 0x100
/* WinDom & Custom bindings for gui window */
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/b806c94c1d6c98cc3e5...
commit b806c94c1d6c98cc3e5461f06032aacff6c00b42
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Fix warnings, moved prototypes, housekeeping
diff --git a/atari/download.c b/atari/download.c
index 8ced4c3..45be977 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -46,8 +46,6 @@
#include "atari/res/netsurf.rsh"
#include "atari/download.h"
#include "atari/osspec.h"
-
-/*TODO: get filename from core. */
extern struct gui_window * input_window;
diff --git a/atari/gui.c b/atari/gui.c
index deb28df..b780985 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -958,7 +958,7 @@ static void gui_init(int argc, char** argv)
}
if (nsoption_charp(cookie_file) == NULL ){
- nsoption_set_charp(cookie_file, "cookies");
+ nsoption_set_charp(cookie_file, (char*)"cookies");
}
LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
if( strlen(nsoption_charp(cookie_file)) ){
diff --git a/atari/history.c b/atari/history.c
index 00fcce9..d658fcb 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/browser.h"
+#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
@@ -105,8 +106,7 @@ bool global_history_init( void )
LOG(("Failed to allocate history window"));
return( false );
}
- /* TODO: load history strings from messages */
- WindSetStr( gl_history.window, WF_NAME, (char*)"History" );
+ WindSetStr(gl_history.window, WF_NAME, messages_get("GlobalHistory"));
//WindSetPtr( gl_history.window, WF_TOOLBAR, tree, evnt_history_toolbar );
EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close );
EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton );
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 68e5c31..bdd10d9 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -103,8 +103,7 @@ void hotlist_init(void)
LOG(("Failed to allocate Hotlist"));
return;
}
- /* TODO: load hotlist strings from messages */
- WindSetStr( hl.window, WF_NAME, (char*)"Hotlist" );
+ WindSetStr( hl.window, WF_NAME, (char*)messages_get("Hotlist") );
WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar );
EvntAttach( hl.window, WM_CLOSED, evnt_hl_close );
EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton );
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index ac5ab1e..66407ff 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -69,13 +69,6 @@ static void snapshot_suspend(void);
/* destroy memory used by screenshot */
static void snapshot_destroy(void);
-/* convert an bgra color to vdi1000 color */
-void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
-
-/* convert an rgb color to an index into the web palette */
-short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
-
-
#ifdef WITH_8BPP_SUPPORT
static unsigned short sys_pal[256][3]; /*RGB*/
static unsigned short pal[256][3]; /*RGB*/
@@ -188,7 +181,7 @@ const char* plot_err_str(int i)
/**
* Set line drawing color by passing netsurf XBGR "colour" type.
- *
+ *
* \param vdih The vdi handle
* \param cin The netsurf colour value
*/
@@ -214,7 +207,7 @@ inline static void vsl_rgbcolor(short vdih, colour cin)
/**
* Set fill color by passing netsurf XBGR "colour" type.
- *
+ *
* \param vdih The vdi handle
* \param cin The netsurf colour value
*/
@@ -567,7 +560,7 @@ inline void vdi1000_to_rgb(unsigned short * in, unsigned char * out)
#ifdef WITH_8BPP_SUPPORT
/**
- * Set pixel within an 8 bit VDI standard bitmap.
+ * Set pixel within an 8 bit VDI standard bitmap.
*/
inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y, unsigned char val )
{
@@ -602,7 +595,7 @@ inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y, unsigned
}
/**
- * Read pixel from an 8 bit VDI standard bitmap.
+ * Read pixel from an 8 bit VDI standard bitmap.
*/
inline static unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y)
{
@@ -715,7 +708,7 @@ static void dump_vdi_info(short vdih)
}
/**
- * Create an snapshot of the screen image in device format.
+ * Create an snapshot of the screen image in device format.
*/
static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
{
@@ -766,7 +759,7 @@ static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
}
/**
- * Create an snapshot of the screen image in VDI standard format (8 bit).
+ * Create an snapshot of the screen image in VDI standard format (8 bit).
*/
static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
{
@@ -804,7 +797,7 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
return( &buf_std );
}
-/*
+/*
* Create an snapshot of the screen in netsurf ABGR format
*/
static struct bitmap * snapshot_create(int x, int y, int w, int h)
diff --git a/atari/plot/plot.h b/atari/plot/plot.h
index a5c7683..53a2645 100755
--- a/atari/plot/plot.h
+++ b/atari/plot/plot.h
@@ -122,6 +122,12 @@ bool plot_copy_rect(GRECT src, GRECT dst);
/* convert an vdi color to bgra */
void vdi1000_to_rgb( unsigned short * in, unsigned char * out );
+/* convert an bgra color to vdi1000 color */
+void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
+
+/* convert an rgb color to an index into the web palette */
+short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
+
/* assign vdi line style to dst ( netsurf type ) */
#define NSLT2VDI(dst, src) \
dst = 0;\
-----------------------------------------------------------------------
Summary of changes:
atari/browser_win.c | 5 +++--
atari/browser_win.h | 10 ++++++----
atari/download.c | 2 --
atari/gui.c | 2 +-
atari/history.c | 4 ++--
atari/hotlist.c | 3 +--
atari/plot/plot.c | 21 +++++++--------------
atari/plot/plot.h | 6 ++++++
8 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/atari/browser_win.c b/atari/browser_win.c
index 29e78ca..3b987bb 100755
--- a/atari/browser_win.c
+++ b/atari/browser_win.c
@@ -165,8 +165,9 @@ int window_create( struct gui_window * gw,
EvntDataAttach( gw->root->handle, WM_ICONDRAW, evnt_window_icondraw, gw);
EvntDataAttach( gw->root->handle, WM_SLIDEXY, evnt_window_slider, gw );
- /* TODO: check if window is openend as "foreground" window... */
- window_set_focus( gw, BROWSER, gw->browser);
+ if (inflags & WIN_TOP) {
+ window_set_focus( gw, BROWSER, gw->browser);
+ }
return (err);
}
diff --git a/atari/browser_win.h b/atari/browser_win.h
index 9d56226..4cf8a26 100755
--- a/atari/browser_win.h
+++ b/atari/browser_win.h
@@ -22,10 +22,12 @@
#define GUIWIN_VISIBLE(gw) (gw->root->handle->status & WS_OPEN)
#define GEMWIN_VISIBLE(win) (win->status & WS_OPEN)
-#define WIDGET_STATUSBAR 0x1
-#define WIDGET_TOOLBAR 0x2
-#define WIDGET_SCROLL 0x4
-#define WIDGET_RESIZE 0x8
+#define WIDGET_STATUSBAR 0x1
+#define WIDGET_TOOLBAR 0x2
+#define WIDGET_SCROLL 0x4
+#define WIDGET_RESIZE 0x8
+
+#define WIN_TOP 0x100
/* WinDom & Custom bindings for gui window */
diff --git a/atari/download.c b/atari/download.c
index 8ced4c3..45be977 100755
--- a/atari/download.c
+++ b/atari/download.c
@@ -46,8 +46,6 @@
#include "atari/res/netsurf.rsh"
#include "atari/download.h"
#include "atari/osspec.h"
-
-/*TODO: get filename from core. */
extern struct gui_window * input_window;
diff --git a/atari/gui.c b/atari/gui.c
index deb28df..b780985 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -958,7 +958,7 @@ static void gui_init(int argc, char** argv)
}
if (nsoption_charp(cookie_file) == NULL ){
- nsoption_set_charp(cookie_file, "cookies");
+ nsoption_set_charp(cookie_file, (char*)"cookies");
}
LOG(("Loading cookies from: %s", nsoption_charp(cookie_file) ));
if( strlen(nsoption_charp(cookie_file)) ){
diff --git a/atari/history.c b/atari/history.c
index 00fcce9..d658fcb 100755
--- a/atari/history.c
+++ b/atari/history.c
@@ -28,6 +28,7 @@
#include "desktop/gui.h"
#include "desktop/history_global_core.h"
#include "desktop/browser.h"
+#include "utils/messages.h"
#include "content/content.h"
#include "content/hlcache.h"
#include "content/urldb.h"
@@ -105,8 +106,7 @@ bool global_history_init( void )
LOG(("Failed to allocate history window"));
return( false );
}
- /* TODO: load history strings from messages */
- WindSetStr( gl_history.window, WF_NAME, (char*)"History" );
+ WindSetStr(gl_history.window, WF_NAME, messages_get("GlobalHistory"));
//WindSetPtr( gl_history.window, WF_TOOLBAR, tree, evnt_history_toolbar );
EvntAttach( gl_history.window, WM_CLOSED, evnt_history_close );
EvntAttach( gl_history.window, WM_XBUTTON,evnt_history_mbutton );
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 68e5c31..bdd10d9 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -103,8 +103,7 @@ void hotlist_init(void)
LOG(("Failed to allocate Hotlist"));
return;
}
- /* TODO: load hotlist strings from messages */
- WindSetStr( hl.window, WF_NAME, (char*)"Hotlist" );
+ WindSetStr( hl.window, WF_NAME, (char*)messages_get("Hotlist") );
WindSetPtr( hl.window, WF_TOOLBAR, tree, evnt_hl_toolbar );
EvntAttach( hl.window, WM_CLOSED, evnt_hl_close );
EvntAttach( hl.window, WM_XBUTTON,evnt_hl_mbutton );
diff --git a/atari/plot/plot.c b/atari/plot/plot.c
index ac5ab1e..66407ff 100755
--- a/atari/plot/plot.c
+++ b/atari/plot/plot.c
@@ -69,13 +69,6 @@ static void snapshot_suspend(void);
/* destroy memory used by screenshot */
static void snapshot_destroy(void);
-/* convert an bgra color to vdi1000 color */
-void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
-
-/* convert an rgb color to an index into the web palette */
-short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
-
-
#ifdef WITH_8BPP_SUPPORT
static unsigned short sys_pal[256][3]; /*RGB*/
static unsigned short pal[256][3]; /*RGB*/
@@ -188,7 +181,7 @@ const char* plot_err_str(int i)
/**
* Set line drawing color by passing netsurf XBGR "colour" type.
- *
+ *
* \param vdih The vdi handle
* \param cin The netsurf colour value
*/
@@ -214,7 +207,7 @@ inline static void vsl_rgbcolor(short vdih, colour cin)
/**
* Set fill color by passing netsurf XBGR "colour" type.
- *
+ *
* \param vdih The vdi handle
* \param cin The netsurf colour value
*/
@@ -567,7 +560,7 @@ inline void vdi1000_to_rgb(unsigned short * in, unsigned char * out)
#ifdef WITH_8BPP_SUPPORT
/**
- * Set pixel within an 8 bit VDI standard bitmap.
+ * Set pixel within an 8 bit VDI standard bitmap.
*/
inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y, unsigned char val )
{
@@ -602,7 +595,7 @@ inline static void set_stdpx( MFDB * dst, int wdplanesz, int x, int y, unsigned
}
/**
- * Read pixel from an 8 bit VDI standard bitmap.
+ * Read pixel from an 8 bit VDI standard bitmap.
*/
inline static unsigned char get_stdpx(MFDB * dst, int wdplanesz, int x, int y)
{
@@ -715,7 +708,7 @@ static void dump_vdi_info(short vdih)
}
/**
- * Create an snapshot of the screen image in device format.
+ * Create an snapshot of the screen image in device format.
*/
static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
{
@@ -766,7 +759,7 @@ static MFDB * snapshot_create_native_mfdb(int x, int y, int w, int h)
}
/**
- * Create an snapshot of the screen image in VDI standard format (8 bit).
+ * Create an snapshot of the screen image in VDI standard format (8 bit).
*/
static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
{
@@ -804,7 +797,7 @@ static MFDB * snapshot_create_std_mfdb(int x, int y, int w, int h)
return( &buf_std );
}
-/*
+/*
* Create an snapshot of the screen in netsurf ABGR format
*/
static struct bitmap * snapshot_create(int x, int y, int w, int h)
diff --git a/atari/plot/plot.h b/atari/plot/plot.h
index a5c7683..53a2645 100755
--- a/atari/plot/plot.h
+++ b/atari/plot/plot.h
@@ -122,6 +122,12 @@ bool plot_copy_rect(GRECT src, GRECT dst);
/* convert an vdi color to bgra */
void vdi1000_to_rgb( unsigned short * in, unsigned char * out );
+/* convert an bgra color to vdi1000 color */
+void rgb_to_vdi1000( unsigned char * in, unsigned short * out );
+
+/* convert an rgb color to an index into the web palette */
+short rgb_to_666_index(unsigned char r, unsigned char g, unsigned char b);
+
/* assign vdi line style to dst ( netsurf type ) */
#define NSLT2VDI(dst, src) \
dst = 0;\
--
NetSurf Browser
10 years, 7 months
netsurf: branch master updated. 02593d170a7163a141acf6f2f72686a7bdbfb828
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/02593d170a7163a141acf...
...commit http://git.netsurf-browser.org/netsurf.git/commit/02593d170a7163a141acf6f...
...tree http://git.netsurf-browser.org/netsurf.git/tree/02593d170a7163a141acf6f2f...
The branch, master has been updated
via 02593d170a7163a141acf6f2f72686a7bdbfb828 (commit)
via 5a7ddb9e8478e18ac06871dc841cf7069a5ba949 (commit)
from 38c6e95f4e0681221f9a4f1517d68bac6e98da2c (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/commitdiff/02593d170a7163a141a...
commit 02593d170a7163a141acf6f2f72686a7bdbfb828
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added is_process_running
Now the source code viewer is launched when not already
running (ShelWrite wasn't handling this correctly)
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 79395ca..1a1755b 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -23,7 +23,8 @@
#include <string.h>
#include <stdbool.h>
#include <assert.h>
-#include <windom.h>
+#include <windom.h>
+#include <mint/osbind.h>
#include "desktop/gui.h"
#include "desktop/netsurf.h"
@@ -122,8 +123,8 @@ void context_popup( struct gui_window * gw, short x, short y )
FILE * fp_tmpfile;
char * tempfile;
int err = 0;
- char * editor;
- char cmdline[128];
+ char * editor, *lastslash;
+ char cmdline[PATH_MAX];
pop = get_tree( POP_CTX );
if (pop == NULL)
@@ -239,15 +240,24 @@ void context_popup( struct gui_window * gw, short x, short y )
fp_tmpfile = fopen( tempfile, "w" );
if (fp_tmpfile != NULL){
fwrite(data, size, 1, fp_tmpfile);
- fclose(fp_tmpfile );
-
- // TODO: check if app is runnin, if not, use pexec or such.
- /*
- sprintf((char*)&cmdline, "%s \"%s\"", nsoption_charp(atari_editor), tempfile );
- system( (char*)&cmdline );
- */
- err = ShelWrite( editor, tempfile , editor, 1, 0);
- LOG(("Launched: %s %s (%d)\n", editor, tempfile, err ));
+ fclose(fp_tmpfile );
+ lastslash = strrchr(editor, '/');
+ if (lastslash == NULL)
+ lastslash = strrchr(editor, '\\');
+ if (lastslash == NULL)
+ lastslash = editor;
+ else
+ lastslash++;
+ if(is_process_running(lastslash)){
+ err = ShelWrite( editor, tempfile , editor, 1, 0);
+ } else {
+ /* check for max length of simple commandline param: */
+ if(strlen(tempfile)<=125){
+ sprintf(cmdline, "%c%s", (char)strlen(tempfile),
+ tempfile);
+ Pexec(100, editor, cmdline, NULL);
+ }
+ }
} else {
printf("Could not open temp file: %s!\n", tempfile );
}
diff --git a/atari/misc.c b/atari/misc.c
index 3721847..054684a 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -45,6 +45,11 @@
#include "cflib.h"
extern void * h_gem_rsrc;
+
+struct is_process_running_callback_data {
+ const char * fname;
+ bool found;
+};
void warn_user(const char *warning, const char *detail)
{
@@ -152,6 +157,86 @@ struct gui_window * find_cmp_window( COMPONENT * c )
gw = gw->next;
}
return( NULL );
+}
+
+static int scan_process_list(scan_process_callback cb, void *data)
+{
+ int pid, count = 0;
+ DIR *dir;
+ char*dirname;
+ struct dirent *de;
+
+ if (( dir = opendir("U:/kern")) == NULL)
+ return(0);
+
+ while ((de = readdir( dir)) != NULL) {
+ dirname = de->d_name;
+
+ if( dirname[0] != '1' && dirname[0] != '2' && dirname[0] != '3' && dirname[0] != '4' && dirname[0] != '5'
+ && dirname[0] != '6' && dirname[0] != '7' && dirname[0] != '8' && dirname[0] != '9')
+ continue;
+
+ count++;
+ if (cb != NULL) {
+ /* when callback returns negative value, we stop scanning: */
+ pid = atoi(dirname);
+ if (cb(pid, data)<0) {
+ break;
+ }
+ }
+ }
+
+ closedir(dir);
+
+ return(count);
+}
+
+static int proc_running_callback(int pid, void * arg)
+{
+ char buf[PATH_MAX], fnamepath[256];
+ FILE *fp;
+ int nread;
+ struct is_process_running_callback_data *data;
+
+ data = (struct is_process_running_callback_data *)arg;
+
+ sprintf(fnamepath, "U:\\kern\\%d\\fname", pid);
+
+ fp = fopen(fnamepath, "r");
+ if(!fp)
+ return(0);
+
+ nread = fread(buf, 1, PATH_MAX-1, fp);
+ fclose(fp);
+
+ if (nread > 0) {
+ buf[nread] = 0;
+
+ char *lastslash = strrchr(buf, '/');
+
+ if(lastslash == NULL)
+ lastslash = strrchr(buf, '\\');
+
+ if(lastslash==NULL)
+ lastslash = buf;
+ else
+ lastslash++;
+
+ if(strcasecmp(lastslash, data->fname)==0){
+ data->found = true;
+ return(-1);
+ }
+ }
+ return(0);
+}
+
+bool is_process_running(const char * name)
+{
+ struct is_process_running_callback_data data = {name, false};
+
+ scan_process_list(proc_running_callback, &data);
+
+ return( (data.found==1) ? true : false );
}
diff --git a/atari/misc.h b/atari/misc.h
index edd026b..612113f 100755
--- a/atari/misc.h
+++ b/atari/misc.h
@@ -39,9 +39,12 @@
/* Modes for find_gui_window: */
#define BY_WINDOM_HANDLE 0x0
#define BY_GEM_HANDLE 0x1
+
+typedef int (*scan_process_callback)(int pid, void *data);
struct gui_window * find_gui_window( unsigned long, short mode );
-struct gui_window * find_cmp_window( COMPONENT * c );
+struct gui_window * find_cmp_window( COMPONENT * c );
+bool is_process_running(const char * name);
OBJECT *get_tree( int idx );
char *get_rsc_string( int idx );
void gem_set_cursor( MFORM_EX * cursor );
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/5a7ddb9e8478e18ac06...
commit 5a7ddb9e8478e18ac06871dc841cf7069a5ba949
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Use is_dir to validate user selection.
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
index 1a0e8f6..0c9dfdc 100755
--- a/atari/global_evnt.c
+++ b/atari/global_evnt.c
@@ -170,21 +170,9 @@ static void __CDECL menu_save_page(WINDOW *win, int item, int title, void *data)
do {
// TODO: localize string
- path = file_select( "Select folder", "" );
- if( path ) {
- printf("testing: %s\n", path );
- // dumb check if the selection is an folder:
- /*FILE * fp;
- fp = fopen( path, "r" );
- if( !fp ){
- is_folder = true;
- } else {
- fclose( fp );
- form_alert(1, "[1][Please select an folder or abort!][OK]");
- }
- */
- is_folder = true;
- }
+ path = file_select("Select folder", "");
+ if (path)
+ is_folder = is_dir(path);
} while( !is_folder && path != NULL );
if( path != NULL ){
-----------------------------------------------------------------------
Summary of changes:
atari/ctxmenu.c | 34 +++++++++++++-------
atari/global_evnt.c | 18 ++---------
atari/misc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++
atari/misc.h | 5 ++-
4 files changed, 114 insertions(+), 28 deletions(-)
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index 79395ca..1a1755b 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -23,7 +23,8 @@
#include <string.h>
#include <stdbool.h>
#include <assert.h>
-#include <windom.h>
+#include <windom.h>
+#include <mint/osbind.h>
#include "desktop/gui.h"
#include "desktop/netsurf.h"
@@ -122,8 +123,8 @@ void context_popup( struct gui_window * gw, short x, short y )
FILE * fp_tmpfile;
char * tempfile;
int err = 0;
- char * editor;
- char cmdline[128];
+ char * editor, *lastslash;
+ char cmdline[PATH_MAX];
pop = get_tree( POP_CTX );
if (pop == NULL)
@@ -239,15 +240,24 @@ void context_popup( struct gui_window * gw, short x, short y )
fp_tmpfile = fopen( tempfile, "w" );
if (fp_tmpfile != NULL){
fwrite(data, size, 1, fp_tmpfile);
- fclose(fp_tmpfile );
-
- // TODO: check if app is runnin, if not, use pexec or such.
- /*
- sprintf((char*)&cmdline, "%s \"%s\"", nsoption_charp(atari_editor), tempfile );
- system( (char*)&cmdline );
- */
- err = ShelWrite( editor, tempfile , editor, 1, 0);
- LOG(("Launched: %s %s (%d)\n", editor, tempfile, err ));
+ fclose(fp_tmpfile );
+ lastslash = strrchr(editor, '/');
+ if (lastslash == NULL)
+ lastslash = strrchr(editor, '\\');
+ if (lastslash == NULL)
+ lastslash = editor;
+ else
+ lastslash++;
+ if(is_process_running(lastslash)){
+ err = ShelWrite( editor, tempfile , editor, 1, 0);
+ } else {
+ /* check for max length of simple commandline param: */
+ if(strlen(tempfile)<=125){
+ sprintf(cmdline, "%c%s", (char)strlen(tempfile),
+ tempfile);
+ Pexec(100, editor, cmdline, NULL);
+ }
+ }
} else {
printf("Could not open temp file: %s!\n", tempfile );
}
diff --git a/atari/global_evnt.c b/atari/global_evnt.c
index 1a0e8f6..0c9dfdc 100755
--- a/atari/global_evnt.c
+++ b/atari/global_evnt.c
@@ -170,21 +170,9 @@ static void __CDECL menu_save_page(WINDOW *win, int item, int title, void *data)
do {
// TODO: localize string
- path = file_select( "Select folder", "" );
- if( path ) {
- printf("testing: %s\n", path );
- // dumb check if the selection is an folder:
- /*FILE * fp;
- fp = fopen( path, "r" );
- if( !fp ){
- is_folder = true;
- } else {
- fclose( fp );
- form_alert(1, "[1][Please select an folder or abort!][OK]");
- }
- */
- is_folder = true;
- }
+ path = file_select("Select folder", "");
+ if (path)
+ is_folder = is_dir(path);
} while( !is_folder && path != NULL );
if( path != NULL ){
diff --git a/atari/misc.c b/atari/misc.c
index 3721847..054684a 100755
--- a/atari/misc.c
+++ b/atari/misc.c
@@ -45,6 +45,11 @@
#include "cflib.h"
extern void * h_gem_rsrc;
+
+struct is_process_running_callback_data {
+ const char * fname;
+ bool found;
+};
void warn_user(const char *warning, const char *detail)
{
@@ -152,6 +157,86 @@ struct gui_window * find_cmp_window( COMPONENT * c )
gw = gw->next;
}
return( NULL );
+}
+
+static int scan_process_list(scan_process_callback cb, void *data)
+{
+ int pid, count = 0;
+ DIR *dir;
+ char*dirname;
+ struct dirent *de;
+
+ if (( dir = opendir("U:/kern")) == NULL)
+ return(0);
+
+ while ((de = readdir( dir)) != NULL) {
+ dirname = de->d_name;
+
+ if( dirname[0] != '1' && dirname[0] != '2' && dirname[0] != '3' && dirname[0] != '4' && dirname[0] != '5'
+ && dirname[0] != '6' && dirname[0] != '7' && dirname[0] != '8' && dirname[0] != '9')
+ continue;
+
+ count++;
+ if (cb != NULL) {
+ /* when callback returns negative value, we stop scanning: */
+ pid = atoi(dirname);
+ if (cb(pid, data)<0) {
+ break;
+ }
+ }
+ }
+
+ closedir(dir);
+
+ return(count);
+}
+
+static int proc_running_callback(int pid, void * arg)
+{
+ char buf[PATH_MAX], fnamepath[256];
+ FILE *fp;
+ int nread;
+ struct is_process_running_callback_data *data;
+
+ data = (struct is_process_running_callback_data *)arg;
+
+ sprintf(fnamepath, "U:\\kern\\%d\\fname", pid);
+
+ fp = fopen(fnamepath, "r");
+ if(!fp)
+ return(0);
+
+ nread = fread(buf, 1, PATH_MAX-1, fp);
+ fclose(fp);
+
+ if (nread > 0) {
+ buf[nread] = 0;
+
+ char *lastslash = strrchr(buf, '/');
+
+ if(lastslash == NULL)
+ lastslash = strrchr(buf, '\\');
+
+ if(lastslash==NULL)
+ lastslash = buf;
+ else
+ lastslash++;
+
+ if(strcasecmp(lastslash, data->fname)==0){
+ data->found = true;
+ return(-1);
+ }
+ }
+ return(0);
+}
+
+bool is_process_running(const char * name)
+{
+ struct is_process_running_callback_data data = {name, false};
+
+ scan_process_list(proc_running_callback, &data);
+
+ return( (data.found==1) ? true : false );
}
diff --git a/atari/misc.h b/atari/misc.h
index edd026b..612113f 100755
--- a/atari/misc.h
+++ b/atari/misc.h
@@ -39,9 +39,12 @@
/* Modes for find_gui_window: */
#define BY_WINDOM_HANDLE 0x0
#define BY_GEM_HANDLE 0x1
+
+typedef int (*scan_process_callback)(int pid, void *data);
struct gui_window * find_gui_window( unsigned long, short mode );
-struct gui_window * find_cmp_window( COMPONENT * c );
+struct gui_window * find_cmp_window( COMPONENT * c );
+bool is_process_running(const char * name);
OBJECT *get_tree( int idx );
char *get_rsc_string( int idx );
void gem_set_cursor( MFORM_EX * cursor );
--
NetSurf Browser
10 years, 7 months
netsurf: branch master updated. 38c6e95f4e0681221f9a4f1517d68bac6e98da2c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/38c6e95f4e0681221f9a4...
...commit http://git.netsurf-browser.org/netsurf.git/commit/38c6e95f4e0681221f9a4f1...
...tree http://git.netsurf-browser.org/netsurf.git/tree/38c6e95f4e0681221f9a4f151...
The branch, master has been updated
via 38c6e95f4e0681221f9a4f1517d68bac6e98da2c (commit)
via def39ad61001fdd49ba53c75e9e2c2671d040aa9 (commit)
from b2330bf4261c65deb9bc672382a7296dfc5295c9 (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/commitdiff/38c6e95f4e0681221f9...
commit 38c6e95f4e0681221f9a4f1517d68bac6e98da2c
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added default favicon
diff --git a/atari/res/favicon.ico b/atari/res/favicon.ico
new file mode 100644
index 0000000..8b26a27
Binary files /dev/null and b/atari/res/favicon.ico differ
commitdiff http://git.netsurf-browser.org/netsurf.git/commitdiff/def39ad61001fdd49ba...
commit def39ad61001fdd49ba53c75e9e2c2671d040aa9
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Removed comment
diff --git a/atari/gui.c b/atari/gui.c
index 8478bd3..deb28df 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -119,9 +119,9 @@ void gui_poll(bool active)
next_poll = clock() + (CLOCKS_PER_SEC>>3);
}
} else {
- if( input_window != NULL ){
+ if (input_window != NULL) {
wind_get( 0, WF_TOP, &winloc[0], &winloc[1], &winloc[2], &winloc[3]);
- if( winloc[1] == _AESapid ){
+ if (winloc[1] == _AESapid) {
/* only check for mouse move when netsurf is on top: */
// move that into m1 event handler
graf_mkstate( &mx, &my, &dummy, &dummy );
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 18d016e..68e5c31 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -120,7 +120,6 @@ void hotlist_init(void)
hotlist_initialise(
hl.tv->tree,
- /* TODO: use option_hotlist_file or slt*/
(char*)&hl.path,
"dir.png"
);
-----------------------------------------------------------------------
Summary of changes:
atari/gui.c | 4 ++--
atari/hotlist.c | 1 -
atari/res/favicon.ico | Bin 0 -> 9862 bytes
3 files changed, 2 insertions(+), 3 deletions(-)
create mode 100644 atari/res/favicon.ico
diff --git a/atari/gui.c b/atari/gui.c
index 8478bd3..deb28df 100755
--- a/atari/gui.c
+++ b/atari/gui.c
@@ -119,9 +119,9 @@ void gui_poll(bool active)
next_poll = clock() + (CLOCKS_PER_SEC>>3);
}
} else {
- if( input_window != NULL ){
+ if (input_window != NULL) {
wind_get( 0, WF_TOP, &winloc[0], &winloc[1], &winloc[2], &winloc[3]);
- if( winloc[1] == _AESapid ){
+ if (winloc[1] == _AESapid) {
/* only check for mouse move when netsurf is on top: */
// move that into m1 event handler
graf_mkstate( &mx, &my, &dummy, &dummy );
diff --git a/atari/hotlist.c b/atari/hotlist.c
index 18d016e..68e5c31 100755
--- a/atari/hotlist.c
+++ b/atari/hotlist.c
@@ -120,7 +120,6 @@ void hotlist_init(void)
hotlist_initialise(
hl.tv->tree,
- /* TODO: use option_hotlist_file or slt*/
(char*)&hl.path,
"dir.png"
);
diff --git a/atari/res/favicon.ico b/atari/res/favicon.ico
new file mode 100644
index 0000000..8b26a27
Binary files /dev/null and b/atari/res/favicon.ico differ
--
NetSurf Browser
10 years, 7 months