content_get_url -> hlcache_handle_get_url, content__get_url -> content_get_url
svn path=/trunk/netsurf/; revision=13236
This commit is contained in:
parent
890bb67993
commit
f2993e6ed0
|
@ -278,7 +278,7 @@ STATIC VOID rx_save(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
|
|||
FWrite(fh, source_data, 1, source_size);
|
||||
|
||||
FClose(fh);
|
||||
SetComment((char *)cmd->ac_ArgList[0], nsurl_access(content_get_url(bw->current_content)));
|
||||
SetComment((char *)cmd->ac_ArgList[0], nsurl_access(hlcache_handle_get_url(bw->current_content)));
|
||||
}
|
||||
|
||||
ami_update_pointer(bw->window->shared->win,GUI_POINTER_DEFAULT);
|
||||
|
@ -307,7 +307,7 @@ STATIC VOID rx_geturl(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((u
|
|||
|
||||
if(bw && bw->current_content)
|
||||
{
|
||||
strcpy(result, nsurl_access(content_get_url(bw->current_content)));
|
||||
strcpy(result, nsurl_access(hlcache_handle_get_url(bw->current_content)));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -426,7 +426,7 @@ bool ami_easy_clipboard_svg(struct hlcache_handle *c)
|
|||
|
||||
if(!(OpenIFF(iffh,IFFF_WRITE)))
|
||||
{
|
||||
ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(content_get_url(c)));
|
||||
ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(hlcache_handle_get_url(c)));
|
||||
CloseIFF(iffh);
|
||||
}
|
||||
|
||||
|
|
|
@ -231,7 +231,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
|
|||
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_PAGEHOTLIST],
|
||||
PMIA_ID, CMID_PAGEHOTLIST,
|
||||
PMIA_UserData, nsurl_access(content_get_url(userdata)),
|
||||
PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
|
||||
PMIA_CommKey, "B",
|
||||
TAG_DONE),
|
||||
TAG_DONE),
|
||||
|
@ -247,12 +247,12 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
|
|||
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMEWIN],
|
||||
PMIA_ID, CMID_FRAMEWIN,
|
||||
PMIA_UserData, nsurl_access(content_get_url(userdata)),
|
||||
PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
|
||||
TAG_DONE),
|
||||
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMETAB],
|
||||
PMIA_ID, CMID_FRAMETAB,
|
||||
PMIA_UserData, nsurl_access(content_get_url(userdata)),
|
||||
PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
|
||||
TAG_DONE),
|
||||
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESHOW],
|
||||
|
@ -273,7 +273,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
|
|||
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMECOPYURL],
|
||||
PMIA_ID, CMID_FRAMECOPYURL,
|
||||
PMIA_UserData, nsurl_access(content_get_url(userdata)),
|
||||
PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
|
||||
TAG_DONE),
|
||||
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, ~0,
|
||||
|
@ -401,7 +401,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
|
|||
PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_COPYOBJ],
|
||||
PMIA_ID, CMID_COPYOBJ,
|
||||
PMIA_UserData, nsurl_access(content_get_url(userdata)),
|
||||
PMIA_UserData, nsurl_access(hlcache_handle_get_url(userdata)),
|
||||
TAG_DONE),
|
||||
PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL,
|
||||
PMIA_Title, (ULONG)ctxmenulab[CMID_CLIPOBJ],
|
||||
|
@ -757,30 +757,30 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
|
|||
case CMID_FRAMEWIN:
|
||||
case CMID_URLOPENWIN:
|
||||
bw = browser_window_create(userdata, gwin->bw,
|
||||
nsurl_access(content_get_url(gwin->bw->current_content)), true, false);
|
||||
nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true, false);
|
||||
break;
|
||||
|
||||
case CMID_FRAMETAB:
|
||||
case CMID_URLOPENTAB:
|
||||
bw = browser_window_create(userdata, gwin->bw,
|
||||
nsurl_access(content_get_url(gwin->bw->current_content)), true, true);
|
||||
nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true, true);
|
||||
break;
|
||||
|
||||
case CMID_FRAMESAVE:
|
||||
case CMID_SAVEURL:
|
||||
browser_window_download(gwin->bw, userdata,
|
||||
nsurl_access(content_get_url(gwin->bw->current_content)));
|
||||
nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)));
|
||||
break;
|
||||
|
||||
case CMID_FRAMESHOW:
|
||||
case CMID_SHOWOBJ:
|
||||
browser_window_go(gwin->bw, nsurl_access(content_get_url(userdata)),
|
||||
nsurl_access(content_get_url(gwin->bw->current_content)), true);
|
||||
browser_window_go(gwin->bw, nsurl_access(hlcache_handle_get_url(userdata)),
|
||||
nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true);
|
||||
break;
|
||||
|
||||
case CMID_URLOPEN:
|
||||
browser_window_go(gwin->bw, userdata,
|
||||
nsurl_access(content_get_url(gwin->bw->current_content)), true);
|
||||
nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)), true);
|
||||
break;
|
||||
|
||||
case CMID_FRAMERELOAD:
|
||||
|
@ -794,7 +794,7 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
|
|||
object = (struct hlcache_handle *)userdata;
|
||||
if((bm = content_get_bitmap(object)))
|
||||
{
|
||||
bm->url = (char *)nsurl_access(content_get_url(object));
|
||||
bm->url = (char *)nsurl_access(hlcache_handle_get_url(object));
|
||||
bm->title = (char *)content_get_title(object);
|
||||
ami_easy_clipboard_bitmap(bm);
|
||||
}
|
||||
|
|
|
@ -150,7 +150,7 @@ void ami_file_save(int type, char *fname, struct Window *win,
|
|||
case AMINS_SAVE_IFF:
|
||||
if((bm = content_get_bitmap(object)))
|
||||
{
|
||||
bm->url = (char *)nsurl_access(content_get_url(object));
|
||||
bm->url = (char *)nsurl_access(hlcache_handle_get_url(object));
|
||||
bm->title = (char *)content_get_title(object);
|
||||
bitmap_save(bm, fname, 0);
|
||||
}
|
||||
|
@ -166,7 +166,7 @@ void ami_file_save(int type, char *fname, struct Window *win,
|
|||
selection_save_text(sel, fname);
|
||||
break;
|
||||
}
|
||||
if(object) SetComment(fname, nsurl_access(content_get_url(object)));
|
||||
if(object) SetComment(fname, nsurl_access(hlcache_handle_get_url(object)));
|
||||
}
|
||||
|
||||
ami_update_pointer(win, GUI_POINTER_DEFAULT);
|
||||
|
@ -180,7 +180,7 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin,
|
|||
if(AslRequestTags(savereq,
|
||||
ASLFR_TitleText, messages_get("NetSurf"),
|
||||
ASLFR_Screen, scrn,
|
||||
ASLFR_InitialFile, object ? FilePart(nsurl_access(content_get_url(object))) : "",
|
||||
ASLFR_InitialFile, object ? FilePart(nsurl_access(hlcache_handle_get_url(object))) : "",
|
||||
TAG_DONE))
|
||||
{
|
||||
strlcpy(fname, savereq->fr_Drawer, 1024);
|
||||
|
|
|
@ -1707,7 +1707,7 @@ void ami_handle_msg(void)
|
|||
struct DiskObject *dobj;
|
||||
struct bitmap *bm;
|
||||
|
||||
bm = urldb_get_thumbnail(nsurl_access(content_get_url(gwin->bw->current_content)));
|
||||
bm = urldb_get_thumbnail(nsurl_access(hlcache_handle_get_url(gwin->bw->current_content)));
|
||||
if(!bm) bm = content_get_bitmap(gwin->bw->current_content);
|
||||
gwin->dobj = amiga_icon_from_bitmap(bm);
|
||||
amiga_icon_superimpose_favicon_internal(gwin->bw->window->favicon,
|
||||
|
@ -2084,7 +2084,7 @@ void ami_switch_tab(struct gui_window_2 *gwin,bool redraw)
|
|||
gwin->redraw_scroll = false;
|
||||
|
||||
browser_window_refresh_url_bar(gwin->bw,
|
||||
content_get_url(gwin->bw->current_content), gwin->bw->frag_id);
|
||||
hlcache_handle_get_url(gwin->bw->current_content), gwin->bw->frag_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1698,7 +1698,7 @@ BOOL ami_gui_opts_event(void)
|
|||
case GID_OPTS_HOMEPAGE_CURRENT:
|
||||
if(curbw) RefreshSetGadgetAttrs((struct Gadget *)gow->objects[GID_OPTS_HOMEPAGE],
|
||||
gow->win, NULL, STRINGA_TextVal,
|
||||
nsurl_access(content_get_url(curbw->current_content)), TAG_DONE);
|
||||
nsurl_access(hlcache_handle_get_url(curbw->current_content)), TAG_DONE);
|
||||
break;
|
||||
|
||||
case GID_OPTS_HOMEPAGE_BLANK:
|
||||
|
|
|
@ -149,7 +149,7 @@ bool amiga_icon_convert(struct content *c)
|
|||
ULONG trans, pals1;
|
||||
struct ColorRegister *pal1;
|
||||
|
||||
url = nsurl_access(content__get_url(c));
|
||||
url = nsurl_access(content_get_url(c));
|
||||
filename = url_to_path(url);
|
||||
|
||||
/* This loader will only work on local files, so fail if not a local path */
|
||||
|
|
|
@ -322,7 +322,7 @@ bool ami_save_svg(struct hlcache_handle *c,char *filename)
|
|||
if((OpenIFF(iffh,IFFF_WRITE))) return false;
|
||||
|
||||
if((source_data = content_get_source_data(c, &source_size)))
|
||||
ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(content_get_url(c)));
|
||||
ami_svg_to_dr2d(iffh, source_data, source_size, nsurl_access(hlcache_handle_get_url(c)));
|
||||
|
||||
if(iffh) CloseIFF(iffh);
|
||||
if(iffh->iff_Stream) Close((BPTR)iffh->iff_Stream);
|
||||
|
|
|
@ -571,7 +571,7 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
|
|||
}
|
||||
else if(bm = content_get_bitmap(gwin->bw->current_content))
|
||||
{
|
||||
bm->url = (char *)nsurl_access(content_get_url(gwin->bw->current_content));
|
||||
bm->url = (char *)nsurl_access(hlcache_handle_get_url(gwin->bw->current_content));
|
||||
bm->title = (char *)content_get_title(gwin->bw->current_content);
|
||||
ami_easy_clipboard_bitmap(bm);
|
||||
}
|
||||
|
@ -653,10 +653,10 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
|
|||
|
||||
if (bw == NULL ||
|
||||
bw->current_content == NULL ||
|
||||
nsurl_access(content_get_url(bw->current_content)) == NULL)
|
||||
nsurl_access(hlcache_handle_get_url(bw->current_content)) == NULL)
|
||||
break;
|
||||
|
||||
hotlist_add_page(nsurl_access(content_get_url(bw->current_content)));
|
||||
hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
|
||||
break;
|
||||
|
||||
case 1: // show
|
||||
|
|
|
@ -175,7 +175,7 @@ void amiga_plugin_hack_open(struct content *c, struct browser_window *bw,
|
|||
struct content *page, struct box *box,
|
||||
struct object_params *params)
|
||||
{
|
||||
LOG(("amiga_plugin_hack_open %s", nsurl_access(content__get_url(c))));
|
||||
LOG(("amiga_plugin_hack_open %s", nsurl_access(content_get_url(c))));
|
||||
|
||||
if(c && box)
|
||||
{
|
||||
|
@ -249,7 +249,7 @@ void amiga_plugin_hack_execute(struct hlcache_handle *c)
|
|||
plugincmd = ami_mime_content_to_cmd(c);
|
||||
if(plugincmd == NULL) return;
|
||||
|
||||
full_cmd = ASPrintf("%s %s", lwc_string_data(plugincmd), nsurl_access(content_get_url(c)));
|
||||
full_cmd = ASPrintf("%s %s", lwc_string_data(plugincmd), nsurl_access(hlcache_handle_get_url(c)));
|
||||
|
||||
if(full_cmd)
|
||||
{
|
||||
|
|
|
@ -393,7 +393,7 @@ void ami_print(struct hlcache_handle *c, int copies)
|
|||
ami_print_info.PD = (struct PrinterData *)ami_print_info.PReq->io_Device;
|
||||
ami_print_info.PED = &ami_print_info.PD->pd_SegmentData->ps_PED;
|
||||
|
||||
ami_print_info.ps = print_make_settings(PRINT_DEFAULT, nsurl_access(content_get_url(c)), &nsfont);
|
||||
ami_print_info.ps = print_make_settings(PRINT_DEFAULT, nsurl_access(hlcache_handle_get_url(c)), &nsfont);
|
||||
ami_print_info.ps->page_width = ami_print_info.PED->ped_MaxXDots;
|
||||
ami_print_info.ps->page_height = ami_print_info.PED->ped_MaxYDots;
|
||||
ami_print_info.ps->scale = scale;
|
||||
|
|
|
@ -210,19 +210,19 @@ void context_popup( struct gui_window * gw, short x, short y )
|
|||
break;
|
||||
|
||||
case POP_CTX_SAVE_AS:
|
||||
if( content_get_url(ctx->ccdata.object) != NULL ){
|
||||
if( hlcache_handle_get_url(ctx->ccdata.object) != NULL ){
|
||||
browser_window_download(
|
||||
gw->browser->bw,
|
||||
nsurl_access(content_get_url(ctx->ccdata.object)),
|
||||
nsurl_access(content_get_url(gw->browser->bw->current_content))
|
||||
nsurl_access(hlcache_handle_get_url(ctx->ccdata.object)),
|
||||
nsurl_access(hlcache_handle_get_url(gw->browser->bw->current_content))
|
||||
);
|
||||
}
|
||||
break;
|
||||
|
||||
case POP_CTX_COPY_URL:
|
||||
if( (ctx->flags & CNT_IMG) && (ctx->ccdata.object != NULL) ){
|
||||
if( content_get_url(ctx->ccdata.object) != NULL ){
|
||||
scrap_txt_write(&app, (char*)nsurl_access(content_get_url(ctx->ccdata.object)) );
|
||||
if( hlcache_handle_get_url(ctx->ccdata.object) != NULL ){
|
||||
scrap_txt_write(&app, (char*)nsurl_access(hlcache_handle_get_url(ctx->ccdata.object)) );
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -238,7 +238,7 @@ void context_popup( struct gui_window * gw, short x, short y )
|
|||
browser_window_create(
|
||||
ctx->ccdata.link_url,
|
||||
gw->browser->bw,
|
||||
nsurl_access(content_get_url(gw->browser->bw->current_content)),
|
||||
nsurl_access(hlcache_handle_get_url(gw->browser->bw->current_content)),
|
||||
true, false
|
||||
);
|
||||
}
|
||||
|
|
|
@ -254,7 +254,7 @@ static void __CDECL menu_add_bookmark(WINDOW *win, int item, int title, void *da
|
|||
if( input_window ) {
|
||||
if( input_window->browser->bw->current_content != NULL ){
|
||||
atari_hotlist_add_page(
|
||||
nsurl_access(content_get_url( input_window->browser->bw->current_content)),
|
||||
nsurl_access(hlcache_handle_get_url( input_window->browser->bw->current_content)),
|
||||
NULL
|
||||
);
|
||||
}
|
||||
|
|
|
@ -849,7 +849,7 @@ void nsbeos_gui_view_source(struct hlcache_handle *content, struct selection *se
|
|||
}
|
||||
|
||||
/* try to load local files directly. */
|
||||
temp_name = url_to_path(nsurl_access(content_get_url(content)));
|
||||
temp_name = url_to_path(nsurl_access(hlcache_handle_get_url(content)));
|
||||
if (temp_name) {
|
||||
path.SetTo(temp_name);
|
||||
BEntry entry;
|
||||
|
|
|
@ -910,12 +910,7 @@ lwc_string *content__get_mime_type(struct content *c)
|
|||
* \param c Content to retrieve URL from
|
||||
* \return Pointer to URL, or NULL if not found.
|
||||
*/
|
||||
nsurl *content_get_url(hlcache_handle *h)
|
||||
{
|
||||
return content__get_url(hlcache_handle_get_content(h));
|
||||
}
|
||||
|
||||
nsurl *content__get_url(struct content *c)
|
||||
nsurl *content_get_url(struct content *c)
|
||||
{
|
||||
if (c == NULL)
|
||||
return NULL;
|
||||
|
|
|
@ -151,6 +151,7 @@ bool content_is_shareable(struct content *c);
|
|||
content_status content__get_status(struct content *c);
|
||||
|
||||
const struct llcache_handle *content_get_llcache_handle(struct content *c);
|
||||
nsurl *content_get_url(struct content *c);
|
||||
|
||||
struct content *content_clone(struct content *c);
|
||||
|
||||
|
@ -185,7 +186,6 @@ struct content_rfc5988_link *content_find_rfc5988_link(struct hlcache_handle *c,
|
|||
/* Member accessors */
|
||||
content_type content_get_type(struct hlcache_handle *c);
|
||||
lwc_string *content_get_mime_type(struct hlcache_handle *c);
|
||||
nsurl *content_get_url(struct hlcache_handle *c);
|
||||
const char *content_get_title(struct hlcache_handle *c);
|
||||
content_status content_get_status(struct hlcache_handle *c);
|
||||
const char *content_get_status_message(struct hlcache_handle *c);
|
||||
|
|
|
@ -179,7 +179,6 @@ void content__request_redraw(struct content *c,
|
|||
bool content__set_title(struct content *c, const char *title);
|
||||
|
||||
lwc_string *content__get_mime_type(struct content *c);
|
||||
nsurl *content__get_url(struct content *c);
|
||||
const char *content__get_title(struct content *c);
|
||||
const char *content__get_status_message(struct content *c);
|
||||
int content__get_width(struct content *c);
|
||||
|
|
|
@ -176,7 +176,7 @@ void hlcache_finalise(void)
|
|||
|
||||
if (entry->content != NULL) {
|
||||
LOG((" %p : %s (%d users)", entry,
|
||||
nsurl_access(content_get_url(&entry_handle)), content_count_users(entry->content)));
|
||||
nsurl_access(hlcache_handle_get_url(&entry_handle)), content_count_users(entry->content)));
|
||||
} else {
|
||||
LOG((" %p", entry));
|
||||
}
|
||||
|
@ -416,6 +416,33 @@ nserror hlcache_handle_clone(hlcache_handle *handle, hlcache_handle **result)
|
|||
return NSERROR_CLONE_FAILED;
|
||||
}
|
||||
|
||||
/* See hlcache.h for documentation */
|
||||
nsurl *hlcache_handle_get_url(const hlcache_handle *handle)
|
||||
{
|
||||
nsurl *result = NULL;
|
||||
|
||||
assert(handle != NULL);
|
||||
|
||||
if (handle->entry != NULL) {
|
||||
result = content_get_url(handle->entry->content);
|
||||
} else {
|
||||
RING_ITERATE_START(struct hlcache_retrieval_ctx,
|
||||
hlcache->retrieval_ctx_ring,
|
||||
ictx) {
|
||||
if (ictx->handle == handle) {
|
||||
/* This is the nascent context for us */
|
||||
result = llcache_handle_get_url(ictx->llcache);
|
||||
|
||||
/* And stop */
|
||||
RING_ITERATE_STOP(hlcache->retrieval_ctx_ring,
|
||||
ictx);
|
||||
}
|
||||
} RING_ITERATE_END(hlcache->retrieval_ctx_ring, ictx);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* High-level cache internals *
|
||||
******************************************************************************/
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include "content/content.h"
|
||||
#include "content/llcache.h"
|
||||
#include "utils/errors.h"
|
||||
#include "utils/nsurl.h"
|
||||
|
||||
/** High-level cache handle */
|
||||
typedef struct hlcache_handle hlcache_handle;
|
||||
|
@ -189,4 +190,12 @@ struct content *hlcache_handle_get_content(const hlcache_handle *handle);
|
|||
*/
|
||||
nserror hlcache_handle_clone(hlcache_handle *handle, hlcache_handle **result);
|
||||
|
||||
/**
|
||||
* Retrieve the URL associated with a high level cache handle
|
||||
*
|
||||
* \param handle The handle to inspect
|
||||
* \return Pointer to URL.
|
||||
*/
|
||||
nsurl *hlcache_handle_get_url(const hlcache_handle *handle);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -173,7 +173,7 @@ nserror nscss_create(const content_handler *handler,
|
|||
}
|
||||
|
||||
error = nscss_create_css_data(&result->data,
|
||||
nsurl_access(content__get_url(&result->base)),
|
||||
nsurl_access(content_get_url(&result->base)),
|
||||
charset, result->base.quirks,
|
||||
nscss_content_done, result);
|
||||
if (error != NSERROR_OK) {
|
||||
|
@ -401,7 +401,7 @@ nserror nscss_clone(const struct content *old, struct content **newc)
|
|||
|
||||
/* Simply replay create/process/convert */
|
||||
error = nscss_create_css_data(&new_css->data,
|
||||
nsurl_access(content__get_url(&new_css->base)),
|
||||
nsurl_access(content_get_url(&new_css->base)),
|
||||
old_css->data.charset,
|
||||
new_css->base.quirks,
|
||||
nscss_content_done, new_css);
|
||||
|
|
|
@ -898,9 +898,9 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
|
|||
|
||||
/* Compare new URL with existing one (ignoring fragments) */
|
||||
if (bw->current_content != NULL &&
|
||||
content_get_url(bw->current_content) != NULL) {
|
||||
hlcache_handle_get_url(bw->current_content) != NULL) {
|
||||
same_url = nsurl_compare(nsurl,
|
||||
content_get_url(bw->current_content),
|
||||
hlcache_handle_get_url(bw->current_content),
|
||||
NSURL_COMPLETE);
|
||||
}
|
||||
|
||||
|
@ -920,7 +920,7 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
|
|||
browser_window_update(bw, false);
|
||||
if (bw->current_content != NULL) {
|
||||
browser_window_refresh_url_bar(bw,
|
||||
content_get_url(bw->current_content),
|
||||
hlcache_handle_get_url(bw->current_content),
|
||||
bw->frag_id);
|
||||
}
|
||||
return;
|
||||
|
@ -1088,7 +1088,7 @@ static void browser_window_update_favicon(hlcache_handle *c,
|
|||
lwc_string *scheme;
|
||||
bool speculative_default = false;
|
||||
|
||||
nsurl = content_get_url(c);
|
||||
nsurl = hlcache_handle_get_url(c);
|
||||
|
||||
scheme = nsurl_get_component(nsurl, NSURL_SCHEME);
|
||||
|
||||
|
@ -1153,7 +1153,7 @@ nserror browser_window_callback(hlcache_handle *c,
|
|||
|
||||
if (bw->current_content != NULL) {
|
||||
browser_window_refresh_url_bar(bw,
|
||||
content_get_url(bw->current_content),
|
||||
hlcache_handle_get_url(bw->current_content),
|
||||
bw->frag_id);
|
||||
}
|
||||
break;
|
||||
|
@ -1205,7 +1205,7 @@ nserror browser_window_callback(hlcache_handle *c,
|
|||
gui_window_new_content(bw->window);
|
||||
|
||||
browser_window_refresh_url_bar(bw,
|
||||
content_get_url(bw->current_content),
|
||||
hlcache_handle_get_url(bw->current_content),
|
||||
bw->frag_id);
|
||||
|
||||
/* new content; set scroll_to_top */
|
||||
|
@ -1215,7 +1215,7 @@ nserror browser_window_callback(hlcache_handle *c,
|
|||
|
||||
/* history */
|
||||
if (bw->history_add && bw->history) {
|
||||
const char *url = nsurl_access(content_get_url(c));
|
||||
const char *url = nsurl_access(hlcache_handle_get_url(c));
|
||||
|
||||
history_add(bw->history, c, bw->frag_id == NULL ? NULL :
|
||||
lwc_string_data(bw->frag_id));
|
||||
|
@ -1472,7 +1472,7 @@ void browser_window_refresh(void *p)
|
|||
/* mark this content as invalid so it gets flushed from the cache */
|
||||
content_invalidate_reuse_data(bw->current_content);
|
||||
|
||||
url = nsurl_access(content_get_url(bw->current_content));
|
||||
url = nsurl_access(hlcache_handle_get_url(bw->current_content));
|
||||
if (url != NULL && strcmp(url, refresh) == 0)
|
||||
history_add = false;
|
||||
|
||||
|
@ -1703,7 +1703,7 @@ void browser_window_stop(struct browser_window *bw)
|
|||
|
||||
if (bw->current_content != NULL) {
|
||||
browser_window_refresh_url_bar(bw,
|
||||
content_get_url(bw->current_content),
|
||||
hlcache_handle_get_url(bw->current_content),
|
||||
bw->frag_id);
|
||||
}
|
||||
|
||||
|
@ -1756,7 +1756,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
|
|||
content_invalidate_reuse_data(bw->current_content);
|
||||
|
||||
browser_window_go(bw, nsurl_access(
|
||||
content_get_url(bw->current_content)), 0, false);
|
||||
hlcache_handle_get_url(bw->current_content)), 0, false);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -244,7 +244,7 @@ void browser_window_create_iframes(struct browser_window *bw,
|
|||
/* fetch iframe's content */
|
||||
browser_window_go_unverifiable(window,
|
||||
nsurl_access(cur->url),
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
bw->current_content)),
|
||||
false, bw->current_content);
|
||||
}
|
||||
|
@ -378,7 +378,7 @@ void browser_window_create_frameset(struct browser_window *bw,
|
|||
if (frame->url) {
|
||||
browser_window_go_unverifiable(window,
|
||||
nsurl_access(frame->url),
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
parent)),
|
||||
true,
|
||||
parent);
|
||||
|
|
|
@ -242,7 +242,7 @@ void history_add(struct history *history, hlcache_handle *content,
|
|||
return;
|
||||
|
||||
/* TODO: use a nsurl? */
|
||||
error = nsurl_get(content_get_url(content), NSURL_WITH_FRAGMENT,
|
||||
error = nsurl_get(hlcache_handle_get_url(content), NSURL_WITH_FRAGMENT,
|
||||
&url, &url_len);
|
||||
if (error != NSERROR_OK) {
|
||||
warn_user("NoMemory", 0);
|
||||
|
|
|
@ -223,12 +223,12 @@ static void hotlist_visited_internal(hlcache_handle *content, struct node *node)
|
|||
const char *url;
|
||||
|
||||
if (content == NULL ||
|
||||
content_get_url(content) == NULL ||
|
||||
hlcache_handle_get_url(content) == NULL ||
|
||||
hotlist_tree == NULL)
|
||||
return;
|
||||
|
||||
/* TODO: do this with a nsurl instead */
|
||||
url = nsurl_access(content_get_url(content));
|
||||
url = nsurl_access(hlcache_handle_get_url(content));
|
||||
|
||||
for (; node; node = tree_node_get_next(node)) {
|
||||
if (!tree_node_is_folder(node)) {
|
||||
|
|
|
@ -171,7 +171,7 @@ bool save_complete_html(hlcache_handle *c, const char *path, bool index,
|
|||
css_data = content_get_source_data(css, &css_size);
|
||||
|
||||
source = rewrite_stylesheet_urls(css_data, css_size,
|
||||
&source_len, nsurl_access(content_get_url(css)),
|
||||
&source_len, nsurl_access(hlcache_handle_get_url(css)),
|
||||
*list);
|
||||
if (!source) {
|
||||
warn_user("NoMemory", 0);
|
||||
|
@ -325,7 +325,7 @@ bool save_imported_sheets(struct nscss_import *imports, uint32_t count,
|
|||
css_data = content_get_source_data(css, &css_size);
|
||||
|
||||
source = rewrite_stylesheet_urls(css_data, css_size,
|
||||
&source_len, nsurl_access(content_get_url(css)),
|
||||
&source_len, nsurl_access(hlcache_handle_get_url(css)),
|
||||
*list);
|
||||
if (!source) {
|
||||
warn_user("NoMemory", 0);
|
||||
|
@ -747,7 +747,7 @@ hlcache_handle * save_complete_list_find(const char *url,
|
|||
struct save_complete_entry *entry;
|
||||
for (entry = list; entry; entry = entry->next)
|
||||
if (strcmp(url, nsurl_access(
|
||||
content_get_url(entry->content))) == 0)
|
||||
hlcache_handle_get_url(entry->content))) == 0)
|
||||
return entry->content;
|
||||
return 0;
|
||||
}
|
||||
|
@ -813,7 +813,7 @@ bool save_complete_inventory(const char *path,
|
|||
|
||||
for (entry = list; entry; entry = entry->next) {
|
||||
fprintf(fp, "%p %s\n", entry->content,
|
||||
nsurl_access(content_get_url(entry->content)));
|
||||
nsurl_access(hlcache_handle_get_url(entry->content)));
|
||||
}
|
||||
|
||||
fclose(fp);
|
||||
|
|
|
@ -291,7 +291,7 @@ nserror search_web_ico_callback(hlcache_handle *ico,
|
|||
break;
|
||||
|
||||
case CONTENT_MSG_DONE:
|
||||
LOG(("got favicon '%s'", nsurl_access(content_get_url(ico))));
|
||||
LOG(("got favicon '%s'", nsurl_access(hlcache_handle_get_url(ico))));
|
||||
gui_window_set_search_ico(search_ico);
|
||||
break;
|
||||
|
||||
|
|
|
@ -579,7 +579,7 @@ ENTRY_CHANGED(entryHomePageURL, option_homepage_url)
|
|||
END_HANDLER
|
||||
|
||||
BUTTON_CLICKED(setCurrentPage)
|
||||
const gchar *url = nsurl_access(content_get_url(
|
||||
const gchar *url = nsurl_access(hlcache_handle_get_url(
|
||||
current_browser->current_content));
|
||||
gtk_entry_set_text(GTK_ENTRY(entryHomePageURL), url);
|
||||
option_homepage_url =
|
||||
|
|
|
@ -166,7 +166,7 @@ void nsgtk_source_dialog_init(GtkWindow *parent, struct browser_window *bw)
|
|||
return;
|
||||
}
|
||||
|
||||
thiswindow->url = strdup(nsurl_access(content_get_url(
|
||||
thiswindow->url = strdup(nsurl_access(hlcache_handle_get_url(
|
||||
bw->current_content)));
|
||||
if (thiswindow->url == NULL) {
|
||||
free(thiswindow);
|
||||
|
|
|
@ -337,9 +337,9 @@ static void nsgtk_window_update_back_forward(struct gtk_scaffolding *g)
|
|||
|
||||
/* update the url bar, particularly necessary when tabbing */
|
||||
if (bw->current_content != NULL &&
|
||||
content_get_url(bw->current_content) != NULL)
|
||||
hlcache_handle_get_url(bw->current_content) != NULL)
|
||||
browser_window_refresh_url_bar(bw,
|
||||
content_get_url(bw->current_content),
|
||||
hlcache_handle_get_url(bw->current_content),
|
||||
bw->frag_id);
|
||||
|
||||
/* update the local history window, as well as queuing a redraw
|
||||
|
@ -621,7 +621,7 @@ MULTIHANDLER(savepage)
|
|||
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(fc), filter);
|
||||
gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(fc), filter);
|
||||
|
||||
res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window(
|
||||
res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window(
|
||||
g->top_level)->current_content)), &path, false);
|
||||
if (res != URL_FUNC_OK) {
|
||||
path = strdup(messages_get("SaveText"));
|
||||
|
@ -682,7 +682,7 @@ MULTIHANDLER(pdf)
|
|||
|
||||
LOG(("Print preview (generating PDF) started."));
|
||||
|
||||
res = url_nice(nsurl_access(content_get_url(bw->current_content)),
|
||||
res = url_nice(nsurl_access(hlcache_handle_get_url(bw->current_content)),
|
||||
&url_name, true);
|
||||
if (res != URL_FUNC_OK) {
|
||||
warn_user(messages_get(res == URL_FUNC_NOMEM ? "NoMemory"
|
||||
|
@ -757,7 +757,7 @@ MULTIHANDLER(plaintext)
|
|||
char *filename;
|
||||
url_func_result res;
|
||||
|
||||
res = url_nice(nsurl_access(content_get_url(nsgtk_get_browser_window(
|
||||
res = url_nice(nsurl_access(hlcache_handle_get_url(nsgtk_get_browser_window(
|
||||
g->top_level)->current_content)), &filename, false);
|
||||
if (res != URL_FUNC_OK) {
|
||||
filename = strdup(messages_get("SaveText"));
|
||||
|
@ -1408,9 +1408,9 @@ MULTIHANDLER(addbookmarks)
|
|||
struct browser_window *bw = nsgtk_get_browser_window(g->top_level);
|
||||
|
||||
if (bw == NULL || bw->current_content == NULL ||
|
||||
content_get_url(bw->current_content) == NULL)
|
||||
hlcache_handle_get_url(bw->current_content) == NULL)
|
||||
return TRUE;
|
||||
hotlist_add_page(nsurl_access(content_get_url(bw->current_content)));
|
||||
hotlist_add_page(nsurl_access(hlcache_handle_get_url(bw->current_content)));
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -412,13 +412,13 @@ void nsgtk_toolbar_close(nsgtk_scaffolding *g)
|
|||
NSGTK_WINDOW_SIGNAL_REDRAW));
|
||||
if ((nsgtk_get_browser_window(nsgtk_scaffolding_top_level(
|
||||
list))->current_content != NULL) &&
|
||||
(content_get_url(nsgtk_get_browser_window(
|
||||
(hlcache_handle_get_url(nsgtk_get_browser_window(
|
||||
nsgtk_scaffolding_top_level(list))->
|
||||
current_content) != NULL))
|
||||
browser_window_refresh_url_bar(
|
||||
nsgtk_get_browser_window(
|
||||
nsgtk_scaffolding_top_level(list)),
|
||||
content_get_url(
|
||||
hlcache_handle_get_url(
|
||||
nsgtk_get_browser_window(
|
||||
nsgtk_scaffolding_top_level(list))->
|
||||
current_content),
|
||||
|
|
|
@ -404,7 +404,7 @@ static mng_bool nsmng_errorproc(mng_handle mng, mng_int32 code,
|
|||
chunk[4] = '\0';
|
||||
|
||||
LOG(("error playing '%s' chunk %s (%d):",
|
||||
content__get_url(&c->base), chunk, chunkseq));
|
||||
content_get_url(&c->base), chunk, chunkseq));
|
||||
LOG(("code %d severity %d extra1 %d extra2 %d text:'%s'", code,
|
||||
severity, extra1, extra2, text));
|
||||
|
||||
|
|
|
@ -132,7 +132,7 @@ static void svg_reformat(struct content *c, int width, int height)
|
|||
source_data = content__get_source_data(c, &source_size);
|
||||
|
||||
svgtiny_parse(svg->diagram, source_data, source_size,
|
||||
nsurl_access(content__get_url(c)),
|
||||
nsurl_access(content_get_url(c)),
|
||||
width, height);
|
||||
|
||||
svg->done_parse = true;
|
||||
|
|
|
@ -942,7 +942,7 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth)
|
|||
fprintf(stream, "space ");
|
||||
if (box->object) {
|
||||
fprintf(stream, "(object '%s') ",
|
||||
nsurl_access(content_get_url(box->object)));
|
||||
nsurl_access(hlcache_handle_get_url(box->object)));
|
||||
}
|
||||
if (box->iframe) {
|
||||
fprintf(stream, "(iframe) ");
|
||||
|
|
|
@ -1103,7 +1103,7 @@ css_select_results *box_get_style(html_content *c,
|
|||
inline_style = nscss_create_inline_style(
|
||||
(uint8_t *) s, strlen(s),
|
||||
c->encoding,
|
||||
nsurl_access(content__get_url(&c->base)),
|
||||
nsurl_access(content_get_url(&c->base)),
|
||||
c->quirks != BINDING_QUIRKS_MODE_NONE,
|
||||
box_style_alloc, NULL);
|
||||
|
||||
|
|
|
@ -1500,7 +1500,7 @@ void form_submit(hlcache_handle *h, struct browser_window *target,
|
|||
|
||||
url_destroy_components(&components);
|
||||
|
||||
browser_window_go(target, url, nsurl_access(content_get_url(h)),
|
||||
browser_window_go(target, url, nsurl_access(hlcache_handle_get_url(h)),
|
||||
true);
|
||||
break;
|
||||
|
||||
|
@ -1513,13 +1513,13 @@ void form_submit(hlcache_handle *h, struct browser_window *target,
|
|||
}
|
||||
|
||||
browser_window_go_post(target, form->action, data, 0,
|
||||
true, nsurl_access(content_get_url(h)),
|
||||
true, nsurl_access(hlcache_handle_get_url(h)),
|
||||
false, true, 0);
|
||||
break;
|
||||
|
||||
case method_POST_MULTIPART:
|
||||
browser_window_go_post(target, form->action, 0,
|
||||
success, true, nsurl_access(content_get_url(h)),
|
||||
success, true, nsurl_access(hlcache_handle_get_url(h)),
|
||||
false, true, 0);
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -274,7 +274,7 @@ nserror html_create_html_data(html_content *c, const http_parameter *params)
|
|||
c->document = NULL;
|
||||
c->quirks = BINDING_QUIRKS_MODE_NONE;
|
||||
c->encoding = NULL;
|
||||
c->base_url = nsurl_ref(content__get_url(&c->base));
|
||||
c->base_url = nsurl_ref(content_get_url(&c->base));
|
||||
c->base_target = NULL;
|
||||
c->aborted = false;
|
||||
c->layout = NULL;
|
||||
|
@ -584,7 +584,7 @@ bool html_convert(struct content *c)
|
|||
/* Make all actions absolute */
|
||||
if (f->action == NULL || f->action[0] == '\0') {
|
||||
/* HTML5 4.10.22.3 step 11 */
|
||||
res = url_join(nsurl_access(content__get_url(c)),
|
||||
res = url_join(nsurl_access(content_get_url(c)),
|
||||
nsurl_access(htmlc->base_url), &action);
|
||||
} else {
|
||||
res = url_join(f->action, nsurl_access(htmlc->base_url),
|
||||
|
@ -1034,7 +1034,7 @@ bool html_meta_refresh(html_content *c, xmlNode *head)
|
|||
xmlFree(content);
|
||||
|
||||
c->base.refresh = nsurl_ref(
|
||||
content__get_url(&c->base));
|
||||
content_get_url(&c->base));
|
||||
|
||||
content_broadcast(&c->base, CONTENT_MSG_REFRESH,
|
||||
msg_data);
|
||||
|
@ -1169,7 +1169,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
|
|||
c->base.active = 0;
|
||||
|
||||
ns_error = hlcache_handle_retrieve(html_default_stylesheet_url, 0,
|
||||
content__get_url(&c->base), NULL,
|
||||
content_get_url(&c->base), NULL,
|
||||
html_convert_css_callback, c, &child, accept,
|
||||
&c->stylesheets[STYLESHEET_BASE].data.external);
|
||||
if (ns_error != NSERROR_OK)
|
||||
|
@ -1179,7 +1179,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
|
|||
|
||||
if (c->quirks == BINDING_QUIRKS_MODE_FULL) {
|
||||
ns_error = hlcache_handle_retrieve(html_quirks_stylesheet_url,
|
||||
0, content__get_url(&c->base), NULL,
|
||||
0, content_get_url(&c->base), NULL,
|
||||
html_convert_css_callback, c, &child, accept,
|
||||
&c->stylesheets[STYLESHEET_QUIRKS].
|
||||
data.external);
|
||||
|
@ -1191,7 +1191,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
|
|||
|
||||
if (option_block_ads) {
|
||||
ns_error = hlcache_handle_retrieve(html_adblock_stylesheet_url,
|
||||
0, content__get_url(&c->base), NULL,
|
||||
0, content_get_url(&c->base), NULL,
|
||||
html_convert_css_callback, c, &child, accept,
|
||||
&c->stylesheets[STYLESHEET_ADBLOCK].
|
||||
data.external);
|
||||
|
@ -1291,7 +1291,7 @@ bool html_find_stylesheets(html_content *c, xmlNode *html)
|
|||
c->stylesheet_count++;
|
||||
c->stylesheets[i].type = HTML_STYLESHEET_EXTERNAL;
|
||||
ns_error = hlcache_handle_retrieve(joined, 0,
|
||||
content__get_url(&c->base), NULL,
|
||||
content_get_url(&c->base), NULL,
|
||||
html_convert_css_callback, c, &child,
|
||||
accept,
|
||||
&c->stylesheets[i].data.external);
|
||||
|
@ -1471,7 +1471,7 @@ nserror html_convert_css_callback(hlcache_handle *css,
|
|||
break;
|
||||
|
||||
case CONTENT_MSG_DONE:
|
||||
LOG(("got stylesheet '%s'", nsurl_access(content_get_url(css))));
|
||||
LOG(("got stylesheet '%s'", nsurl_access(hlcache_handle_get_url(css))));
|
||||
parent->base.active--;
|
||||
break;
|
||||
|
||||
|
@ -1543,7 +1543,7 @@ bool html_fetch_object(html_content *c, nsurl *url, struct box *box,
|
|||
|
||||
error = hlcache_handle_retrieve(url,
|
||||
HLCACHE_RETRIEVE_SNIFF_TYPE,
|
||||
content__get_url(&c->base), NULL,
|
||||
content_get_url(&c->base), NULL,
|
||||
html_object_callback, object, &child,
|
||||
object->permitted_types, &object->content);
|
||||
if (error != NSERROR_OK) {
|
||||
|
@ -1596,7 +1596,7 @@ bool html_replace_object(struct content_html_object *object, nsurl *url)
|
|||
|
||||
/* initialise fetch */
|
||||
error = hlcache_handle_retrieve(url, HLCACHE_RETRIEVE_SNIFF_TYPE,
|
||||
content__get_url(&c->base), NULL,
|
||||
content_get_url(&c->base), NULL,
|
||||
html_object_callback, object, &child,
|
||||
object->permitted_types,
|
||||
&object->content);
|
||||
|
|
|
@ -554,7 +554,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
|
|||
mouse & BROWSER_MOUSE_MOD_1) {
|
||||
/* force download of link */
|
||||
browser_window_go_post(bw, nsurl_access(url), 0, 0,
|
||||
false, nsurl_access(content_get_url(h)),
|
||||
false, nsurl_access(hlcache_handle_get_url(h)),
|
||||
true, true, 0);
|
||||
} else if (mouse & BROWSER_MOUSE_CLICK_2 &&
|
||||
mouse & BROWSER_MOUSE_MOD_1) {
|
||||
|
@ -692,7 +692,7 @@ void html_mouse_action(struct content *c, struct browser_window *bw,
|
|||
case ACTION_GO:
|
||||
browser_window_go(browser_window_find_target(bw, target, mouse),
|
||||
nsurl_access(url),
|
||||
nsurl_access(content_get_url(h)), true);
|
||||
nsurl_access(hlcache_handle_get_url(h)), true);
|
||||
break;
|
||||
case ACTION_NONE:
|
||||
break;
|
||||
|
|
|
@ -989,7 +989,7 @@ bool layout_block_object(struct box *block)
|
|||
|
||||
#ifdef LAYOUT_DEBUG
|
||||
LOG(("block %p, object %s, width %i", block,
|
||||
content_get_url(block->object), block->width));
|
||||
hlcache_handle_get_url(block->object), block->width));
|
||||
#endif
|
||||
|
||||
if (content_get_type(block->object) == CONTENT_HTML) {
|
||||
|
|
|
@ -2162,7 +2162,7 @@ void ro_gui_view_source(hlcache_handle *c)
|
|||
}
|
||||
|
||||
/* try to load local files directly. */
|
||||
temp_name = url_to_path(nsurl_access(content_get_url(c)));
|
||||
temp_name = url_to_path(nsurl_access(hlcache_handle_get_url(c)));
|
||||
if (temp_name) {
|
||||
error = xosfile_read_no_path(temp_name, &objtype, 0, 0, 0, 0);
|
||||
if ((!error) && (objtype == osfile_IS_FILE)) {
|
||||
|
|
|
@ -271,7 +271,7 @@ void ro_gui_save_prepare(gui_save_type save_type, hlcache_handle *h,
|
|||
}
|
||||
|
||||
ro_gui_save_set_state(h, save_type,
|
||||
h ? nsurl_access(content_get_url(h)) : url,
|
||||
h ? nsurl_access(hlcache_handle_get_url(h)) : url,
|
||||
name_buf + leaf_offset, FILENAME_MAX - leaf_offset,
|
||||
icon_buf, sizeof(icon_buf));
|
||||
|
||||
|
@ -376,7 +376,7 @@ void gui_drag_save_object(gui_save_type save_type, hlcache_handle *c,
|
|||
return;
|
||||
}
|
||||
|
||||
ro_gui_save_set_state(c, save_type, nsurl_access(content_get_url(c)),
|
||||
ro_gui_save_set_state(c, save_type, nsurl_access(hlcache_handle_get_url(c)),
|
||||
save_leafname, LEAFNAME_MAX,
|
||||
icon_buf, sizeof(icon_buf));
|
||||
|
||||
|
@ -1159,7 +1159,7 @@ bool ro_gui_save_complete(hlcache_handle *h, char *path)
|
|||
|
||||
/* save URL file with original URL */
|
||||
snprintf(buf, sizeof buf, "%s.URL", path);
|
||||
if (!ro_gui_save_link(nsurl_access(content_get_url(h)),
|
||||
if (!ro_gui_save_link(nsurl_access(hlcache_handle_get_url(h)),
|
||||
content_get_title(h), LINK_ANT, buf))
|
||||
return false;
|
||||
|
||||
|
|
|
@ -1663,8 +1663,8 @@ void ro_gui_window_close(wimp_w w)
|
|||
h = g->bw->current_content;
|
||||
if (pointer.buttons & wimp_CLICK_ADJUST) {
|
||||
destroy = !ro_gui_shift_pressed();
|
||||
filename = (h && content_get_url(h)) ?
|
||||
url_to_path(nsurl_access(content_get_url(h))) :
|
||||
filename = (h && hlcache_handle_get_url(h)) ?
|
||||
url_to_path(nsurl_access(hlcache_handle_get_url(h))) :
|
||||
NULL;
|
||||
if (filename) {
|
||||
temp_name = malloc(strlen(filename) + 32);
|
||||
|
@ -1696,7 +1696,7 @@ void ro_gui_window_close(wimp_w w)
|
|||
if (!destroy && g->bw != NULL &&
|
||||
g->bw->current_content != NULL)
|
||||
ro_gui_window_navigate_up(g->bw->window,
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
g->bw->current_content)));
|
||||
}
|
||||
}
|
||||
|
@ -2454,28 +2454,28 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu,
|
|||
case BROWSER_SAVE_URL_URI:
|
||||
if (h != NULL)
|
||||
ro_gui_save_prepare(GUI_SAVE_LINK_URI, NULL, NULL,
|
||||
nsurl_access(content_get_url(h)),
|
||||
nsurl_access(hlcache_handle_get_url(h)),
|
||||
content_get_title(h));
|
||||
break;
|
||||
|
||||
case BROWSER_SAVE_URL_URL:
|
||||
if (h != NULL)
|
||||
ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL,
|
||||
nsurl_access(content_get_url(h)),
|
||||
nsurl_access(hlcache_handle_get_url(h)),
|
||||
content_get_title(h));
|
||||
break;
|
||||
|
||||
case BROWSER_SAVE_URL_TEXT:
|
||||
if (h != NULL)
|
||||
ro_gui_save_prepare(GUI_SAVE_LINK_TEXT, NULL, NULL,
|
||||
nsurl_access(content_get_url(h)),
|
||||
nsurl_access(hlcache_handle_get_url(h)),
|
||||
content_get_title(h));
|
||||
break;
|
||||
|
||||
case BROWSER_OBJECT_SAVE_URL_URI:
|
||||
if (current_menu_object != NULL)
|
||||
ro_gui_save_prepare(GUI_SAVE_LINK_URI, NULL, NULL,
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
current_menu_object)),
|
||||
content_get_title(current_menu_object));
|
||||
break;
|
||||
|
@ -2483,7 +2483,7 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu,
|
|||
case BROWSER_OBJECT_SAVE_URL_URL:
|
||||
if (current_menu_object != NULL)
|
||||
ro_gui_save_prepare(GUI_SAVE_LINK_URL, NULL, NULL,
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
current_menu_object)),
|
||||
content_get_title(current_menu_object));
|
||||
break;
|
||||
|
@ -2491,7 +2491,7 @@ void ro_gui_window_menu_warning(wimp_w w, wimp_i i, wimp_menu *menu,
|
|||
case BROWSER_OBJECT_SAVE_URL_TEXT:
|
||||
if (current_menu_object != NULL)
|
||||
ro_gui_save_prepare(GUI_SAVE_LINK_TEXT, NULL, NULL,
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
current_menu_object)),
|
||||
content_get_title(current_menu_object));
|
||||
break;
|
||||
|
@ -2732,12 +2732,12 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
|
|||
case BROWSER_LINK_DOWNLOAD:
|
||||
if (current_menu_url != NULL)
|
||||
browser_window_download(bw, current_menu_url,
|
||||
nsurl_access(content_get_url(h)));
|
||||
nsurl_access(hlcache_handle_get_url(h)));
|
||||
break;
|
||||
case BROWSER_LINK_NEW_WINDOW:
|
||||
if (current_menu_url != NULL)
|
||||
browser_window_create(current_menu_url, bw,
|
||||
nsurl_access(content_get_url(h)),
|
||||
nsurl_access(hlcache_handle_get_url(h)),
|
||||
true, false);
|
||||
break;
|
||||
|
||||
|
@ -2832,7 +2832,7 @@ bool ro_gui_window_menu_select(wimp_w w, wimp_i i, wimp_menu *menu,
|
|||
case BROWSER_NAVIGATE_UP:
|
||||
if (bw != NULL && h != NULL)
|
||||
ro_gui_window_navigate_up(bw->window,
|
||||
nsurl_access(content_get_url(h)));
|
||||
nsurl_access(hlcache_handle_get_url(h)));
|
||||
break;
|
||||
case BROWSER_NAVIGATE_RELOAD_ALL:
|
||||
if (bw != NULL)
|
||||
|
@ -3329,7 +3329,7 @@ void ro_gui_window_toolbar_click(void *data,
|
|||
save_type = GUI_SAVE_LINK_TEXT;
|
||||
|
||||
ro_gui_drag_save_link(save_type,
|
||||
nsurl_access(content_get_url(h)),
|
||||
nsurl_access(hlcache_handle_get_url(h)),
|
||||
content_get_title(h), g);
|
||||
}
|
||||
|
||||
|
@ -3421,7 +3421,7 @@ void ro_gui_window_toolbar_click(void *data,
|
|||
case TOOLBAR_BUTTON_UP:
|
||||
if (g->bw != NULL && g->bw->current_content != NULL)
|
||||
ro_gui_window_navigate_up(g->bw->window,
|
||||
nsurl_access(content_get_url(
|
||||
nsurl_access(hlcache_handle_get_url(
|
||||
g->bw->current_content)));
|
||||
break;
|
||||
|
||||
|
@ -3434,7 +3434,7 @@ void ro_gui_window_toolbar_click(void *data,
|
|||
/* do it without loading the content
|
||||
* into the new window */
|
||||
ro_gui_window_navigate_up(new_bw->window,
|
||||
nsurl_access(content_get_url(h)));
|
||||
nsurl_access(hlcache_handle_get_url(h)));
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -3558,11 +3558,11 @@ bool ro_gui_window_up_available(struct browser_window *bw)
|
|||
url_func_result res;
|
||||
|
||||
if (bw != NULL && bw->current_content != NULL) {
|
||||
res = url_parent(nsurl_access(content_get_url(
|
||||
res = url_parent(nsurl_access(hlcache_handle_get_url(
|
||||
bw->current_content)), &parent);
|
||||
|
||||
if (res == URL_FUNC_OK) {
|
||||
res = url_compare(nsurl_access(content_get_url(
|
||||
res = url_compare(nsurl_access(hlcache_handle_get_url(
|
||||
bw->current_content)),
|
||||
parent, false, &compare);
|
||||
if (res == URL_FUNC_OK)
|
||||
|
@ -3599,7 +3599,7 @@ void ro_gui_window_prepare_pageinfo(struct gui_window *g)
|
|||
title = content_get_title(h);
|
||||
if (title == NULL)
|
||||
title = "-";
|
||||
url = nsurl_access(content_get_url(h));
|
||||
url = nsurl_access(hlcache_handle_get_url(h));
|
||||
if (url == NULL)
|
||||
url = "-";
|
||||
mime = content_get_mime_type(h);
|
||||
|
@ -3654,7 +3654,7 @@ void ro_gui_window_prepare_objectinfo(hlcache_handle *object, const char *href)
|
|||
if (!ro_gui_wimp_sprite_exists(icon_buf))
|
||||
sprintf(icon_buf, "file_xxx");
|
||||
|
||||
url = nsurl_access(content_get_url(object));
|
||||
url = nsurl_access(hlcache_handle_get_url(object));
|
||||
if (url == NULL)
|
||||
url = "-";
|
||||
mime = content_get_mime_type(object);
|
||||
|
@ -3802,7 +3802,7 @@ void ro_gui_window_action_new_window(struct gui_window *g)
|
|||
return;
|
||||
|
||||
browser_window_create(nsurl_access(
|
||||
content_get_url(g->bw->current_content)), g->bw,
|
||||
hlcache_handle_get_url(g->bw->current_content)), g->bw,
|
||||
0, false, false);
|
||||
}
|
||||
|
||||
|
@ -3883,10 +3883,10 @@ void ro_gui_window_action_zoom(struct gui_window *g)
|
|||
void ro_gui_window_action_add_bookmark(struct gui_window *g)
|
||||
{
|
||||
if (g == NULL || g->bw == NULL || g->bw->current_content == NULL ||
|
||||
content_get_url(g->bw->current_content) == NULL)
|
||||
hlcache_handle_get_url(g->bw->current_content) == NULL)
|
||||
return;
|
||||
|
||||
ro_gui_hotlist_add_page(nsurl_access(content_get_url(g->bw->current_content)));
|
||||
ro_gui_hotlist_add_page(nsurl_access(hlcache_handle_get_url(g->bw->current_content)));
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue