r6326 chris_y - in /trunk/netsurf/amiga: arexx.c context_menu.c context_menu.h dist/NetSurf.guide gui.c gui.h
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Jan 31 17:45:25 2009
New Revision: 6326
URL: http://source.netsurf-browser.org?rev=6326&view=rev
Log:
Added context menu option to download the link target.
Added SAVEAS/K to OPEN ARexx command to download a URL instead of displaying it.
Modified:
trunk/netsurf/amiga/arexx.c
trunk/netsurf/amiga/context_menu.c
trunk/netsurf/amiga/context_menu.h
trunk/netsurf/amiga/dist/NetSurf.guide
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/gui.h
Modified: trunk/netsurf/amiga/arexx.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/arexx.c?rev=6326&r1...
==============================================================================
--- trunk/netsurf/amiga/arexx.c (original)
+++ trunk/netsurf/amiga/arexx.c Sat Jan 31 17:45:25 2009
@@ -54,7 +54,7 @@
STATIC struct ARexxCmd Commands[] =
{
- {"OPEN",RX_OPEN,rx_open,"URL/A,NEW=NEWWINDOW/S", 0, NULL, 0, 0, NULL },
+ {"OPEN",RX_OPEN,rx_open,"URL/A,NEW=NEWWINDOW/S,SAVEAS/K", 0, NULL, 0, 0, NULL },
{"QUIT",RX_QUIT,rx_quit,NULL, 0, NULL, 0, 0, NULL },
{"TOFRONT",RX_TOFRONT,rx_tofront,NULL, 0, NULL, 0, 0, NULL },
{"GETURL",RX_GETURL,rx_geturl,NULL, 0, NULL, 0, 0, NULL },
@@ -79,7 +79,7 @@
}
else
{
-/* Create a temporary ARexx port so will can send commands to the NetSurf which
+/* Create a temporary ARexx port so we can send commands to the NetSurf which
* is already running */
arexx_obj = ARexxObject,
AREXX_HostName,"NETSURF",
@@ -109,7 +109,12 @@
STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
{
- if(cmd->ac_ArgList[1])
+ if(cmd->ac_ArgList[2])
+ {
+ curbw->window->dlfilename = strdup(cmd->ac_ArgList[2]);
+ browser_window_download(curbw,(char *)cmd->ac_ArgList[0],NULL);
+ }
+ else if(cmd->ac_ArgList[1])
{
browser_window_create((char *)cmd->ac_ArgList[0],NULL,NULL,true,false);
}
Modified: trunk/netsurf/amiga/context_menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/context_menu.c?rev=...
==============================================================================
--- trunk/netsurf/amiga/context_menu.c (original)
+++ trunk/netsurf/amiga/context_menu.c Sat Jan 31 17:45:25 2009
@@ -43,7 +43,7 @@
ctxmenulab[CMID_SHOWOBJ] = ami_utf8_easy((char *)messages_get("ObjShow"));
ctxmenulab[CMID_COPYOBJ] = ami_utf8_easy((char *)messages_get("CopyURL"));
ctxmenulab[CMID_SAVEOBJ] = ami_utf8_easy((char *)messages_get("ObjSave"));
-
+ ctxmenulab[CMID_SAVEURL] = ami_utf8_easy((char *)messages_get("LinkDload"));
ctxmenulab[CMID_URLOPENWIN] = ami_utf8_easy((char *)messages_get("LinkNewWin"));
ctxmenulab[CMID_URLOPENTAB] = ami_utf8_easy((char *)messages_get("LinkNewTab"));
@@ -106,6 +106,11 @@
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
PMIA_Title, (ULONG)ctxmenulab[CMID_COPYURL],
PMIA_ID,CMID_COPYURL,
+ PMIA_UserData,curbox->href,
+ TAG_DONE),
+ PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
+ PMIA_Title, (ULONG)ctxmenulab[CMID_SAVEURL],
+ PMIA_ID,CMID_SAVEURL,
PMIA_UserData,curbox->href,
TAG_DONE),
TAG_DONE),
@@ -237,6 +242,10 @@
case CMID_URLOPENTAB:
bw = browser_window_create(userdata,gwin->bw, gwin->bw->current_content->url, true, true);
+ break;
+
+ case CMID_SAVEURL:
+ browser_window_download(gwin->bw,userdata,gwin->bw->current_content->url);
break;
case CMID_SHOWOBJ:
Modified: trunk/netsurf/amiga/context_menu.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/context_menu.h?rev=...
==============================================================================
--- trunk/netsurf/amiga/context_menu.h (original)
+++ trunk/netsurf/amiga/context_menu.h Sat Jan 31 17:45:25 2009
@@ -25,6 +25,7 @@
CMID_COPYURL,
CMID_URLOPENWIN,
CMID_URLOPENTAB,
+ CMID_SAVEURL,
CMID_SHOWOBJ,
CMID_COPYOBJ,
CMID_SAVEOBJ,
Modified: trunk/netsurf/amiga/dist/NetSurf.guide
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/NetSurf.guide?...
==============================================================================
--- trunk/netsurf/amiga/dist/NetSurf.guide (original)
+++ trunk/netsurf/amiga/dist/NetSurf.guide Sat Jan 31 17:45:25 2009
@@ -54,7 +54,7 @@
Commands are:
-@{b}OPEN URL/A,NEW=NEWWINDOW/S@{ub} Opens URL in current window or a new window if NEWWINDOW is specified.
+@{b}OPEN URL/A,NEW=NEWWINDOW/S,SAVEAS/K@{ub} Opens URL in current window or a new window if NEWWINDOW is specified. Saves the location without displaying if SAVEAS and a filename is specified (SAVEAS available in 2.6325)
@{b}SAVE FILENAME/A@{ub} (2.6027) Saves current page source to FILENAME
@{b}QUIT@{ub} Quits NetSurf
@{b}TOFRONT@{ub} Brings NetSurf's screen to the front
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=6326&r1=6...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sat Jan 31 17:45:25 2009
@@ -717,7 +717,7 @@
GetAttr(SPACE_AreaBox,gwin->gadgets[GID_BROWSER],(ULONG *)&bbox);
GetAttr(SCROLLER_Top,gwin->objects[OID_HSCROLL],(ULONG *)&xs);
- x = gwin->win->MouseX - bbox->Left +xs;
+ x = gwin->win->MouseX - bbox->Left +xs; // mousex should be in intuimessage
GetAttr(SCROLLER_Top,gwin->objects[OID_VSCROLL],(ULONG *)&ys);
y = gwin->win->MouseY - bbox->Top + ys;
@@ -1971,26 +1971,8 @@
void gui_window_redraw(struct gui_window *g, int x0, int y0, int x1, int y1)
{
gui_window_redraw_window(g); // temporary
-}
-
-void gui_window_redraw_window(struct gui_window *g)
-{
- ULONG cur_tab = 0;
-
- if(!g) return;
-
- if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab);
-
- if((cur_tab == g->tab) || (g->shared->tabs == 0))
- {
- g->shared->redraw_required = true;
- g->shared->redraw_data = NULL;
- }
-}
-
-void gui_window_update_box(struct gui_window *g,
- const union content_msg_data *data)
-{
+#if 0
+this doesn't actually redraw the section as it should...
struct content *c;
ULONG hcurrent,vcurrent,xoffset,yoffset,width=800,height=600;
struct IBox *bbox;
@@ -2009,6 +1991,75 @@
GetAttr(SCROLLER_Top,g->shared->objects[OID_HSCROLL],(ULONG *)&hcurrent);
GetAttr(SCROLLER_Top,g->shared->objects[OID_VSCROLL],(ULONG *)&vcurrent);
+ c = g->shared->bw->current_content;
+
+ if(!c) return;
+ if (c->locked) return;
+
+ current_redraw_browser = g->shared->bw;
+
+ width=bbox->Width;
+ height=bbox->Height;
+ xoffset=bbox->Left+x0;
+ yoffset=bbox->Top+y0;
+
+ plot=amiplot;
+
+// if (c->type == CONTENT_HTML) scale = 1;
+
+ content_redraw(c,
+ xoffset-hcurrent,
+ yoffset-vcurrent,
+ x1,
+ y1,
+ 0,0,width,height,
+ g->shared->bw->scale,
+ 0xFFFFFF);
+
+ current_redraw_browser = NULL;
+
+ ami_update_buttons(g->shared);
+
+ BltBitMapRastPort(glob.bm,0,0,g->shared->win->RPort,xoffset,yoffset,width,height,0x0C0); // this blit needs optimising
+#endif
+}
+
+void gui_window_redraw_window(struct gui_window *g)
+{
+ ULONG cur_tab = 0;
+
+ if(!g) return;
+
+ if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab);
+
+ if((cur_tab == g->tab) || (g->shared->tabs == 0))
+ {
+ g->shared->redraw_required = true;
+ g->shared->redraw_data = NULL;
+ }
+}
+
+void gui_window_update_box(struct gui_window *g,
+ const union content_msg_data *data)
+{
+ struct content *c;
+ ULONG hcurrent,vcurrent,xoffset,yoffset,width=800,height=600;
+ struct IBox *bbox;
+ ULONG cur_tab = 0,x0,y0,x1,y1;
+
+ if(!g) return;
+
+ if(g->tab_node) GetAttr(CLICKTAB_Current,g->shared->gadgets[GID_TABS],(ULONG *)&cur_tab);
+
+ if(!((cur_tab == g->tab) || (g->shared->tabs == 0)))
+ {
+ return;
+ }
+
+ GetAttr(SPACE_AreaBox,g->shared->gadgets[GID_BROWSER],(ULONG *)&bbox);
+ GetAttr(SCROLLER_Top,g->shared->objects[OID_HSCROLL],(ULONG *)&hcurrent);
+ GetAttr(SCROLLER_Top,g->shared->objects[OID_VSCROLL],(ULONG *)&vcurrent);
+
// DebugPrintF("DOING REDRAW\n");
c = g->shared->bw->current_content;
@@ -2029,6 +2080,7 @@
// if (c->type == CONTENT_HTML) scale = 1;
+/* this needs fixing as it appears to be redrawing the entire page */
content_redraw(data->redraw.object,
floorf((data->redraw.object_x *
g->shared->bw->scale)-hcurrent),
@@ -2124,6 +2176,7 @@
else
{
*/
+
content_redraw(c, -hcurrent /* * g->bw->scale */,
-vcurrent /* * g->bw->scale */,
width-hcurrent /* * g->bw->scale */,
@@ -2597,16 +2650,25 @@
struct gui_download_window *dw;
APTR va[3];
- if(AslRequestTags(savereq,
- ASLFR_TitleText,messages_get("NetSurf"),
- ASLFR_Screen,scrn,
- ASLFR_InitialFile,FilePart(url),
- TAG_DONE))
- {
- strlcpy(&fname,savereq->fr_Drawer,1024);
- AddPart((STRPTR)&fname,savereq->fr_File,1024);
- }
- else return NULL;
+ if(gui->dlfilename)
+ {
+ strcpy(fname,gui->dlfilename);
+ free(gui->dlfilename);
+ gui->dlfilename = NULL;
+ }
+ else
+ {
+ if(AslRequestTags(savereq,
+ ASLFR_TitleText,messages_get("NetSurf"),
+ ASLFR_Screen,scrn,
+ ASLFR_InitialFile,FilePart(url),
+ TAG_DONE))
+ {
+ strlcpy(&fname,savereq->fr_Drawer,1024);
+ AddPart((STRPTR)&fname,savereq->fr_File,1024);
+ }
+ else return NULL;
+ }
dw = AllocVec(sizeof(struct gui_download_window),MEMF_PRIVATE | MEMF_CLEAR);
Modified: trunk/netsurf/amiga/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.h?rev=6326&r1=6...
==============================================================================
--- trunk/netsurf/amiga/gui.h (original)
+++ trunk/netsurf/amiga/gui.h Sat Jan 31 17:45:25 2009
@@ -116,7 +116,8 @@
int c_h;
int scrollx;
int scrolly;
- struct browser_window *bw; // not used
+ char *dlfilename;
+// struct browser_window *bw; // not used
};
struct gui_globals
14 years, 8 months
r6325 tlsa - /trunk/netsurf/render/layout.c
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Jan 31 16:49:41 2009
New Revision: 6325
URL: http://source.netsurf-browser.org?rev=6325&view=rev
Log:
Hubbub allows FONT tags to span blocks and the way that
the box tree is generated, this makes the BOX_INLINE's
BOX_INLINE_END appears in a different BOX_BLOCK. That
seems wrong, but fix layout not to crash for now.
Modified:
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=6325&...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Sat Jan 31 16:49:41 2009
@@ -2131,7 +2131,7 @@
d->next != d->inline_end) {
if (d->height > d->inline_end->line_height)
d->inline_end->line_height = d->height;
- for (struct box *il = d; il != d->inline_end;
+ for (struct box *il = d; il && il != d->inline_end;
il = il->next) {
if (d->height > il->line_height)
il->line_height = d->height;
14 years, 8 months
r6324 joty - /trunk/netsurf/amiga/menu.c
by netsurf＠semichrome.net
Author: joty
Date: Sat Jan 31 10:28:29 2009
New Revision: 6324
URL: http://source.netsurf-browser.org?rev=6324&view=rev
Log:
This change belonged to r6323.
Modified:
trunk/netsurf/amiga/menu.c
Modified: trunk/netsurf/amiga/menu.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=6324&r1=...
==============================================================================
--- trunk/netsurf/amiga/menu.c (original)
+++ trunk/netsurf/amiga/menu.c Sat Jan 31 10:28:29 2009
@@ -74,7 +74,7 @@
menulab[6] = ami_utf8_easy((char *)messages_get("Source"));
menulab[7] = ami_utf8_easy((char *)messages_get("TextNS"));
menulab[8] = ami_utf8_easy((char *)messages_get("SaveCompNS"));
- menulab[9] = ami_utf8_easy((char *)messages_get("PDF"));
+ menulab[9] = ami_utf8_easy((char *)messages_get("PDFNS"));
menulab[10] = NM_BARLABEL;
menulab[11] = ami_utf8_easy((char *)messages_get("CloseTab"));
menulab[12] = ami_utf8_easy((char *)messages_get("CloseWindow"));
14 years, 8 months
r6323 joty - in /trunk/netsurf/!NetSurf/Resources: de/Messages en/Messages fr/Messages it/Messages nl/Messages
by netsurf＠semichrome.net
Author: joty
Date: Sat Jan 31 10:07:09 2009
New Revision: 6323
URL: http://source.netsurf-browser.org?rev=6323&view=rev
Log:
Avoid having '...' in the RISC OS PDF export menu entry.
Modified:
trunk/netsurf/!NetSurf/Resources/de/Messages
trunk/netsurf/!NetSurf/Resources/en/Messages
trunk/netsurf/!NetSurf/Resources/fr/Messages
trunk/netsurf/!NetSurf/Resources/it/Messages
trunk/netsurf/!NetSurf/Resources/nl/Messages
Modified: trunk/netsurf/!NetSurf/Resources/de/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/de/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/de/Messages Sat Jan 31 10:07:09 2009
@@ -63,6 +63,7 @@
# Main -> Page -> Export menu
#
Draw:Draw â^F3
+PDF:PDF
Text:Text ^F3
# Main -> Page -> Save location menu
@@ -242,7 +243,7 @@
Source:Source...
TextNS:Text...
SaveCompNS:Complete...
-PDF:PDF...
+PDFNS:PDF...
OpenFile:Open local file...
About:About...
Modified: trunk/netsurf/!NetSurf/Resources/en/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/en/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/en/Messages Sat Jan 31 10:07:09 2009
@@ -63,6 +63,7 @@
# Main -> Page -> Export menu
#
Draw:Draw â^F3
+PDF:PDF
Text:Text ^F3
# Main -> Page -> Save location menu
@@ -242,7 +243,7 @@
Source:Source...
TextNS:Text...
SaveCompNS:Complete...
-PDF:PDF...
+PDFNS:PDF...
OpenFile:Open local file...
About:About...
Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/fr/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/fr/Messages Sat Jan 31 10:07:09 2009
@@ -63,6 +63,7 @@
# Main -> Page -> Export menu
#
Draw:Draw â^F3
+PDF:PDF
Text:Texte ^F3
# Main -> Page -> Save location menu
@@ -242,7 +243,7 @@
Source:Source...
TextNS:Text...
SaveCompNS:Complete...
-PDF:PDF...
+PDFNS:PDF...
OpenFile:Open local file...
About:About...
Modified: trunk/netsurf/!NetSurf/Resources/it/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/it/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/it/Messages Sat Jan 31 10:07:09 2009
@@ -64,6 +64,7 @@
# Main -> Page -> Export menu
#
Draw:Disegna ?^F3
+PDF:PDF
Text:Testo ^F3
# Main -> Page -> Save location menu
@@ -243,7 +244,7 @@
Source:Sorgente...
TextNS:Testo...
SaveCompNS:Complete...
-PDF:PDF...
+PDFNS:PDF...
OpenFile:Open local file...
About:About...
Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M...
==============================================================================
--- trunk/netsurf/!NetSurf/Resources/nl/Messages (original)
+++ trunk/netsurf/!NetSurf/Resources/nl/Messages Sat Jan 31 10:07:09 2009
@@ -63,6 +63,7 @@
# Main -> Page -> Export menu
#
Draw:Draw â^F3
+PDF:PDF
Text:Tekst ^F3
# Main -> Page -> Save location menu
@@ -242,7 +243,7 @@
Source:Source...
TextNS:Text...
SaveCompNS:Complete...
-PDF:PDF...
+PDFNS:PDF...
OpenFile:Open local file...
About:About...
14 years, 8 months
r6322 joty - /trunk/netsurf/!NetSurf/Docs/about/index_en,faf
by netsurf＠semichrome.net
Author: joty
Date: Sat Jan 31 07:56:36 2009
New Revision: 6322
URL: http://source.netsurf-browser.org?rev=6322&view=rev
Log:
Fix a couple copyright years.
Modified:
trunk/netsurf/!NetSurf/Docs/about/index_en,faf
Modified: trunk/netsurf/!NetSurf/Docs/about/index_en,faf
URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Docs/about/ind...
==============================================================================
--- trunk/netsurf/!NetSurf/Docs/about/index_en,faf (original)
+++ trunk/netsurf/!NetSurf/Docs/about/index_en,faf Sat Jan 31 07:56:36 2009
@@ -42,7 +42,7 @@
© 1995–1998 Eric A. Young, Tim J. Hudson</td></tr>
<tr><th><a href="http://ro-oslib.sourceforge.net/">OSLib</a></th>
-<td>© 1994–2002 Jonathan Coxhead and OSLib maintainers</td></tr>
+<td>© 1994–2007 Jonathan Coxhead and OSLib maintainers</td></tr>
<tr><th><a href="http://www.xmlsoft.org/"><img src="libxml2" alt="libxml2"></a></th>
<td>© 1998–2003 Daniel Veillard</td></tr>
@@ -53,7 +53,7 @@
<div class="footer">
-<p>Copyright 2003 - 2008 The NetSurf Developers</p>
+<p>Copyright 2003 - 2009 The NetSurf Developers</p>
</div>
</div>
@@ -62,4 +62,4 @@
</body>
-</html>
+</html>
14 years, 8 months
r6321 joty - /trunk/netsurf/riscos/gui.c
by netsurf＠semichrome.net
Author: joty
Date: Sat Jan 31 07:50:17 2009
New Revision: 6321
URL: http://source.netsurf-browser.org?rev=6321&view=rev
Log:
When UnixLib 5 is used, use its API to do the coredumping. Define UnixEnv$coredump (value needs to be a directory to where the coredump files can be written too) instead of NetSurf$CoreDump to
enable this.
Modified:
trunk/netsurf/riscos/gui.c
Modified: trunk/netsurf/riscos/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=6321&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.c (original)
+++ trunk/netsurf/riscos/gui.c Sat Jan 31 07:50:17 2009
@@ -4,7 +4,7 @@
* Copyright 2003 John M Bell <jmb202(a)ecs.soton.ac.uk>
* Copyright 2005 Richard Wilson <info(a)tinct.net>
* Copyright 2004 Andrew Timmins <atimmins(a)blueyonder.co.uk>
- * Copyright 2004-2008 John Tytgat <joty(a)netsurf-browser.org>
+ * Copyright 2004-2009 John Tytgat <joty(a)netsurf-browser.org>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -154,7 +154,9 @@
/* default filename handling */
int __riscosify_control = __RISCOSIFY_NO_SUFFIX |
__RISCOSIFY_NO_REVERSE_SUFFIX;
+#ifndef __ELF__
extern int __dynamic_num;
+#endif
const char * NETSURF_DIR;
@@ -865,6 +867,7 @@
options_dump();
/*rufl_dump_state();*/
+#ifndef __ELF__
/* save WimpSlot and DA to files if NetSurf$CoreDump exists */
int used;
xos_read_var_val_size("NetSurf$CoreDump", 0, 0, &used, 0, 0);
@@ -890,6 +893,13 @@
base_address + size);
}
}
+#else
+ /* Save WimpSlot and UnixLib managed DAs when UnixEnv$coredump
+ * defines a coredump directory. */
+ _kernel_oserror *err = __unixlib_write_coredump (NULL);
+ if (err != NULL)
+ LOG(("Coredump failed: %s", err->errmess));
+#endif
xhourglass_colours(old_sand, old_glass, 0, 0);
xhourglass_off();
14 years, 8 months
r6320 joty - /trunk/Makefile
by netsurf＠semichrome.net
Author: joty
Date: Sat Jan 31 07:42:23 2009
New Revision: 6320
URL: http://source.netsurf-browser.org?rev=6320&view=rev
Log:
Hook in tools/makerun in the build.
Modified:
trunk/Makefile
Modified: trunk/Makefile
URL: http://source.netsurf-browser.org/trunk/Makefile?rev=6320&r1=6319&r2=6320...
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Jan 31 07:42:23 2009
@@ -56,6 +56,6 @@
make install --directory=libsvgtiny TARGET=$(TARGET) PREFIX=$(PREFIX)
make install --directory=pencil TARGET=$(TARGET) PREFIX=$(PREFIX)
make install --directory=rufl TARGET=$(TARGET) PREFIX=$(PREFIX)
+ make install --directory=tools TARGET=$(TARGET) PREFIX=$(PREFIX)
make --directory=netsurf TARGET=$(TARGET) PREFIX=$(PREFIX)
-
14 years, 8 months
r6319 tlsa - in /trunk/netsurf/render: box.c box.h layout.c
by netsurf＠semichrome.net
Author: tlsa
Date: Sat Jan 31 07:26:28 2009
New Revision: 6319
URL: http://source.netsurf-browser.org?rev=6319&view=rev
Log:
Make inline boxes store the height of their line box and include in box tree dump.
Modified:
trunk/netsurf/render/box.c
trunk/netsurf/render/box.h
trunk/netsurf/render/layout.c
Modified: trunk/netsurf/render/box.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.c?rev=6319&r1=...
==============================================================================
--- trunk/netsurf/render/box.c (original)
+++ trunk/netsurf/render/box.c Sat Jan 31 07:26:28 2009
@@ -102,6 +102,7 @@
box->parent = NULL;
box->fallback = NULL;
box->inline_end = NULL;
+ box->line_height = 0;
box->float_children = NULL;
box->float_container = NULL;
box->next_float = NULL;
@@ -576,6 +577,9 @@
fprintf(stream, " ");
fprintf(stream, "%p ", box);
+ if (box->type == BOX_INLINE || box->type == BOX_TEXT ||
+ box->type == BOX_INLINE_END)
+ fprintf(stream, "lh%i ", box->line_height);
fprintf(stream, "x%i y%i w%i h%i ", box->x, box->y,
box->width, box->height);
if (box->max_width != UNKNOWN_MAX_WIDTH)
Modified: trunk/netsurf/render/box.h
URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.h?rev=6319&r1=...
==============================================================================
--- trunk/netsurf/render/box.h (original)
+++ trunk/netsurf/render/box.h Sat Jan 31 07:26:28 2009
@@ -201,6 +201,7 @@
* corresponding to this INLINE_END box. */
struct box *inline_end;
bool inline_new_line;
+ int line_height;
/** First float child box, or 0. Float boxes are in the tree twice, in
* this list for the block box which defines the area for floats, and
Modified: trunk/netsurf/render/layout.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/layout.c?rev=6319&...
==============================================================================
--- trunk/netsurf/render/layout.c (original)
+++ trunk/netsurf/render/layout.c Sat Jan 31 07:26:28 2009
@@ -1420,6 +1420,7 @@
if ((!c->object && c->text && (c->length || is_pre)) ||
c->type == BOX_BR)
has_text_children = true;
+ c->line_height = 0;
}
/** \todo fix wrapping so that a box with horizontal scrollbar will
@@ -2126,6 +2127,16 @@
(d->style->position == CSS_POSITION_ABSOLUTE ||
d->style->position == CSS_POSITION_FIXED))
continue;
+ if (d->type == BOX_INLINE && d->inline_end &&
+ d->next != d->inline_end) {
+ if (d->height > d->inline_end->line_height)
+ d->inline_end->line_height = d->height;
+ for (struct box *il = d; il != d->inline_end;
+ il = il->next) {
+ if (d->height > il->line_height)
+ il->line_height = d->height;
+ }
+ }
if ((d->type == BOX_INLINE && (d->object || d->gadget)) ||
d->type == BOX_INLINE_BLOCK) {
h = d->margin[TOP] + d->border[TOP] + d->padding[TOP] +
@@ -2134,9 +2145,14 @@
if (used_height < h)
used_height = h;
}
- if (d->type == BOX_TEXT && d->height > used_height)
- used_height = d->height;
- }
+ if (d->line_height > used_height)
+ used_height = d->line_height;
+ }
+
+ /* Set the line_height for the boxes on the current line */
+ for (d = first; d != b; d = d->next)
+ d->line_height = used_height;
+
first->inline_new_line = true;
assert(b != first || (move_y && 0 < used_height && (left || right)));
14 years, 8 months
r6318 adrianl - in /trunk/netsurf/riscos: menus.c save.c save.h window.c
by netsurf＠semichrome.net
Author: adrianl
Date: Fri Jan 30 21:43:06 2009
New Revision: 6318
URL: http://source.netsurf-browser.org?rev=6318&view=rev
Log:
RFix immediate menu-related problems; changes to follow
Modified:
trunk/netsurf/riscos/menus.c
trunk/netsurf/riscos/save.c
trunk/netsurf/riscos/save.h
trunk/netsurf/riscos/window.c
Modified: trunk/netsurf/riscos/menus.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/menus.c?rev=6318&r...
==============================================================================
--- trunk/netsurf/riscos/menus.c (original)
+++ trunk/netsurf/riscos/menus.c Fri Jan 30 21:43:06 2009
@@ -215,7 +215,7 @@
{ "Object.Object.SaveURL.URI", BROWSER_OBJECT_SAVE_URL_URI, dialog_saveas },
{ "Object.Object.SaveURL.URL", BROWSER_OBJECT_SAVE_URL_URL, dialog_saveas },
{ "Object.Object.SaveURL.LinkText", BROWSER_OBJECT_SAVE_URL_TEXT, dialog_saveas },
- { "_Object.Object.ObjReload", BROWSER_OBJECT_RELOAD, 0 },
+ { "Object.Object.ObjReload", BROWSER_OBJECT_RELOAD, 0 },
{ "Object.Link", BROWSER_OBJECT_LINK, 0 },
{ "Object.Link.LinkSave", BROWSER_LINK_SAVE, 0 },
{ "Object.Link.LinkSave.URI", BROWSER_LINK_SAVE_URI, dialog_saveas },
Modified: trunk/netsurf/riscos/save.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/save.c?rev=6318&r1...
==============================================================================
--- trunk/netsurf/riscos/save.c (original)
+++ trunk/netsurf/riscos/save.c Fri Jan 30 21:43:06 2009
@@ -414,6 +414,49 @@
/**
+ * Initiates drag saving of a link/URL file
+ *
+ * \param save_type format in which URL should be saved
+ * \param url url to be saved
+ * \param title title to be included in URI format, if any
+ * \param g gui window to save from
+ * \
+ */
+
+void ro_gui_drag_save_link(gui_save_type save_type, const char *url,
+ const char *title, struct gui_window *g)
+{
+ wimp_pointer pointer;
+ char icon_buf[20];
+ os_error *error;
+
+ /* Close the save window because otherwise we need two contexts
+ */
+ xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);
+ ro_gui_dialog_close(dialog_saveas);
+
+ gui_save_url = url;
+ gui_save_title = title;
+ gui_save_sourcew = g->window;
+ saving_from_dialog = false;
+
+ error = xwimp_get_pointer_info(&pointer);
+ if (error) {
+ LOG(("xwimp_get_pointer_info: 0x%x: %s",
+ error->errnum, error->errmess));
+ warn_user("WimpError", error->errmess);
+ return;
+ }
+
+ ro_gui_save_set_state(NULL, save_type, url, save_leafname, icon_buf);
+
+ gui_current_drag_type = GUI_DRAG_SAVE;
+
+ ro_gui_drag_icon(pointer.pos.x, pointer.pos.y, icon_buf);
+}
+
+
+/**
* Start drag of icon under the pointer.
*/
Modified: trunk/netsurf/riscos/save.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/save.h?rev=6318&r1...
==============================================================================
--- trunk/netsurf/riscos/save.h (original)
+++ trunk/netsurf/riscos/save.h Fri Jan 30 21:43:06 2009
@@ -32,6 +32,8 @@
void ro_gui_save_prepare(gui_save_type save_type, struct content *c, struct selection *s,
const char *url, const char *title);
void ro_gui_save_start_drag(wimp_pointer *pointer);
+void ro_gui_drag_save_link(gui_save_type save_type, const char *url,
+ const char *title, struct gui_window *g);
void ro_gui_drag_icon(int x, int y, const char *sprite);
void ro_gui_drag_box_cancel(void);
void ro_gui_save_drag_end(wimp_dragged *drag);
Modified: trunk/netsurf/riscos/window.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=6318&...
==============================================================================
--- trunk/netsurf/riscos/window.c (original)
+++ trunk/netsurf/riscos/window.c Fri Jan 30 21:43:06 2009
@@ -2216,6 +2216,7 @@
case ICON_TOOLBAR_URL:
if (pointer->buttons & (wimp_DRAG_SELECT | wimp_DRAG_ADJUST)) {
if (g->bw->current_content) {
+ struct content *c = g->bw->current_content;
gui_save_type save_type;
if (ro_gui_shift_pressed())
@@ -2223,7 +2224,7 @@
else
save_type = GUI_SAVE_LINK_TEXT;
- gui_drag_save_object(save_type, g->bw->current_content, g);
+ ro_gui_drag_save_link(save_type, c->url, c->title, g);
}
}
else
14 years, 8 months
r6317 jmb - /trunk/netsurf/content/urldb.c
by netsurf＠semichrome.net
Author: jmb
Date: Fri Jan 30 21:03:50 2009
New Revision: 6317
URL: http://source.netsurf-browser.org?rev=6317&view=rev
Log:
Let's try that again. Now actually passes the regression tests.
Modified:
trunk/netsurf/content/urldb.c
Modified: trunk/netsurf/content/urldb.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/urldb.c?rev=6317&...
==============================================================================
--- trunk/netsurf/content/urldb.c (original)
+++ trunk/netsurf/content/urldb.c Fri Jan 30 21:03:50 2009
@@ -1905,17 +1905,13 @@
const char *slash;
assert(parent != NULL);
+ assert(parent->segment == NULL);
assert(path[0] == '/');
- /* Skip past leading / */
- path++;
- /* And start with children, as parent has no segment */
+ /* Start with children, as parent has no segment */
p = parent->children;
while (p != NULL) {
- if (*path == '\0')
- return (struct path_data *) p;
-
slash = strchr(path + 1, '/');
if (!slash)
slash = path + strlen(path);
@@ -1923,6 +1919,11 @@
if (strncmp(p->segment, path + 1, slash - path - 1) == 0 &&
strcmp(p->scheme, scheme) == 0 &&
p->port == port) {
+ if (*slash == '\0') {
+ /* Complete match */
+ return (struct path_data *) p;
+ }
+
/* Match so far, go down tree */
p = p->children;
14 years, 8 months