Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/08e88124d790da0bef5573dba722951d3878463e
...commit
http://git.netsurf-browser.org/netsurf.git/commit/08e88124d790da0bef5573dba722951d3878463e
...tree
http://git.netsurf-browser.org/netsurf.git/tree/08e88124d790da0bef5573dba722951d3878463e
The branch, master has been updated
via 08e88124d790da0bef5573dba722951d3878463e (commit)
via 2dba1d064d86912dddda2f7ff8915130ebe0ccc2 (commit)
via 7b5639d9821ca94865e25bc7c53fb3f93108c455 (commit)
via 239205033ccdd215c1fcc058be2c844ea03e4870 (commit)
via cd0ed2249437a849f5a865eef35b24934b748672 (commit)
from b00a43139e174ec01fa12a225f4a468c8ed4cf40 (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=08e88124d790da0bef5573dba722951d3878463e
commit 08e88124d790da0bef5573dba722951d3878463e
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Attempt to preserve timestamps
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 9ef40ef..a2c1b13 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -78,22 +78,22 @@ netsurf.lha: $(EXETARGET)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
- $(Q)cp -r $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
- $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -rp $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines
>$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines
- $(Q)cp \!NetSurf/Resources/AdBlock,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
- $(Q)cp \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
- $(Q)cp \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
- $(Q)cp \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
- $(Q)cp \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
- $(Q)cp $(AMIGA_PKG_DIR)/drawer.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
- $(Q)cp $(AMIGA_PKG_DIR)/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
+ $(Q)cp -p \!NetSurf/Resources/AdBlock,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
+ $(Q)cp -p \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
+ $(Q)cp -p \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
+ $(Q)cp -p \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
+ $(Q)cp -p \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
+ $(Q)cp -p $(AMIGA_PKG_DIR)/drawer.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
+ $(Q)cp -p $(AMIGA_PKG_DIR)/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
ifeq ($(SUBTARGET),os3)
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf_os3.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf_os3.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf_os3.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf_os3.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
else
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
endif
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2dba1d064d86912dddda2f7ff8915130ebe0ccc2
commit 2dba1d064d86912dddda2f7ff8915130ebe0ccc2
Merge: 7b5639d b00a431
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7b5639d9821ca94865e25bc7c53fb3f93108c455
commit 7b5639d9821ca94865e25bc7c53fb3f93108c455
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
When opening a new blank tab, always switch to it.
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index a530d62..9e5850a 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -2875,7 +2875,7 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool
redraw)
struct IBox *bbox;
/* Clear the last new tab list */
- gwin->gw->last_new_tab = NULL;
+ gwin->last_new_tab = NULL;
if(gwin->tabs == 0) return;
@@ -3513,6 +3513,16 @@ nserror ami_gui_new_blank_tab(struct gui_window_2 *gwin)
return error;
}
+ if(nsoption_bool(new_tab_is_active) == false) {
+ /* Because this is a new blank tab, switch to it (if
new_tab_is_active, we already did!) */
+ RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_TABS],
+ gwin->win, NULL,
+
CLICKTAB_CurrentNode, gwin->last_new_tab,
+ TAG_DONE);
+
+ ami_switch_tab(gwin, false);
+ }
+
return NSERROR_OK;
}
@@ -3863,12 +3873,13 @@ gui_window_create(struct browser_window *bw,
} else {
struct Node *insert_after = existing->tab_node;
- if(existing->last_new_tab)
- insert_after = existing->last_new_tab;
+ if(g->shared->last_new_tab)
+ insert_after = g->shared->last_new_tab;
Insert(&g->shared->tab_list, g->tab_node, insert_after);
- existing->last_new_tab = g->tab_node;
}
+ g->shared->last_new_tab = g->tab_node;
+
RefreshSetGadgetAttrs((struct Gadget
*)g->shared->objects[GID_TABS],
g->shared->win, NULL,
CLICKTAB_Labels,
&g->shared->tab_list,
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index c1513a0..52411c4 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -101,6 +101,7 @@ struct gui_window_2 {
struct List tab_list;
ULONG tabs;
ULONG next_tab;
+ struct Node *last_new_tab;
struct Hook scrollerhook;
struct form_control *control;
browser_mouse_state mouse_state;
@@ -152,7 +153,6 @@ struct gui_window
struct gui_window_2 *shared;
int tab;
struct Node *tab_node;
- struct Node *last_new_tab;
int c_x; /* Caret X posn */
int c_y; /* Caret Y posn */
int c_w; /* Caret width */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=239205033ccdd215c1fcc058be2c844ea03e4870
commit 239205033ccdd215c1fcc058be2c844ea03e4870
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Only bring the screen to the front if an active tab is being opened via
re-launch
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index e355d9f..a530d62 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1094,7 +1094,12 @@ static void gui_init2(int argc, char** argv)
ami_arexx_self(sendcmd);
FreeVec(sendcmd);
- ami_arexx_self("TOFRONT");
+ if((nsoption_bool(tab_new_session) == true) &&
(nsoption_bool(new_tab_is_active) == true)) {
+ /* If we're opening a new tab and that tab will be
active, bring the screen to the front.
+ *\todo consider if we should be bringing the window to
the front too.
+ * If we're opening a new window, Intuition brings the
screen to the front anyway. */
+ ami_arexx_self("TOFRONT");
+ }
ami_quit=true;
return;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=cd0ed2249437a849f5a865eef35b24934b748672
commit cd0ed2249437a849f5a865eef35b24934b748672
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Bring screen to front when new window/tab is opened be launching NetSurf a
second time.
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index b0aeb20..e355d9f 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1092,9 +1092,10 @@ static void gui_init2(int argc, char** argv)
sendcmd = ASPrintf("OPEN \"%s\" NEW%s",
nsoption_charp(homepage_url), newtab);
}
ami_arexx_self(sendcmd);
-
FreeVec(sendcmd);
+ ami_arexx_self("TOFRONT");
+
ami_quit=true;
return;
}
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 26 +++++++++++++-------------
frontends/amiga/gui.c | 27 ++++++++++++++++++++++-----
frontends/amiga/gui.h | 2 +-
3 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 9ef40ef..a2c1b13 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -78,22 +78,22 @@ netsurf.lha: $(EXETARGET)
$(Q)mkdir -p $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cp -p $(EXETARGET) $(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)mkdir $(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
- $(Q)cp -r $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
- $(Q)cp -r $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -rp $(AMIGA_RESOURCES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources
+ $(Q)cp -rp $(AMIGA_DISTRIBUTION_FILES)
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
$(Q)cat resources/SearchEngines $(AMIGA_PKG_DIR)/SearchEngines
>$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/SearchEngines
- $(Q)cp \!NetSurf/Resources/AdBlock,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
- $(Q)cp \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
- $(Q)cp \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
- $(Q)cp \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
- $(Q)cp \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
- $(Q)cp $(AMIGA_PKG_DIR)/drawer.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
- $(Q)cp $(AMIGA_PKG_DIR)/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
+ $(Q)cp -p \!NetSurf/Resources/AdBlock,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/adblock.css
+ $(Q)cp -p \!NetSurf/Resources/CSS,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/nsdefault.css
+ $(Q)cp -p \!NetSurf/Resources/internal.css,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/internal.css
+ $(Q)cp -p \!NetSurf/Resources/Quirks,f79
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/quirks.css
+ $(Q)cp -p \!NetSurf/Resources/netsurf.png,b60
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf/Resources/netsurf.png
+ $(Q)cp -p $(AMIGA_PKG_DIR)/drawer.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf.info
+ $(Q)cp -p $(AMIGA_PKG_DIR)/AutoInstall $(AMIGA_INSTALL_TARGET_DIR)
ifeq ($(SUBTARGET),os3)
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf_os3.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf_os3.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf_os3.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf_os3.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
else
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
- $(Q)cp $(AMIGA_PKG_DIR)/netsurf.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf.readme
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
+ $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf.readme.info
$(AMIGA_INSTALL_TARGET_DIR)/NetSurf
endif
$(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \
lha a netsurf.lha NetSurf NetSurf.info AutoInstall
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index b0aeb20..9e5850a 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1092,9 +1092,15 @@ static void gui_init2(int argc, char** argv)
sendcmd = ASPrintf("OPEN \"%s\" NEW%s",
nsoption_charp(homepage_url), newtab);
}
ami_arexx_self(sendcmd);
-
FreeVec(sendcmd);
+ if((nsoption_bool(tab_new_session) == true) &&
(nsoption_bool(new_tab_is_active) == true)) {
+ /* If we're opening a new tab and that tab will be
active, bring the screen to the front.
+ *\todo consider if we should be bringing the window to
the front too.
+ * If we're opening a new window, Intuition brings the
screen to the front anyway. */
+ ami_arexx_self("TOFRONT");
+ }
+
ami_quit=true;
return;
}
@@ -2869,7 +2875,7 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool
redraw)
struct IBox *bbox;
/* Clear the last new tab list */
- gwin->gw->last_new_tab = NULL;
+ gwin->last_new_tab = NULL;
if(gwin->tabs == 0) return;
@@ -3507,6 +3513,16 @@ nserror ami_gui_new_blank_tab(struct gui_window_2 *gwin)
return error;
}
+ if(nsoption_bool(new_tab_is_active) == false) {
+ /* Because this is a new blank tab, switch to it (if
new_tab_is_active, we already did!) */
+ RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_TABS],
+ gwin->win, NULL,
+
CLICKTAB_CurrentNode, gwin->last_new_tab,
+ TAG_DONE);
+
+ ami_switch_tab(gwin, false);
+ }
+
return NSERROR_OK;
}
@@ -3857,12 +3873,13 @@ gui_window_create(struct browser_window *bw,
} else {
struct Node *insert_after = existing->tab_node;
- if(existing->last_new_tab)
- insert_after = existing->last_new_tab;
+ if(g->shared->last_new_tab)
+ insert_after = g->shared->last_new_tab;
Insert(&g->shared->tab_list, g->tab_node, insert_after);
- existing->last_new_tab = g->tab_node;
}
+ g->shared->last_new_tab = g->tab_node;
+
RefreshSetGadgetAttrs((struct Gadget
*)g->shared->objects[GID_TABS],
g->shared->win, NULL,
CLICKTAB_Labels,
&g->shared->tab_list,
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index c1513a0..52411c4 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -101,6 +101,7 @@ struct gui_window_2 {
struct List tab_list;
ULONG tabs;
ULONG next_tab;
+ struct Node *last_new_tab;
struct Hook scrollerhook;
struct form_control *control;
browser_mouse_state mouse_state;
@@ -152,7 +153,6 @@ struct gui_window
struct gui_window_2 *shared;
int tab;
struct Node *tab_node;
- struct Node *last_new_tab;
int c_x; /* Caret X posn */
int c_y; /* Caret Y posn */
int c_w; /* Caret width */
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
