r10921 chris_y - in /trunk/netsurf/amiga: download.c download.h tree.c
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Oct 30 05:44:44 2010
New Revision: 10921
URL: http://source.netsurf-browser.org?rev=10921&view=rev
Log:
Allow drags of URLs from treeview windows to browser windows.
Modified:
trunk/netsurf/amiga/download.c
trunk/netsurf/amiga/download.h
trunk/netsurf/amiga/tree.c
Modified: trunk/netsurf/amiga/download.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1092...
==============================================================================
--- trunk/netsurf/amiga/download.c (original)
+++ trunk/netsurf/amiga/download.c Sat Oct 30 05:44:44 2010
@@ -59,6 +59,7 @@
struct Window *drag_icon = NULL;
ULONG drag_icon_width;
ULONG drag_icon_height;
+BOOL drag_in_progress = FALSE;
struct gui_download_window *gui_download_window_create(download_context *ctx,
struct gui_window *gui)
@@ -381,7 +382,7 @@
char *source_data;
ULONG source_size;
- if(drag_icon) ami_drag_icon_close(NULL);
+ ami_drag_icon_close(NULL);
ami_autoscroll = FALSE;
if(strcmp(option_use_pubscreen,"Workbench") == 0)
@@ -502,6 +503,8 @@
int err = 0;
int deftype = WBPROJECT;
+ drag_in_progress = TRUE;
+
if(option_drag_save_icons == false)
{
ami_update_pointer(win, AMI_GUI_POINTER_DRAG);
@@ -567,6 +570,12 @@
if(drag_icon) CloseWindow(drag_icon);
if(win) ami_update_pointer(win, GUI_POINTER_DEFAULT);
drag_icon = NULL;
+ drag_in_progress = FALSE;
+}
+
+BOOL ami_drag_in_progress(void)
+{
+ return drag_in_progress;
}
void ami_superimpose_favicon(STRPTR path, struct hlcache_handle *icon, STRPTR type)
Modified: trunk/netsurf/amiga/download.h
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=1092...
==============================================================================
--- trunk/netsurf/amiga/download.h (original)
+++ trunk/netsurf/amiga/download.h Sat Oct 30 05:44:44 2010
@@ -52,6 +52,7 @@
void ami_drag_icon_show(struct Window *win, char *type);
void ami_drag_icon_close(struct Window *win);
void ami_drag_icon_move(void);
+BOOL ami_drag_in_progress(void);
void ami_free_download_list(struct List *dllist);
void ami_superimpose_favicon(STRPTR path, struct hlcache_handle *icon, STRPTR type);
Modified: trunk/netsurf/amiga/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10921&r1...
==============================================================================
--- trunk/netsurf/amiga/tree.c (original)
+++ trunk/netsurf/amiga/tree.c Sat Oct 30 05:44:44 2010
@@ -267,6 +267,13 @@
void ami_tree_drag_icon_show(struct treeview_window *twin)
{
+ if((tree_drag_status(twin->tree) == TREE_NO_DRAG) ||
+ (tree_drag_status(twin->tree) == TREE_SELECT_DRAG))
+ return;
+
+ if((twin->type == AMI_TREE_COOKIES) ||
+ (twin->type == AMI_TREE_SSLCERT)) return; /* No permissable drag operations */
+
if(tree_node_is_folder(
tree_get_selected_node(
tree_get_root(twin->tree))))
@@ -276,6 +283,41 @@
else
{
ami_drag_icon_show(twin->win, "html");
+ }
+}
+
+void ami_tree_drag_end(struct treeview_window *twin, int x, int y)
+{
+ struct gui_window_2 *gwin;
+ struct node *selected_node;
+ BOOL drag;
+
+ if(drag = ami_drag_in_progress()) ami_drag_icon_close(twin->win);
+
+ if(drag && (gwin = ami_window_at_pointer()))
+ {
+ selected_node = tree_get_selected_node(tree_get_root(twin->tree));
+
+ if(tree_node_is_folder(selected_node))
+ {
+ DisplayBeep(scrn);
+ }
+ else
+ {
+ browser_window_go(gwin->bw, tree_url_node_get_url(selected_node),
+ NULL, true);
+ }
+ tree_drag_end(twin->tree, twin->mouse_state,
+ twin->drag_x, twin->drag_y,
+ twin->drag_x, twin->drag_y); /* Keep the tree happy */
+ }
+ else
+ {
+ if(tree_drag_status(twin->tree) == TREE_UNKNOWN_DRAG)
+ DisplayBeep(scrn);
+
+ tree_drag_end(twin->tree, twin->mouse_state,
+ twin->drag_x, twin->drag_y, x, y);
}
}
@@ -729,8 +771,7 @@
BROWSER_MOUSE_DRAG_ON;
if(twin->drag_x == 0) twin->drag_x = x;
if(twin->drag_y == 0) twin->drag_y = y;
- if(tree_drag_status(twin->tree) == TREE_MOVE_DRAG)
- ami_tree_drag_icon_show(twin);
+ ami_tree_drag_icon_show(twin);
}
else if(twin->mouse_state & BROWSER_MOUSE_PRESS_2)
{
@@ -740,8 +781,7 @@
BROWSER_MOUSE_DRAG_ON;
if(twin->drag_x == 0) twin->drag_x = x;
if(twin->drag_y == 0) twin->drag_y = y;
- if(tree_drag_status(twin->tree) == TREE_MOVE_DRAG)
- ami_tree_drag_icon_show(twin);
+ ami_tree_drag_icon_show(twin);
}
else
{
@@ -813,12 +853,8 @@
twin->lastclick.tv_usec = curtime.tv_usec;
}
}
- else
- {
- ami_drag_icon_close(twin->win);
- tree_drag_end(twin->tree, twin->mouse_state,
- twin->drag_x, twin->drag_y, x, y);
- }
+ else ami_tree_drag_end(twin, x, y);
+
twin->mouse_state=0;
twin->drag_x = 0;
twin->drag_y = 0;
@@ -829,12 +865,8 @@
tree_mouse_action(twin->tree,
BROWSER_MOUSE_CLICK_2 | twin->key_state, x, y);
}
- else
- {
- ami_drag_icon_close(twin->win);
- tree_drag_end(twin->tree, twin->mouse_state,
- twin->drag_x, twin->drag_y, x, y);
- }
+ else ami_tree_drag_end(twin, x, y);
+
twin->mouse_state=0;
twin->drag_x = 0;
twin->drag_y = 0;
13 years, 1 month
r10920 chris_y - in /trunk/netsurf/desktop: tree.c tree.h
by netsurf＠semichrome.net
Author: chris_y
Date: Sat Oct 30 05:43:14 2010
New Revision: 10920
URL: http://source.netsurf-browser.org?rev=10920&view=rev
Log:
If a drag is in progress that the tree can't handle, it is a TREE_UNKNOWN_DRAG not a
TREE_NO_DRAG, as the platform code might be able to deal with it.
Modified:
trunk/netsurf/desktop/tree.c
trunk/netsurf/desktop/tree.h
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10920&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Sat Oct 30 05:43:14 2010
@@ -2167,6 +2167,7 @@
if (tree->flags & TREE_MOVABLE)
tree->drag = TREE_MOVE_DRAG;
+ else tree->drag = TREE_UNKNOWN_DRAG;
return true;
}
@@ -2411,6 +2412,7 @@
switch (tree->drag) {
case TREE_NO_DRAG:
+ case TREE_UNKNOWN_DRAG:
break;
case TREE_SELECT_DRAG:
tree_handle_selection_area(tree, y0, y1 - y0,
Modified: trunk/netsurf/desktop/tree.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.h?rev=10920&...
==============================================================================
--- trunk/netsurf/desktop/tree.h (original)
+++ trunk/netsurf/desktop/tree.h Sat Oct 30 05:43:14 2010
@@ -66,7 +66,8 @@
typedef enum {
TREE_NO_DRAG = 0,
TREE_SELECT_DRAG,
- TREE_MOVE_DRAG
+ TREE_MOVE_DRAG,
+ TREE_UNKNOWN_DRAG /** < A drag the tree itself won't handle */
} tree_drag_type;
typedef enum {
13 years, 1 month
r10918 chris_y - /trunk/netsurf/amiga/gui.c
by netsurf＠semichrome.net
Author: chris_y
Date: Fri Oct 29 13:05:48 2010
New Revision: 10918
URL: http://source.netsurf-browser.org?rev=10918&view=rev
Log:
Fix content icons in treeviews
Modified:
trunk/netsurf/amiga/gui.c
Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10918&r1=...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Fri Oct 29 13:05:48 2010
@@ -381,6 +381,9 @@
if((!option_theme) || (option_theme[0] == '\0'))
option_theme = (char *)strdup("PROGDIR:Resources/Themes/Default");
+
+ if((!option_tree_icons_dir) || (option_tree_icons_dir[0] == '\0'))
+ option_tree_icons_dir = (char *)strdup("ENV:Sys");
if((!option_arexx_dir) || (option_arexx_dir[0] == '\0'))
option_arexx_dir = (char *)strdup("Rexx");
13 years, 1 month
r10917 chris_y - in /trunk/netsurf: amiga/download.c amiga/tree.c desktop/tree.c desktop/tree.h
by netsurf＠semichrome.net
Author: chris_y
Date: Fri Oct 29 12:40:36 2010
New Revision: 10917
URL: http://source.netsurf-browser.org?rev=10917&view=rev
Log:
Allow getting the tree's drag property. This ensures we can see whether the current
drag is something we might need to display an icon for.
Modified:
trunk/netsurf/amiga/download.c
trunk/netsurf/amiga/tree.c
trunk/netsurf/desktop/tree.c
trunk/netsurf/desktop/tree.h
Modified: trunk/netsurf/amiga/download.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1091...
==============================================================================
--- trunk/netsurf/amiga/download.c (original)
+++ trunk/netsurf/amiga/download.c Fri Oct 29 12:40:36 2010
@@ -512,7 +512,7 @@
ami_update_pointer(win, GUI_POINTER_DEFAULT);
}
- if(type == "drawer") deftype = WBDRAWER;
+ if(!strcmp(type, "drawer")) deftype = WBDRAWER;
dobj = GetIconTags(NULL, ICONGETA_GetDefaultName, type,
ICONGETA_GetDefaultType, deftype,
Modified: trunk/netsurf/amiga/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10917&r1...
==============================================================================
--- trunk/netsurf/amiga/tree.c (original)
+++ trunk/netsurf/amiga/tree.c Fri Oct 29 12:40:36 2010
@@ -265,6 +265,19 @@
ami_tree_draw(twin);
}
+void ami_tree_drag_icon_show(struct treeview_window *twin)
+{
+ if(tree_node_is_folder(
+ tree_get_selected_node(
+ tree_get_root(twin->tree))))
+ {
+ ami_drag_icon_show(twin->win, "drawer");
+ }
+ else
+ {
+ ami_drag_icon_show(twin->win, "html");
+ }
+}
void ami_tree_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg)
{
@@ -688,8 +701,6 @@
{
int drag_x_move = 0, drag_y_move = 0;
- /* TODO: Show drag icons on TREE_MOVE_DRAG start.
- * Until then, the below line does nothing. */
ami_drag_icon_move();
if(twin->win->MouseX < bbox->Left)
@@ -718,7 +729,8 @@
BROWSER_MOUSE_DRAG_ON;
if(twin->drag_x == 0) twin->drag_x = x;
if(twin->drag_y == 0) twin->drag_y = y;
-
+ if(tree_drag_status(twin->tree) == TREE_MOVE_DRAG)
+ ami_tree_drag_icon_show(twin);
}
else if(twin->mouse_state & BROWSER_MOUSE_PRESS_2)
{
@@ -728,6 +740,8 @@
BROWSER_MOUSE_DRAG_ON;
if(twin->drag_x == 0) twin->drag_x = x;
if(twin->drag_y == 0) twin->drag_y = y;
+ if(tree_drag_status(twin->tree) == TREE_MOVE_DRAG)
+ ami_tree_drag_icon_show(twin);
}
else
{
Modified: trunk/netsurf/desktop/tree.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10917&...
==============================================================================
--- trunk/netsurf/desktop/tree.c (original)
+++ trunk/netsurf/desktop/tree.c Fri Oct 29 12:40:36 2010
@@ -39,13 +39,6 @@
#include "utils/messages.h"
#include "utils/utils.h"
#include "utils/url.h"
-
-typedef enum {
- TREE_NO_DRAG = 0,
- TREE_SELECT_DRAG,
- TREE_MOVE_DRAG
-} tree_drag_type;
-
#define MAXIMUM_URL_LENGTH 1024
@@ -1431,6 +1424,18 @@
/**
+ * Get the drag state of a tree
+ *
+ * \param tree the tree to get the state of
+ * \return drag type (defined in desktop/tree.h)
+ */
+tree_drag_type tree_drag_status(struct tree *tree)
+{
+ return tree->drag;
+}
+
+
+/**
* Returns the first child of a node
*
* \param node the node to get the child of
Modified: trunk/netsurf/desktop/tree.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.h?rev=10917&...
==============================================================================
--- trunk/netsurf/desktop/tree.h (original)
+++ trunk/netsurf/desktop/tree.h Fri Oct 29 12:40:36 2010
@@ -62,6 +62,12 @@
struct tree;
struct node;
struct node_element;
+
+typedef enum {
+ TREE_NO_DRAG = 0,
+ TREE_SELECT_DRAG,
+ TREE_MOVE_DRAG
+} tree_drag_type;
typedef enum {
NODE_ELEMENT_TEXT, /**< Text only */
@@ -163,7 +169,7 @@
const char *tree_node_element_get_text(struct node_element *element);
struct node *tree_get_root(struct tree *tree);
bool tree_is_edited(struct tree *tree);
-
+tree_drag_type tree_drag_status(struct tree *tree);
/* functions for traversing the tree */
struct node *tree_node_get_child(struct node *node);
13 years, 1 month
r10916 vince - in /trunk/netsurf: Makefile Makefile.resources Makefile.sources amiga/Makefile.target beos/Makefile.target framebuffer/Makefile.target gtk/Makefile.target riscos/Makefile.target windows/Makefile.target
by netsurf＠semichrome.net
Author: vince
Date: Thu Oct 28 19:54:27 2010
New Revision: 10916
URL: http://source.netsurf-browser.org?rev=10916&view=rev
Log:
Futher simplification of the makefile
Use target makefiles to set build sources
Modified:
trunk/netsurf/Makefile
trunk/netsurf/Makefile.resources
trunk/netsurf/Makefile.sources
trunk/netsurf/amiga/Makefile.target
trunk/netsurf/beos/Makefile.target
trunk/netsurf/framebuffer/Makefile.target
trunk/netsurf/gtk/Makefile.target
trunk/netsurf/riscos/Makefile.target
trunk/netsurf/windows/Makefile.target
Modified: trunk/netsurf/Makefile
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile?rev=10916&r1=109...
==============================================================================
--- trunk/netsurf/Makefile (original)
+++ trunk/netsurf/Makefile Thu Oct 28 19:54:27 2010
@@ -189,7 +189,11 @@
endif
endif
+# Target paths
+
OBJROOT = build-$(HOST)-$(TARGET)$(SUBTARGET)
+DEPROOT := $(OBJROOT)/deps
+TOOLROOT := $(OBJROOT)/tools
# 1: Feature name (ie, NETSURF_USE_BMP -> BMP)
@@ -284,11 +288,6 @@
CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
CFLAGS += -DNETSURF_HOMEPAGE=\"$(NETSURF_HOMEPAGE)\"
-# ----------------------------------------------------------------------------
-# Target specific setup
-# ----------------------------------------------------------------------------
-
-include $(TARGET)/Makefile.target
# ----------------------------------------------------------------------------
# General make rules
@@ -299,13 +298,11 @@
$(Q)$(MKDIR) $(OBJROOT)
$(Q)$(TOUCH) $(OBJROOT)/created
-DEPROOT := $(OBJROOT)/deps
$(DEPROOT)/created: $(OBJROOT)/created
$(VQ)echo " MKDIR: $(DEPROOT)"
$(Q)$(MKDIR) $(DEPROOT)
$(Q)$(TOUCH) $(DEPROOT)/created
-TOOLROOT := $(OBJROOT)/tools
$(TOOLROOT)/created: $(OBJROOT)/created
$(VQ)echo " MKDIR: $(TOOLROOT)"
$(Q)$(MKDIR) $(TOOLROOT)
@@ -315,8 +312,25 @@
POSTEXES :=
-include Makefile.resources
+# ----------------------------------------------------------------------------
+# General source file setup
+# ----------------------------------------------------------------------------
+
include Makefile.sources
+
+# ----------------------------------------------------------------------------
+# Target specific setup
+# ----------------------------------------------------------------------------
+
+include $(TARGET)/Makefile.target
+
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+ifeq ($(SOURCES),)
+$(error Unable to build NetSurf, could not determine set of sources to build)
+endif
OBJECTS := $(sort $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(patsubst %.s,%.o,$(SOURCES)))))))
Modified: trunk/netsurf/Makefile.resources
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.resources?rev=10...
==============================================================================
--- trunk/netsurf/Makefile.resources (original)
+++ trunk/netsurf/Makefile.resources Thu Oct 28 19:54:27 2010
@@ -8,72 +8,12 @@
ifeq ($(TARGET),framebuffer)
-# We make convert_image depend on fb_bitmap.h so that if we change
-# that header, we get new images built just in case.
-$(TOOLROOT)/convert_image: $(TOOLROOT)/created framebuffer/convert_image.c framebuffer/bitmap.h
- $(VQ)echo " HOST CC: $@"
- $(Q)$(HOST_CC) -o $@ framebuffer/convert_image.c -lpng
-
-FB_IMAGE_left_arrow := framebuffer/res/icons/back.png
-FB_IMAGE_right_arrow := framebuffer/res/icons/forward.png
-FB_IMAGE_reload := framebuffer/res/icons/reload.png
-FB_IMAGE_stop_image := framebuffer/res/icons/stop.png
-FB_IMAGE_history_image := framebuffer/res/icons/history.png
-
-FB_IMAGE_left_arrow_g := framebuffer/res/icons/back_g.png
-FB_IMAGE_right_arrow_g := framebuffer/res/icons/forward_g.png
-FB_IMAGE_reload_g := framebuffer/res/icons/reload_g.png
-FB_IMAGE_stop_image_g := framebuffer/res/icons/stop_g.png
-FB_IMAGE_history_image_g := framebuffer/res/icons/history_g.png
-
-FB_IMAGE_scrolll := framebuffer/res/icons/scrolll.png
-FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png
-FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png
-FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png
-
-
-FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png
-FB_IMAGE_hand_image := framebuffer/res/pointers/point.png
-FB_IMAGE_caret_image := framebuffer/res/pointers/caret.png
-FB_IMAGE_menu_image := framebuffer/res/pointers/menu.png
-FB_IMAGE_progress_image := framebuffer/res/pointers/progress.png
-
-FB_IMAGE_throbber0 := framebuffer/res/throbber/throbber0.png
-FB_IMAGE_throbber1 := framebuffer/res/throbber/throbber1.png
-FB_IMAGE_throbber2 := framebuffer/res/throbber/throbber2.png
-FB_IMAGE_throbber3 := framebuffer/res/throbber/throbber3.png
-FB_IMAGE_throbber4 := framebuffer/res/throbber/throbber4.png
-FB_IMAGE_throbber5 := framebuffer/res/throbber/throbber5.png
-FB_IMAGE_throbber6 := framebuffer/res/throbber/throbber6.png
-FB_IMAGE_throbber7 := framebuffer/res/throbber/throbber7.png
-FB_IMAGE_throbber8 := framebuffer/res/throbber/throbber8.png
-
-# 1: input file
-# 2: output file
-# 3: bitmap name
-define convert_image
-
-S_IMAGES += $(2)
-
-$(2): $(1) $(TOOLROOT)/convert_image
- $(Q)$(TOOLROOT)/convert_image $(1) $(2) $(3)
-
-endef
-
-S_IMAGES :=
-
-$(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/$(patsubst FB_IMAGE_%,%,$(V)).c,$(patsubst FB_IMAGE_%,%,$(V)))))
# End of framebuffer resource definitions
endif
ifeq ($(TARGET),windows)
-$(OBJROOT)/windows_resource.o: windows/res/resource.rc
- $(VQ)echo " WINDRES: compiling windows resources"
- ${Q}$(MINGW_PREFIX)windres $< -O coff -o $@
-
-S_RESOURCES := windows_resource.o
# End of windows resource definitions
endif
Modified: trunk/netsurf/Makefile.sources
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=1091...
==============================================================================
--- trunk/netsurf/Makefile.sources (original)
+++ trunk/netsurf/Makefile.sources Thu Oct 28 19:54:27 2010
@@ -1,18 +1,21 @@
#
# NetSurf source file inclusion
#
-# Included by main makefile -- indicates sources
-# for each build.
+# Included by main makefile -- indicates generic sources for every build.
#
S_CONTENT := content.c dirlist.c fetch.c hlcache.c llcache.c urldb.c \
fetchers/fetch_curl.c fetchers/fetch_data.c fetchers/fetch_file.c
+
S_CSS := css.c dump.c internal.c select.c utils.c
-S_RENDER := box.c box_construct.c box_normalise.c favicon.c \
+
+S_RENDER := box.c box_construct.c box_normalise.c favicon.c \
font.c form.c html.c html_interaction.c html_redraw.c \
hubbub_binding.c imagemap.c layout.c list.c table.c textplain.c
+
S_UTILS := base64.c filename.c hashtable.c http.c locale.c messages.c \
talloc.c url.c utf8.c utils.c useragent.c findresource.c log.c
+
S_DESKTOP := cookies.c history_global_core.c hotlist.c knockout.c \
options.c plot_style.c print.c search.c searchweb.c scroll.c \
sslcert.c textarea.c tree.c tree_url_node.c version.c \
@@ -39,86 +42,6 @@
save_complete.c save_text.c selection.c textinput.c
S_BROWSER := $(addprefix desktop/,$(S_BROWSER))
-# S_RISCOS are sources purely for the RISC OS build
-S_RISCOS := 401login.c artworks.c assert.c awrender.s bitmap.c buffer.c \
- cookies.c configure.c debugwin.c dialog.c download.c draw.c \
- filetype.c font.c global_history.c gui.c help.c history.c \
- hotlist.c image.c menus.c message.c palettes.c plotters.c \
- plugin.c print.c query.c save.c save_draw.c save_pdf.c \
- schedule.c search.c searchweb.c sprite.c sslcert.c \
- textarea.c textselection.c theme.c theme_install.c thumbnail.c \
- treeview.c ucstables.c uri.c url_complete.c url_protocol.c \
- url_suggest.c wimp.c wimp_event.c window.c gui/progress_bar.c \
- gui/status_bar.c \
- $(addprefix configure/,con_cache.c con_connect.c con_content.c \
- con_fonts.c con_home.c con_image.c con_inter.c con_language.c \
- con_memory.c con_secure.c con_theme.c)
-S_RISCOS := $(addprefix riscos/,$(S_RISCOS))
-TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
-TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
-
-# S_GTK are sources purely for the GTK build
-S_GTK := font_pango.c gtk_bitmap.c gtk_gui.c gtk_schedule.c \
- gtk_thumbnail.c gtk_plotters.c gtk_treeview.c gtk_scaffolding.c \
- gtk_completion.c gtk_login.c gtk_throbber.c gtk_selection.c \
- gtk_history.c gtk_window.c gtk_filetype.c gtk_download.c \
- gtk_menu.c gtk_print.c gtk_save.c gtk_search.c gtk_tabs.c \
- gtk_theme.c gtk_toolbar.c sexy_icon_entry.c gtk_compat.c \
- gtk_cookies.c gtk_hotlist.c \
- $(addprefix dialogs/,gtk_options.c gtk_about.c gtk_source.c)
-S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
-# code in utils/container.ch is non-universal it seems
-
-# S_WINDOWS are sources purely for the windows build
-S_WINDOWS := about.c bitmap.c download.c filetype.c findfile.c font.c \
- gui.c localhistory.c login.c misc.c plot.c prefs.c schedule.c \
- thumbnail.c tree.c windbg.c
-S_WINDOWS := $(addprefix windows/,$(S_WINDOWS))
-
-# S_BEOS are sources purely for the BeOS build
-S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp \
- beos_filetype.cpp beos_font.cpp beos_gui.cpp beos_login.cpp \
- beos_options.cpp beos_plotters.cpp beos_save_complete.cpp \
- beos_scaffolding.cpp beos_search.cpp beos_schedule.cpp \
- beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp \
- beos_window.cpp
-S_BEOS := $(addprefix beos/,$(S_BEOS))
-RDEF_BEOS := beos_res.rdef
-RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
-RDEP_BEOS := adblock.css beosdefault.css default.css ca-bundle.txt \
- messages
-RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
- $(wildcard beos/res/throbber/throbber*.png)
-
-# S_AMIGA are sources purely for the Amiga build
-S_AMIGA := compat.c gui.c tree.c history.c hotlist.c schedule.c \
- thumbnail.c misc.c bitmap.c font.c filetype.c utf8.c login.c \
- plotters.c object.c menu.c save_pdf.c arexx.c version.c \
- cookies.c context_menu.c clipboard.c save_complete.c \
- fetch_mailto.c search.c history_local.c \
- download.c iff_dr2d.c sslcert.c gui_options.c print.c \
- theme.c \
- stringview/stringview.c stringview/urlhistory.c
-S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
-
-
-# S_FRAMEBUFFER are sources purely for the framebuffer build
-S_FRAMEBUFFER := gui.c framebuffer.c tree.c save.c schedule.c \
- thumbnail.c misc.c bitmap.c filetype.c login.c findfile.c \
- localhistory.c
-
-S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c \
- text.c scroll.c osk.c
-
-S_FRAMEBUFFER += font_$(NETSURF_FB_FONTLIB).c
-
-ifeq ($(NETSURF_FB_FONTLIB),internal)
-S_FRAMEBUFFER += nsfont_regular.c nsfont_italic.c nsfont_bold.c \
- nsfont_italic_bold.c
-endif
-
-S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuffer/fbtk/,$(S_FRAMEBUFFER_FBTK))
-
# Some extra rules for building the transliteration table.
ifeq ($(HOST),riscos)
@@ -138,49 +61,3 @@
$(Q)$(RM) utils/translit.c
CLEANS += clean-intermediates
-
-# Finally select the correct set of sources for this build...
-
-ifeq ($(TARGET),riscos)
-SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_RISCOS)
-EXETARGET := !NetSurf/!RunImage$(EXEEXT)
-
-!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET)
- $(VQ)echo " MAKERUN: $@"
- $(Q)$(MAKERUN) $(EXETARGET) $< $@
-POSTEXES += !NetSurf/!Run$(RUNEXT)
-
-clean-run:
- $(VQ)echo " CLEAN: !NetSurf/!Run$(RUNEXT)"
- $(Q) $(RM) !NetSurf/!Run$(RUNEXT)
-CLEANS += clean-run
-endif
-
-ifeq ($(TARGET),gtk)
-SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_GTK)
-EXETARGET := nsgtk
-endif
-
-ifeq ($(TARGET),beos)
-SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
-EXETARGET := NetSurf
-endif
-
-ifeq ($(TARGET),amiga)
-SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF)
-EXETARGET := NetSurf$(SUBTARGET)
-endif
-
-ifeq ($(TARGET),framebuffer)
-SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES)
-EXETARGET := nsfb$(SUBTARGET)
-endif
-
-ifeq ($(TARGET),windows)
-SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_WINDOWS) $(S_RESOURCES)
-EXETARGET := NetSurf.exe
-endif
-
-ifeq ($(SOURCES),)
-$(error Unable to build NetSurf, could not determine set of sources to build)
-endif
Modified: trunk/netsurf/amiga/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/Makefile.target?rev...
==============================================================================
--- trunk/netsurf/amiga/Makefile.target (original)
+++ trunk/netsurf/amiga/Makefile.target Thu Oct 28 19:54:27 2010
@@ -3,28 +3,45 @@
# ----------------------------------------------------------------------------
- NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
- NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
- NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
- NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
- NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP
- NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
+NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
+NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
+NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
+NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
+NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP
+NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
- $(eval $(call feature_enabled,ROSPRITE,-DWITH_NSSPRITE,-lrosprite,Sprite (librosprite)))
- $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
- $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
- $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
- $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
- $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
- $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp)))
+$(eval $(call feature_enabled,ROSPRITE,-DWITH_NSSPRITE,-lrosprite,Sprite (librosprite)))
+$(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
+$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
+$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
+$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
+$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
+$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp)))
- CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga
- LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto
- LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet -liconv
+CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga
+LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto
+LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet -liconv
- ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
- CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
- LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
- SUBTARGET := -cairo
- endif
+ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
+ CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
+ LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
+ SUBTARGET := -cairo
+endif
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# S_AMIGA are sources purely for the Amiga build
+S_AMIGA := compat.c gui.c tree.c history.c hotlist.c schedule.c \
+ thumbnail.c misc.c bitmap.c font.c filetype.c utf8.c login.c \
+ plotters.c object.c menu.c save_pdf.c arexx.c version.c \
+ cookies.c context_menu.c clipboard.c save_complete.c \
+ fetch_mailto.c search.c history_local.c download.c iff_dr2d.c \
+ sslcert.c gui_options.c print.c theme.c \
+ stringview/stringview.c stringview/urlhistory.c
+S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
+
+# complete source file list
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF)
+EXETARGET := NetSurf$(SUBTARGET)
Modified: trunk/netsurf/beos/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/beos/Makefile.target?rev=...
==============================================================================
--- trunk/netsurf/beos/Makefile.target (original)
+++ trunk/netsurf/beos/Makefile.target Thu Oct 28 19:54:27 2010
@@ -79,3 +79,26 @@
$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
endif
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# S_BEOS are sources purely for the BeOS build
+S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp \
+ beos_filetype.cpp beos_font.cpp beos_gui.cpp beos_login.cpp \
+ beos_options.cpp beos_plotters.cpp beos_save_complete.cpp \
+ beos_scaffolding.cpp beos_search.cpp beos_schedule.cpp \
+ beos_thumbnail.cpp beos_treeview.cpp beos_throbber.cpp \
+ beos_window.cpp
+S_BEOS := $(addprefix beos/,$(S_BEOS))
+RDEF_BEOS := beos_res.rdef
+RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS))
+RDEP_BEOS := adblock.css beosdefault.css default.css ca-bundle.txt \
+ messages
+RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \
+ $(wildcard beos/res/throbber/throbber*.png)
+
+
+# complete source file list
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS)
+EXETARGET := NetSurf
Modified: trunk/netsurf/framebuffer/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/Makefile.targ...
==============================================================================
--- trunk/netsurf/framebuffer/Makefile.target (original)
+++ trunk/netsurf/framebuffer/Makefile.target Thu Oct 28 19:54:27 2010
@@ -3,67 +3,151 @@
# ----------------------------------------------------------------------------
+$(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG/MNG/JNG (libmng)))
+$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
- $(eval $(call feature_enabled,MNG,-DWITH_MNG,-lmng,PNG/MNG/JNG (libmng)))
- $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
+ifeq ($(NETSURF_FB_FONTLIB),freetype)
+ CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
+ LDFLAGS += $(shell freetype-config --libs)
+endif
- ifeq ($(NETSURF_FB_FONTLIB),freetype)
- CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags)
- LDFLAGS += $(shell freetype-config --libs)
- endif
+# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
+NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
+NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
+NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
+NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
+NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
- # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
- NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG
- NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
- NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB
- NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
- NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
+CFLAGS += -Dnsframebuffer
- CFLAGS += -Dnsframebuffer
+#resource path
+CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"'
- #resource path
- CFLAGS += '-DNETSURF_FB_RESPATH="$(NETSURF_FB_RESPATH_$(NETSURF_FB_FRONTEND))"'
+# compile time font locations
+CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF="$(NETSURF_FB_FONT_SANS_SERIF)"'
+CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_BOLD="$(NETSURF_FB_FONT_SANS_SERIF_BOLD)"'
+CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC="$(NETSURF_FB_FONT_SANS_SERIF_ITALIC)"'
+CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD="$(NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD)"'
+CFLAGS += '-DNETSURF_FB_FONT_SERIF="$(NETSURF_FB_FONT_SERIF)"'
+CFLAGS += '-DNETSURF_FB_FONT_SERIF_BOLD="$(NETSURF_FB_FONT_SERIF_BOLD)"'
+CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE="$(NETSURF_FB_FONT_MONOSPACE)"'
+CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
+CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
+CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
- # compile time font locations
- CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF="$(NETSURF_FB_FONT_SANS_SERIF)"'
- CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_BOLD="$(NETSURF_FB_FONT_SANS_SERIF_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC="$(NETSURF_FB_FONT_SANS_SERIF_ITALIC)"'
- CFLAGS += '-DNETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD="$(NETSURF_FB_FONT_SANS_SERIF_ITALIC_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_SERIF="$(NETSURF_FB_FONT_SERIF)"'
- CFLAGS += '-DNETSURF_FB_FONT_SERIF_BOLD="$(NETSURF_FB_FONT_SERIF_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE="$(NETSURF_FB_FONT_MONOSPACE)"'
- CFLAGS += '-DNETSURF_FB_FONT_MONOSPACE_BOLD="$(NETSURF_FB_FONT_MONOSPACE_BOLD)"'
- CFLAGS += '-DNETSURF_FB_FONT_CURSIVE="$(NETSURF_FB_FONT_CURSIVE)"'
- CFLAGS += '-DNETSURF_FB_FONT_FANTASY="$(NETSURF_FB_FONT_FANTASY)"'
+$(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
+$(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
+$(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
- $(eval $(call pkg_config_find_and_add,ROSPRITE,librosprite,Sprite))
- $(eval $(call pkg_config_find_and_add,BMP,libnsbmp,BMP))
- $(eval $(call pkg_config_find_and_add,GIF,libnsgif,GIF))
+CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \
+ -D_BSD_SOURCE \
+ -D_XOPEN_SOURCE=600 \
+ -D_POSIX_C_SOURCE=200112L \
+ $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
+ $(shell xml2-config --cflags)
- CFLAGS += -std=c99 -g -I. -Dsmall $(WARNFLAGS) \
- -D_BSD_SOURCE \
- -D_XOPEN_SOURCE=600 \
- -D_POSIX_C_SOURCE=200112L \
- $(shell $(PKG_CONFIG) --cflags libnsfb libhubbub libcss openssl) \
- $(shell xml2-config --cflags)
+LDFLAGS += -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive
- ifeq ($(HOST),mint)
+ifeq ($(HOST),mint)
# freemint does not support pkg-config for libcurl
CFLAGS += $(shell curl-config --cflags)
- else
- CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl)
- endif
- LDFLAGS += -Wl,--whole-archive $(shell $(PKG_CONFIG) --libs libnsfb) -Wl,--no-whole-archive
-
- ifeq ($(HOST),mint)
LDFLAGS += $(shell curl-config --libs)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub openssl libcss)
- # xml-config returns -lsocket which is not needed and does not exist on all systems.
- # because of that - hardcoded reference to libxml-2.0 here.
+ # xml-config returns -lsocket which is not needed and does not
+ # exist on all systems. because of that - hardcoded reference to
+ # libxml-2.0 here.
LDFLAGS += -L/usr/lib/ -lxml2 -lz -liconv
LDFLAGS += -lm
- else
+else
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl)
+
LDFLAGS += $(shell $(PKG_CONFIG) --libs libxml-2.0 libcurl libhubbub openssl)
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss)
- endif
+endif
+
+
+# ----------------------------------------------------------------------------
+# built-in resource setup
+# ----------------------------------------------------------------------------
+
+# We make convert_image depend on fb_bitmap.h so that if we change
+# that header, we get new images built just in case.
+$(TOOLROOT)/convert_image: $(TOOLROOT)/created framebuffer/convert_image.c framebuffer/bitmap.h
+ $(VQ)echo " HOST CC: $@"
+ $(Q)$(HOST_CC) -o $@ framebuffer/convert_image.c -lpng
+
+FB_IMAGE_left_arrow := framebuffer/res/icons/back.png
+FB_IMAGE_right_arrow := framebuffer/res/icons/forward.png
+FB_IMAGE_reload := framebuffer/res/icons/reload.png
+FB_IMAGE_stop_image := framebuffer/res/icons/stop.png
+FB_IMAGE_history_image := framebuffer/res/icons/history.png
+
+FB_IMAGE_left_arrow_g := framebuffer/res/icons/back_g.png
+FB_IMAGE_right_arrow_g := framebuffer/res/icons/forward_g.png
+FB_IMAGE_reload_g := framebuffer/res/icons/reload_g.png
+FB_IMAGE_stop_image_g := framebuffer/res/icons/stop_g.png
+FB_IMAGE_history_image_g := framebuffer/res/icons/history_g.png
+
+FB_IMAGE_scrolll := framebuffer/res/icons/scrolll.png
+FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png
+FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png
+FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png
+
+
+FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png
+FB_IMAGE_hand_image := framebuffer/res/pointers/point.png
+FB_IMAGE_caret_image := framebuffer/res/pointers/caret.png
+FB_IMAGE_menu_image := framebuffer/res/pointers/menu.png
+FB_IMAGE_progress_image := framebuffer/res/pointers/progress.png
+
+FB_IMAGE_throbber0 := framebuffer/res/throbber/throbber0.png
+FB_IMAGE_throbber1 := framebuffer/res/throbber/throbber1.png
+FB_IMAGE_throbber2 := framebuffer/res/throbber/throbber2.png
+FB_IMAGE_throbber3 := framebuffer/res/throbber/throbber3.png
+FB_IMAGE_throbber4 := framebuffer/res/throbber/throbber4.png
+FB_IMAGE_throbber5 := framebuffer/res/throbber/throbber5.png
+FB_IMAGE_throbber6 := framebuffer/res/throbber/throbber6.png
+FB_IMAGE_throbber7 := framebuffer/res/throbber/throbber7.png
+FB_IMAGE_throbber8 := framebuffer/res/throbber/throbber8.png
+
+# 1: input file
+# 2: output file
+# 3: bitmap name
+define convert_image
+
+S_IMAGES += $(2)
+
+$(2): $(1) $(TOOLROOT)/convert_image
+ $(Q)$(TOOLROOT)/convert_image $(1) $(2) $(3)
+
+endef
+
+S_IMAGES :=
+
+$(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/$(patsubst FB_IMAGE_%,%,$(V)).c,$(patsubst FB_IMAGE_%,%,$(V)))))
+
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# S_FRAMEBUFFER are sources purely for the framebuffer build
+S_FRAMEBUFFER := gui.c framebuffer.c tree.c save.c schedule.c \
+ thumbnail.c misc.c bitmap.c filetype.c login.c findfile.c \
+ localhistory.c
+
+S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c \
+ text.c scroll.c osk.c
+
+S_FRAMEBUFFER += font_$(NETSURF_FB_FONTLIB).c
+
+ifeq ($(NETSURF_FB_FONTLIB),internal)
+S_FRAMEBUFFER += nsfont_regular.c nsfont_italic.c nsfont_bold.c \
+ nsfont_italic_bold.c
+endif
+
+S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuffer/fbtk/,$(S_FRAMEBUFFER_FBTK))
+
+# complete source file list
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES)
+EXETARGET := nsfb$(SUBTARGET)
Modified: trunk/netsurf/gtk/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/Makefile.target?rev=1...
==============================================================================
--- trunk/netsurf/gtk/Makefile.target (original)
+++ trunk/netsurf/gtk/Makefile.target Thu Oct 28 19:54:27 2010
@@ -52,3 +52,21 @@
CFLAGS += -U__STRICT_ANSI__
endif
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# S_GTK are sources purely for the GTK build
+S_GTK := font_pango.c gtk_bitmap.c gtk_gui.c gtk_schedule.c \
+ gtk_thumbnail.c gtk_plotters.c gtk_treeview.c gtk_scaffolding.c \
+ gtk_completion.c gtk_login.c gtk_throbber.c gtk_selection.c \
+ gtk_history.c gtk_window.c gtk_filetype.c gtk_download.c \
+ gtk_menu.c gtk_print.c gtk_save.c gtk_search.c gtk_tabs.c \
+ gtk_theme.c gtk_toolbar.c sexy_icon_entry.c gtk_compat.c \
+ gtk_cookies.c gtk_hotlist.c \
+ $(addprefix dialogs/,gtk_options.c gtk_about.c gtk_source.c)
+S_GTK := $(addprefix gtk/,$(S_GTK)) $(addprefix utils/,container.c)
+# code in utils/container.ch is non-universal it seems
+
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_GTK)
+EXETARGET := nsgtk
Modified: trunk/netsurf/riscos/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/Makefile.target?re...
==============================================================================
--- trunk/netsurf/riscos/Makefile.target (original)
+++ trunk/netsurf/riscos/Makefile.target Thu Oct 28 19:54:27 2010
@@ -59,3 +59,40 @@
EXEEXT := ,ff8
endif
endif
+
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# S_RISCOS are sources purely for the RISC OS build
+S_RISCOS := 401login.c artworks.c assert.c awrender.s bitmap.c buffer.c \
+ cookies.c configure.c debugwin.c dialog.c download.c draw.c \
+ filetype.c font.c global_history.c gui.c help.c history.c \
+ hotlist.c image.c menus.c message.c palettes.c plotters.c \
+ plugin.c print.c query.c save.c save_draw.c save_pdf.c \
+ schedule.c search.c searchweb.c sprite.c sslcert.c \
+ textarea.c textselection.c theme.c theme_install.c thumbnail.c \
+ treeview.c ucstables.c uri.c url_complete.c url_protocol.c \
+ url_suggest.c wimp.c wimp_event.c window.c gui/progress_bar.c \
+ gui/status_bar.c \
+ $(addprefix configure/,con_cache.c con_connect.c con_content.c \
+ con_fonts.c con_home.c con_image.c con_inter.c con_language.c \
+ con_memory.c con_secure.c con_theme.c)
+S_RISCOS := $(addprefix riscos/,$(S_RISCOS))
+TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
+TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
+
+
+# complete source file list
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_RISCOS)
+EXETARGET := !NetSurf/!RunImage$(EXEEXT)
+
+!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET)
+ $(VQ)echo " MAKERUN: $@"
+ $(Q)$(MAKERUN) $(EXETARGET) $< $@
+POSTEXES += !NetSurf/!Run$(RUNEXT)
+
+clean-run:
+ $(VQ)echo " CLEAN: !NetSurf/!Run$(RUNEXT)"
+ $(Q) $(RM) !NetSurf/!Run$(RUNEXT)
+CLEANS += clean-run
Modified: trunk/netsurf/windows/Makefile.target
URL: http://source.netsurf-browser.org/trunk/netsurf/windows/Makefile.target?r...
==============================================================================
--- trunk/netsurf/windows/Makefile.target (original)
+++ trunk/netsurf/windows/Makefile.target Thu Oct 28 19:54:27 2010
@@ -28,3 +28,25 @@
CFLAGS += $(WSCFLAGS)
LDFLAGS += $(WSCFLAGS)
+# ----------------------------------------------------------------------------
+# built-in resource setup
+# ----------------------------------------------------------------------------
+
+$(OBJROOT)/windows_resource.o: windows/res/resource.rc
+ $(VQ)echo " WINDRES: compiling windows resources"
+ ${Q}$(MINGW_PREFIX)windres $< -O coff -o $@
+
+S_RESOURCES := windows_resource.o
+
+# ----------------------------------------------------------------------------
+# Source file setup
+# ----------------------------------------------------------------------------
+
+# S_WINDOWS are sources purely for the windows build
+S_WINDOWS := about.c bitmap.c download.c filetype.c findfile.c font.c \
+ gui.c localhistory.c login.c misc.c plot.c prefs.c schedule.c \
+ thumbnail.c tree.c windbg.c
+S_WINDOWS := $(addprefix windows/,$(S_WINDOWS))
+
+SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_WINDOWS) $(S_RESOURCES)
+EXETARGET := NetSurf.exe
13 years, 1 month
r10914 chris_y - /trunk/netsurf/amiga/dist/Rexx/GetVideo.nsrx
by netsurf＠semichrome.net
Author: chris_y
Date: Thu Oct 28 14:21:58 2010
New Revision: 10914
URL: http://source.netsurf-browser.org?rev=10914&view=rev
Log:
Add an error message if GetVideo is not installed. Use v0.27's new "ask" function
instead of assuming the user wants to save.
Modified:
trunk/netsurf/amiga/dist/Rexx/GetVideo.nsrx
Modified: trunk/netsurf/amiga/dist/Rexx/GetVideo.nsrx
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Rexx/GetVideo....
==============================================================================
--- trunk/netsurf/amiga/dist/Rexx/GetVideo.nsrx (original)
+++ trunk/netsurf/amiga/dist/Rexx/GetVideo.nsrx Thu Oct 28 14:21:58 2010
@@ -20,4 +20,10 @@
options results
geturl
-address REXX 'rexx:getvideo.rexx' result 'save "ram:"'
+
+if open('getvideo','rexx:agetvideo.rexx','R') then do
+ close('getvideo')
+ address REXX 'rexx:getvideo.rexx' result 'ask "ram:"'
+end
+else
+ address command 'requestchoice >NIL: "NetSurf" "GetVideo.rexx must be installed in REXX: for this script to function.*n*nIt can be downloaded from Aminet:comm/www/getvideo.lha" "OK"'
13 years, 1 month
r10913 chris_y - /trunk/netsurf/!NetSurf/Resources/it/Messages
by netsurf＠semichrome.net
Author: chris_y
Date: Thu Oct 28 13:56:50 2010
New Revision: 10913
URL: http://source.netsurf-browser.org?rev=10913&view=rev
Log:
Updated translation from Samir Hawamdeh
Modified:
trunk/netsurf/!NetSurf/Resources/it/Messages
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 Thu Oct 28 13:56:50 2010
@@ -1,6 +1,6 @@
-# Italian messages for NetSurf 2.6 Development (Revision 10683)
+# Italian messages for NetSurf 2.6/3.0 Development (Revision 10868)
# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture)
-# 7.08.2010
+# 27.10.2010
# =========================================================================
#
# Description
@@ -191,8 +191,8 @@
New:Nuovo
Expand:Espandi
Collapse:Raggruppa
-Tree:Tree
-TreeExport:Export...
+Tree:Albero
+TreeExport:Esporta...
# New hotlist entry menu
#
@@ -204,7 +204,7 @@
All:Tutte
Folders:Cartelle
Links:Indirizzi
-Domains:Domains
+Domains:Domini
# Other menus
#
@@ -313,16 +313,16 @@
# Tree URL text
#
TreeAdded:Aggiunto: %s
-TreeLast:Ultimi visitati: %s
-TreeVisited:Visitati: %s
-TreeVisits:Navigati: %i
-TreeUnknown:Sconosciuto
+TreeLast:Ultima visita: %s
+TreeVisited:Visitato: %s
+TreeVisits:Navigato/i: %i
+TreeUnknown:Sconosciuta
TreeValue:Valore: %s
TreeComment:Commento: %s
TreeDomain:Dominio: %s%s
TreePath:Percorso: %s%s
-TreeExpires:Scomparsi: %s
-TreeLastUsed:Ultimi usati: %s
+TreeExpires:Scadenza: %s
+TreeLastUsed:Ultimo utilizzo: %s
TreeSecure:Solo host sicuri: %s
TreeVersion:Versione: %s
TreePersistent:Persistenza: %s
@@ -335,7 +335,7 @@
TreeImport:URL importati
TreeNewFolder:Nuova cartella
TreeLaunch:Visita URL
-TreeDelete:Cancella
+TreeDelete:Elimina
# Tree export
#
@@ -378,13 +378,13 @@
Date1Week:Ultima settimana
Date2Week:2 settimane fa
Date3Week:3 settimane fa
-Sunday:Sunday
-Monday:Monday
-Tuesday:Tuesday
-Wednesday:Wednesday
-Thursday:Thursday
-Friday:Friday
-Saturday:Saturday
+Sunday:Domenica
+Monday:Lunedi
+Tuesday:Martedi
+Wednesday:Mercoledi
+Thursday:Giovedi
+Friday:Venerdi
+Saturday:Sabato
# Download user interface tokens
@@ -719,12 +719,12 @@
PrintError:Si è verificato un errore durante la stampa:
EncNotRec:Tipo di codifica sconosciuta.
FileOpenError:impossibile aprire il file '%s'
-DirectoryError:La directory '%s' già esistente
+DirectoryError:La directory '%s' è già esistente
# Specific errors - displayed in a dialog box
#
NoMemory:Memoria insufficiente per l'esecuzione di NetSurf. Per favore liberane un pò e riprova nuovamente.
-FontBadInst:Si è verificato un errore durante l'inizializzazione dei font a causa della presenza di una copia obsoleta dei font "ROM" nel disco. NetSurf verrà ora chiuso e si cercherà di lanciare un programma in grado di risolvere questo problema.
+FontBadInst:Si è verificato un errore durante l'inizializzazione dei font a causa della presenza di una copia obsoleta dei font "ROM" nel disco. NetSurf verrà chiuso e si cercherà di lanciare un programma in grado di risolvere questo problema.
FontError:Impossibile aprire il font "Homerton.Medium" (%s).
Resolvers:Non è stato configurato nessun nome per i domini dei server, perciò sarà possibile effettuare la navigazione dei file solo in modalità locale. Usa "Configura" per impostare il nome (o i nomi) del/dei server.
NoDiscSpace:Spazio insufficiente nel disco.
@@ -732,7 +732,7 @@
HotlistSaveError:Non è stato possibile salvare correttamente i segnalibri.
HotlistLoadError:Non è stato possibile caricare correttamente i segnalibri.
NoDirError:%s non è una directory
-NoPathError:Per salvare, trascinare l'icona in una directory di visualizzazione.
+NoPathError:Per salvare, trascina l'icona in una directory di visualizzazione.
NoNameError:Inserisci un nome
NoURLError:Inserisci un URL
URIError:NetSurf non è stato in grado di processare questo file URI a causa di un errore di sintassi.
@@ -768,7 +768,7 @@
Loading:Apertura della pagina in corso...
RecPercent:Ricevuti %s (%u%%)
Received:Ricevuti %s
-Converting:Convertiti %lu byte
+Converting:Conversione %lu byte
Complete:Pagina completata (%gs)
Redirecting:Redirezione in corso...
Processing:Elaborazione del documento in corso...
@@ -828,7 +828,7 @@
HTTP416:Estensione richiesta non soddisfabile
HTTP417:Previsione fallita
HTTP500:Errore interno del server
-HTTP501:Non implementato
+HTTP501:Non implementata
HTTP502:Gateway errato
HTTP503:Servizio non disponibile
HTTP504:TimeOut Gateway
@@ -991,25 +991,25 @@
HelpBrowserMenu4:\Rimposta le opzioni di visualizzazione locale.
HelpBrowserMenu4-0:\Rscala la pagina, questo agirà sia sul testo che sulle immagini.
HelpBrowserMenu4-1:\Rimposta le opzioni relative alle immagini locali.
-#HelpBrowserMen43-1-0:\Stoggle the display of foreground images.
-HelpBrowserMenu4-1-1:\Stoggle the display of background images.
-HelpBrowserMenu4-1-2:\Stoggle the display of animations.|MIf turned off, the first frame is displayed.
+#HelpBrowserMen43-1-0:\Salterna la visualizzazione delle immagini in primo piano.
+HelpBrowserMenu4-1-1:\Salterna la visualizzazione delle immagini di sfondo.
+HelpBrowserMenu4-1-2:\Salterna la visualizzazione delle animazioni.|MSe disattivato verrà visualizzato solo il primo frame.
HelpBrowserMenu4-2:\Rcontrolla la visualizzazione delle barre strumenti di NetSurf.
-HelpBrowserMenu4-2-0:\Stoggle the display of the toolbar buttons.|MURL bar uses the remaining space.
-HelpBrowserMenu4-2-1:\Stoggle the display of the address (URL) bar.
-HelpBrowserMenu4-2-2:\Stoggle the display of the throbber.|MURL bar uses the remaining space.
-HelpBrowserMenu4-2-3:\Stoggle the display of the status bar.|MHorizontal scroll bar uses the remaining width.
-HelpBrowserMenu4-2-4:\Stoggle toolbar edit mode.
-HelpBrowserMenu4-3:\Scontrol the manner in which the display is rendered.
-HelpBrowserMenu4-3-0:\Stoggle whether animations are not displayed until all calculations are complete.
-HelpBrowserMenu4-3-1:\Stoggle whether everything is not displayed until all calculations are complete.
-HelpBrowserMenu4-4:\Smake your local display options the default options for NetSurf.
-HelpBrowserMenu4-5:\Rcontrol the default \w positioning.
-HelpBrowserMenu4-5-0:\S make the current \w position the default.
-HelpBrowserMenu4-5-1:\S toggle whether subsequent windows are staggered down the screen.
-HelpBrowserMenu4-5-2:\S toggle whether child windows copy the size and position of their parent.|MWhen off, all new windows open in the default position.
-HelpBrowserMenu4-5-3:\S return to the default \w positioning.
-HelpBrowserMenu5:\Raccess NetSurf's built in utilities.|MUtilities are tools such as the hotlist, history tree and various setup options.
+HelpBrowserMenu4-2-0:\Salterna la visualizzazione dei pulsanti della barra strumenti.|MLa barra URL coprirà lo spazio eccedente.
+HelpBrowserMenu4-2-1:\Salterna la visualizzazione della barra indirizzi (URL).
+HelpBrowserMenu4-2-2:\Salterna la visualizzazione del throbber.|MLa barra URL coprirà lo spazio eccedente.
+HelpBrowserMenu4-2-3:\Salterna la visualizzazione della barra di stato.|MLa barra di scrolling orizzontale coprirà la larghezza eccedente.
+HelpBrowserMenu4-2-4:\Salterna la modalità di modifica della barra strumenti.
+HelpBrowserMenu4-3:\Scontrolla il modo in cui è resa l'esposizione.
+HelpBrowserMenu4-3-0:\Simposta la non visualizzazione delle animazioni fino al completamento dei calcoli.
+HelpBrowserMenu4-3-1:\Simposta la non visualizzazione di tutto fino al completamento dei calcoli.
+HelpBrowserMenu4-4:\Simposta come predefinite le tue impostazioni di visualizzazione.
+HelpBrowserMenu4-5:\Rimposta il posizionamento \w predefinito.
+HelpBrowserMenu4-5-0:\S imposta come predefinita \w la posizione corrente.
+HelpBrowserMenu4-5-1:\S imposta se le finestre successive sono sfalsate in basso allo schermo.
+HelpBrowserMenu4-5-2:\S alterna se le finestre figlie dovranno copiare la dimensione ed il posizionamento di quelle genitrici.|MSe disattivato tutte le finestre verranno aperte nel posizionamento predefinito.
+HelpBrowserMenu4-5-3:\S ritorna al posizionamento \w predefinito.
+HelpBrowserMenu5:\Raccesso a NetSurf attraverso le utilità .|MLe utilità sono strumenti simili ai segnalibri, gli alberi della cronologia ed altre opzioni di configurazione.
HelpBrowserMenu5-0:\Rgestisci i segnalibri.
HelpBrowserMenu5-0-0:\Saggiungi la pagina corrente ai segnalibri
HelpBrowserMenu5-0-1:\Sapri il gestore dei segnalibri \w.
@@ -1018,17 +1018,17 @@
HelpBrowserMenu5-1-1:\Sapri la cronologia globale
HelpBrowserMenu5-2:\Rgestisci i tuoi cookie
HelpBrowserMenu5-2-0:\Sapri il gestore dei cookie \w.
-HelpBrowserMenu6:\Rmostra la documentazione di aiuto disponibile
-HelpBrowserMenu6-0:\Sopen the documentation contents page in a new \w.
-HelpBrowserMenu6-1:\Sopen the user guide in a new \w.
-HelpBrowserMenu6-2:\Sopen the user information page in a new \w.
-HelpBrowserMenu6-3:\Sopen the NetSurf about page in a new \w.
+HelpBrowserMenu6:\Rmostra la documentazione disponibile
+HelpBrowserMenu6-0:\Sapri i contenuti della documentazione in una nuova \w.
+HelpBrowserMenu6-1:\Sapri la guida in linea in una nuova \w.
+HelpBrowserMenu6-2:\Sapri la pagina delle informazioni utente in una nuova \w.
+HelpBrowserMenu6-3:\Sapri la finestra delle informazioni di NetSurf in una nuova \w.
HelpBrowserMenu6-4:\Savvia la guida in linea
-HelpBrowser-1:Click \s on a link to follow it.|MClick \a on a link to open it in a new \w.|MShift+\s click on a link to download the link target contents.|MShift+\a click to save the link target address.
-
-HelpIconbar:\TNetSurf icon.|M\Sopen a new browser \w.|M\Aopen the hotlist management \w.
-HelpHistory:Use this \w to navigate around the local history tree.|M\Son a thumbnail to return to that page.
+HelpBrowser-1:Clicca \s sul link per procedere.|MClicca \a in un link per aprirlo in una nuova \w.|MShift+\s clicca sul link per scaricarne i contenuti.|MShift+\a clicca per salvare l'indirizzo del link.
+
+HelpIconbar:\TIcona di NetSurf.|M\Sapri una nuova finestra \w.|M\Aapri il gestore dei segnalibri \w.
+HelpHistory:Usa questo \w per navigare all'interno dell'albero della cronologia locale.|M\Ssulla miniatura per tornare a quella pagina.
HelpPrint:Usa questa funzione \w per stampare la pagina.
13 years, 1 month
r10912 jmb - /trunk/netsurf/content/llcache.c
by netsurf＠semichrome.net
Author: jmb
Date: Wed Oct 27 17:12:00 2010
New Revision: 10912
URL: http://source.netsurf-browser.org?rev=10912&view=rev
Log:
Fix bug 3096811: discard HTTP headers for all but the last response
Modified:
trunk/netsurf/content/llcache.c
Modified: trunk/netsurf/content/llcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/llcache.c?rev=109...
==============================================================================
--- trunk/netsurf/content/llcache.c (original)
+++ trunk/netsurf/content/llcache.c Wed Oct 27 17:12:00 2010
@@ -210,6 +210,18 @@
static nserror llcache_fetch_cert_error(llcache_object *object,
const struct ssl_cert_info *certs, size_t num);
+/* Destroy headers */
+static inline void llcache_destroy_headers(llcache_object *object)
+{
+ while (object->num_headers > 0) {
+ object->num_headers--;
+
+ free(object->headers[object->num_headers].name);
+ free(object->headers[object->num_headers].value);
+ }
+ free(object->headers);
+ object->headers = NULL;
+}
/* Invalidate cache control data */
static inline void llcache_invalidate_cache_control_data(llcache_object *object)
@@ -2163,6 +2175,28 @@
if (error != NSERROR_OK)
return error;
+ /* The headers for multiple HTTP responses may be delivered to us if
+ * the fetch layer receives a 401 response for which it has
+ * authentication credentials. This will result in a silent re-request
+ * after which we'll receive the actual response headers for the
+ * object we want to fetch (assuming that the credentials were correct
+ * of course)
+ *
+ * Therefore, if the header is an HTTP response start marker, then we
+ * must discard any headers we've read so far, reset the cache data
+ * that we might have computed, and start again.
+ */
+ if (strncmp(name, "HTTP/", SLEN("HTTP/")) == 0 && value[0] == '\0') {
+ time_t req_time = object->cache.req_time;
+
+ llcache_invalidate_cache_control_data(object);
+
+ /* Restore request time, so we compute object's age correctly */
+ object->cache.req_time = req_time;
+
+ llcache_destroy_headers(object);
+ }
+
/* Append header data to the object's headers array */
temp = realloc(object->headers, (object->num_headers + 1) *
sizeof(llcache_header));
@@ -2231,14 +2265,7 @@
llcache_invalidate_cache_control_data(object);
/* Destroy headers */
- while (object->num_headers > 0) {
- object->num_headers--;
-
- free(object->headers[object->num_headers].name);
- free(object->headers[object->num_headers].value);
- }
- free(object->headers);
- object->headers = NULL;
+ llcache_destroy_headers(object);
/* If there was no realm, then default to the URL */
/** \todo If there was no WWW-Authenticate header, use response body */
13 years, 1 month