mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Ole Loots 2012-07-25 13:59:38 +02:00
parent e1a9a98e05 25cdea3351
commit b06fecab55
12 changed files with 924 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1059
Docs/Doxyfile
View File

File diff suppressed because it is too large Load Diff

2
content/urldb.c
View File

@ -167,7 +167,7 @@ struct path_data {
* the default port for given scheme, i.e.
* 80 (http), 443 (https). */
char *segment; /**< Path segment for this node */
unsigned int frag_cnt; /**< Number of entries in ::fragment */
unsigned int frag_cnt; /**< Number of entries in path_data::fragment */
char **fragment; /**< Array of fragments */
bool persistent; /**< This entry should persist */

2
css/select.c
View File

@ -3367,7 +3367,7 @@ bool parse_number(const char *data, bool maybe_negative, bool real,
}
/**
* Parse a font @size attribute
* Parse a font \@size attribute
*
* \param size Data to parse (NUL-terminated)
* \param val Pointer to location to receive enum value

9
desktop/browser.c
View File

@ -1622,7 +1622,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top)
browser_window_set_scroll(bw, 0, 0);
/* if frag_id exists, then try to scroll to it */
/** \TODO don't do this if the user has scrolled */
/** @todo don't do this if the user has scrolled */
if (bw->frag_id && html_get_id_offset(bw->current_content,
bw->frag_id, &x, &y)) {
browser_window_set_scroll(bw, x, y);
@ -1641,7 +1641,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top)
browser_window_set_scroll(bw, 0, 0);
/* if frag_id exists, then try to scroll to it */
/** \TODO don't do this if the user has scrolled */
/** @todo don't do this if the user has scrolled */
if (bw->frag_id && html_get_id_offset(bw->current_content,
bw->frag_id, &x, &y)) {
browser_window_set_scroll(bw, x, y);
@ -1659,7 +1659,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top)
browser_window_set_scroll(bw, 0, 0);
/* if frag_id exists, then try to scroll to it */
/** \TODO don't do this if the user has scrolled */
/** @todo don't do this if the user has scrolled */
if (bw->frag_id && html_get_id_offset(bw->current_content,
bw->frag_id, &x, &y)) {
browser_window_set_scroll(bw, x, y);
@ -1849,7 +1849,8 @@ void browser_window_set_status(struct browser_window *bw, const char *text)
/**
* Change the shape of the mouse pointer
*
* \param shape shape to use
* \param bw Browser window to set shape in
* \param shape The pointer shape to use
*/
void browser_window_set_pointer(struct browser_window *bw,

2
desktop/browser.h
View File

@ -202,7 +202,7 @@ struct browser_window {
/** cache of the currently displayed status text. */
char *status_text; /**< Current status bar text. */
int status_text_len; /**< Length of the ::status_text buffer. */
int status_text_len; /**< Length of the browser_window::status_text buffer. */
int status_match; /**< Number of times an idempotent status-set operation was performed. */
int status_miss; /**< Number of times status was really updated. */
};

3
desktop/download.c
View File

@ -17,7 +17,8 @@
*/
/**
* \file Core download context (implementation)
* \file desktop/download.c
* \brief Core download context implementation
*/
#include <assert.h>

3
desktop/download.h
View File

@ -17,7 +17,8 @@
*/
/**
* \file Core download context (interface)
* \file desktop/download.h
* \brief Core download context (interface)
*/
#ifndef NETSURF_DESKTOP_DOWNLOAD_H_

4
desktop/plot_style.c
View File

@ -16,7 +16,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file Plotter global styles.
/**
* \file desktop/plot_style.c
* \brief Plotter global styles.
*
* These plot styles are globaly available and used in many places.
*/

4
render/box.h
View File

@ -283,7 +283,7 @@ struct column {
bool positioned;
};
/** Parameters for <object> and similar elements. */
/** Parameters for object element and similar elements. */
struct object_params {
nsurl *data;
char *type;
@ -293,7 +293,7 @@ struct object_params {
struct object_param *params;
};
/** Linked list of <object> parameters. */
/** Linked list of object element parameters. */
struct object_param {
char *name;
char *value;

5
utils/filepath.h
View File

@ -16,7 +16,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file Utility routines to obtain paths to file resources. */
/**
* \file utils/filepath.h
* \brief Utility routines to obtain paths to file resources.
*/
#ifndef _NETSURF_UTILS_FILEPATH_H_
#define _NETSURF_UTILS_FILEPATH_H_

9
utils/url.h
View File

@ -17,17 +17,20 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/** \file
* URL parsing and joining (interface).
/**
* \file utils/url.h
* \brief URL parsing and joining (interface).
*/
#ifndef _NETSURF_UTILS_URL_H_
#define _NETSURF_UTILS_URL_H_
/* file url prefix */
/** File url prefix */
#define FILE_SCHEME_PREFIX "file:///"
/** File url prefix length */
#define FILE_SCHEME_PREFIX_LEN 8
/** URL utility function return codes */
typedef enum {
URL_FUNC_OK, /**< No error */
URL_FUNC_NOMEM, /**< Insufficient memory */

6
windows/Makefile.target
View File

@ -17,9 +17,9 @@
$(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng)))
ifneq ($(PKG_CONFIG),)
CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl libhubbub zlib \
libparserutils libdom libwapcaplet libcares libxml-2.0)
LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcares libcurl \
CFLAGS += $(shell $(PKG_CONFIG) --cflags zlib libcares libcurl libhubbub \
libparserutils libdom libwapcaplet libxml-2.0)
LDFLAGS += $(shell $(PKG_CONFIG) --libs zlib libxml-2.0 libcurl libcares \
libhubbub libparserutils libcss libdom libwapcaplet)
else
LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lxml2 -lcurl -lz