r6609 vince - /trunk/netsurf/framebuffer/fb_font_freetype.c
by netsurf＠semichrome.net
Author: vince
Date: Mon Feb 23 10:51:31 2009
New Revision: 6609
URL: http://source.netsurf-browser.org?rev=6609&view=rev
Log:
fix splitting on spaces
Modified:
trunk/netsurf/framebuffer/fb_font_freetype.c
Modified: trunk/netsurf/framebuffer/fb_font_freetype.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_font_freet...
==============================================================================
--- trunk/netsurf/framebuffer/fb_font_freetype.c (original)
+++ trunk/netsurf/framebuffer/fb_font_freetype.c Mon Feb 23 10:51:31 2009
@@ -70,7 +70,7 @@
}
/* set the default render mode */
- // ft_load_type = FT_LOAD_MONOCHROME;
+ //ft_load_type = FT_LOAD_MONOCHROME; /* faster but less pretty */
ft_load_type = 0;
return true;
@@ -217,37 +217,40 @@
FT_UInt glyph_index;
FT_Face face = fb_get_face(style);
FT_Error error;
- int last_space_x = -1;
- int last_space_idx = -1;
+ int last_space_x = 0;
+ int last_space_idx = 0;
*actual_x = 0;
while (nxtchr < length) {
ucs4 = utf8_to_ucs4(string + nxtchr, length - nxtchr);
+
+
+ glyph_index = FT_Get_Char_Index(face, ucs4);
+
+ error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
+ if (error)
+ continue;
if (ucs4 == 0x20) {
last_space_x = *actual_x;
last_space_idx = nxtchr;
}
- glyph_index = FT_Get_Char_Index(face, ucs4);
-
- error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
- if (error)
- continue;
-
*actual_x += face->glyph->advance.x >> 6;
- if (*actual_x > x)
- break;
+ if (*actual_x > x) {
+ /* string has exceeded available width return previous
+ * space
+ */
+ *actual_x = last_space_x;
+ *char_offset = last_space_idx;
+ return true;
+ }
nxtchr = utf8_next(string, length, nxtchr);
}
- if (last_space_x == -1) {
- *char_offset = nxtchr;
- } else {
- *actual_x = last_space_x;
- *char_offset = last_space_idx;
- }
+ *char_offset = nxtchr;
+
return true;
}
14 years, 9 months
r6608 tlsa - /trunk/netsurf/Makefile.sources
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Feb 23 09:01:03 2009
New Revision: 6608
URL: http://source.netsurf-browser.org?rev=6608&view=rev
Log:
Pedantic wrap.
Modified:
trunk/netsurf/Makefile.sources
Modified: trunk/netsurf/Makefile.sources
URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.sources?rev=6608...
==============================================================================
--- trunk/netsurf/Makefile.sources (original)
+++ trunk/netsurf/Makefile.sources Mon Feb 23 09:01:03 2009
@@ -9,7 +9,7 @@
fetchers/fetch_curl.c fetchers/fetch_data.c
S_CSS := css.c css_enum.c parser.c ruleset.c scanner.c
S_RENDER := box.c box_construct.c box_normalise.c directory.c \
- form.c html.c html_redraw.c hubbub_binding.c imagemap.c \
+ form.c html.c html_redraw.c hubbub_binding.c imagemap.c \
layout.c libxml_binding.c list.c loosen.c table.c textplain.c
S_UTILS := base64.c filename.c hashtable.c locale.c messages.c talloc.c \
url.c utf8.c utils.c useragent.c
@@ -64,12 +64,11 @@
S_GTK := $(addprefix gtk/,$(S_GTK))
# 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_history.cpp beos_login.cpp \
- beos_options.cpp beos_plotters.cpp beos_scaffolding.cpp \
- beos_schedule.cpp beos_thumbnail.cpp beos_treeview.cpp \
- beos_throbber.cpp beos_window.cpp
+S_BEOS := beos_about.cpp beos_bitmap.cpp beos_fetch_rsrc.cpp \
+ beos_filetype.cpp beos_font.cpp beos_gui.cpp beos_history.cpp \
+ beos_login.cpp beos_options.cpp beos_plotters.cpp \
+ beos_scaffolding.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))
@@ -86,16 +85,16 @@
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_file.c \
- fetch_mailto.c search.c
+ cookies.c context_menu.c clipboard.c save_complete.c \
+ fetch_file.c fetch_mailto.c search.c
S_AMIGA := $(addprefix amiga/,$(S_AMIGA))
# S_FRAMEBUFFER are sources purely for the framebuffer build
S_FRAMEBUFFER := fb_gui.c tree.c history.c hotlist.c fb_schedule.c \
- thumbnail.c misc.c fb_bitmap.c \
- fb_filetype.c login.c fb_cursor.c fb_plotters.c \
- fb_8bpp_plotters.c fb_16bpp_plotters.c fb_32bpp_plotters.c \
- fb_findfile.c fb_rootwindow.c fb_image_data.c
+ thumbnail.c misc.c fb_bitmap.c fb_filetype.c login.c \
+ fb_cursor.c fb_plotters.c fb_8bpp_plotters.c \
+ fb_16bpp_plotters.c fb_32bpp_plotters.c fb_findfile.c \
+ fb_rootwindow.c fb_image_data.c
# fb_1bpp_plotters.c
S_FRAMEBUFFER += fb_font_$(NETSURF_FB_FONTLIB).c
14 years, 9 months
r6607 tlsa - /trunk/netsurf/framebuffer/fb_plotters.c
by netsurf＠semichrome.net
Author: tlsa
Date: Mon Feb 23 03:19:22 2009
New Revision: 6607
URL: http://source.netsurf-browser.org?rev=6607&view=rev
Log:
Neater fix for framebuffer tiled bitmap plot extents.
Modified:
trunk/netsurf/framebuffer/fb_plotters.c
Modified: trunk/netsurf/framebuffer/fb_plotters.c
URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_plotters.c...
==============================================================================
--- trunk/netsurf/framebuffer/fb_plotters.c (original)
+++ trunk/netsurf/framebuffer/fb_plotters.c Mon Feb 23 03:19:22 2009
@@ -430,54 +430,40 @@
{
int xf,yf;
- /* x and y define coordinate of top left of of the initial explicitly
- * placed tile. The width and height are the image scaling and the
- * bounding box defines the extent of the repeat (which may go in all
- * four directions from the initial tile).
- */
-
- LOG(("x %d, y %d, width %d, height %d, bitmap %p, repx %d repy %d content %p", x,y,width,height,bitmap,repeat_x, repeat_y, content));
+ /* x and y define coordinate of top left of of the initial explicitly
+ * placed tile. The width and height are the image scaling and the
+ * bounding box defines the extent of the repeat (which may go in all
+ * four directions from the initial tile).
+ */
+
+ LOG(("x %d, y %d, width %d, height %d, bitmap %p, repx %d repy %d content %p", x,y,width,height,bitmap,repeat_x, repeat_y, content));
if (!(repeat_x || repeat_y)) {
/* Not repeating at all, so just pass it on */
- LOG(("Not repeating"));
+ LOG(("Not repeating"));
return bitmapfn(x, y, width, height, bitmap, bg,content);
}
- /* Initial tile and repeat left, right and down */
+ /* get left most tile position */
+ if (repeat_x)
+ for (; x > fb_plot_ctx.x0; x -= width)
+ ;
+
+ /* get top most tile position */
+ if (repeat_y)
+ for (; y > fb_plot_ctx.y0; y -= height)
+ ;
+
+ /* tile down and across to extents */
for (xf = x; xf < fb_plot_ctx.x1; xf += width) {
for (yf = y; yf < fb_plot_ctx.y1; yf += height) {
- bitmapfn(xf, yf, width, height, bitmap, bg, content);
- if (!repeat_y)
- break;
- }
- for (yf = y - height; yf + height > fb_plot_ctx.y0;
- yf -= height) {
- if (!repeat_y)
- break;
- bitmapfn(xf, yf, width, height, bitmap, bg, content);
+ bitmapfn(xf, yf, width, height, bitmap, bg, content);
+ if (!repeat_y)
+ break;
}
- if (!repeat_x)
- break;
+ if (!repeat_x)
+ break;
}
-
- /* repeat left and right above */
- for (xf = x - width; xf + height > fb_plot_ctx.x0; xf -= width) {
- if (!repeat_x)
- break;
- for (yf = y; yf < fb_plot_ctx.y1; yf += height) {
- bitmapfn(xf, yf, width, height, bitmap, bg, content);
- if (!repeat_y)
- break;
- }
- for (yf = y - height; yf + height > fb_plot_ctx.y0;
- yf -= height) {
- if (!repeat_y)
- break;
- bitmapfn(xf, yf, width, height, bitmap, bg, content);
- }
- }
-
return true;
}
14 years, 9 months
r6606 jmb - /trunk/netsurf/desktop/textinput.c
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 17:30:27 2009
New Revision: 6606
URL: http://source.netsurf-browser.org?rev=6606&view=rev
Log:
Only attempt to find the next character in a string if we're not already at the end of the string.
Modified:
trunk/netsurf/desktop/textinput.c
Modified: trunk/netsurf/desktop/textinput.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/textinput.c?rev=6...
==============================================================================
--- trunk/netsurf/desktop/textinput.c (original)
+++ trunk/netsurf/desktop/textinput.c Sun Feb 22 17:30:27 2009
@@ -455,8 +455,7 @@
/* leave caret at join */
reflow = true;
- }
- else {
+ } else {
/* delete a character */
size_t next_offset = utf8_next(text_box->text,
text_box->length, char_offset);
@@ -1052,9 +1051,12 @@
break;
}
- /* Go to the next valid UTF-8 character */
- box_offset = utf8_next(text_box->text, text_box->length,
- box_offset);
+ if (box_offset < text_box->length) {
+ /* Go to the next valid UTF-8 character */
+ box_offset = utf8_next(text_box->text,
+ text_box->length, box_offset);
+ }
+
break;
case KEY_LEFT:
14 years, 9 months
r6604 jmb - in /trunk/netsurf: Docs/Doxyfile riscos/dialog.c riscos/gui.h riscos/search.c riscos/window.c utils/config.h
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 09:21:54 2009
New Revision: 6604
URL: http://source.netsurf-browser.org?rev=6604&view=rev
Log:
Purge WITH_SEARCH
Modified:
trunk/netsurf/Docs/Doxyfile
trunk/netsurf/riscos/dialog.c
trunk/netsurf/riscos/gui.h
trunk/netsurf/riscos/search.c
trunk/netsurf/riscos/window.c
trunk/netsurf/utils/config.h
Modified: trunk/netsurf/Docs/Doxyfile
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6604&r1...
==============================================================================
--- trunk/netsurf/Docs/Doxyfile (original)
+++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:21:54 2009
@@ -894,7 +894,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_PDF_EXPORT
+PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SPRITE WITH_THEME_INSTALL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: trunk/netsurf/riscos/dialog.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6604&...
==============================================================================
--- trunk/netsurf/riscos/dialog.c (original)
+++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:21:54 2009
@@ -131,9 +131,7 @@
ro_gui_wimp_event_set_help_prefix(dialog_debug, "HelpDebug");
/* search */
-#ifdef WITH_SEARCH
ro_gui_search_init();
-#endif
/* print */
ro_gui_print_init();
Modified: trunk/netsurf/riscos/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=6604&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.h (original)
+++ trunk/netsurf/riscos/gui.h Sun Feb 22 09:21:54 2009
@@ -198,11 +198,9 @@
void ro_gui_debugwin_open(void);
/* in search.c */
-#ifdef WITH_SEARCH
void ro_gui_search_init(void);
void ro_gui_search_prepare(struct gui_window *g);
bool ro_gui_search_prepare_menu(void);
-#endif
/* in print.c */
void ro_gui_print_init(void);
Modified: trunk/netsurf/riscos/search.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/search.c?rev=6604&...
==============================================================================
--- trunk/netsurf/riscos/search.c (original)
+++ trunk/netsurf/riscos/search.c Sun Feb 22 09:21:54 2009
@@ -22,7 +22,6 @@
*/
#include "utils/config.h"
-#ifdef WITH_SEARCH
#include <ctype.h>
#include <string.h>
@@ -877,4 +876,3 @@
found ? "" : messages_get("NotFound"), true);
}
-#endif
Modified: trunk/netsurf/riscos/window.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=6604&...
==============================================================================
--- trunk/netsurf/riscos/window.c (original)
+++ trunk/netsurf/riscos/window.c Sun Feb 22 09:21:54 2009
@@ -2177,12 +2177,10 @@
ro_gui_menu_handle_action(g->window,
BROWSER_NAVIGATE_HOME, true);
break;
-#ifdef WITH_SEARCH
case ICON_TOOLBAR_SEARCH:
ro_gui_menu_handle_action(g->window,
BROWSER_FIND_TEXT, true);
break;
-#endif
case ICON_TOOLBAR_SCALE:
ro_gui_menu_handle_action(g->window,
BROWSER_SCALE_VIEW, true);
@@ -2426,12 +2424,10 @@
return ro_gui_menu_handle_action(g->window,
BROWSER_EXPORT_DRAW, false);
-#ifdef WITH_SEARCH
case 6: /* Ctrl + F */
case IS_WIMP_KEY + wimp_KEY_F4: /* Search */
return ro_gui_menu_handle_action(g->window,
BROWSER_FIND_TEXT, false);
-#endif
case IS_WIMP_KEY + wimp_KEY_F5: /* Reload */
return ro_gui_menu_handle_action(g->window,
Modified: trunk/netsurf/utils/config.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6604&r...
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sun Feb 22 09:21:54 2009
@@ -41,8 +41,6 @@
/* Platform specific features */
#if defined(riscos)
- /* Free text search */
- #define WITH_SEARCH
/* Theme auto-install */
#define WITH_THEME_INSTALL
#elif defined(__HAIKU__) || defined(__BEOS__)
14 years, 9 months
r6603 jmb - in /trunk/netsurf: Docs/Doxyfile riscos/gui.c riscos/url_protocol.c riscos/url_protocol.h utils/config.h
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 09:19:06 2009
New Revision: 6603
URL: http://source.netsurf-browser.org?rev=6603&view=rev
Log:
Purge WITH_URL
Modified:
trunk/netsurf/Docs/Doxyfile
trunk/netsurf/riscos/gui.c
trunk/netsurf/riscos/url_protocol.c
trunk/netsurf/riscos/url_protocol.h
trunk/netsurf/utils/config.h
Modified: trunk/netsurf/Docs/Doxyfile
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6603&r1...
==============================================================================
--- trunk/netsurf/Docs/Doxyfile (original)
+++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:19:06 2009
@@ -894,7 +894,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URL WITH_PDF_EXPORT
+PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: trunk/netsurf/riscos/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=6603&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.c (original)
+++ trunk/netsurf/riscos/gui.c Sun Feb 22 09:19:06 2009
@@ -83,9 +83,7 @@
#include "riscos/theme.h"
#include "riscos/treeview.h"
#include "riscos/uri.h"
-#ifdef WITH_URL
#include "riscos/url_protocol.h"
-#endif
#include "riscos/url_complete.h"
#include "riscos/wimp.h"
#include "riscos/wimp_event.h"
@@ -205,9 +203,7 @@
message_FONT_CHANGED,
message_URI_PROCESS,
message_URI_RETURN_RESULT,
-#ifdef WITH_URL
message_INET_SUITE_OPEN_URL,
-#endif
#ifdef WITH_PLUGIN
message_PLUG_IN_OPENING,
message_PLUG_IN_CLOSED,
@@ -1373,7 +1369,6 @@
case message_URI_RETURN_RESULT:
ro_uri_bounce(message);
break;
-#ifdef WITH_URL
case message_INET_SUITE_OPEN_URL:
if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) {
ro_url_bounce(message);
@@ -1382,7 +1377,6 @@
ro_url_message_received(message);
}
break;
-#endif
#ifdef WITH_PLUGIN
case message_PLUG_IN_OPENING:
plugin_opening(message);
@@ -2319,10 +2313,8 @@
void gui_launch_url(const char *url)
{
-#ifdef WITH_URL
/* Try ant broadcast first */
ro_url_broadcast(url);
-#endif
}
Modified: trunk/netsurf/riscos/url_protocol.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/url_protocol.c?rev...
==============================================================================
--- trunk/netsurf/riscos/url_protocol.c (original)
+++ trunk/netsurf/riscos/url_protocol.c Sun Feb 22 09:19:06 2009
@@ -25,7 +25,6 @@
*/
#include "utils/config.h"
-#ifdef WITH_URL
#define _GNU_SOURCE /* for strndup */
#include <ctype.h>
@@ -205,4 +204,3 @@
ro_uri_launch(url_message->url);
}
-#endif
Modified: trunk/netsurf/riscos/url_protocol.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/url_protocol.h?rev...
==============================================================================
--- trunk/netsurf/riscos/url_protocol.h (original)
+++ trunk/netsurf/riscos/url_protocol.h Sun Feb 22 09:19:06 2009
@@ -24,7 +24,6 @@
#define _NETSURF_RISCOS_URL_H_
#include "utils/config.h"
-#ifdef WITH_URL
#include "oslib/wimp.h"
@@ -33,6 +32,4 @@
void ro_url_load(const char *url);
void ro_url_bounce(wimp_message *message);
-#endif /* WITH_URL */
-
#endif
Modified: trunk/netsurf/utils/config.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6603&r...
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sun Feb 22 09:19:06 2009
@@ -41,8 +41,6 @@
/* Platform specific features */
#if defined(riscos)
- /* ANT URL protocol support */
- #define WITH_URL
/* Free text search */
#define WITH_SEARCH
/* Theme auto-install */
14 years, 9 months
r6602 jmb - in /trunk/netsurf: Docs/Doxyfile riscos/gui.c riscos/uri.c riscos/uri.h utils/config.h
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 09:17:46 2009
New Revision: 6602
URL: http://source.netsurf-browser.org?rev=6602&view=rev
Log:
Purge WITH_URI
Modified:
trunk/netsurf/Docs/Doxyfile
trunk/netsurf/riscos/gui.c
trunk/netsurf/riscos/uri.c
trunk/netsurf/riscos/uri.h
trunk/netsurf/utils/config.h
Modified: trunk/netsurf/Docs/Doxyfile
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6602&r1...
==============================================================================
--- trunk/netsurf/Docs/Doxyfile (original)
+++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:17:46 2009
@@ -894,7 +894,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
+PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: trunk/netsurf/riscos/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=6602&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.c (original)
+++ trunk/netsurf/riscos/gui.c Sun Feb 22 09:17:46 2009
@@ -82,9 +82,7 @@
#include "riscos/textselection.h"
#include "riscos/theme.h"
#include "riscos/treeview.h"
-#ifdef WITH_URI
#include "riscos/uri.h"
-#endif
#ifdef WITH_URL
#include "riscos/url_protocol.h"
#endif
@@ -205,10 +203,8 @@
message_DRAG_CLAIM,
message_MODE_CHANGE,
message_FONT_CHANGED,
-#ifdef WITH_URI
message_URI_PROCESS,
message_URI_RETURN_RESULT,
-#endif
#ifdef WITH_URL
message_INET_SUITE_OPEN_URL,
#endif
@@ -1370,7 +1366,6 @@
ro_gui_wimp_get_desktop_font();
break;
-#ifdef WITH_URI
case message_URI_PROCESS:
if (event != wimp_USER_MESSAGE_ACKNOWLEDGE)
ro_uri_message_received(message);
@@ -1378,7 +1373,6 @@
case message_URI_RETURN_RESULT:
ro_uri_bounce(message);
break;
-#endif
#ifdef WITH_URL
case message_INET_SUITE_OPEN_URL:
if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) {
Modified: trunk/netsurf/riscos/uri.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/uri.c?rev=6602&r1=...
==============================================================================
--- trunk/netsurf/riscos/uri.c (original)
+++ trunk/netsurf/riscos/uri.c Sun Feb 22 09:17:46 2009
@@ -17,7 +17,6 @@
*/
#include "utils/config.h"
-#ifdef WITH_URI
#include <stdbool.h>
#include <stdio.h>
@@ -101,4 +100,3 @@
return;
}
-#endif
Modified: trunk/netsurf/riscos/uri.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/uri.h?rev=6602&r1=...
==============================================================================
--- trunk/netsurf/riscos/uri.h (original)
+++ trunk/netsurf/riscos/uri.h Sun Feb 22 09:17:46 2009
@@ -20,7 +20,6 @@
#define _NETSURF_RISCOS_URI_H_
#include "utils/config.h"
-#ifdef WITH_URI
#include "oslib/wimp.h"
@@ -28,6 +27,4 @@
bool ro_uri_launch(char *uri);
void ro_uri_bounce(wimp_message *message);
-#endif /* WITH_URI */
-
#endif
Modified: trunk/netsurf/utils/config.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6602&r...
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sun Feb 22 09:17:46 2009
@@ -41,8 +41,6 @@
/* Platform specific features */
#if defined(riscos)
- /* Acorn URI protocol support */
- #define WITH_URI
/* ANT URL protocol support */
#define WITH_URL
/* Free text search */
14 years, 9 months
r6601 jmb - in /trunk/netsurf: Docs/Doxyfile riscos/dialog.c riscos/gui.c riscos/print.c riscos/print.h riscos/window.c utils/config.h
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 09:16:04 2009
New Revision: 6601
URL: http://source.netsurf-browser.org?rev=6601&view=rev
Log:
Purge WITH_PRINT
Modified:
trunk/netsurf/Docs/Doxyfile
trunk/netsurf/riscos/dialog.c
trunk/netsurf/riscos/gui.c
trunk/netsurf/riscos/print.c
trunk/netsurf/riscos/print.h
trunk/netsurf/riscos/window.c
trunk/netsurf/utils/config.h
Modified: trunk/netsurf/Docs/Doxyfile
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6601&r1...
==============================================================================
--- trunk/netsurf/Docs/Doxyfile (original)
+++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:16:04 2009
@@ -894,7 +894,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
+PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: trunk/netsurf/riscos/dialog.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6601&...
==============================================================================
--- trunk/netsurf/riscos/dialog.c (original)
+++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:16:04 2009
@@ -136,9 +136,7 @@
#endif
/* print */
-#ifdef WITH_PRINT
ro_gui_print_init();
-#endif
/* about us */
dialog_info = ro_gui_dialog_create("info");
Modified: trunk/netsurf/riscos/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.c?rev=6601&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.c (original)
+++ trunk/netsurf/riscos/gui.c Sun Feb 22 09:16:04 2009
@@ -75,9 +75,7 @@
#ifdef WITH_PLUGIN
#include "riscos/plugin.h"
#endif
-#ifdef WITH_PRINT
#include "riscos/print.h"
-#endif
#include "riscos/query.h"
#include "riscos/save.h"
#include "riscos/save_complete.h"
@@ -235,11 +233,9 @@
message_PLUG_IN_ACTION,
/* message_PLUG_IN_INFORMED, (not provided by oslib) */
#endif
-#ifdef WITH_PRINT
message_PRINT_SAVE,
message_PRINT_ERROR,
message_PRINT_TYPE_ODD,
-#endif
0
} };
@@ -1336,20 +1332,16 @@
ro_msg_terminate_filename((wimp_full_message_data_xfer*)message);
if (event == wimp_USER_MESSAGE_ACKNOWLEDGE) {
-#ifdef WITH_PRINT
if (ro_print_current_window)
ro_print_dataload_bounce(message);
-#endif
}
else
ro_msg_dataload(message);
break;
case message_DATA_LOAD_ACK:
-#ifdef WITH_PRINT
if (ro_print_current_window)
ro_print_cleanup();
-#endif
break;
case message_MENU_WARNING:
@@ -1442,7 +1434,6 @@
case message_PLUG_IN_ACTION:
break;
#endif
-#ifdef WITH_PRINT
case message_PRINT_SAVE:
if (event == wimp_USER_MESSAGE_ACKNOWLEDGE)
ro_print_save_bounce(message);
@@ -1453,7 +1444,6 @@
case message_PRINT_TYPE_ODD:
ro_print_type_odd(message);
break;
-#endif
case message_QUIT:
netsurf_quit = true;
@@ -1866,10 +1856,8 @@
{
ro_msg_terminate_filename((wimp_full_message_data_xfer*)message);
-#ifdef WITH_PRINT
if (ro_print_ack(message))
return;
-#endif
switch (gui_current_drag_type) {
case GUI_DRAG_DOWNLOAD_SAVE:
Modified: trunk/netsurf/riscos/print.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/print.c?rev=6601&r...
==============================================================================
--- trunk/netsurf/riscos/print.c (original)
+++ trunk/netsurf/riscos/print.c Sun Feb 22 09:16:04 2009
@@ -18,7 +18,6 @@
*/
#include "utils/config.h"
-#ifdef WITH_PRINT
#include <assert.h>
#include <string.h>
@@ -952,5 +951,3 @@
print_fonts_count++;
}
-
-#endif
Modified: trunk/netsurf/riscos/print.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/print.h?rev=6601&r...
==============================================================================
--- trunk/netsurf/riscos/print.h (original)
+++ trunk/netsurf/riscos/print.h Sun Feb 22 09:16:04 2009
@@ -20,7 +20,6 @@
#define _NETSURF_RISCOS_PRINT_H_
#include "utils/config.h"
-#ifdef WITH_PRINT
#include <stdbool.h>
#include "oslib/wimp.h"
@@ -36,6 +35,4 @@
void ro_print_dataload_bounce(wimp_message *m);
void ro_print_cleanup(void);
-#endif /* WITH_PRINT */
-
#endif
Modified: trunk/netsurf/riscos/window.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=6601&...
==============================================================================
--- trunk/netsurf/riscos/window.c (original)
+++ trunk/netsurf/riscos/window.c Sun Feb 22 09:16:04 2009
@@ -2546,11 +2546,9 @@
}
return true;
-#ifdef WITH_PRINT
case IS_WIMP_KEY + wimp_KEY_PRINT:
return ro_gui_menu_handle_action(g->window,
BROWSER_PRINT, false);
-#endif
case IS_WIMP_KEY | wimp_KEY_LEFT:
case IS_WIMP_KEY | wimp_KEY_RIGHT:
Modified: trunk/netsurf/utils/config.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6601&r...
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sun Feb 22 09:16:04 2009
@@ -47,8 +47,6 @@
#define WITH_URL
/* Free text search */
#define WITH_SEARCH
- /* Printing support */
- #define WITH_PRINT
/* Theme auto-install */
#define WITH_THEME_INSTALL
#elif defined(__HAIKU__) || defined(__BEOS__)
14 years, 9 months
r6600 jmb - in /trunk/netsurf: Docs/Doxyfile content/content.h content/fetch.h content/fetchcache.c content/fetchers/fetch_curl.c css/css.c desktop/401login.h desktop/browser.c render/html.c riscos/401login.c riscos/dialog.c riscos/gui.h utils/config.h
by netsurf＠semichrome.net
Author: jmb
Date: Sun Feb 22 09:13:10 2009
New Revision: 6600
URL: http://source.netsurf-browser.org?rev=6600&view=rev
Log:
Purge WITH_AUTH
Modified:
trunk/netsurf/Docs/Doxyfile
trunk/netsurf/content/content.h
trunk/netsurf/content/fetch.h
trunk/netsurf/content/fetchcache.c
trunk/netsurf/content/fetchers/fetch_curl.c
trunk/netsurf/css/css.c
trunk/netsurf/desktop/401login.h
trunk/netsurf/desktop/browser.c
trunk/netsurf/render/html.c
trunk/netsurf/riscos/401login.c
trunk/netsurf/riscos/dialog.c
trunk/netsurf/riscos/gui.h
trunk/netsurf/utils/config.h
Modified: trunk/netsurf/Docs/Doxyfile
URL: http://source.netsurf-browser.org/trunk/netsurf/Docs/Doxyfile?rev=6600&r1...
==============================================================================
--- trunk/netsurf/Docs/Doxyfile (original)
+++ trunk/netsurf/Docs/Doxyfile Sun Feb 22 09:13:10 2009
@@ -894,7 +894,7 @@
# or name=definition (no spaces). If the definition and the = are
# omitted =1 is assumed.
-PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_AUTH WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
+PREDEFINED = riscos CSS_INTERNALS WITH_ARTWORKS WITH_BMP WITH_DRAW WITH_DRAW_EXPORT WITH_GIF WITH_JPEG WITH_MMAP WITH_MNG WITH_NSSPRITE WITH_NS_SVG WITH_PLUGIN WITH_PRINT WITH_RSVG WITH_SAVE_COMPLETE WITH_SEARCH WITH_SPRITE WITH_THEME_INSTALL WITH_URI WITH_URL WITH_PDF_EXPORT
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
# this tag can be used to specify a list of macro names that should be expanded.
Modified: trunk/netsurf/content/content.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/content.h?rev=660...
==============================================================================
--- trunk/netsurf/content/content.h (original)
+++ trunk/netsurf/content/content.h Sun Feb 22 09:13:10 2009
@@ -97,9 +97,7 @@
CONTENT_MSG_NEWPTR, /**< structure has been replaced */
CONTENT_MSG_REFRESH, /**< wants refresh */
CONTENT_MSG_LAUNCH, /**< needs url launching in external program */
-#ifdef WITH_AUTH
CONTENT_MSG_AUTH, /**< authentication required */
-#endif
CONTENT_MSG_SSL /**< SSL cert verify failed */
} content_msg;
Modified: trunk/netsurf/content/fetch.h
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetch.h?rev=6600&...
==============================================================================
--- trunk/netsurf/content/fetch.h (original)
+++ trunk/netsurf/content/fetch.h Sun Feb 22 09:13:10 2009
@@ -36,9 +36,7 @@
FETCH_ERROR,
FETCH_REDIRECT,
FETCH_NOTMODIFIED,
-#ifdef WITH_AUTH
FETCH_AUTH,
-#endif
FETCH_CERT_ERR,
} fetch_msg;
Modified: trunk/netsurf/content/fetchcache.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchcache.c?rev=...
==============================================================================
--- trunk/netsurf/content/fetchcache.c (original)
+++ trunk/netsurf/content/fetchcache.c Sun Feb 22 09:13:10 2009
@@ -501,7 +501,6 @@
fetchcache_notmodified(c, data);
break;
-#ifdef WITH_AUTH
case FETCH_AUTH:
/* data -> string containing the Realm */
LOG(("FETCH_AUTH, '%s'", (const char *)data));
@@ -512,7 +511,6 @@
* destroyed in content_clean() */
c->status = CONTENT_STATUS_ERROR;
break;
-#endif
case FETCH_CERT_ERR:
c->fetch = 0;
Modified: trunk/netsurf/content/fetchers/fetch_curl.c
URL: http://source.netsurf-browser.org/trunk/netsurf/content/fetchers/fetch_cu...
==============================================================================
--- trunk/netsurf/content/fetchers/fetch_curl.c (original)
+++ trunk/netsurf/content/fetchers/fetch_curl.c Sun Feb 22 09:13:10 2009
@@ -561,16 +561,13 @@
SETOPT(CURLOPT_COOKIE, NULL);
}
-#ifdef WITH_AUTH
if ((auth = urldb_get_auth_details(f->url)) != NULL) {
SETOPT(CURLOPT_HTTPAUTH, CURLAUTH_ANY);
SETOPT(CURLOPT_USERPWD, auth);
} else {
-#endif
SETOPT(CURLOPT_USERPWD, NULL);
-#ifdef WITH_AUTH
- }
-#endif
+ }
+
if (option_http_proxy && option_http_proxy_host) {
SETOPT(CURLOPT_PROXY, option_http_proxy_host);
SETOPT(CURLOPT_PROXYPORT, (long) option_http_proxy_port);
@@ -1036,7 +1033,6 @@
SKIP_ST(15);
if (i < (int)size && '0' <= data[i] && data[i] <= '9')
f->content_length = atol(data + i);
-#ifdef WITH_AUTH
} else if (17 < size && strncasecmp(data, "WWW-Authenticate:", 17) == 0) {
/* extract the first Realm from WWW-Authenticate header */
free(f->realm);
@@ -1065,7 +1061,6 @@
f->realm[i] == '\n'); --i)
f->realm[i] = '\0';
}
-#endif
} else if (11 < size && strncasecmp(data, "Set-Cookie:", 11) == 0) {
/* extract Set-Cookie header */
SKIP_ST(11);
@@ -1118,12 +1113,10 @@
}
/* handle HTTP 401 (Authentication errors) */
-#ifdef WITH_AUTH
if (http_code == 401) {
fetch_send_callback(FETCH_AUTH, f->fetch_handle, f->realm,0);
return true;
}
-#endif
/* handle HTTP errors (non 2xx response codes) */
if (f->only_2xx && strncmp(f->url, "http", 4) == 0 &&
Modified: trunk/netsurf/css/css.c
URL: http://source.netsurf-browser.org/trunk/netsurf/css/css.c?rev=6600&r1=659...
==============================================================================
--- trunk/netsurf/css/css.c (original)
+++ trunk/netsurf/css/css.c Sun Feb 22 09:13:10 2009
@@ -956,12 +956,10 @@
/*css_dump_stylesheet(css->data.css);*/
c->active--;
break;
-#ifdef WITH_AUTH
+
case CONTENT_MSG_AUTH:
-#endif
case CONTENT_MSG_SSL:
/* todo: handle AUTH and SSL */
-
case CONTENT_MSG_LAUNCH:
/* Fall through */
case CONTENT_MSG_ERROR:
Modified: trunk/netsurf/desktop/401login.h
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/401login.h?rev=66...
==============================================================================
--- trunk/netsurf/desktop/401login.h (original)
+++ trunk/netsurf/desktop/401login.h Sun Feb 22 09:13:10 2009
@@ -20,7 +20,6 @@
#define NETSURF_DESKTOP_401LOGIN_H
#include "utils/config.h"
-#ifdef WITH_AUTH
#include "content/content.h"
#include "desktop/browser.h"
@@ -29,5 +28,3 @@
const char *realm);
#endif
-
-#endif
Modified: trunk/netsurf/desktop/browser.c
URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=660...
==============================================================================
--- trunk/netsurf/desktop/browser.c (original)
+++ trunk/netsurf/desktop/browser.c Sun Feb 22 09:13:10 2009
@@ -40,9 +40,7 @@
#include "content/fetchcache.h"
#include "content/urldb.h"
#include "css/css.h"
-#ifdef WITH_AUTH
#include "desktop/401login.h"
-#endif
#include "desktop/browser.h"
#include "desktop/frames.h"
#include "desktop/history_core.h"
@@ -587,7 +585,6 @@
bw->referer = 0;
break;
-#ifdef WITH_AUTH
case CONTENT_MSG_AUTH:
gui_401login_open(bw, c, data.auth_realm);
if (c == bw->loading_content)
@@ -602,7 +599,6 @@
free(bw->referer);
bw->referer = 0;
break;
-#endif
case CONTENT_MSG_SSL:
gui_cert_verify(bw, c, data.ssl.certs, data.ssl.num);
Modified: trunk/netsurf/render/html.c
URL: http://source.netsurf-browser.org/trunk/netsurf/render/html.c?rev=6600&r1...
==============================================================================
--- trunk/netsurf/render/html.c (original)
+++ trunk/netsurf/render/html.c Sun Feb 22 09:13:10 2009
@@ -1131,13 +1131,11 @@
c->data.html.stylesheet_content[i] = css;
break;
-#ifdef WITH_AUTH
case CONTENT_MSG_AUTH:
c->data.html.stylesheet_content[i] = 0;
c->active--;
content_add_error(c, "?", 0);
break;
-#endif
case CONTENT_MSG_SSL:
c->data.html.stylesheet_content[i] = 0;
@@ -1410,13 +1408,11 @@
c->data.html.object[i].content = object;
break;
-#ifdef WITH_AUTH
case CONTENT_MSG_AUTH:
c->data.html.object[i].content = 0;
c->active--;
content_add_error(c, "?", 0);
break;
-#endif
case CONTENT_MSG_SSL:
c->data.html.object[i].content = 0;
Modified: trunk/netsurf/riscos/401login.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/401login.c?rev=660...
==============================================================================
--- trunk/netsurf/riscos/401login.c (original)
+++ trunk/netsurf/riscos/401login.c Sun Feb 22 09:13:10 2009
@@ -17,7 +17,6 @@
*/
#include "utils/config.h"
-#ifdef WITH_AUTH
#include <assert.h>
#include <stdbool.h>
@@ -213,4 +212,3 @@
return true;
}
-#endif
Modified: trunk/netsurf/riscos/dialog.c
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/dialog.c?rev=6600&...
==============================================================================
--- trunk/netsurf/riscos/dialog.c (original)
+++ trunk/netsurf/riscos/dialog.c Sun Feb 22 09:13:10 2009
@@ -64,9 +64,7 @@
wimp_w dialog_info, dialog_saveas,
-#ifdef WITH_AUTH
dialog_401li,
-#endif
dialog_zoom, dialog_pageinfo, dialog_objinfo, dialog_tooltip,
dialog_warning, dialog_debug,
dialog_folder, dialog_entry, dialog_search, dialog_print,
@@ -105,9 +103,7 @@
ro_gui_configure_initialise();
/* 401 login window */
-#ifdef WITH_AUTH
ro_gui_401login_init();
-#endif
/* certificate verification window */
ro_gui_cert_init();
Modified: trunk/netsurf/riscos/gui.h
URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/gui.h?rev=6600&r1=...
==============================================================================
--- trunk/netsurf/riscos/gui.h (original)
+++ trunk/netsurf/riscos/gui.h Sun Feb 22 09:13:10 2009
@@ -134,9 +134,7 @@
bool ro_gui_download_prequit(void);
/* in 401login.c */
-#ifdef WITH_AUTH
void ro_gui_401login_init(void);
-#endif
/* in sslcert.c */
void ro_gui_cert_init(void);
Modified: trunk/netsurf/utils/config.h
URL: http://source.netsurf-browser.org/trunk/netsurf/utils/config.h?rev=6600&r...
==============================================================================
--- trunk/netsurf/utils/config.h (original)
+++ trunk/netsurf/utils/config.h Sun Feb 22 09:13:10 2009
@@ -39,9 +39,6 @@
* IF ADDING A FEATURE HERE, ADD IT TO Docs/Doxyfile's "PREDEFINED" DEFINITION AS WELL.
*/
-/* HTTP Auth */
-#define WITH_AUTH
-
/* Platform specific features */
#if defined(riscos)
/* Acorn URI protocol support */
14 years, 9 months