June 2007 - netsurf-commits - listmaster.pepperfish.net

r3316 dsilvers - /branches/dsilvers/scheme-switcher/

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Jun 10 12:08:26 2007 New Revision: 3316 URL: http://svn.semichrome.net?rev=3D3316&view=3Drev Log: Initialized merge tracking via "svnmerge" with revisions "1-3314" from = svn://svn.semichrome.net/trunk/netsurf Modified: branches/dsilvers/scheme-switcher/ (props changed) Propchange: branches/dsilvers/scheme-switcher/ ---------------------------------------------------------------------------= --- svnmerge-integrated =3D /trunk/netsurf:1-3314

15 years, 8 months

1
0
0 / 0

r3315 dsilvers - /branches/dsilvers/scheme-switcher/

by netsurf＠semichrome.net

Author: dsilvers Date: Sun Jun 10 12:02:06 2007 New Revision: 3315 URL: http://svn.semichrome.net?rev=3D3315&view=3Drev Log: Prepare branch for scheme switcher Added: branches/dsilvers/scheme-switcher/ - copied from r3314, trunk/netsurf/

15 years, 8 months

1
0
0 / 0

r3314 bursa - /trunk/rufl/rufl_paint.c

by netsurf＠semichrome.net

Author: bursa Date: Sun Jun 10 01:25:12 2007 New Revision: 3314 URL: http://svn.semichrome.net?rev=3D3314&view=3Drev Log: Work around for broken PS printer driver. Modified: trunk/rufl/rufl_paint.c Modified: trunk/rufl/rufl_paint.c URL: http://svn.semichrome.net/trunk/rufl/rufl_paint.c?rev=3D3314&r1=3D3313= &r2=3D3314&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rufl/rufl_paint.c (original) +++ trunk/rufl/rufl_paint.c Sun Jun 10 01:25:12 2007 @@ -403,8 +403,12 @@ = if (action =3D=3D rufl_FONT_BBOX) { rufl_fm_error =3D xfont_read_info(f, &x[0], &x[1], &x[2], &x[3]); - if (rufl_fm_error) + if (rufl_fm_error) { + LOG("xfont_read_info: 0x%x: %s", + rufl_fm_error->errnum, + rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; + } return rufl_OK; } = @@ -420,6 +424,15 @@ = if (action =3D=3D rufl_PAINT) { /* paint span */ + /* call Font_SetFont to work around broken PS printer driver, + * which doesn't use the font handle from Font_Paint */ + rufl_fm_error =3D xfont_set_font(f); + if (rufl_fm_error) { + LOG("xfont_set_font: 0x%x: %s", + rufl_fm_error->errnum, + rufl_fm_error->errmess); + return rufl_FONT_MANAGER_ERROR; + } rufl_fm_error =3D xfont_paint(f, s2, font_OS_UNITS | (oblique ? font_GIVEN_TRFM : 0) | font_GIVEN_LENGTH | font_GIVEN_FONT | @@ -427,8 +440,12 @@ ((flags & rufl_BLEND_FONT) ? font_BLEND_FONT : 0), *x, y, 0, &trfm_oblique, n); - if (rufl_fm_error) + if (rufl_fm_error) { + LOG("xfont_paint: 0x%x: %s", + rufl_fm_error->errnum, + rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; + } } else if (action =3D=3D rufl_PAINT_CALLBACK) { callback(context, rufl_font_list[font].identifier, font_size, s2, 0, n, *x, y); @@ -450,8 +467,12 @@ 0x7fffffff, 0x7fffffff, 0, 0, n, 0, &x_out, &y_out, 0); } - if (rufl_fm_error) + if (rufl_fm_error) { + LOG("xfont_scan_string: 0x%x: %s", + rufl_fm_error->errnum, + rufl_fm_error->errmess); return rufl_FONT_MANAGER_ERROR; + } *x +=3D x_out / 400; = return rufl_OK;

15 years, 8 months

1
0
0 / 0

r3313 bursa - in /trunk/rufl: rufl_decompose.c rufl_metrics.c

by netsurf＠semichrome.net

Author: bursa Date: Sat Jun 9 15:26:24 2007 New Revision: 3313 URL: http://svn.semichrome.net?rev=3D3313&view=3Drev Log: Fix LOG warnings. Modified: trunk/rufl/rufl_decompose.c trunk/rufl/rufl_metrics.c Modified: trunk/rufl/rufl_decompose.c URL: http://svn.semichrome.net/trunk/rufl/rufl_decompose.c?rev=3D3313&r1=3D= 3312&r2=3D3313&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rufl/rufl_decompose.c (original) +++ trunk/rufl/rufl_decompose.c Sat Jun 9 15:26:24 2007 @@ -104,7 +104,7 @@ /* Allocate and initialise buffer */ buf =3D malloc(buf_size); if (!buf) { - LOG("Failed allocating buffer", 0); + LOG("Failed to allocate decompose buffer of size %i", buf_size); return rufl_OUT_OF_MEMORY; } buf[0] =3D 0; Modified: trunk/rufl/rufl_metrics.c URL: http://svn.semichrome.net/trunk/rufl/rufl_metrics.c?rev=3D3313&r1=3D33= 12&r2=3D3313&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/rufl/rufl_metrics.c (original) +++ trunk/rufl/rufl_metrics.c Sat Jun 9 15:26:24 2007 @@ -49,7 +49,8 @@ } = if (misc_size =3D=3D 0) { - LOG("No font metrics in file", 0); + LOG("no miscellaneous information in metrics for %s", + rufl_font_list[font].identifier); /** \todo better error code */ return rufl_FONT_NOT_FOUND; }

15 years, 8 months

1
0
0 / 0

r3312 adrianl - /trunk/netsurf/riscos/save.c

by netsurf＠semichrome.net

Author: adrianl Date: Tue Jun 5 07:17:16 2007 New Revision: 3312 URL: http://svn.semichrome.net?rev=3D3312&view=3Drev Log: Overlooked warnings Modified: trunk/netsurf/riscos/save.c Modified: trunk/netsurf/riscos/save.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/save.c?rev=3D3312&r1=3D= 3311&r2=3D3312&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/riscos/save.c (original) +++ trunk/netsurf/riscos/save.c Tue Jun 5 07:17:16 2007 @@ -31,6 +31,7 @@ #include "riscos/dialog.h" #include "riscos/gui.h" #include "riscos/menus.h" +#include "riscos/message.h" #include "riscos/options.h" #include "riscos/save.h" #include "riscos/save_complete.h" @@ -534,8 +535,6 @@ = void ro_gui_send_datasave(gui_save_type save_type, wimp_full_message_data_= xfer *message, wimp_t to) { - os_error *error; - /* Close the save window because otherwise we need two contexts */ xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);

15 years, 8 months

1
0
0 / 0

r3311 adrianl - in /trunk/netsurf/riscos: save.c window.c

by netsurf＠semichrome.net

Author: adrianl Date: Tue Jun 5 06:14:54 2007 New Revision: 3311 URL: http://svn.semichrome.net?rev=3D3311&view=3Drev Log: Fix interaction between failed drag save and pointer tracking (including pa= ge drag scrolling) Modified: trunk/netsurf/riscos/save.c trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/save.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/save.c?rev=3D3311&r1=3D= 3310&r2=3D3311&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/riscos/save.c (original) +++ trunk/netsurf/riscos/save.c Tue Jun 5 06:14:54 2007 @@ -64,6 +64,7 @@ = static bool ro_gui_save_complete(struct content *c, char *path); static bool ro_gui_save_content(struct content *c, char *path); +static void ro_gui_save_bounced(wimp_message *message); static void ro_gui_save_object_native(struct content *c, char *path); static bool ro_gui_save_link(struct content *c, link_format format, char *= path); static void ro_gui_save_set_state(struct content *c, gui_save_type save_ty= pe, @@ -518,8 +519,8 @@ message.size =3D 44 + ((strlen(message.data.data_xfer.file_name) + 4) & (~3u)); = - wimp_send_message_to_window(wimp_USER_MESSAGE, &message, - pointer.w, pointer.i); + ro_message_send_message_to_window(wimp_USER_MESSAGE_RECORDED, &message, + pointer.w, pointer.i, ro_gui_save_bounced, NULL); = free(local_name); } @@ -540,17 +541,23 @@ xwimp_create_menu(wimp_CLOSE_MENU, 0, 0); ro_gui_dialog_close(dialog_saveas); = - error =3D xwimp_send_message(wimp_USER_MESSAGE, (wimp_message*)message, t= o); - if (error) { - LOG(("xwimp_send_message: 0x%x: %s", error->errnum, error->errmess)); - warn_user("WimpError", error->errmess); - } - else { + if (ro_message_send_message(wimp_USER_MESSAGE_RECORDED, (wimp_message*)me= ssage, + to, ro_gui_save_bounced)) { gui_save_current_type =3D save_type; gui_save_sourcew =3D (wimp_w)-1; saving_from_dialog =3D false; gui_current_drag_type =3D GUI_DRAG_SAVE; } +} + + +/** + * Handle lack of Message_DataSaveAck for drags, saveas dialogs and clipbo= ard code + */ + +void ro_gui_save_bounced(wimp_message *message) +{ + gui_current_drag_type =3D GUI_DRAG_NONE; } = = Modified: trunk/netsurf/riscos/window.c URL: http://svn.semichrome.net/trunk/netsurf/riscos/window.c?rev=3D3311&r1= =3D3310&r2=3D3311&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Tue Jun 5 06:14:54 2007 @@ -1198,6 +1198,7 @@ return false; } = + gui_track_gui_window =3D g; gui_current_drag_type =3D GUI_DRAG_SCROLL; return true; }

15 years, 8 months

1
0
0 / 0

r3310 rjek - /trunk/netsurfbuild/autobuild.pl

by netsurf＠semichrome.net

Author: rjek Date: Fri Jun 1 15:18:08 2007 New Revision: 3310 URL: http://svn.semichrome.net?rev=3D3310&view=3Drev Log: Change TEST for (Dev) in autobuild version creation. This has the advantag= es that it's similar to what was previously agreed and that it actually fit= s in the Info box. Modified: trunk/netsurfbuild/autobuild.pl Modified: trunk/netsurfbuild/autobuild.pl URL: http://svn.semichrome.net/trunk/netsurfbuild/autobuild.pl?rev=3D3310&r= 1=3D3309&r2=3D3310&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/netsurfbuild/autobuild.pl (original) +++ trunk/netsurfbuild/autobuild.pl Fri Jun 1 15:18:08 2007 @@ -33,7 +33,7 @@ # determine build date time and version my $date =3D (command("date -u '+%d %b %Y %H:%M'"))[0]; chomp $date; -my $version =3D "2.0 TEST r$revno"; +my $version =3D "2.0 (Dev) r$revno"; my $pkg_version =3D (command("date -u '+0.%Y.%m.%d.%H%M'"))[0]; chomp $pkg_version; =

15 years, 8 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 June 2007