Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/df2b14ed5f26f6aabaad548d38a24a724b242047
...commit
http://git.netsurf-browser.org/netsurf.git/commit/df2b14ed5f26f6aabaad548d38a24a724b242047
...tree
http://git.netsurf-browser.org/netsurf.git/tree/df2b14ed5f26f6aabaad548d38a24a724b242047
The branch, master has been updated
via df2b14ed5f26f6aabaad548d38a24a724b242047 (commit)
via ccccf76ff841bbd9df517a184b14c3706491c6ce (commit)
via 26acc5d5c72ac8968758a0975dcd3f506fbcab15 (commit)
from a4ed8bf4c9900e0361636dd95a98cf26a54a2e8a (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=df2b14ed5f26f6aabaad548d38a24a724b242047
commit df2b14ed5f26f6aabaad548d38a24a724b242047
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Make rxsig private to gui.c
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index 03ee8c4..534391b 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -109,7 +109,7 @@ STATIC struct ARexxCmd Commands[] =
{ NULL, 0, NULL,
NULL, 0, NULL, 0, 0, NULL }
};
-BOOL ami_arexx_init(void)
+bool ami_arexx_init(ULONG *rxsig)
{
if((arexx_obj = ARexxObj,
AREXX_HostName,"NETSURF",
@@ -119,7 +119,7 @@ BOOL ami_arexx_init(void)
AREXX_DefExtension,"nsrx",
End))
{
- GetAttr(AREXX_SigMask, arexx_obj, &rxsig);
+ GetAttr(AREXX_SigMask, arexx_obj, rxsig);
return true;
}
else
diff --git a/frontends/amiga/arexx.h b/frontends/amiga/arexx.h
index 1982053..e6c9c7e 100755
--- a/frontends/amiga/arexx.h
+++ b/frontends/amiga/arexx.h
@@ -22,11 +22,9 @@
#include <proto/arexx.h>
#include <classes/arexx.h>
-BOOL ami_arexx_init(void);
+bool ami_arexx_init(ULONG *rxsig);
void ami_arexx_handle(void);
void ami_arexx_execute(char *);
void ami_arexx_command(const char *cmd);
void ami_arexx_cleanup(void);
-
-ULONG rxsig;
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 3644751..f285d96 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -198,8 +198,9 @@ static bool win_destroyed;
static STRPTR nsscreentitle;
static struct MsgPort *applibport = NULL;
-static ULONG applibsig = 0;
static uint32 ami_appid = 0;
+static ULONG applibsig = 0;
+static ULONG rxsig = 0;
static struct Hook newprefs_hook;
static STRPTR temp_homepage_url = NULL;
@@ -944,7 +945,7 @@ static void gui_init2(int argc, char** argv)
nserror error;
struct browser_window *bw = NULL;
- notalreadyrunning = ami_arexx_init();
+ notalreadyrunning = ami_arexx_init(&rxsig);
/* Treeview init code ends up calling a font function which needs this
*/
glob = &browserglob;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=ccccf76ff841bbd9df517a184b14c3706491c6ce
commit ccccf76ff841bbd9df517a184b14c3706491c6ce
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Make arexx_obj private to arexx.c
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index ef9ea53..03ee8c4 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -68,6 +68,7 @@ enum
RX_HOTLIST
};
+Object *arexx_obj = NULL;
STATIC char result[100];
STATIC VOID rx_open(struct ARexxCmd *, struct RexxMsg *);
@@ -141,6 +142,12 @@ void ami_arexx_handle(void)
RA_HandleRexx(arexx_obj);
}
+void ami_arexx_command(const char *cmd)
+{
+ if(arexx_obj == NULL) return;
+ IDoMethod(arexx_obj, AM_EXECUTE, cmd, NULL, NULL, NULL, NULL, NULL);
+}
+
void ami_arexx_execute(char *script)
{
char full_script_path[1025];
@@ -149,7 +156,7 @@ void ami_arexx_execute(char *script)
if((lock = Lock(script, ACCESS_READ))) {
DevNameFromLock(lock, full_script_path, 1024, DN_FULLPATH);
LOG("Executing script: %s", full_script_path);
- IDoMethod(arexx_obj, AM_EXECUTE, full_script_path, NULL, NULL,
NULL, NULL, NULL);
+ ami_arexx_command(full_script_path);
UnLock(lock);
}
}
diff --git a/frontends/amiga/arexx.h b/frontends/amiga/arexx.h
index 358d174..1982053 100755
--- a/frontends/amiga/arexx.h
+++ b/frontends/amiga/arexx.h
@@ -25,8 +25,8 @@
BOOL ami_arexx_init(void);
void ami_arexx_handle(void);
void ami_arexx_execute(char *);
+void ami_arexx_command(const char *cmd);
void ami_arexx_cleanup(void);
-Object *arexx_obj;
ULONG rxsig;
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index e41b4f0..3644751 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1055,16 +1055,13 @@ static void gui_init2(int argc, char** argv)
{
STRPTR sendcmd = NULL;
- if(temp_homepage_url)
- {
+ if(temp_homepage_url) {
sendcmd = ASPrintf("OPEN \"%s\" NEW",temp_homepage_url);
free(temp_homepage_url);
- }
- else
- {
+ } else {
sendcmd = ASPrintf("OPEN \"%s\"
NEW",nsoption_charp(homepage_url));
}
-
IDoMethod(arexx_obj,AM_EXECUTE,sendcmd,"NETSURF",NULL,NULL,NULL,NULL);
+ ami_arexx_command(sendcmd);
FreeVec(sendcmd);
ami_quit=true;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=26acc5d5c72ac8968758a0975dcd3f506fbcab15
commit 26acc5d5c72ac8968758a0975dcd3f506fbcab15
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Move some globals into gui.c
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index d7178bc..e41b4f0 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -173,8 +173,6 @@
#define BOOL_MISMATCH(a,b) (1)
#endif
-static bool ami_quit = false;
-
extern struct gui_utf8_table *amiga_utf8_table;
struct ami_gui_tb_userdata {
@@ -183,6 +181,13 @@ struct ami_gui_tb_userdata {
int items;
};
+struct MinList *window_list = NULL;
+struct Screen *scrn = NULL;
+struct MsgPort *sport = NULL;
+struct gui_window *cur_gw = NULL;
+
+static bool ami_quit = false;
+
static struct MsgPort *schedulermsgport = NULL;
static struct MsgPort *appport;
static Class *urlStringClass;
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 5ca1894..4e36cb6 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -170,10 +170,10 @@ struct gui_window
float scale;
};
-struct MinList *window_list;
-struct Screen *scrn;
-struct MsgPort *sport;
-struct gui_window *cur_gw;
+extern struct MinList *window_list;
+extern struct Screen *scrn;
+extern struct MsgPort *sport;
+extern struct gui_window *cur_gw;
void ami_get_msg(void);
void ami_try_quit(void);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/arexx.c | 13 ++++++++++---
frontends/amiga/arexx.h | 6 ++----
frontends/amiga/gui.c | 23 +++++++++++++----------
frontends/amiga/gui.h | 8 ++++----
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c
index ef9ea53..534391b 100644
--- a/frontends/amiga/arexx.c
+++ b/frontends/amiga/arexx.c
@@ -68,6 +68,7 @@ enum
RX_HOTLIST
};
+Object *arexx_obj = NULL;
STATIC char result[100];
STATIC VOID rx_open(struct ARexxCmd *, struct RexxMsg *);
@@ -108,7 +109,7 @@ STATIC struct ARexxCmd Commands[] =
{ NULL, 0, NULL,
NULL, 0, NULL, 0, 0, NULL }
};
-BOOL ami_arexx_init(void)
+bool ami_arexx_init(ULONG *rxsig)
{
if((arexx_obj = ARexxObj,
AREXX_HostName,"NETSURF",
@@ -118,7 +119,7 @@ BOOL ami_arexx_init(void)
AREXX_DefExtension,"nsrx",
End))
{
- GetAttr(AREXX_SigMask, arexx_obj, &rxsig);
+ GetAttr(AREXX_SigMask, arexx_obj, rxsig);
return true;
}
else
@@ -141,6 +142,12 @@ void ami_arexx_handle(void)
RA_HandleRexx(arexx_obj);
}
+void ami_arexx_command(const char *cmd)
+{
+ if(arexx_obj == NULL) return;
+ IDoMethod(arexx_obj, AM_EXECUTE, cmd, NULL, NULL, NULL, NULL, NULL);
+}
+
void ami_arexx_execute(char *script)
{
char full_script_path[1025];
@@ -149,7 +156,7 @@ void ami_arexx_execute(char *script)
if((lock = Lock(script, ACCESS_READ))) {
DevNameFromLock(lock, full_script_path, 1024, DN_FULLPATH);
LOG("Executing script: %s", full_script_path);
- IDoMethod(arexx_obj, AM_EXECUTE, full_script_path, NULL, NULL,
NULL, NULL, NULL);
+ ami_arexx_command(full_script_path);
UnLock(lock);
}
}
diff --git a/frontends/amiga/arexx.h b/frontends/amiga/arexx.h
index 358d174..e6c9c7e 100755
--- a/frontends/amiga/arexx.h
+++ b/frontends/amiga/arexx.h
@@ -22,11 +22,9 @@
#include <proto/arexx.h>
#include <classes/arexx.h>
-BOOL ami_arexx_init(void);
+bool ami_arexx_init(ULONG *rxsig);
void ami_arexx_handle(void);
void ami_arexx_execute(char *);
+void ami_arexx_command(const char *cmd);
void ami_arexx_cleanup(void);
-
-Object *arexx_obj;
-ULONG rxsig;
#endif
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index d7178bc..f285d96 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -173,8 +173,6 @@
#define BOOL_MISMATCH(a,b) (1)
#endif
-static bool ami_quit = false;
-
extern struct gui_utf8_table *amiga_utf8_table;
struct ami_gui_tb_userdata {
@@ -183,6 +181,13 @@ struct ami_gui_tb_userdata {
int items;
};
+struct MinList *window_list = NULL;
+struct Screen *scrn = NULL;
+struct MsgPort *sport = NULL;
+struct gui_window *cur_gw = NULL;
+
+static bool ami_quit = false;
+
static struct MsgPort *schedulermsgport = NULL;
static struct MsgPort *appport;
static Class *urlStringClass;
@@ -193,8 +198,9 @@ static bool win_destroyed;
static STRPTR nsscreentitle;
static struct MsgPort *applibport = NULL;
-static ULONG applibsig = 0;
static uint32 ami_appid = 0;
+static ULONG applibsig = 0;
+static ULONG rxsig = 0;
static struct Hook newprefs_hook;
static STRPTR temp_homepage_url = NULL;
@@ -939,7 +945,7 @@ static void gui_init2(int argc, char** argv)
nserror error;
struct browser_window *bw = NULL;
- notalreadyrunning = ami_arexx_init();
+ notalreadyrunning = ami_arexx_init(&rxsig);
/* Treeview init code ends up calling a font function which needs this
*/
glob = &browserglob;
@@ -1050,16 +1056,13 @@ static void gui_init2(int argc, char** argv)
{
STRPTR sendcmd = NULL;
- if(temp_homepage_url)
- {
+ if(temp_homepage_url) {
sendcmd = ASPrintf("OPEN \"%s\" NEW",temp_homepage_url);
free(temp_homepage_url);
- }
- else
- {
+ } else {
sendcmd = ASPrintf("OPEN \"%s\"
NEW",nsoption_charp(homepage_url));
}
-
IDoMethod(arexx_obj,AM_EXECUTE,sendcmd,"NETSURF",NULL,NULL,NULL,NULL);
+ ami_arexx_command(sendcmd);
FreeVec(sendcmd);
ami_quit=true;
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 5ca1894..4e36cb6 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -170,10 +170,10 @@ struct gui_window
float scale;
};
-struct MinList *window_list;
-struct Screen *scrn;
-struct MsgPort *sport;
-struct gui_window *cur_gw;
+extern struct MinList *window_list;
+extern struct Screen *scrn;
+extern struct MsgPort *sport;
+extern struct gui_window *cur_gw;
void ami_get_msg(void);
void ami_try_quit(void);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
