October 2010 - netsurf-commits - listmaster.pepperfish.net

r10901 jmb - in /trunk: hubbub/include/hubbub/ libcss/include/libcss/ libparserutils/include/parserutils/ libparserutils/include/parserutils/charset/ libparserutils/include/parserutils/input/ libparserutils/include/parserutils/utils/ libwapcaplet/include/libwapcaplet/

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 18:00:21 2010 New Revision: 10901 URL: http://source.netsurf-browser.org?rev=10901&view=rev Log: Sprinkle some C++ scoping around Modified: trunk/hubbub/include/hubbub/errors.h trunk/hubbub/include/hubbub/functypes.h trunk/hubbub/include/hubbub/hubbub.h trunk/hubbub/include/hubbub/parser.h trunk/hubbub/include/hubbub/tree.h trunk/hubbub/include/hubbub/types.h trunk/libcss/include/libcss/computed.h trunk/libcss/include/libcss/errors.h trunk/libcss/include/libcss/fpmath.h trunk/libcss/include/libcss/functypes.h trunk/libcss/include/libcss/hint.h trunk/libcss/include/libcss/libcss.h trunk/libcss/include/libcss/properties.h trunk/libcss/include/libcss/select.h trunk/libcss/include/libcss/stylesheet.h trunk/libcss/include/libcss/types.h trunk/libparserutils/include/parserutils/charset/codec.h trunk/libparserutils/include/parserutils/charset/mibenum.h trunk/libparserutils/include/parserutils/charset/utf16.h trunk/libparserutils/include/parserutils/charset/utf8.h trunk/libparserutils/include/parserutils/errors.h trunk/libparserutils/include/parserutils/functypes.h trunk/libparserutils/include/parserutils/input/inputstream.h trunk/libparserutils/include/parserutils/parserutils.h trunk/libparserutils/include/parserutils/types.h trunk/libparserutils/include/parserutils/utils/buffer.h trunk/libparserutils/include/parserutils/utils/stack.h trunk/libparserutils/include/parserutils/utils/vector.h trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h Modified: trunk/hubbub/include/hubbub/errors.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/errors.h?re... ============================================================================== --- trunk/hubbub/include/hubbub/errors.h (original) +++ trunk/hubbub/include/hubbub/errors.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef hubbub_errors_h_ #define hubbub_errors_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stddef.h> @@ -28,5 +33,9 @@ /* Convert a hubbub error value to a string */ const char *hubbub_error_to_string(hubbub_error error); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/hubbub/include/hubbub/functypes.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/functypes.h... ============================================================================== --- trunk/hubbub/include/hubbub/functypes.h (original) +++ trunk/hubbub/include/hubbub/functypes.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef hubbub_functypes_h_ #define hubbub_functypes_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdbool.h> #include <stdint.h> @@ -47,5 +52,9 @@ typedef void (*hubbub_error_handler)(uint32_t line, uint32_t col, const char *message, void *pw); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/hubbub/include/hubbub/hubbub.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/hubbub.h?re... ============================================================================== --- trunk/hubbub/include/hubbub/hubbub.h (original) +++ trunk/hubbub/include/hubbub/hubbub.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef hubbub_h_ #define hubbub_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <hubbub/errors.h> #include <hubbub/functypes.h> @@ -19,5 +24,9 @@ /* Clean up after Hubbub */ hubbub_error hubbub_finalise(hubbub_allocator_fn alloc, void *pw); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/hubbub/include/hubbub/parser.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/parser.h?re... ============================================================================== --- trunk/hubbub/include/hubbub/parser.h (original) +++ trunk/hubbub/include/hubbub/parser.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef hubbub_parser_h_ #define hubbub_parser_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdbool.h> #include <inttypes.h> @@ -77,5 +82,9 @@ const char *hubbub_parser_read_charset(hubbub_parser *parser, hubbub_charset_source *source); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/hubbub/include/hubbub/tree.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/tree.h?rev=... ============================================================================== --- trunk/hubbub/include/hubbub/tree.h (original) +++ trunk/hubbub/include/hubbub/tree.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef hubbub_tree_h_ #define hubbub_tree_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <hubbub/functypes.h> @@ -277,5 +282,9 @@ void *ctx; /**< Context pointer */ } hubbub_tree_handler; +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/hubbub/include/hubbub/types.h URL: http://source.netsurf-browser.org/trunk/hubbub/include/hubbub/types.h?rev... ============================================================================== --- trunk/hubbub/include/hubbub/types.h (original) +++ trunk/hubbub/include/hubbub/types.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef hubbub_types_h_ #define hubbub_types_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdbool.h> #include <inttypes.h> @@ -125,4 +130,8 @@ } data; /**< Type-specific data */ } hubbub_token; +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libcss/include/libcss/computed.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/computed.h?... ============================================================================== --- trunk/libcss/include/libcss/computed.h (original) +++ trunk/libcss/include/libcss/computed.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_computed_h_ #define libcss_computed_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <libwapcaplet/libwapcaplet.h> @@ -2177,4 +2182,8 @@ #undef CSS_TEXT_ALIGN_SHIFT #undef CSS_TEXT_ALIGN_INDEX +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libcss/include/libcss/errors.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/errors.h?re... ============================================================================== --- trunk/libcss/include/libcss/errors.h (original) +++ trunk/libcss/include/libcss/errors.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_errors_h_ #define libcss_errors_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stddef.h> @@ -27,5 +32,9 @@ /* Convert a libcss error value to a string */ const char *css_error_to_string(css_error error); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libcss/include/libcss/fpmath.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/fpmath.h?re... ============================================================================== --- trunk/libcss/include/libcss/fpmath.h (original) +++ trunk/libcss/include/libcss/fpmath.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_fpmath_h_ #define libcss_fpmath_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdint.h> @@ -57,5 +62,9 @@ #define F_300 0x0004b000 /* 300 */ #define F_400 0x00064000 /* 400 */ +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libcss/include/libcss/functypes.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/functypes.h... ============================================================================== --- trunk/libcss/include/libcss/functypes.h (original) +++ trunk/libcss/include/libcss/functypes.h Sat Oct 23 18:00:21 2010 @@ -8,6 +8,11 @@ #ifndef libcss_functypes_h_ #define libcss_functypes_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include <stdbool.h> #include <stdint.h> #include <stdlib.h> @@ -17,5 +22,9 @@ /* Type of allocation function for libcss */ typedef void *(*css_allocator_fn)(void *ptr, size_t size, void *pw); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libcss/include/libcss/hint.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/hint.h?rev=... ============================================================================== --- trunk/libcss/include/libcss/hint.h (original) +++ trunk/libcss/include/libcss/hint.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_hint_h_ #define libcss_hint_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <libwapcaplet/libwapcaplet.h> @@ -46,4 +51,8 @@ uint8_t status; } css_hint; +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libcss/include/libcss/libcss.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/libcss.h?re... ============================================================================== --- trunk/libcss/include/libcss/libcss.h (original) +++ trunk/libcss/include/libcss/libcss.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_h_ #define libcss_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <libwapcaplet/libwapcaplet.h> @@ -25,5 +30,9 @@ /* Clean up after LibCSS */ css_error css_finalise(css_allocator_fn alloc, void *pw); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libcss/include/libcss/properties.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/properties.... ============================================================================== --- trunk/libcss/include/libcss/properties.h (original) +++ trunk/libcss/include/libcss/properties.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_properties_h_ #define libcss_properties_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif enum css_properties_e { CSS_PROP_AZIMUTH = 0x000, @@ -599,4 +604,8 @@ CSS_Z_INDEX_AUTO = 0x2 }; +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libcss/include/libcss/select.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/select.h?re... ============================================================================== --- trunk/libcss/include/libcss/select.h (original) +++ trunk/libcss/include/libcss/select.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_select_h_ #define libcss_select_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <libwapcaplet/libwapcaplet.h> @@ -102,4 +107,8 @@ css_computed_style *result, css_select_handler *handler, void *pw); +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libcss/include/libcss/stylesheet.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/stylesheet.... ============================================================================== --- trunk/libcss/include/libcss/stylesheet.h (original) +++ trunk/libcss/include/libcss/stylesheet.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_stylesheet_h_ #define libcss_stylesheet_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <libcss/errors.h> #include <libcss/types.h> @@ -53,5 +58,9 @@ css_error css_stylesheet_size(css_stylesheet *sheet, size_t *size); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libcss/include/libcss/types.h URL: http://source.netsurf-browser.org/trunk/libcss/include/libcss/types.h?rev... ============================================================================== --- trunk/libcss/include/libcss/types.h (original) +++ trunk/libcss/include/libcss/types.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef libcss_types_h_ #define libcss_types_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdbool.h> #include <stdint.h> @@ -101,4 +106,8 @@ typedef struct css_computed_style css_computed_style; +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libparserutils/include/parserutils/charset/codec.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/charset/codec.h (original) +++ trunk/libparserutils/include/parserutils/charset/codec.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_charset_codec_h_ #define parserutils_charset_codec_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <inttypes.h> @@ -113,4 +118,8 @@ parserutils_error parserutils_charset_codec_reset( parserutils_charset_codec *codec); +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libparserutils/include/parserutils/charset/mibenum.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/charset/mibenum.h (original) +++ trunk/libparserutils/include/parserutils/charset/mibenum.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_charset_mibenum_h_ #define parserutils_charset_mibenum_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <inttypes.h> #include <stdbool.h> @@ -21,4 +26,8 @@ /* Determine if a MIB enum value represents a Unicode variant */ bool parserutils_charset_mibenum_is_unicode(uint16_t mibenum); +#ifdef __cplusplus +} #endif + +#endif Modified: trunk/libparserutils/include/parserutils/charset/utf16.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/charset/utf16.h (original) +++ trunk/libparserutils/include/parserutils/charset/utf16.h Sat Oct 23 18:00:21 2010 @@ -11,6 +11,11 @@ #ifndef parserutils_charset_utf16_h_ #define parserutils_charset_utf16_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <inttypes.h> @@ -34,5 +39,9 @@ parserutils_error parserutils_charset_utf16_next_paranoid(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/charset/utf8.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/charset/utf8.h (original) +++ trunk/libparserutils/include/parserutils/charset/utf8.h Sat Oct 23 18:00:21 2010 @@ -11,6 +11,11 @@ #ifndef parserutils_charset_utf8_h_ #define parserutils_charset_utf8_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <inttypes.h> @@ -34,5 +39,9 @@ parserutils_error parserutils_charset_utf8_next_paranoid(const uint8_t *s, uint32_t len, uint32_t off, uint32_t *nextoff); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/errors.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/errors.h (original) +++ trunk/libparserutils/include/parserutils/errors.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_errors_h_ #define parserutils_errors_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stddef.h> @@ -27,5 +32,9 @@ /* Convert a string to a parserutils error value */ parserutils_error parserutils_error_from_string(const char *str, size_t len); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/functypes.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/functypes.h (original) +++ trunk/libparserutils/include/parserutils/functypes.h Sat Oct 23 18:00:21 2010 @@ -8,6 +8,11 @@ #ifndef parserutils_functypes_h_ #define parserutils_functypes_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include <stdbool.h> #include <stdint.h> #include <stdlib.h> @@ -17,5 +22,9 @@ /* Type of allocation function for parserutils */ typedef void *(*parserutils_alloc)(void *ptr, size_t size, void *pw); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/input/inputstream.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/input/inputstream.h (original) +++ trunk/libparserutils/include/parserutils/input/inputstream.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_input_inputstream_h_ #define parserutils_input_inputstream_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdbool.h> #ifndef NDEBUG @@ -175,5 +180,9 @@ parserutils_inputstream *stream, const char *enc, uint32_t source); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/parserutils.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/parserutils.h (original) +++ trunk/libparserutils/include/parserutils/parserutils.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_parserutils_h_ #define parserutils_parserutils_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <parserutils/errors.h> #include <parserutils/functypes.h> @@ -19,5 +24,9 @@ /* Clean up after ParserUtils */ parserutils_error parserutils_finalise(parserutils_alloc alloc, void *pw); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/types.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/types.h (original) +++ trunk/libparserutils/include/parserutils/types.h Sat Oct 23 18:00:21 2010 @@ -8,8 +8,17 @@ #ifndef parserutils_types_h_ #define parserutils_types_h_ +#ifdef __cplusplus +extern "C" +{ +#endif + #include <stdbool.h> #include <inttypes.h> +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/utils/buffer.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/utils/buffer.h (original) +++ trunk/libparserutils/include/parserutils/utils/buffer.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_utils_buffer_h_ #define parserutils_utils_buffer_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <parserutils/errors.h> #include <parserutils/functypes.h> @@ -37,5 +42,9 @@ parserutils_error parserutils_buffer_randomise(parserutils_buffer *buffer); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/utils/stack.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/utils/stack.h (original) +++ trunk/libparserutils/include/parserutils/utils/stack.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_utils_stack_h_ #define parserutils_utils_stack_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stddef.h> @@ -26,5 +31,9 @@ void *parserutils_stack_get_current(parserutils_stack *stack); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libparserutils/include/parserutils/utils/vector.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/utils/vector.h (original) +++ trunk/libparserutils/include/parserutils/utils/vector.h Sat Oct 23 18:00:21 2010 @@ -7,6 +7,11 @@ #ifndef parserutils_utils_vector_h_ #define parserutils_utils_vector_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <stddef.h> @@ -32,5 +37,9 @@ const void *parserutils_vector_peek(const parserutils_vector *vector, int32_t ctx); +#ifdef __cplusplus +} #endif +#endif + Modified: trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h URL: http://source.netsurf-browser.org/trunk/libwapcaplet/include/libwapcaplet... ============================================================================== --- trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h (original) +++ trunk/libwapcaplet/include/libwapcaplet/libwapcaplet.h Sat Oct 23 18:00:21 2010 @@ -8,6 +8,11 @@ #ifndef libwapcaplet_h_ #define libwapcaplet_h_ + +#ifdef __cplusplus +extern "C" +{ +#endif #include <sys/types.h> #include <stdbool.h> @@ -215,4 +220,8 @@ */ extern void lwc_iterate_strings(lwc_iteration_callback_fn cb, void *pw); +#ifdef __cplusplus +} +#endif + #endif /* libwapcaplet_h_ */

12 years, 11 months

1
0
0 / 0

r10900 jmb - /trunk/netsurf/render/textplain.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 13:43:48 2010 New Revision: 10900 URL: http://source.netsurf-browser.org?rev=10900&view=rev Log: Slightly less braindead textplain handling Modified: trunk/netsurf/render/textplain.c Modified: trunk/netsurf/render/textplain.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/textplain.c?rev=10... ============================================================================== --- trunk/netsurf/render/textplain.c (original) +++ trunk/netsurf/render/textplain.c Sat Oct 23 13:43:48 2010 @@ -51,7 +51,7 @@ #include "utils/utf8.h" -#define CHUNK 20480 +#define CHUNK 32768 /* Must be a power of 2 */ #define MARGIN 4 @@ -73,6 +73,8 @@ uint16_t *mibenum, uint32_t *source); static bool textplain_drain_input(struct content *c, parserutils_inputstream *stream, parserutils_error terminator); +static bool textplain_copy_utf8_data(struct content *c, + const uint8_t *buf, size_t len); static int textplain_coord_from_offset(const char *text, size_t offset, size_t length); static float textplain_line_height(void); @@ -165,40 +167,86 @@ { static const uint8_t *u_fffd = (const uint8_t *) "\xef\xbf\xfd"; const uint8_t *ch; - size_t chlen, outlen; - - /** \todo Optimise: stop invoking memcpy for each character */ - while (parserutils_inputstream_peek(stream, 0, &ch, &chlen) != + size_t chlen, offset = 0; + + while (parserutils_inputstream_peek(stream, offset, &ch, &chlen) != terminator) { - /* Replace all instances of NUL with U+FFFD */ if (chlen == 1 && *ch == 0) { - ch = u_fffd; - outlen = 3; + if (offset > 0) { + /* Obtain pointer to start of input data */ + parserutils_inputstream_peek(stream, 0, + &ch, &chlen); + /* Copy from it up to the start of the NUL */ + if (textplain_copy_utf8_data(c, ch, + offset) == false) + return false; + } + + /* Emit U+FFFD */ + if (textplain_copy_utf8_data(c, u_fffd, 3) == false) + return false; + + /* Advance inputstream past the NUL we just read */ + parserutils_inputstream_advance(stream, offset + 1); + /* Reset the read offset */ + offset = 0; } else { - outlen = chlen; + /* Accumulate input */ + offset += chlen; + + if (offset > CHUNK) { + /* Obtain pointer to start of input data */ + parserutils_inputstream_peek(stream, 0, + &ch, &chlen); + + /* Emit the data we've read */ + if (textplain_copy_utf8_data(c, ch, + offset) == false) + return false; + + /* Advance the inputstream */ + parserutils_inputstream_advance(stream, offset); + /* Reset the read offset */ + offset = 0; + } } - - if (c->data.textplain.utf8_data_size + outlen >= - c->data.textplain.utf8_data_allocated) { - size_t allocated = CHUNK + - c->data.textplain.utf8_data_allocated; - char *utf8_data = talloc_realloc(c, - c->data.textplain.utf8_data, - char, allocated); - if (utf8_data == NULL) - return false; - - c->data.textplain.utf8_data = utf8_data; - c->data.textplain.utf8_data_allocated = allocated; - } - - memcpy(c->data.textplain.utf8_data + - c->data.textplain.utf8_data_size, ch, outlen); - c->data.textplain.utf8_data_size += outlen; - - parserutils_inputstream_advance(stream, chlen); - } + } + + if (offset > 0) { + /* Obtain pointer to start of input data */ + parserutils_inputstream_peek(stream, 0, &ch, &chlen); + /* Emit any data remaining */ + if (textplain_copy_utf8_data(c, ch, offset) == false) + return false; + + /* Advance the inputstream past the data we've read */ + parserutils_inputstream_advance(stream, offset); + } + + return true; +} + +bool textplain_copy_utf8_data(struct content *c, const uint8_t *buf, size_t len) +{ + if (c->data.textplain.utf8_data_size + len >= + c->data.textplain.utf8_data_allocated) { + /* Compute next multiple of chunk above the required space */ + size_t allocated = (c->data.textplain.utf8_data_size + len + + CHUNK - 1) & ~(CHUNK - 1); + char *utf8_data = talloc_realloc(c, + c->data.textplain.utf8_data, + char, allocated); + if (utf8_data == NULL) + return false; + + c->data.textplain.utf8_data = utf8_data; + c->data.textplain.utf8_data_allocated = allocated; + } + + memcpy(c->data.textplain.utf8_data + + c->data.textplain.utf8_data_size, buf, len); + c->data.textplain.utf8_data_size += len; return true; }

12 years, 11 months

1
0
0 / 0

r10899 jmb - /trunk/libparserutils/src/input/inputstream.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 12:24:28 2010 New Revision: 10899 URL: http://source.netsurf-browser.org?rev=10899&view=rev Log: Fix bug where any encoding specified when creating an input stream would be replaced by UTF-8 if there was no charset detection callback provided, too. Tidy up the logic in this area, and add more commentary so it's clear. Modified: trunk/libparserutils/src/input/inputstream.c Modified: trunk/libparserutils/src/input/inputstream.c URL: http://source.netsurf-browser.org/trunk/libparserutils/src/input/inputstr... ============================================================================== --- trunk/libparserutils/src/input/inputstream.c (original) +++ trunk/libparserutils/src/input/inputstream.c Sat Oct 23 12:24:28 2010 @@ -379,6 +379,9 @@ if (stream->done_first_chunk == false) { parserutils_filter_optparams params; + /* If there is a charset detection routine, give it an + * opportunity to override any charset specified when the + * inputstream was created */ if (stream->csdetect != NULL) { error = stream->csdetect(stream->raw->data, stream->raw->length, @@ -391,16 +394,23 @@ /* We don't have enough data to detect the * input encoding, but we're not going to get * any more as we've been notified of EOF. - * Therefore, fall back to UTF-8. */ - stream->mibenum = - parserutils_charset_mibenum_from_name( - "UTF-8", SLEN("UTF-8")); - stream->encsrc = 0; - + * Therefore, leave the encoding alone + * so that any charset specified when the + * inputstream was created will be preserved. + * If there was no charset specified, then + * we'll default to UTF-8, below */ error = PARSERUTILS_OK; } - } else { - /* Default to UTF-8 */ + } + + /* Default to UTF-8 if there is still no encoding information + * We'll do this if there was no encoding specified up-front + * and: + * 1) there was no charset detection routine + * or 2) there was insufficient data for the charset + * detection routine to detect an encoding + */ + if (stream->mibenum == 0) { stream->mibenum = parserutils_charset_mibenum_from_name("UTF-8", SLEN("UTF-8"));

12 years, 11 months

1
0
0 / 0

r10898 jmb - /trunk/libparserutils/include/parserutils/input/inputstream.h

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 12:22:43 2010 New Revision: 10898 URL: http://source.netsurf-browser.org?rev=10898&view=rev Log: Fix whitespace Modified: trunk/libparserutils/include/parserutils/input/inputstream.h Modified: trunk/libparserutils/include/parserutils/input/inputstream.h URL: http://source.netsurf-browser.org/trunk/libparserutils/include/parserutil... ============================================================================== --- trunk/libparserutils/include/parserutils/input/inputstream.h (original) +++ trunk/libparserutils/include/parserutils/input/inputstream.h Sat Oct 23 12:22:43 2010 @@ -136,7 +136,7 @@ #undef IS_ASCII if (off != utf8_len && error != PARSERUTILS_NEEDDATA) - abort(); + abort(); return parserutils_inputstream_peek_slow(stream, offset, ptr, length); }

12 years, 11 months

1
0
0 / 0

r10897 jmb - in /trunk/netsurf/gtk: gtk_compat.c gtk_compat.h gtk_window.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 09:12:33 2010 New Revision: 10897 URL: http://source.netsurf-browser.org?rev=10897&view=rev Log: More GTK 2.22.0 support Modified: trunk/netsurf/gtk/gtk_compat.c trunk/netsurf/gtk/gtk_compat.h trunk/netsurf/gtk/gtk_window.c Modified: trunk/netsurf/gtk/gtk_compat.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_compat.c?rev=1089... ============================================================================== --- trunk/netsurf/gtk/gtk_compat.c (original) +++ trunk/netsurf/gtk/gtk_compat.c Sat Oct 23 09:12:33 2010 @@ -21,6 +21,18 @@ */ #include "gtk/gtk_compat.h" + +void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus) +{ + #if GTK_CHECK_VERSION(2,22,0) + gtk_widget_set_can_focus(widget, can_focus); + #else + if (can_focus == TRUE) + GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS); + else + GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS); + #endif +} gboolean nsgtk_widget_has_focus(GtkWidget *widget) { Modified: trunk/netsurf/gtk/gtk_compat.h URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_compat.h?rev=1089... ============================================================================== --- trunk/netsurf/gtk/gtk_compat.h (original) +++ trunk/netsurf/gtk/gtk_compat.h Sat Oct 23 09:12:33 2010 @@ -25,6 +25,7 @@ #include <gtk/gtk.h> +void nsgtk_widget_set_can_focus(GtkWidget *widget, gboolean can_focus); gboolean nsgtk_widget_has_focus(GtkWidget *widget); gboolean nsgtk_widget_get_visible(GtkWidget *widget); gboolean nsgtk_widget_get_realized(GtkWidget *widget); Modified: trunk/netsurf/gtk/gtk_window.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_window.c?rev=1089... ============================================================================== --- trunk/netsurf/gtk/gtk_window.c (original) +++ trunk/netsurf/gtk/gtk_window.c Sat Oct 23 09:12:33 2010 @@ -27,6 +27,7 @@ #include "desktop/searchweb.h" #include "desktop/textinput.h" #include "desktop/selection.h" +#include "gtk/gtk_compat.h" #include "gtk/gtk_gui.h" #include "gtk/options.h" #include "gtk/gtk_scaffolding.h" @@ -302,7 +303,7 @@ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_SCROLL_MASK); - GTK_WIDGET_SET_FLAGS(GTK_WIDGET(g->layout), GTK_CAN_FOCUS); + nsgtk_widget_set_can_focus(GTK_WIDGET(g->layout), TRUE); /* set the default background colour of the drawing area to white. */ gtk_widget_modify_bg(GTK_WIDGET(g->layout), GTK_STATE_NORMAL,

12 years, 11 months

1
0
0 / 0

r10896 jmb - /trunk/netsurf/Makefile.defaults

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 08:54:35 2010 New Revision: 10896 URL: http://source.netsurf-browser.org?rev=10896&view=rev Log: Do not build with webp support by default on GTK. Firstly, almost noone has the libraries installed. Secondly, it requires a documentation update before it can be enabled. Thirdly, we should be using pkg-config to detect the presence of libraries on platforms that support it. Modified: trunk/netsurf/Makefile.defaults Modified: trunk/netsurf/Makefile.defaults URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.defaults?rev=108... ============================================================================== --- trunk/netsurf/Makefile.defaults (original) +++ trunk/netsurf/Makefile.defaults Sat Oct 23 08:54:35 2010 @@ -145,10 +145,6 @@ # Enable NetSurf's use of librosprite for displaying RISC OS Sprites # Valid options: YES, NO, AUTO NETSURF_USE_ROSPRITE := AUTO - - # Enable NetSurf's use of libwebp/libvpx for displaying WebPs - # Valid options: YES, NO - NETSURF_USE_WEBP := YES # Configuration overrides for Mac OS X ifeq ($(HOST),macosx)

12 years, 11 months

1
0
0 / 0

r10895 jmb - /trunk/netsurf/gtk/gtk_tabs.c

by netsurf＠semichrome.net

Author: jmb Date: Sat Oct 23 08:53:11 2010 New Revision: 10895 URL: http://source.netsurf-browser.org?rev=10895&view=rev Log: Hackery to support GTK >= 2.21.6 Modified: trunk/netsurf/gtk/gtk_tabs.c Modified: trunk/netsurf/gtk/gtk_tabs.c URL: http://source.netsurf-browser.org/trunk/netsurf/gtk/gtk_tabs.c?rev=10895&... ============================================================================== --- trunk/netsurf/gtk/gtk_tabs.c (original) +++ trunk/netsurf/gtk/gtk_tabs.c Sat Oct 23 08:53:11 2010 @@ -37,7 +37,7 @@ static void nsgtk_tab_update_size(GtkWidget *hbox, GtkStyle *previous_style, GtkWidget *close_button); -static void nsgtk_tab_page_changed(GtkNotebook *notebook, GtkNotebookPage *page, +static void nsgtk_tab_page_changed(GtkNotebook *notebook, gpointer *page, gint page_num); void nsgtk_tab_options_changed(GtkWidget *tabs) @@ -183,7 +183,7 @@ gtk_widget_set_size_request(close_button, w + 4, h + 4); } -void nsgtk_tab_page_changed(GtkNotebook *notebook, GtkNotebookPage *page, +void nsgtk_tab_page_changed(GtkNotebook *notebook, gpointer *page, gint page_num) { GtkWidget *window = gtk_notebook_get_nth_page(notebook, page_num);

12 years, 11 months

1
0
0 / 0

r10894 chris_y - in /trunk/netsurf/amiga: download.c download.h gui.c tree.c

by netsurf＠semichrome.net

Author: chris_y Date: Tue Oct 19 17:22:03 2010 New Revision: 10894 URL: http://source.netsurf-browser.org?rev=10894&view=rev Log: Auto-scroll on drags beyond window boundaries Modified: trunk/netsurf/amiga/download.c trunk/netsurf/amiga/download.h trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/tree.c Modified: trunk/netsurf/amiga/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1089... ============================================================================== --- trunk/netsurf/amiga/download.c (original) +++ trunk/netsurf/amiga/download.c Tue Oct 19 17:22:03 2010 @@ -56,11 +56,9 @@ #include <reaction/reaction_macros.h> +struct Window *drag_icon = NULL; ULONG drag_icon_width; ULONG drag_icon_height; - -struct Window *ami_drag_icon_show(struct gui_window *g, char *type, ULONG *x, ULONG *y); -void ami_drag_icon_close(struct Window *win); struct gui_download_window *gui_download_window_create(download_context *ctx, struct gui_window *gui) @@ -360,7 +358,7 @@ break; } - drag_icon = ami_drag_icon_show(g, filetype, &drag_icon_width, &drag_icon_height); + ami_drag_icon_show(g->shared->win, filetype); drag_save_data = c; drag_save_gui = g; @@ -369,7 +367,7 @@ void gui_drag_save_selection(struct selection *s, struct gui_window *g) { - drag_icon = ami_drag_icon_show(g, "ascii", &drag_icon_width, &drag_icon_height); + ami_drag_icon_show(g->shared->win, "ascii"); drag_save_data = s; drag_save = GUI_SAVE_TEXT_SELECTION; @@ -382,7 +380,7 @@ char *source_data; ULONG source_size; - if(drag_icon) ami_drag_icon_close(drag_icon); + if(drag_icon) ami_drag_icon_close(); if(strcmp(option_use_pubscreen,"Workbench") == 0) { @@ -493,9 +491,8 @@ ami_update_pointer(win,GUI_POINTER_DEFAULT); } -struct Window *ami_drag_icon_show(struct gui_window *g, char *type, ULONG *x, ULONG *y) -{ - struct Window *win; +void ami_drag_icon_show(struct Window *win, char *type) +{ struct DiskObject *dobj = NULL; ULONG *icondata1; ULONG width, height; @@ -505,12 +502,12 @@ if(option_drag_save_icons == false) { - gui_window_set_pointer(g, AMI_GUI_POINTER_DRAG); - return NULL; + ami_update_pointer(win, AMI_GUI_POINTER_DRAG); + return; } else { - gui_window_set_pointer(g, GUI_POINTER_DEFAULT); + ami_update_pointer(win, GUI_POINTER_DEFAULT); } if(type == "drawer") deftype = WBDRAWER; @@ -524,10 +521,10 @@ ICONCTRLA_GetHeight,&height, TAG_DONE); - *x = width; - *y = height; - - win = OpenWindowTags(NULL, + drag_icon_width = width; + drag_icon_height = height; + + drag_icon = OpenWindowTags(NULL, WA_Left, scrn->MouseX - (width/2), WA_Top, scrn->MouseY - (height/2), WA_Width, width, @@ -542,27 +539,24 @@ /* probably need layouticon and drawinfo stuff too */ - DrawIconState(win->RPort, dobj, NULL, 0, 0, IDS_NORMAL, + DrawIconState(drag_icon->RPort, dobj, NULL, 0, 0, IDS_NORMAL, ICONDRAWA_Frameless, TRUE, ICONDRAWA_Borderless, TRUE, -// ICONDRAWA_Transparency, 128, TAG_DONE); - - return win; -} - -void ami_drag_icon_move(struct Window *win) -{ - if(win == NULL) return; - - ChangeWindowBox(win, scrn->MouseX - (drag_icon_width / 2), +} + +void ami_drag_icon_move(void) +{ + if(drag_icon == NULL) return; + + ChangeWindowBox(drag_icon, scrn->MouseX - (drag_icon_width / 2), scrn->MouseY - (drag_icon_height / 2), drag_icon_width, drag_icon_height); } -void ami_drag_icon_close(struct Window *win) -{ - if(win) CloseWindow(win); +void ami_drag_icon_close(void) +{ + if(drag_icon) CloseWindow(drag_icon); drag_icon = NULL; } Modified: trunk/netsurf/amiga/download.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=1089... ============================================================================== --- trunk/netsurf/amiga/download.h (original) +++ trunk/netsurf/amiga/download.h Tue Oct 19 17:22:03 2010 @@ -45,12 +45,13 @@ int drag_save; void *drag_save_data; struct gui_window *drag_save_gui; -struct Window *drag_icon; void ami_download_window_abort(struct gui_download_window *dw); BOOL ami_download_window_event(struct gui_download_window *dw); void ami_drag_save(struct Window *win); -void ami_drag_icon_move(struct Window *win); +void ami_drag_icon_show(struct Window *win, char *type); +void ami_drag_icon_close(void); +void ami_drag_icon_move(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/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10894&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Tue Oct 19 17:22:03 2010 @@ -1012,9 +1012,6 @@ switch(result & WMHI_CLASSMASK) // class { case WMHI_MOUSEMOVE: - if(drag_icon) - ami_drag_icon_move(drag_icon); - GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], (ULONG *)&bbox); @@ -1029,6 +1026,32 @@ width=bbox->Width; height=bbox->Height; + + if(gwin->mouse_state & BROWSER_MOUSE_DRAG_ON) + { + int drag_x_move = 0, drag_y_move = 0; + + ami_drag_icon_move(); + + if(gwin->win->MouseX < bbox->Left) + drag_x_move = gwin->win->MouseX - bbox->Left; + if(gwin->win->MouseX > (bbox->Left + bbox->Width)) + drag_x_move = gwin->win->MouseX - (bbox->Left + bbox->Width); + if(gwin->win->MouseY < bbox->Top) + drag_y_move = gwin->win->MouseY - bbox->Top; + if(gwin->win->MouseY > (bbox->Top + bbox->Height)) + drag_y_move = gwin->win->MouseY - (bbox->Top + bbox->Height); + + if(drag_x_move || drag_y_move) + { + gui_window_get_scroll(gwin->bw->window, + &gwin->bw->window->scrollx, &gwin->bw->window->scrolly); + + gui_window_set_scroll(gwin->bw->window, + gwin->bw->window->scrollx + drag_x_move, + gwin->bw->window->scrolly + drag_y_move); + } + } if((x>=xs) && (y>=ys) && (x<width+xs) && (y<height+ys)) { Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10894&r1... ============================================================================== --- trunk/netsurf/amiga/tree.c (original) +++ trunk/netsurf/amiga/tree.c Tue Oct 19 17:22:03 2010 @@ -242,8 +242,6 @@ int x, y; if(!twin) return; - if(sx<0) sx=0; - if(sy<0) sy=0; GetAttr(SCROLLER_Top, twin->objects[OID_HSCROLL], (ULONG *)&x); GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&y); @@ -678,6 +676,27 @@ GetAttr(SCROLLER_Top, twin->objects[OID_VSCROLL], (ULONG *)&ys); y = twin->win->MouseY - bbox->Top + ys; + if(twin->mouse_state & BROWSER_MOUSE_DRAG_ON) + { + 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) + drag_x_move = twin->win->MouseX - bbox->Left; + if(twin->win->MouseX > (bbox->Left + bbox->Width)) + drag_x_move = twin->win->MouseX - (bbox->Left + bbox->Width); + if(twin->win->MouseY < bbox->Top) + drag_y_move = twin->win->MouseY - bbox->Top; + if(twin->win->MouseY > (bbox->Top + bbox->Height)) + drag_y_move = twin->win->MouseY - (bbox->Top + bbox->Height); + + if(drag_x_move || drag_y_move) + ami_tree_scroll(twin, drag_x_move, drag_y_move); + } + if((x >= xs) && (y >= ys) && (x < bbox->Width + xs) && (y < bbox->Height + ys)) {

12 years, 11 months

1
0
0 / 0

r10893 chris_y - /trunk/netsurf/amiga/tree.c

by netsurf＠semichrome.net

Author: chris_y Date: Sun Oct 17 08:15:27 2010 New Revision: 10893 URL: http://source.netsurf-browser.org?rev=10893&view=rev Log: Clear bitmap before redrawing tree Modified: trunk/netsurf/amiga/tree.c Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10893&r1... ============================================================================== --- trunk/netsurf/amiga/tree.c (original) +++ trunk/netsurf/amiga/tree.c Sun Oct 17 08:15:27 2010 @@ -199,6 +199,9 @@ #endif #ifdef WITH_NS_SVG case CONTENT_SVG: +#endif +#ifdef WITH_WEBP + case CONTENT_WEBP: #endif default: ami_get_theme_filename(buffer,"theme_list_content",true); @@ -1046,6 +1049,8 @@ if(x - pos_x + width > bbox->Width) width = bbox->Width - (x - pos_x); if(y - pos_y + height > bbox->Height) height = bbox->Height - (y - pos_y); + ami_clg(0xffffffff); + tree_draw(twin->tree, -pos_x, -pos_y, x, y, width, height); BltBitMapRastPort(twin->globals.bm, x - pos_x, y - pos_y, twin->win->RPort,

12 years, 11 months

1
0
0 / 0

r10892 chris_y - /trunk/netsurf/desktop/tree.c

by netsurf＠semichrome.net

Author: chris_y Date: Sun Oct 17 08:00:51 2010 New Revision: 10892 URL: http://source.netsurf-browser.org?rev=10892&view=rev Log: Make CR also stop and save tree edits Modified: trunk/netsurf/desktop/tree.c Modified: trunk/netsurf/desktop/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree.c?rev=10892&... ============================================================================== --- trunk/netsurf/desktop/tree.c (original) +++ trunk/netsurf/desktop/tree.c Sun Oct 17 08:00:51 2010 @@ -2438,6 +2438,7 @@ tree_stop_edit(tree, false); return true; case KEY_NL: + case KEY_CR: tree_stop_edit(tree, true); return true; default:

12 years, 11 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2010