March 2011 - netsurf-commits - listmaster.pepperfish.net

r12137 chris_y - /trunk/netsurf/amiga/pkg/makepackage

by netsurf＠semichrome.net

Author: chris_y Date: Sat Mar 26 11:59:40 2011 New Revision: 12137 URL: http://source.netsurf-browser.org?rev=12137&view=rev Log: copy documentation Modified: trunk/netsurf/amiga/pkg/makepackage Modified: trunk/netsurf/amiga/pkg/makepackage URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/pkg/makepackage?rev... ============================================================================== --- trunk/netsurf/amiga/pkg/makepackage (original) +++ trunk/netsurf/amiga/pkg/makepackage Sat Mar 26 11:59:40 2011 @@ -1,7 +1,7 @@ makedir ram:NetSurf/Resources ALL list resources LFORMAT="copy %f%n ram:netsurf/resources followlinks" files >t:nslinks list resources LFORMAT="makedir ram:netsurf/resources/%n" dirs >>t:nslinks -list resources/~(Pointers|Themes) LFORMAT="copy %f%n/Messages ram:netsurf/resources/%n/Messages followlinks" dirs >>t:nslinks +list resources/~(Pointers|Themes) LFORMAT="copy %f%n/(Messages|#?,faf) ram:netsurf/resources/%n/ followlinks" dirs >>t:nslinks list resources/Themes/~(.svn) LFORMAT="makedir ram:netsurf/resources/Themes/%n" dirs >>t:nslinks list resources/Themes/~(.svn) LFORMAT="copy %f%n/~(.svn) ram:netsurf/resources/Themes/%n/" dirs >>t:nslinks execute t:nslinks

12 years, 2 months

1
0
0 / 0

r12136 chris_y - in /trunk/netsurf/amiga: bitmap.c bitmap.h

by netsurf＠semichrome.net

Author: chris_y Date: Sat Mar 26 05:36:25 2011 New Revision: 12136 URL: http://source.netsurf-browser.org?rev=12136&view=rev Log: Remove unused ColorMap to CLUT function Modified: trunk/netsurf/amiga/bitmap.c trunk/netsurf/amiga/bitmap.h Modified: trunk/netsurf/amiga/bitmap.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/bitmap.c?rev=12136&... ============================================================================== --- trunk/netsurf/amiga/bitmap.c (original) +++ trunk/netsurf/amiga/bitmap.c Sat Mar 26 05:36:25 2011 @@ -421,26 +421,3 @@ return tbm; } - -APTR ami_colormap_to_clut(struct ColorMap *cmap) -{ - int i; - UBYTE *clut = AllocVec(256 * 4, MEMF_PRIVATE | MEMF_CLEAR); - ULONG colour[3 * 256]; - - if(!clut) return NULL; - - /* Get the palette from the ColorMap */ - GetRGB32(cmap, 0, 256, (ULONG *)&colour); - - /* convert it to a table of ARGB values */ - for(i = 0; i < 1024; i += 4) - { - clut[i] = (0xff << 24) | - ((colour[i] & 0xff000000) >> 8) | - ((colour[i + 1] & 0xff000000) >> 16) | - ((colour[i + 2] & 0xff000000) >> 24); - } - - return clut; -} Modified: trunk/netsurf/amiga/bitmap.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/bitmap.h?rev=12136&... ============================================================================== --- trunk/netsurf/amiga/bitmap.h (original) +++ trunk/netsurf/amiga/bitmap.h Sat Mar 26 05:36:25 2011 @@ -41,5 +41,4 @@ struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm); Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap); -APTR ami_colormap_to_clut(struct ColorMap *cmap); #endif

12 years, 2 months

1
0
0 / 0

r12135 chris_y - in /trunk/netsurf/amiga: arexx.c bitmap.c bitmap.h clipboard.h context_menu.c download.c download.h drag.c gui_options.c iff_dr2d.c iff_dr2d.h menu.c options.h save_pdf.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Mar 26 05:33:58 2011 New Revision: 12135 URL: http://source.netsurf-browser.org?rev=12135&view=rev Log: Implement ask overwrite Modified: trunk/netsurf/amiga/arexx.c trunk/netsurf/amiga/bitmap.c trunk/netsurf/amiga/bitmap.h trunk/netsurf/amiga/clipboard.h trunk/netsurf/amiga/context_menu.c trunk/netsurf/amiga/download.c trunk/netsurf/amiga/download.h trunk/netsurf/amiga/drag.c trunk/netsurf/amiga/gui_options.c trunk/netsurf/amiga/iff_dr2d.c trunk/netsurf/amiga/iff_dr2d.h trunk/netsurf/amiga/menu.c trunk/netsurf/amiga/options.h trunk/netsurf/amiga/save_pdf.c Modified: trunk/netsurf/amiga/arexx.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/arexx.c?rev=12135&r... ============================================================================== --- trunk/netsurf/amiga/arexx.c (original) +++ trunk/netsurf/amiga/arexx.c Sat Mar 26 05:33:58 2011 @@ -19,11 +19,11 @@ #include "amiga/os3support.h" #include "amiga/arexx.h" +#include "amiga/download.h" +#include "amiga/gui.h" +#include "amiga/options.h" #include "desktop/browser.h" #include "desktop/history_core.h" -#include "amiga/gui.h" -#include "amiga/download.h" -#include "amiga/options.h" #include "utils/testament.h" #include <string.h> Modified: trunk/netsurf/amiga/bitmap.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/bitmap.c?rev=12135&... ============================================================================== --- trunk/netsurf/amiga/bitmap.c (original) +++ trunk/netsurf/amiga/bitmap.c Sat Mar 26 05:33:58 2011 @@ -20,6 +20,7 @@ #include "assert.h" #include "amiga/bitmap.h" +#include "amiga/download.h" #include <proto/exec.h> #include <proto/Picasso96API.h> #ifdef __amigaos4__ @@ -136,6 +137,8 @@ { int err = 0; Object *dto = NULL; + + if(!ami_download_check_overwrite(path, NULL)) return false; if(dto = ami_datatype_object_from_bitmap(bitmap)) { @@ -418,3 +421,26 @@ return tbm; } + +APTR ami_colormap_to_clut(struct ColorMap *cmap) +{ + int i; + UBYTE *clut = AllocVec(256 * 4, MEMF_PRIVATE | MEMF_CLEAR); + ULONG colour[3 * 256]; + + if(!clut) return NULL; + + /* Get the palette from the ColorMap */ + GetRGB32(cmap, 0, 256, (ULONG *)&colour); + + /* convert it to a table of ARGB values */ + for(i = 0; i < 1024; i += 4) + { + clut[i] = (0xff << 24) | + ((colour[i] & 0xff000000) >> 8) | + ((colour[i + 1] & 0xff000000) >> 16) | + ((colour[i + 2] & 0xff000000) >> 24); + } + + return clut; +} Modified: trunk/netsurf/amiga/bitmap.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/bitmap.h?rev=12135&... ============================================================================== --- trunk/netsurf/amiga/bitmap.h (original) +++ trunk/netsurf/amiga/bitmap.h Sat Mar 26 05:33:58 2011 @@ -41,4 +41,5 @@ struct BitMap *ami_getcachenativebm(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm); Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap); +APTR ami_colormap_to_clut(struct ColorMap *cmap); #endif Modified: trunk/netsurf/amiga/clipboard.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/clipboard.h?rev=121... ============================================================================== --- trunk/netsurf/amiga/clipboard.h (original) +++ trunk/netsurf/amiga/clipboard.h Sat Mar 26 05:33:58 2011 @@ -18,6 +18,8 @@ #ifndef AMIGA_CLIPBOARD_H #define AMIGA_CLIPBOARD_H +#include <stdbool.h> + struct bitmap; struct hlcache_handle; struct selection; Modified: trunk/netsurf/amiga/context_menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/context_menu.c?rev=... ============================================================================== --- trunk/netsurf/amiga/context_menu.c (original) +++ trunk/netsurf/amiga/context_menu.c Sat Mar 26 05:33:58 2011 @@ -499,13 +499,18 @@ strlcpy(&fname,savereq->fr_Drawer,1024); AddPart(fname,savereq->fr_File,1024); ami_update_pointer(gwin->win,GUI_POINTER_WAIT); - if(fh = FOpen(fname,MODE_NEWFILE,0)) + + if(ami_download_check_overwrite(fname, gwin->win)) { - if((source_data = content_get_source_data(object, &source_size))) - FWrite(fh, source_data, 1, source_size); - - FClose(fh); - SetComment(fname, content_get_url(object)); + if(fh = FOpen(fname,MODE_NEWFILE,0)) + { + if((source_data = + content_get_source_data(object, &source_size))) + FWrite(fh, source_data, 1, source_size); + + FClose(fh); + SetComment(fname, content_get_url(object)); + } } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } @@ -529,15 +534,16 @@ { bm->url = content_get_url(object); bm->title = content_get_title(object); - bitmap_save(bm, fname, 0); + if(bitmap_save(bm, fname, 0)) + SetComment(fname, content_get_url(object)); } #ifdef WITH_NS_SVG else if(content_get_type(object) == CONTENT_SVG) { - ami_save_svg(object,fname); + if(ami_save_svg(object,fname)) + SetComment(fname, content_get_url(object)); } #endif - SetComment(fname, content_get_url(object)); ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } break; Modified: trunk/netsurf/amiga/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1213... ============================================================================== --- trunk/netsurf/amiga/download.c (original) +++ trunk/netsurf/amiga/download.c Sat Mar 26 05:33:58 2011 @@ -38,6 +38,7 @@ #include "amiga/bitmap.h" #include "amiga/iff_dr2d.h" #include "amiga/theme.h" +#include "amiga/utf8.h" #include "desktop/download.h" #include "desktop/selection.h" @@ -59,6 +60,20 @@ #include <gadgets/layout.h> #include <reaction/reaction_macros.h> + +struct gui_download_window { + struct nsObject *node; + struct Window *win; + Object *objects[GID_LAST]; + BPTR fh; + uint32 size; + uint32 downloaded; + struct dlnode *dln; + struct browser_window *bw; + struct download_context *ctx; + char *url; + char fname[1024]; +}; struct gui_download_window *gui_download_window_create(download_context *ctx, struct gui_window *gui) @@ -87,8 +102,16 @@ { strlcpy(&dw->fname,savereq->fr_Drawer,1024); AddPart((STRPTR)&dw->fname,savereq->fr_File,1024); + if(!ami_download_check_overwrite(dw->fname, gui->shared->win)) + { + FreeVec(dw); + return NULL; + } } - else return NULL; + else + { + + } } dw->size = total_size; @@ -302,27 +325,69 @@ strlcpy(&fname,savereq->fr_Drawer,1024); AddPart(fname,savereq->fr_File,1024); ami_update_pointer(g->shared->win,GUI_POINTER_WAIT); - if(fh = FOpen(fname,MODE_NEWFILE,0)) + + if(ami_download_check_overwrite(fname, g->shared->win)) { - openurlstring = ASPrintf("openurl \"%s\"\n",url); - FWrite(fh,openurlstring,1,strlen(openurlstring)); - FClose(fh); - FreeVec(openurlstring); - SetComment(fname,url); - - dobj = GetIconTags(NULL,ICONGETA_GetDefaultName,"url", - ICONGETA_GetDefaultType,WBPROJECT, - TAG_DONE); - - dobj->do_DefaultTool = "IconX"; - - PutIconTags(fname,dobj, - ICONPUTA_NotifyWorkbench,TRUE, - TAG_DONE); - - FreeDiskObject(dobj); + if(fh = FOpen(fname,MODE_NEWFILE,0)) + { + /* TODO: Should be URLOpen on OS4.1 */ + openurlstring = ASPrintf("openurl \"%s\"\n",url); + FWrite(fh,openurlstring,1,strlen(openurlstring)); + FClose(fh); + FreeVec(openurlstring); + SetComment(fname,url); + + dobj = GetIconTags(NULL,ICONGETA_GetDefaultName,"url", + ICONGETA_GetDefaultType,WBPROJECT, + TAG_DONE); + + dobj->do_DefaultTool = "IconX"; + + PutIconTags(fname,dobj, + ICONPUTA_NotifyWorkbench,TRUE, + TAG_DONE); + + FreeDiskObject(dobj); + } + FreeVec(linkname); } - FreeVec(linkname); ami_update_pointer(g->shared->win,GUI_POINTER_DEFAULT); } } + +BOOL ami_download_check_overwrite(const char *file, struct Window *win) +{ + /* Return TRUE if file can be (over-)written */ + int res = 0; + BPTR lock = 0; + + if(option_ask_overwrite == false) return TRUE; + + lock = Lock(file, ACCESS_READ); + + if(lock) + { + UnLock(lock); + + char *utf8text = ami_utf8_easy(messages_get("OverwriteFile")); + char *utf8gadget1 = ami_utf8_easy(messages_get("DontReplace")); + char *utf8gadget2 = ami_utf8_easy(messages_get("Replace")); + char *utf8gadgets = ASPrintf("%s|%s", utf8gadget1, utf8gadget2); + free(utf8gadget1); + free(utf8gadget2); + + res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_WARNING, + TDR_TitleString, messages_get("NetSurf"), + TDR_FormatString, utf8text, + TDR_GadgetString, utf8gadgets, + TDR_Window, win, + TAG_DONE); + + if(utf8text) free(utf8text); + if(utf8gadgets) FreeVec(utf8gadgets); + } + else return TRUE; + + if(res == 0) return TRUE; + else return FALSE; +} Modified: trunk/netsurf/amiga/download.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=1213... ============================================================================== --- trunk/netsurf/amiga/download.h (original) +++ trunk/netsurf/amiga/download.h Sat Mar 26 05:33:58 2011 @@ -24,6 +24,7 @@ #include "amiga/gui.h" struct download_context; +struct gui_download_window; struct dlnode { @@ -31,21 +32,8 @@ char *filename; }; -struct gui_download_window { - struct nsObject *node; - struct Window *win; - Object *objects[GID_LAST]; - BPTR fh; - uint32 size; - uint32 downloaded; - struct dlnode *dln; - struct browser_window *bw; - struct download_context *ctx; - char *url; - char fname[1024]; -}; - void ami_download_window_abort(struct gui_download_window *dw); BOOL ami_download_window_event(struct gui_download_window *dw); void ami_free_download_list(struct List *dllist); +BOOL ami_download_check_overwrite(const char *file, struct Window *win); #endif Modified: trunk/netsurf/amiga/drag.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/drag.c?rev=12135&r1... ============================================================================== --- trunk/netsurf/amiga/drag.c (original) +++ trunk/netsurf/amiga/drag.c Sat Mar 26 05:33:58 2011 @@ -31,10 +31,12 @@ #endif #include <workbench/icon.h> +#include "amiga/clipboard.h" #include "amiga/download.h" #include "amiga/drag.h" #include "amiga/filetype.h" #include "amiga/options.h" +#include "amiga/icon.h" #include "amiga/iff_dr2d.h" #include "amiga/theme.h" @@ -154,6 +156,9 @@ BPTR fh = 0; AddPart(path, content_get_title(c), 1024); + if(!ami_download_check_overwrite(path, win)) + break; + if(fh = FOpen(path,MODE_NEWFILE,0)) { if((source_data = content_get_source_data(c, &source_size))) @@ -167,6 +172,8 @@ case GUI_SAVE_TEXT_SELECTION: // selection AddPart(path,"netsurf_text_file",1024); + if(!ami_download_check_overwrite(path, win)) + break; selection_save_text((struct selection *)drag_save_data,path); break; @@ -176,6 +183,9 @@ BPTR lock = 0; AddPart(path, content_get_title(c), 1024); + if(!ami_download_check_overwrite(path, win)) + break; + if(lock = CreateDir(path)) { UnLock(lock); @@ -197,12 +207,14 @@ { bm->url = content_get_url(c); bm->title = content_get_title(c); - bitmap_save(bm, path, 0); + if(bitmap_save(bm, path, 0)) + SetComment(path, content_get_url(c)); } #ifdef WITH_NS_SVG else if(content_get_type(c) == CONTENT_SVG) { - ami_save_svg(c, path); + if(ami_save_svg(c, path)) + SetComment(path, content_get_url(c)); } #endif } Modified: trunk/netsurf/amiga/gui_options.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui_options.c?rev=1... ============================================================================== --- trunk/netsurf/amiga/gui_options.c (original) +++ trunk/netsurf/amiga/gui_options.c Sat Mar 26 05:33:58 2011 @@ -1047,7 +1047,7 @@ GA_RelVerify, TRUE, GA_Disabled, TRUE, GA_Text, gadlab[GID_OPTS_OVERWRITE], - GA_Selected, FALSE, //option_ask_overwrite, + GA_Selected, option_ask_overwrite, CheckBoxEnd, LAYOUT_AddChild, gow->objects[GID_OPTS_NOTIFY] = CheckBoxObject, GA_ID, GID_OPTS_NOTIFY, Modified: trunk/netsurf/amiga/iff_dr2d.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/iff_dr2d.c?rev=1213... ============================================================================== --- trunk/netsurf/amiga/iff_dr2d.c (original) +++ trunk/netsurf/amiga/iff_dr2d.c Sat Mar 26 05:33:58 2011 @@ -307,6 +307,8 @@ char *source_data; ULONG source_size; + if(!ami_download_check_overwrite(filename, NULL)) return false; + if(iffh = AllocIFF()) { if(iffh->iff_Stream = Open(filename,MODE_NEWFILE)) Modified: trunk/netsurf/amiga/iff_dr2d.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/iff_dr2d.h?rev=1213... ============================================================================== --- trunk/netsurf/amiga/iff_dr2d.h (original) +++ trunk/netsurf/amiga/iff_dr2d.h Sat Mar 26 05:33:58 2011 @@ -24,6 +24,7 @@ #include <stdbool.h> #ifndef AMIGA_DR2D_STANDALONE #include "content/content.h" +#include "amiga/download.h" #endif #define ID_DR2D MAKE_ID('D','R','2','D') Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=12135&r1... ============================================================================== --- trunk/netsurf/amiga/menu.c (original) +++ trunk/netsurf/amiga/menu.c Sat Mar 26 05:33:58 2011 @@ -534,12 +534,17 @@ strlcpy(&fname,savereq->fr_Drawer,1024); AddPart(fname,savereq->fr_File,1024); ami_update_pointer(gwin->win,GUI_POINTER_WAIT); - if(fh = FOpen(fname,MODE_NEWFILE,0)) + + if(ami_download_check_overwrite(fname, gwin->win)) { - if((source_data = content_get_source_data(gwin->bw->current_content, &source_size))) - FWrite(fh,source_data, 1, source_size); - FClose(fh); - SetComment(fname, content_get_url(gwin->bw->current_content)); + if(fh = FOpen(fname,MODE_NEWFILE,0)) + { + if((source_data = + content_get_source_data(gwin->bw->current_content, &source_size))) + FWrite(fh,source_data, 1, source_size); + FClose(fh); + SetComment(fname, content_get_url(gwin->bw->current_content)); + } } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } @@ -555,8 +560,12 @@ strlcpy(&fname,savereq->fr_Drawer,1024); AddPart(fname,savereq->fr_File,1024); ami_update_pointer(gwin->win,GUI_POINTER_WAIT); - save_as_text(gwin->bw->current_content,fname); - SetComment(fname,content_get_url(gwin->bw->current_content)); + + if(ami_download_check_overwrite(fname, gwin->win)) + { + save_as_text(gwin->bw->current_content,fname); + SetComment(fname,content_get_url(gwin->bw->current_content)); + } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } break; @@ -571,13 +580,16 @@ strlcpy(&fname,savereq->fr_Drawer,1024); AddPart(fname,savereq->fr_File,1024); ami_update_pointer(gwin->win,GUI_POINTER_WAIT); - if(lock = CreateDir(fname)) + if(ami_download_check_overwrite(fname, gwin->win)) { - UnLock(lock); - save_complete(gwin->bw->current_content,fname); - SetComment(fname,content_get_url(gwin->bw->current_content)); - ami_superimpose_favicon(fname, - gwin->bw->window->favicon, NULL); + if(lock = CreateDir(fname)) + { + UnLock(lock); + save_complete(gwin->bw->current_content,fname); + SetComment(fname,content_get_url(gwin->bw->current_content)); + ami_superimpose_favicon(fname, + gwin->bw->window->favicon, NULL); + } } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } @@ -594,10 +606,12 @@ strlcpy(&fname,savereq->fr_Drawer,1024); AddPart(fname,savereq->fr_File,1024); ami_update_pointer(gwin->win,GUI_POINTER_WAIT); - save_as_pdf(gwin->bw->current_content,fname); - SetComment(fname, content_get_url(gwin->bw->current_content)); - ami_superimpose_favicon(fname, - gwin->bw->window->favicon, "pdf"); + if(save_as_pdf(gwin->bw->current_content,fname)) + { + SetComment(fname, content_get_url(gwin->bw->current_content)); + ami_superimpose_favicon(fname, + gwin->bw->window->favicon, "pdf"); + } ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } #endif @@ -617,15 +631,16 @@ { bm->url = content_get_url(gwin->bw->current_content); bm->title = content_get_title(gwin->bw->current_content); - bitmap_save(bm, fname, 0); + if(bitmap_save(bm, fname, 0)) + SetComment(fname, content_get_url(gwin->bw->current_content)); } #ifdef WITH_NS_SVG else if(content_get_type(gwin->bw->current_content) == CONTENT_SVG) { - ami_save_svg(gwin->bw->current_content,fname); + if(ami_save_svg(gwin->bw->current_content,fname)) + SetComment(fname, content_get_url(gwin->bw->current_content)); } #endif - SetComment(fname, content_get_url(gwin->bw->current_content)); ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT); } break; Modified: trunk/netsurf/amiga/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=12135... ============================================================================== --- trunk/netsurf/amiga/options.h (original) +++ trunk/netsurf/amiga/options.h Sat Mar 26 05:33:58 2011 @@ -90,7 +90,7 @@ bool option_download_notify = false; \ bool option_faster_scroll = true; \ bool option_scale_quality = false; \ -bool option_ask_overwrite = false; \ +bool option_ask_overwrite = true; \ int option_printer_unit = 0; \ int option_print_scale = 100; \ bool option_startup_no_window = false; \ Modified: trunk/netsurf/amiga/save_pdf.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/save_pdf.c?rev=1213... ============================================================================== --- trunk/netsurf/amiga/save_pdf.c (original) +++ trunk/netsurf/amiga/save_pdf.c Sat Mar 26 05:33:58 2011 @@ -44,6 +44,8 @@ { struct print_settings *psettings; + if(!ami_download_check_overwrite(path, NULL)) return false; + psettings = print_make_settings(PRINT_OPTIONS, path, &haru_nsfont); if (psettings == NULL) return false;

12 years, 2 months

1
0
0 / 0

r12134 vince - /trunk/netsurf/windows/gui.c

by netsurf＠semichrome.net

Author: vince Date: Fri Mar 25 18:32:46 2011 New Revision: 12134 URL: http://source.netsurf-browser.org?rev=12134&view=rev Log: Finally fix initial layout size. Tested on wine, XP, vista and windows 7 Fix teh stupid always on top unintended behaviour Modified: trunk/netsurf/windows/gui.c Modified: trunk/netsurf/windows/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/gui.c?rev=12134&r... ============================================================================== --- trunk/netsurf/windows/gui.c (original) +++ trunk/netsurf/windows/gui.c Fri Mar 25 18:32:46 2011 @@ -287,7 +287,7 @@ GetClientRect(hWndParent, &rc); *x = (toolbuttonsize + 1) * (buttonc + 1) + (NSWS_THROBBER_WIDTH>>1); - *y = ((rc.bottom - 1) - cy_edit) >> 1; + *y = ((((rc.bottom - 1) - cy_edit) >> 1) * 2) / 3; *width = (rc.right - 1) - *x - (NSWS_THROBBER_WIDTH>>1) - NSWS_THROBBER_WIDTH; *height = cy_edit; } @@ -1163,7 +1163,6 @@ return 0; } - /* Called when activity occours within the drawable window. */ LRESULT CALLBACK nsws_window_drawable_event_callback(HWND hwnd, @@ -1253,7 +1252,7 @@ LPARAM lparam) { int x, y; - RECT rmain, rstatus, rtool; + RECT rstatus, rtool; if ((gw->toolbar == NULL) || (gw->urlbar == NULL) || @@ -1263,12 +1262,11 @@ SendMessage(gw->statusbar, WM_SIZE, wparam, lparam); SendMessage(gw->toolbar, WM_SIZE, wparam, lparam); - GetClientRect(hwnd, &rmain); GetClientRect(gw->toolbar, &rtool); GetWindowRect(gw->statusbar, &rstatus); gui_window_get_scroll(gw, &x, &y); + gw->width = LOWORD(lparam); gw->height = HIWORD(lparam) - (rtool.bottom - rtool.top) - (rstatus.bottom - rstatus.top); - gw->width = LOWORD(lparam); if (gw->drawingarea != NULL) { MoveWindow(gw->drawingarea, @@ -1591,8 +1589,25 @@ nsws_window_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { struct gui_window *gw; + RECT rmain; LOG_WIN_MSG(hwnd, msg, wparam, lparam); + + /* deal with window creation as a special case */ + if (msg == WM_CREATE) { + /* To cause all the component child windows to be + * re-sized correctly a WM_SIZE message of the actual + * created size must be sent. + * + * The message must be posted here because the actual + * size values of the component windows are not known + * until after the WM_CREATE message is dispatched. + */ + GetClientRect(hwnd, &rmain); + PostMessage(hwnd, WM_SIZE, 0, MAKELPARAM(rmain.right, rmain.bottom)); + return DefWindowProc(hwnd, msg, wparam, lparam); + } + gw = nsws_get_gui_window(hwnd); if (gw == NULL) { @@ -1602,23 +1617,6 @@ switch(msg) { -/* - case WM_LBUTTONDBLCLK: { - int x,y; - x = GET_X_LPARAM(lparam); - y = GET_Y_LPARAM(lparam); - if ((gw != NULL) && (gw->bw != NULL) ) - browser_window_mouse_click(gw->bw, - BROWSER_MOUSE_DOUBLE_CLICK, - (x + gw->scrollx) / gw->bw->scale, - (y + gw->scrolly) / gw->bw->scale); - return DefWindowProc(hwnd, msg, wparam, lparam); - break; - } - case WM_ENTERMENULOOP: - nsws_update_edit(w); - return DefWindowProc(hwnd, msg, wparam, lparam); -*/ case WM_CONTEXTMENU: if (nsws_ctx_menu(gw, hwnd, GET_X_LPARAM(lparam), GET_Y_LPARAM(lparam))) @@ -1629,7 +1627,6 @@ if (nsws_window_command(hwnd, gw, HIWORD(wparam), LOWORD(wparam), (HWND)lparam) == 0) return 0; break; - case WM_SIZE: return nsws_window_resize(gw, hwnd, wparam, lparam); @@ -1762,7 +1759,7 @@ LOG(("Setting Window position %d,%d %d,%d", option_window_x, option_window_y, option_window_width, option_window_height)); - SetWindowPos(hwnd, HWND_TOPMOST, + SetWindowPos(hwnd, HWND_TOP, option_window_x, option_window_y, option_window_width, option_window_height, SWP_SHOWWINDOW); @@ -1784,7 +1781,6 @@ bool new_tab) { struct gui_window *gw; - RECT rmain, rstatus, rtool; LOG(("Creating gui window for browser window %p", bw)); @@ -1827,19 +1823,10 @@ gw->toolbar = nsws_window_toolbar_create(gw, gw->main); gw->statusbar = nsws_window_statusbar_create(gw); - - GetClientRect(gw->main, &rmain); - GetClientRect(gw->toolbar, &rtool); - GetWindowRect(gw->statusbar, &rstatus); - - gw->width = rmain.right; - gw->height = rmain.bottom - (rtool.bottom - rtool.top) - (rstatus.bottom - rstatus.top); - gw->drawingarea = CreateWindow(windowclassname_drawable, NULL, WS_VISIBLE | WS_CHILD, - 0, rtool.bottom, - gw->width, gw->height, + 0, 0, 0, 0, gw->main, NULL, hinstance,

12 years, 2 months

1
0
0 / 0

r12133 chris_y - in /trunk/netsurf/!NetSurf/Resources/it: credits.html, faf licence.html, faf

by netsurf＠semichrome.net

Author: chris_y Date: Fri Mar 25 10:16:03 2011 New Revision: 12133 URL: http://source.netsurf-browser.org?rev=12133&view=rev Log: Italian translation by Samir Hawamdeh Added: trunk/netsurf/!NetSurf/Resources/it/credits.html,faf (with props) trunk/netsurf/!NetSurf/Resources/it/licence.html,faf (with props) Added: trunk/netsurf/!NetSurf/Resources/it/credits.html,faf URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/c... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/credits.html,faf (added) +++ trunk/netsurf/!NetSurf/Resources/it/credits.html,faf Fri Mar 25 10:16:03 2011 @@ -1,0 +1,98 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>NetSurf | Ringraziamenti</title> +<link rel="stylesheet" type="text/css" href="resource:internal.css"> +<style type="text/css"> +div#DevList li { + float: left; + width: 18em; } +div#DevList ul { + overflow: hidden; } +</style> +</head> + +<body> +<p class="banner"><a href="http://www.netsurf-browser.org/"><img src="resource:netsurf.png" alt="NetSurf"></a></p> + +<h1>Ringraziamenti</h1> + +<p>NetSurf è stato sviluppato per voi dalle seguenti persone:</p> + +<div id="DevList"> + +<h2>Programmazione e codice sorgente</h2> +<ul> +<li>Kevin Bagust</li> +<li>John-Mark Bell</li> +<li>Mark Benjamin</li> +<li>Adam Blokus</li> +<li>Pawe&#x0142 Blokus</li> +<li>James Bursa</li> +<li>Stefaan Claes</li> +<li>Calin Dobos</li> +<li>Michael Drake</li> +<li>Sean Fox</li> +<li>Stephen Fryatt</li> +<li>Rik Griffin</li> +<li>Matthew Hambley</li> +<li>Rob Jackson</li> +<li>Rob Kendrick</li> +<li>Jeffrey Lee</li> +<li>Adrian Lees</li> +<li>Michael Lester</li> +<li>Ole Loots</li> +<li>Phil Mellor</li> +<li>Philip Pemberton</li> +<li>François Revol</li> +<li>Darren Salt</li> +<li>Vincent Sanders</li> +<li>James Shaw</li> +<li>Andrew Sidwell</li> +<li>Daniel Silverstone</li> +<li>Andrew Timmins</li> +<li>John Tytgat</li> +<li>Sven Weidauer</li> +<li>Chris Williams</li> +<li>Richard Wilson</li> +<li>Bo Yang</li> +<li>Chris Young</li> +</ul> + +<h2>Documentazione</h2> +<ul> +<li>John-Mark Bell</li> +<li>James Bursa</li> +<li>Michael Drake</li> +<li>Rob Kendrick</li> +<li>James Shaw</li> +<li>Richard Wilson</li> +</ul> + +<h2>Grafica e loghi</h2> +<ul> +<li>Michael Drake</li> +<li>Andrew Duffell</li> +<li>John Duffell</li> +<li>Richard Hallas</li> +<li>Phil Mellor</li> +</ul> + +<h2>Traduttori</h2> +<ul> +<li>Sebastian Barthel</li> +<li>Bruno D'Arcangeli</li> +<li>Samir Hawamdeh</li> +<li>Gerard van Katwijk</li> +<li>Jérôme Mathevet</li> +<li>Simon Voortman</li> +</ul> + +</div> + +<div class="footer"> +<p><br>Copyright 2003–2011 The NetSurf Developers</p> +</div> + +</body> +</html> Propchange: trunk/netsurf/!NetSurf/Resources/it/credits.html,faf ------------------------------------------------------------------------------ amiga:protection = ----rwed ---- ---- Propchange: trunk/netsurf/!NetSurf/Resources/it/credits.html,faf ------------------------------------------------------------------------------ svn:executable = * Added: trunk/netsurf/!NetSurf/Resources/it/licence.html,faf URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/l... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/licence.html,faf (added) +++ trunk/netsurf/!NetSurf/Resources/it/licence.html,faf Fri Mar 25 10:16:03 2011 @@ -1,0 +1,1901 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<title>NetSurf | Licenza d'uso</title> +<link rel="stylesheet" type="text/css" href="resource:internal.css"> +<style type="text/css"> +div.licence { + background: #ddd; + white-space: pre; + font-family: monospace; + border: solid 1px black; + margin: 10mm; + padding: 1em 0.5em; +} +dl.components > dt { + border-bottom: dotted 2px #94adff; +} +dl.components > dt > a { + text-decoration: none; +} +dl.components > dd > span { + display: table-cell; +} +dl.components > dd > span { + width: 100%; +} +dl.components > dd > span + span { + width: auto; +} +</style> +</head> + +<body> +<p class="banner"><a href="http://www.netsurf-browser.org/"><img src="resource:netsurf.png" alt="NetSurf"></a></p> + +<h1>Licenza d'uso</h1> + +<p>Il codice sorgente di NetSurf, la sua documentazione, i file delle traduzioni e le definizioni UI sono rilasciati liberamente secondo i termini della Licenza Pubblica Generica GNU cosi com'è pubblicata dalla Free Software Foundation nella versione 2.0 o successiva, inoltre, come eccezione particolare è possibile collegare il codice sorgente di NetSurf con quello della libreria OpenSSL oppure distribuirli insieme usando una versione modificata della libreria stessa avente la medesima licenza d'uso.</p> + +<p>E' necessario rispettare a tutti gli effetti la Licenza Pubblica Generica GNU versione 2.0 per tutte le parti del codice sorgente utilizzato ad eccezione di OpenSSL.</p> + +<p>Nel caso si desideri modificare il programma è possibile estendere questa eccezione anche alla versione del codice sorgente modificato, tuttavia non è obbligatorio farlo, se non lo si desidera è possibile cancellare questa eccezione dalla propria versione.</p> + +<h2>Licenza d'uso dei vari componenti</h2> + +<p>Tutte le risorse ArtWork di NetSurf sono rilasciate secondo i termini della licenza MIT.</p> + +<p>NetSurf può anche incorporare i seguenti altri componenti.</p> + +<h3>Componenti del progetto NetSurf</h3> + +<dl class="components"> +<dt><a href="http://www.netsurf-browser.org/">NetSurf</a></dt> +<dd> +<span>© 2002–2011 The NetSurf Developers</span> +<span><a href="#gplv2">GPLv2</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/libcss/">LibCSS</a></dt> +<dd> +<span>© 2007–2011 John-Mark Bell</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/hubbub/">Hubbub</a></dt> +<dd> +<span>© 2007–2011 John-Mark Bell<br>© 2008–2009 Andrew Sidwell</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/libparserutils/">LibParserUtils</a></dt> +<dd> +<span>© 2007–2011 John-Mark Bell</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/librosprite/">LibROSprite</a></dt> +<dd> +<span>© 2008 James Shaw</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/libpencil">Libpencil</a></dt> +<dd> +<span>© 2005–2006 James Bursa</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/rufl">RUfl</a></dt> +<dd> +<span>© 2005–2009 James Bursa</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/libsvgtiny">Libsvgtiny</a></dt> +<dd> +<span>© 2008–2009 James Bursa</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://source.netsurf-browser.org/trunk/libnsbmp/">Libnsbmp</a></dt> +<dd> +<span>© 2006 Richard Wilson<br>© 2008 Sean Fox</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://source.netsurf-browser.org/trunk/libnsfb/">Libnsfb</a></dt> +<dd> +<span>© 2009–2011 Vincent Sanders<br>© 2009–2011 Michael Drake</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://source.netsurf-browser.org/trunk/libnsgif/">Libnsgif</a></dt> +<dd> +<span>© 2004 Richard Wilson<br>© 2008 Sean Fox</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.netsurf-browser.org/projects/libwapcaplet">LibWapcaplet</a></dt> +<dd> +<span>© 2009–2011 NetSurf Browser Project, Daniel Silverstone</span> +<span><a href="#mit">MIT</a></span> +</dd> +</dl> + +<h3>Componenti di terze parti</h3> + +<dl class="components"> +<dt><a href="http://curl.haxx.se/">cURL</a></dt> +<dd> +<span>© 1996–2010 Daniel Stenberg</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://libharu.org/">Haru PDF</a></dt> +<dd> +<span>© 2000–2008 Takeshi Kanno</span> +<span><a href="#zlib">ZLib</a></span> +</dd> + +<dt><a href="http://www.ijg.org">libjpeg</a></dt> +<dd> +<span>© 1991–2010 Thomas G. Lane, Guido Vollbeding</span> +<span><a href="#ijg">IJG</a></span> +</dd> + +<dt><a href="http://www.littlecms.com/">liblcms</a></dt> +<dd> +<span>© 1998–2007 Marti Maria Saguer</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.libmng.com">libmng</a></dt> +<dd> +<span>© 2000–2007 Gerard Juyn, Glenn Randers-Pehrson</span> +<span><a href="#mng">MNG</a></span> +</dd> + +<dt><a href="http://ro-oslib.sourceforge.net/">OSLib</a></dt> +<dd> +<span>© 1994–1998 Jonathan Coxhead and contributors</span> +<span><a href="#oslib">OSLib</a></span> +</dd> + +<dt><a href="http://www.openssl.org/">OpenSSL</a></dt> +<dd> +<span>© 1995–1998 Eric A. Young, Tim J. Hudson<br>© 1998–2010 The OpenSSL Project</span> +<span><a href="#openssl">OpenSSL</a></span> +</dd> + +<dt><a href="http://www.libpng.org">libpng</a></dt> +<dd> +<span>© 2004–2010 Glenn Randers-Pehrson</span> +<span><a href="#png">PNG</a></span> +</dd> + +<dt><a href="http://xmlsoft.org">libxml2</a></dt> +<dd> +<span>© 1998–2009 Daniel Veillard</span> +<span><a href="#mit">MIT</a></span> +</dd> + +<dt><a href="http://www.riscos.info/websvn/listing.php?repname=gccsdk&path=%2Ftrunk%2F...">UnixLib</a></dt> +<dd> +<span>© 1995–1999 Simon Callan, Nick Burrett, Nicholas Clark and +Peter Burwood<br>© 1999–2009 Nick Burrett, John Tytgat, Peter Naulls, +Lee Noar, Peter Teichmann, Alex Waugh, Christian Ludlam, Theo Markettos, +Graham Shaw, James Bursa and John-Mark Bell.</span> +<span><a href="#unixlib">UnixLib</a></span> +</dd> + +<dt><a href="http://zlib.net/">ZLib</a></dt> +<dd> +<span>© 1995–2010 Jean-loup Gailly and Mark Adler</span> +<span><a href="#zlib">ZLib</a></span> +</dd> +</dl> + +<h2>Testi delle licenze</h2> + +<p>Ove possibile le forme generiche dei vari testi delle licenze sono visualizzate qui. Alcuni componenti possono variare leggermente la licenza per cui il nostro sforzo è stato quello di rispettare in accordo ad esse le nostre modifiche, in questo caso le piccole variazioni alla licenza sono elencate qui, eventuali altre variazioni minori come ad esempio gli spazi bianchi non sono considerati.</p> + +<a name="gplv2" /> +<h3>GNU General Public Licence, Versione 2</h3> +<div class="licence"> GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. +</div> + +<a name="mit" /> +<h3>Licenza MIT/X</h3> +<div class="licence">Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +</div> + +<a name="zlib" /> +<h3>Licenza ZLib</h3> +<div class="licence"> This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +</div> + +<a name="ijg" /> +<h3>Licenza IJG</h3> +<div class="licence">The authors make NO WARRANTY or representation, either express or implied, +with respect to this software, its quality, accuracy, merchantability, or +fitness for a particular purpose. This software is provided "AS IS", and you, +its user, assume the entire risk as to its quality and accuracy. + +This software is copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. +All Rights Reserved except as specified below. + +Permission is hereby granted to use, copy, modify, and distribute this +software (or portions thereof) for any purpose, without fee, subject to these +conditions: +(1) If any part of the source code for this software is distributed, then this +README file must be included, with this copyright and no-warranty notice +unaltered; and any additions, deletions, or changes to the original files +must be clearly indicated in accompanying documentation. +(2) If only executable code is distributed, then the accompanying +documentation must state that "this software is based in part on the work of +the Independent JPEG Group". +(3) Permission for use of this software is granted only if the user accepts +full responsibility for any undesirable consequences; the authors accept +NO LIABILITY for damages of any kind. + +These conditions apply to any software derived from or based on the IJG code, +not just to the unmodified library. If you use our work, you ought to +acknowledge us. + +Permission is NOT granted for the use of any IJG author's name or company name +in advertising or publicity relating to this software or products derived from +it. This software may be referred to only as "the Independent JPEG Group's +software". + +We specifically permit and encourage the use of this software as the basis of +commercial products, provided that all warranty or liability claims are +assumed by the product vendor. + + +ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, +sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. +ansi2knr.c is NOT covered by the above copyright and conditions, but instead +by the usual distribution terms of the Free Software Foundation; principally, +that you must include source code if you redistribute it. (See the file +ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part +of any program generated from the IJG code, this does not limit you more than +the foregoing paragraphs do. + +The Unix configuration script "configure" was produced with GNU Autoconf. +It is copyright by the Free Software Foundation but is freely distributable. +The same holds for its supporting scripts (config.guess, config.sub, +ltmain.sh). Another support script, install-sh, is copyright by X Consortium +but is also freely distributable. +</div> + +<a name="mng" /> +<h3>Licenza MNG</h3> +<div class="licence">The MNG Library is supplied "AS IS". The Contributing Authors +disclaim all warranties, expressed or implied, including, without +limitation, the warranties of merchantability and of fitness for any +purpose. The Contributing Authors assume no liability for direct, +indirect, incidental, special, exemplary, or consequential damages, +which may result from the use of the MNG Library, even if advised of +the possibility of such damage. + +Permission is hereby granted to use, copy, modify, and distribute this +source code, or portions hereof, for any purpose, without fee, subject +to the following restrictions: + +1. The origin of this source code must not be misrepresented; + you must not claim that you wrote the original software. + +2. Altered versions must be plainly marked as such and must not be + misrepresented as being the original source. + +3. This Copyright notice may not be removed or altered from any source + or altered source distribution. + +The Contributing Authors specifically permit, without fee, and +encourage the use of this source code as a component to supporting +the MNG and JNG file format in commercial products. If you use this +source code in a product, acknowledgment would be highly appreciated. +</div> + +<a name="oslib" /> +<h3>Licenza OSLib</h3> +<div class="licence">The copyright holder has granted a small relaxation of the +conditions of the GNU Public Licence, in that OSLib is itself +free software, but applications linked to it need not be. +This means that any changes to OSLib itself (the contents of +the OSLib, OSLibHelp, OSLibSrc, and OSLibSupport archives) +fall under the terms of the GNU Public Licence; but programs +written using OSLib need not be so restricted. + + GNU GENERAL PUBLIC LICENCE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, U S A + Everyone is permitted to copy and distribute verbatim copies + of this licence document, but changing it is not allowed. + + Preamble + + The licence agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +Licence is intended to guarantee your freedom to share and change free +software---to make sure the software is free for all its users. The +General Public Licence applies to the Free Software Foundation's +software and to any other programme whose authors commit to using it. +You can use it for your programmes, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public Licence is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programmes; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a programme, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this licence which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENCE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This Licence Agreement applies to any programme or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public Licence. The +"Programme", below, refers to any such programme or work, and a "work based +on the Programme" means either the Programme or any work containing the +Programme or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute verbatim copies of the Programme's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this +General Public Licence and to the absence of any warranty; and give any +other recipients of the Programme a copy of this General Public Licence +along with the Programme. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Programme or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Programme or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public Licence (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified programme normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the programme under these + conditions, and telling the user how to view a copy of this General + Public Licence. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Programme (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Programme (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the programme in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Programme except as expressly provided under this General Public Licence. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Programme is void, and will automatically terminate your rights to use +the Programme under this Licence. However, parties who have received +copies, or rights to use copies, from you under this General Public +Licence will not have their licences terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Programme (or any work based +on the Programme) you indicate your acceptance of this licence to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Programme (or any work based on the +Programme), the recipient automatically receives a licence from the original +licensor to copy, distribute or modify the Programme subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the General Public Licence from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Programme +specifies a version number of the licence which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Programme does not specify a version number of +the licence, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Programme into other free +programmes whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAMME IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAMME, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAMME "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAMME IS WITH YOU. SHOULD THE +PROGRAMME PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAMME AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAMME (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAMME TO OPERATE WITH ANY OTHER +PROGRAMMES), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programmes + + If you develop a new programme, and you want it to be of the greatest +possible use to humanity, the best way to achieve this is to make it +free software which everyone can redistribute and change under these +terms. + + To do so, attach the following notices to the programme. It is safest to +attach them to the start of each source file to most effectively convey +the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the programme's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This programme is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public Licence as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This programme is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public Licence for more details. + + You should have received a copy of the GNU General Public Licence + along with this programme; if not, write to the Free Software + Foundation, Inc, 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the programme is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public Licence. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +programme. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the programme, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + programme `Gnomovision' (a programme to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! +</div> + +<a name="openssl" /> +<h3>Licenza OpenSSL</h3> +<div class="licence"> The OpenSSL toolkit stays under a dual license, i.e. both the conditions of + the OpenSSL License and the original SSLeay license apply to the toolkit. + See below for the actual license texts. Actually both licenses are BSD-style + Open Source licenses. In case of any license issues related to OpenSSL + please contact openssl-core(a)openssl.org. + + OpenSSL License + --------------- + +/* ==================================================================== + * Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core(a)openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay(a)cryptsoft.com). This product includes software written by Tim + * Hudson (tjh(a)cryptsoft.com). + * + */ + + Original SSLeay License + ----------------------- + +/* Copyright (C) 1995-1998 Eric Young (eay(a)cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay(a)cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh(a)cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay(a)cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh(a)cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ +</div> + +<a name="png" /> +<h3>Licenza PNG</h3> +<div class="licence"> * This code is released under the libpng license. + * + * libpng versions 1.2.6, August 15, 2004, through 1.4.1, February 25, 2010, are + * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are + * distributed according to the same disclaimer and license as libpng-1.2.5 + * with the following individual added to the list of Contributing Authors: + * + * Cosmin Truta + * + * libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are + * Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are + * distributed according to the same disclaimer and license as libpng-1.0.6 + * with the following individuals added to the list of Contributing Authors: + * + * Simon-Pierre Cadieux + * Eric S. Raymond + * Gilles Vollant + * + * and with the following additions to the disclaimer: + * + * There is no warranty against interference with your enjoyment of the + * library or against infringement. There is no warranty that our + * efforts or the library will fulfill any of your particular purposes + * or needs. This library is provided with all faults, and the entire + * risk of satisfactory quality, performance, accuracy, and effort is with + * the user. + * + * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are + * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are + * distributed according to the same disclaimer and license as libpng-0.96, + * with the following individuals added to the list of Contributing Authors: + * + * Tom Lane + * Glenn Randers-Pehrson + * Willem van Schaik + * + * libpng versions 0.89, June 1996, through 0.96, May 1997, are + * Copyright (c) 1996, 1997 Andreas Dilger + * Distributed according to the same disclaimer and license as libpng-0.88, + * with the following individuals added to the list of Contributing Authors: + * + * John Bowler + * Kevin Bracey + * Sam Bushell + * Magnus Holmgren + * Greg Roelofs + * Tom Tanner + * + * libpng versions 0.5, May 1995, through 0.88, January 1996, are + * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + * + * For the purposes of this copyright and license, "Contributing Authors" + * is defined as the following set of individuals: + * + * Andreas Dilger + * Dave Martindale + * Guy Eric Schalnat + * Paul Schmidt + * Tim Wegner + * + * The PNG Reference Library is supplied "AS IS". The Contributing Authors + * and Group 42, Inc. disclaim all warranties, expressed or implied, + * including, without limitation, the warranties of merchantability and of + * fitness for any purpose. The Contributing Authors and Group 42, Inc. + * assume no liability for direct, indirect, incidental, special, exemplary, + * or consequential damages, which may result from the use of the PNG + * Reference Library, even if advised of the possibility of such damage. + * + * Permission is hereby granted to use, copy, modify, and distribute this + * source code, or portions hereof, for any purpose, without fee, subject + * to the following restrictions: + * + * 1. The origin of this source code must not be misrepresented. + * + * 2. Altered versions must be plainly marked as such and + * must not be misrepresented as being the original source. + * + * 3. This Copyright notice may not be removed or altered from + * any source or altered source distribution. + * + * The Contributing Authors and Group 42, Inc. specifically permit, without + * fee, and encourage the use of this source code as a component to + * supporting the PNG file format in commercial products. If you use this + * source code in a product, acknowledgment is not required but would be + * appreciated. + */ +</div> + +<a name="unixlib" /> +<h3>Licenza UnixLib</h3> +<div class="licence">In January 2005, permission was obtained from all relevant contributors +by Peter Naulls to license all past and present contributions to UnixLib +(where possible) under the revised BSD license. The license is included +in the next section and is applicable to all code in UnixLib that does not +have an explicit license in its source. + +Prior to 4th January 2005 and after May 2001, UnixLib contained code licensed +under the GNU General Public License, and versions of UnixLib produced +between these dates are subject to the provisions of the GPL. We realised +that this might cause potential problems with the wider use of UnixLib in +RISC OS, and along with the desire to clarify the overall licensing status of +UnixLib, GPL code was removed from UnixLib and the above permission from all +copyright holders allowed UnixLib contributions to be relicensed as per the +revised BSD license. The GPL is therefore not included in this notice +as it is no longer relevant to UnixLib. + + +Practical notes on using UnixLib in your own programs: + +This is a plain English version of guidelines for use of UnixLib in +your programs. It does not override any of the licenses included +below, but is intended to state instances when it may be used in +free and non-free software. Where there is contradiction or +ambiguity in this wording, please refer to the specifics of the licence +in question. These recommendations are based upon our understading +of the GPL/LGPL and BSD licenses and are subject to change should +our understanding of the topics improve. + + - Because UnixLib contains code that is subject to the Lesser GNU + Public License, the LGPL is the overriding consideration when + linking UnixLib to programs (unless the program itself is GPL). + + - You are free to use sections of UnixLib in your own programs + subject to the conditions of that code. If the entirety of + that code is under a BSD license, then you can generally use + that code as you see fit, and there is no further obligation + from you as long as the copyright notice remains. If you + use LGPL code in your program, then your program must also be + distributed under the LGPL (or GPL). + + - If you use UnixLib in its intended original form - that is as a + supporting library for ported programs to RISC OS - then your program + is subject to the LGPL; or the GPL if the program is covered by that. + Note that you must make the source and any modifications available to for + both if requested. This is of course equally true if you write an original + GPL program using UnixLib. In most cases, no additional action is + required of you, especially since source is usually readibly available. + + - If you use UnixLib for a non-free program - whether that's commercial or + otherwise, then you should carefully read section 6 of the LGPL. This + applies, because at the present time, there is no practical method of + dynamic linking on RISC OS. At such time that UnixLib is available as a + shared library, then programs dynamically linking to it will no longer be + subject to the LPGL as applied to UnixLib. + + - Section 6 means that in practice, you must supply, or offer to + supply either source or object code for your program. + This is mainly to allow rebuilding of the executable program + with later or modified versions of UnixLib. You must of course + supply (or better, contribute to the GCCSDK project) any + modifications you make to UnixLib upon request. + + +Recommended reading: + +Frequently Asked Questions about the GNU GPL +http://www.fsf.org/licenses/gpl-faq.html (has some sections on LGPL) + +About the justifications for using LGPL +http://www.fsf.org/licenses/why-not-lgpl.html + + + +=========================================================================== + + Copyright (c) 1995-2009 UnixLib Developers + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=========================================================================== + +Portions of UnixLib are copyright The Regents of the University of +California. + +Portions of this library are copyright Sun Microsystems, Inc. The + +Portions of this library are derived from the GNU C Library and fall under +the GNU Library General Public License. + +Portions of this library are copyright Henry Spencer. + +Portions of this library are copyright The Regents of the University of +California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState +Corporation and other parties. + +Portions of this library are copyright PostgreSQL Global Development Group. + +The licenses for the above are duplicated below. + + +=========================================================================== + + Copyright (c) The Regents of the University of California. + All rights reserved. + + This code is derived from software contributed to Berkeley by + Chris Torek. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. + 4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +=========================================================================== + + Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + + Developed at SunPro, a Sun Microsystems, Inc. business. + Permission to use, copy, modify, and distribute this + software is freely granted, provided that this notice + is preserved. + +=========================================================================== + + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if +you distribute copies of the library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, so that any problems introduced by others will not reflect on +the original authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the source code distributed need not include anything that is normally +distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + +=========================================================================== + +Copyright (c) 1998, 1999 Henry Spencer. All rights reserved. + +Development of this software was funded, in part, by Cray Research Inc., +UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics +Corporation, none of whom are responsible for the results. The author +thanks all of them. + +Redistribution and use in source and binary forms -- with or without +modification -- are permitted for any purpose, provided that +redistributions in source form retain this entire copyright notice and +indicate the origin and nature of any modifications. + +I'd appreciate being given credit for this package in the documentation +of software which uses it, but that is not a requirement. + +THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL +HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +=========================================================================== + +This software is copyrighted by the Regents of the University of +California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState +Corporation and other parties. The following terms apply to all files +associated with the software unless explicitly disclaimed in +individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, provided +that existing copyright notices are retained in all copies and that this +notice is included verbatim in any distributions. No written agreement, +license, or royalty fee is required for any of the authorized uses. +Modifications to this software may be copyrighted by their authors +and need not follow the licensing terms described here, provided that +the new terms are clearly indicated on the first page of each file where +they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY +FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY +DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE +IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE +NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of the +U.S. government, the Government shall have only "Restricted Rights" +in the software and related documentation as defined in the Federal +Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you +are acquiring the software on behalf of the Department of Defense, the +software shall be classified as "Commercial Computer Software" and the +Government shall have only "Restricted Rights" as defined in Clause +252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the +authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with the +terms specified in this license. + +=========================================================================== + +PostgreSQL Database Management System +(formerly known as Postgres, then as Postgres95) + +Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group + +Portions Copyright (c) 1994, The Regents of the University of California + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement +is hereby granted, provided that the above copyright notice and this +paragraph and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING +LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS +DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS +ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO +PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. +</div> + +<div class="footer"> +<p>Copyright 2003–2011 The NetSurf Developers</p> +</div> + +</body> +</html> Propchange: trunk/netsurf/!NetSurf/Resources/it/licence.html,faf ------------------------------------------------------------------------------ amiga:protection = ----rwed ---- ---- Propchange: trunk/netsurf/!NetSurf/Resources/it/licence.html,faf ------------------------------------------------------------------------------ svn:executable = *

12 years, 2 months

1
0
0 / 0

r12132 chris_y - /trunk/netsurf/amiga/gui_options.c

by netsurf＠semichrome.net

Author: chris_y Date: Thu Mar 24 19:34:00 2011 New Revision: 12132 URL: http://source.netsurf-browser.org?rev=12132&view=rev Log: Remove "search from url bar" as it doesn't do anything. Move clipboard group into vacated space Modified: trunk/netsurf/amiga/gui_options.c Modified: trunk/netsurf/amiga/gui_options.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui_options.c?rev=1... ============================================================================== --- trunk/netsurf/amiga/gui_options.c (original) +++ trunk/netsurf/amiga/gui_options.c Thu Mar 24 19:34:00 2011 @@ -113,7 +113,6 @@ GID_OPTS_DLDIR, GID_OPTS_TAB_ACTIVE, GID_OPTS_TAB_2, - GID_OPTS_SEARCH_URLBAR, GID_OPTS_SEARCH_PROV, GID_OPTS_CLIPBOARD, GID_OPTS_CMENU_ENABLE, @@ -277,7 +276,6 @@ gadlab[GID_OPTS_DLDIR] = (char *)ami_utf8_easy((char *)messages_get("DownloadDir")); gadlab[GID_OPTS_TAB_ACTIVE] = (char *)ami_utf8_easy((char *)messages_get("TabActive")); gadlab[GID_OPTS_TAB_2] = (char *)ami_utf8_easy((char *)messages_get("TabMiddle")); - gadlab[GID_OPTS_SEARCH_URLBAR] = (char *)ami_utf8_easy((char *)messages_get("SearchURL")); gadlab[GID_OPTS_SEARCH_PROV] = (char *)ami_utf8_easy((char *)messages_get("SearchProvider")); gadlab[GID_OPTS_CLIPBOARD] = (char *)ami_utf8_easy((char *)messages_get("ClipboardUTF8")); gadlab[GID_OPTS_CMENU_ENABLE] = (char *)ami_utf8_easy((char *)messages_get("Enable")); @@ -1110,40 +1108,36 @@ LayoutEnd, // context menus LayoutEnd, // hgroup CHILD_WeightedHeight, 0, - LAYOUT_AddChild,HGroupObject, - LAYOUT_SpaceOuter, TRUE, - LAYOUT_BevelStyle, BVS_GROUP, - LAYOUT_Label, gadlab[GRP_OPTS_SEARCH], - LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_URLBAR] = CheckBoxObject, - GA_ID, GID_OPTS_SEARCH_URLBAR, - GA_RelVerify, TRUE, - GA_Text, gadlab[GID_OPTS_SEARCH_URLBAR], - GA_Selected, option_search_url_bar, - CheckBoxEnd, - LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObject, - GA_ID, GID_OPTS_SEARCH_PROV, - GA_RelVerify, TRUE, - CHOOSER_PopUp, TRUE, - CHOOSER_LabelArray, websearch_list, - CHOOSER_Selected, option_search_provider, - CHOOSER_MaxLabels, 40, - ChooserEnd, - CHILD_Label, LabelObject, - LABEL_Text, gadlab[GID_OPTS_SEARCH_PROV], - LabelEnd, - LayoutEnd, // search - CHILD_WeightedHeight, 0, - LAYOUT_AddChild,HGroupObject, - LAYOUT_SpaceOuter, TRUE, - LAYOUT_BevelStyle, BVS_GROUP, - LAYOUT_Label, gadlab[GRP_OPTS_CLIPBOARD], - LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObject, - GA_ID, GID_OPTS_CLIPBOARD, - GA_RelVerify, TRUE, - GA_Text, gadlab[GID_OPTS_CLIPBOARD], - GA_Selected, option_utf8_clipboard, - CheckBoxEnd, - LayoutEnd, // clipboard + LAYOUT_AddChild, HGroupObject, + LAYOUT_AddChild,HGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, gadlab[GRP_OPTS_SEARCH], + LAYOUT_AddChild, gow->objects[GID_OPTS_SEARCH_PROV] = ChooserObject, + GA_ID, GID_OPTS_SEARCH_PROV, + GA_RelVerify, TRUE, + CHOOSER_PopUp, TRUE, + CHOOSER_LabelArray, websearch_list, + CHOOSER_Selected, option_search_provider, + CHOOSER_MaxLabels, 40, + ChooserEnd, + CHILD_Label, LabelObject, + LABEL_Text, gadlab[GID_OPTS_SEARCH_PROV], + LabelEnd, + LayoutEnd, // search + CHILD_WeightedHeight, 0, + LAYOUT_AddChild,HGroupObject, + LAYOUT_SpaceOuter, TRUE, + LAYOUT_BevelStyle, BVS_GROUP, + LAYOUT_Label, gadlab[GRP_OPTS_CLIPBOARD], + LAYOUT_AddChild, gow->objects[GID_OPTS_CLIPBOARD] = CheckBoxObject, + GA_ID, GID_OPTS_CLIPBOARD, + GA_RelVerify, TRUE, + GA_Text, gadlab[GID_OPTS_CLIPBOARD], + GA_Selected, option_utf8_clipboard, + CheckBoxEnd, + LayoutEnd, // clipboard + LayoutEnd, // hgroup CHILD_WeightedHeight, 0, LAYOUT_AddChild,VGroupObject, LAYOUT_SpaceOuter, TRUE, @@ -1539,10 +1533,6 @@ if(data) option_button_2_tab = true; else option_button_2_tab = false; - GetAttr(GA_Selected,gow->objects[GID_OPTS_SEARCH_URLBAR],(ULONG *)&data); - if(data) option_search_url_bar = true; - else option_search_url_bar = false; - GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_SEARCH_PROV],(ULONG *)&option_search_provider); search_web_provider_details(option_search_provider); search_web_retrieve_ico(false);

12 years, 2 months

1
0
0 / 0

r12131 vince - in /trunk/netsurf: !NetSurf/Resources/en/Messages windows/about.c windows/download.c windows/gui.c windows/gui.h windows/res/resource.rc windows/resourceid.h windows/windbg.h

by netsurf＠semichrome.net

Author: vince Date: Thu Mar 24 19:14:34 2011 New Revision: 12131 URL: http://source.netsurf-browser.org?rev=12131&view=rev Log: make windows about window functional make url bar font more acceptable Modified: trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/windows/about.c trunk/netsurf/windows/download.c trunk/netsurf/windows/gui.c trunk/netsurf/windows/gui.h trunk/netsurf/windows/res/resource.rc trunk/netsurf/windows/resourceid.h trunk/netsurf/windows/windbg.h Modified: trunk/netsurf/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/en/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/en/Messages Thu Mar 24 19:14:34 2011 @@ -20,6 +20,9 @@ # ignored. # +# Globals +NetSurf:NetSurf +NetSurfCopyright:Copyright Â© 2003 - 2011 The NetSurf Developers # Menus # ===== @@ -29,7 +32,6 @@ # Iconbar menu # -NetSurf:NetSurf Info:Info AppHelp:Help... F1 Open:Open Modified: trunk/netsurf/windows/about.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/about.c?rev=12131... ============================================================================== --- trunk/netsurf/windows/about.c (original) +++ trunk/netsurf/windows/about.c Thu Mar 24 19:14:34 2011 @@ -22,145 +22,113 @@ #include "utils/utils.h" #include "utils/messages.h" #include "desktop/netsurf.h" +#include "utils/log.h" +#include "windows/gui.h" #include "windows/about.h" #include "windows/resourceid.h" -const char *netsurf_authors[] = { - "John-Mark Bell", "James Bursa", "Michael Drake", - "Rob Kendrick", "Adrian Lees", "Vincent Sanders", - "Daniel Silverstone", "Richard Wilson", - "\nContributors:", "Kevin Bagust", "Stefaan Claes", - "Matthew Hambley", "Rob Jackson", "Jeffrey Lee", "Phil Mellor", - "Philip Pemberton", "Darren Salt", "Andrew Timmins", - "John Tytgat", "Chris Williams", - "\nGoogle Summer of Code Contributors:", "Mark Benjamin", - "Adam Blokus", "Paul Blokus", "Sean Fox", "Michael Lester", - "Andrew Sidwell", "Bo Yang", NULL -}; -const char * const netsurf_translators = "Sebastian Barthel\n" - "Bruno D'Arcangeli\nGerard van Katwijk\nJÃ©rÃ´me Mathevet\n" - "Simon Voortman."; -const char *netsurf_artists[] = { - "Michael Drake", "\nContributors:", "Andrew Duffell", - "John Duffell", "Richard Hallas", "Phil Mellor", NULL -}; -const char *netsurf_documenters[] = { - "John-Mark Bell", "James Bursa", "Michael Drake", - "Richard Wilson", "\nContributors:", "James Shaw", NULL -}; -const char * const netsurf_name = "NetSurf"; -const char * const netsurf_description = - "Small as a mouse, fast as a cheetah, and available for free.\n" - "NetSurf is a portable web browser for RISC OS, AmigaOS, BeOS, " - "Windows and UNIX-like platforms."; -const char * const netsurf_url = "http://www.netsurf-browser.org/"; -const char * const netsurf_url_label = "NetSurf Website"; -const char * const netsurf_copyright = - "Copyright Â© 2003 - 2009 The NetSurf Developers"; +#include "windbg.h" -BOOL CALLBACK nsws_about_event_callback(HWND hwnd, UINT msg, WPARAM wparam, - LPARAM lparam); +/** + * Initialize the about dialog text fields + */ +static BOOL init_about_dialog(HWND hwnd) +{ + char ver_str[128]; + HWND dlg_itm; + HFONT hFont; -BOOL CALLBACK nsws_about_event_callback(HWND hwnd, UINT msg, WPARAM wparam, - LPARAM lparam) + dlg_itm = GetDlgItem(hwnd, IDC_ABOUT_VERSION); + if (dlg_itm != NULL) { + + hFont=CreateFont (26, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, "Arial"); + if (hFont != NULL) { + LOG(("Setting font object")); + SendMessage(dlg_itm, WM_SETFONT, (WPARAM)hFont, 0); + } + + snprintf(ver_str, sizeof(ver_str), "%s %s", + messages_get("NetSurf"), netsurf_version); + + SendMessage(dlg_itm, WM_SETTEXT, 0, (LPARAM)ver_str); + } + + dlg_itm = GetDlgItem(hwnd, IDC_ABOUT_COPYRIGHT); + if (dlg_itm != NULL) { + snprintf(ver_str, sizeof(ver_str), "%s", + messages_get("NetSurfCopyright")); + + SendMessage(dlg_itm, WM_SETTEXT, 0, (LPARAM)ver_str); + } + + return TRUE; +} + +/** + * destroy resources used to create about dialog + */ +static BOOL destroy_about_dialog(HWND hwnd) { + HWND dlg_itm; + HFONT hFont; + + dlg_itm = GetDlgItem(hwnd, IDC_ABOUT_VERSION); + if (dlg_itm != NULL) { + hFont = (HFONT)SendMessage(dlg_itm, WM_GETFONT, 0, 0); + if (hFont != NULL) { + LOG(("Destroyed font object")); + DeleteObject(hFont); + } + } + + return TRUE; + +} + +static BOOL CALLBACK +nsws_about_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + + LOG_WIN_MSG(hwnd, msg, wparam, lparam); + switch(msg) { - case WM_INITDIALOG: { - HWND content = GetDlgItem(hwnd, IDC_ABOUT_CONTENT); - /* modify label NSWS_ID_ABOUT_CONTENT */ - size_t len; - char *newcontent, *authors, *artists, *documenters; - int i; - for (i = 0, len = 0; netsurf_authors[i] != NULL; i++) { - len += strlen(netsurf_authors[i]) + 1; - } - authors = malloc(len + 1); - if (authors == NULL) { - warn_user(messages_get("NoMemory"), 0); - return FALSE; - } - authors[0] = '\0'; - for (i = 0; netsurf_authors[i] != NULL; i++) { - strcat(authors, netsurf_authors[i]); - strcat(authors, " "); - } - for (i = 0, len = 0; netsurf_artists[i] != NULL; i++) { - len += strlen(netsurf_artists[i]) + 1; - } - artists = malloc(len + 1); - if (artists == NULL) { - warn_user(messages_get("NoMemory"), 0); - free(authors); - return FALSE; - } - artists[0] = '\0'; - for (i = 0; netsurf_artists[i] != NULL; i++) { - strcat(artists, netsurf_artists[i]); - strcat(artists, " "); - } - for (i = 0, len = 0; netsurf_documenters[i] != NULL; i++) { - len += strlen(netsurf_documenters[i]) + 1; - } - documenters = malloc(len + 1); - if (documenters == NULL) { - warn_user(messages_get("NoMemory"), 0); - free(authors); - free(artists); - return FALSE; - } - documenters[0] = '\0'; - for (i = 0; netsurf_documenters[i] != NULL; i++) { - strcat(documenters, netsurf_documenters[i]); - strcat(documenters, " "); - } - len = strlen(netsurf_name) + 1 + strlen(netsurf_version) + - 2 + strlen(netsurf_description) + 2 + - strlen(netsurf_url) + 2 + - strlen(netsurf_copyright) + 2 + - strlen(netsurf_translators) + 2 + - strlen(authors) + 2 + strlen(artists) + 2 + - strlen(documenters) + 2 + SLEN("authors:") + 2 + - SLEN("artists:") + 2 + SLEN("documenters:") + 2 + - SLEN("translators:") + 2; - newcontent = malloc(len + 1); - if (newcontent == NULL) { - warn_user(messages_get("NoMemory"), 0); - free(authors); - free(artists); - free(documenters); - return FALSE; - } - sprintf(newcontent, "%s %s\n\n%s\n\nauthors:\n\n%s\n\n" - "artists:\n\n%s\n\ndocumenters:\n\n%s\n\n" - "translators:\n\n%s\n\n%s\n\n%s\n", - netsurf_name, netsurf_version, - netsurf_description, authors, artists, - documenters, netsurf_translators, netsurf_url, - netsurf_copyright); - SendMessage(content, WM_SETTEXT, 0, (LPARAM)newcontent); - free(authors); - free(artists); - free(documenters); - free(newcontent); - - return TRUE; - } + case WM_INITDIALOG: + return init_about_dialog(hwnd); + case WM_COMMAND: switch(LOWORD(wparam)) { case IDOK: + LOG(("OK clicked")); EndDialog(hwnd, IDOK); break; - default: - return FALSE; + + case IDCANCEL: + LOG(("Cancel clicked")); + EndDialog(hwnd, IDOK); + break; + + case IDC_BTN_CREDITS: + nsws_window_go(hwnd, "about:credits"); + EndDialog(hwnd, IDOK); + break; + + case IDC_BTN_LICENCE: + nsws_window_go(hwnd, "about:licence"); + EndDialog(hwnd, IDOK); + break; + } break; + case WM_CREATE: return TRUE; - default: - return FALSE; + + case WM_DESTROY: + return destroy_about_dialog(hwnd); + } - return TRUE; + return FALSE; } void nsws_about_dialog_init(HINSTANCE hinst, HWND parent) Modified: trunk/netsurf/windows/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/download.c?rev=12... ============================================================================== --- trunk/netsurf/windows/download.c (original) +++ trunk/netsurf/windows/download.c Thu Mar 24 19:14:34 2011 @@ -23,6 +23,7 @@ #include "content/fetch.h" #include "desktop/gui.h" +#include "utils/schedule.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/url.h" Modified: trunk/netsurf/windows/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/windows/gui.c?rev=12131&r... ============================================================================== --- trunk/netsurf/windows/gui.c (original) +++ trunk/netsurf/windows/gui.c Thu Mar 24 19:14:34 2011 @@ -183,36 +183,45 @@ static struct gui_window * nsws_get_gui_window(HWND hwnd) { - struct gui_window *gw; - HWND phwnd; - - gw = GetProp(hwnd, TEXT("GuiWnd")); + struct gui_window *gw = NULL; + HWND phwnd = hwnd; + + /* scan the window hierachy for gui window */ + while (phwnd != NULL) { + gw = GetProp(phwnd, TEXT("GuiWnd")); + if (gw != NULL) + break; + phwnd = GetParent(phwnd); + } if (gw == NULL) { - /* try the parent window instead */ - phwnd = GetParent(hwnd); - gw = GetProp(phwnd, TEXT("GuiWnd")); - } - - if (gw == NULL) { - /* unable to fetch from property, try searching the - * gui window list - */ - gw = window_list; - while (gw != NULL) { - if ((gw->main == hwnd) || - (gw->drawingarea == hwnd) || - (gw->urlbar == hwnd) || - (gw->toolbar == hwnd)) { + /* try again looking for owner windows instead */ + phwnd = hwnd; + while (phwnd != NULL) { + gw = GetProp(phwnd, TEXT("GuiWnd")); + if (gw != NULL) break; - } - gw = gw->next; + phwnd = GetWindow(phwnd, GW_OWNER); } } + LOG(("gw %p",gw)); return gw; } +bool +nsws_window_go(HWND hwnd, const char *url) +{ + struct gui_window * gw; + + gw = nsws_get_gui_window(hwnd); + if (gw == NULL) + return false; + + browser_window_go(gw->bw, url, 0, true); + + return true; +} /** * callback for url bar events @@ -222,11 +231,13 @@ { struct gui_window *gw; WNDPROC urlproc; + HFONT hFont; + + LOG_WIN_MSG(hwnd, msg, wparam, lparam); gw = nsws_get_gui_window(hwnd); - LOG(("%s, hwnd %p, gw %p, wparam %d, lparam %ld", - msg_num_to_name(msg), hwnd, gw, wparam, lparam)); + urlproc = (WNDPROC)GetProp(hwnd, TEXT("OrigMsgProc")); /* override messages */ switch (msg) { @@ -237,20 +248,25 @@ } break; - } - - /* remove properties if window is being destroyed */ - if (msg == WM_NCDESTROY) { + case WM_DESTROY: + hFont = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0); + if (hFont != NULL) { + LOG(("Destroyed font object")); + DeleteObject(hFont); + } + + + case WM_NCDESTROY: + /* remove properties if window is being destroyed */ RemoveProp(hwnd, TEXT("GuiWnd")); - urlproc = (WNDPROC)RemoveProp(hwnd, TEXT("OrigMsgProc")); - } else { - urlproc = (WNDPROC)GetProp(hwnd, TEXT("OrigMsgProc")); + RemoveProp(hwnd, TEXT("OrigMsgProc")); + break; } if (urlproc == NULL) { /* the original toolbar procedure is not available */ return DefWindowProc(hwnd, msg, wparam, lparam); - } + } /* chain to the next handler */ return CallWindowProc(urlproc, hwnd, msg, wparam, lparam); @@ -258,29 +274,29 @@ /* calculate the dimensions of the url bar relative to the parent toolbar */ static void -urlbar_dimensions(HWND hWndParent, - int toolbuttonsize, - int buttonc, - int *x, - int *y, - int *width, +urlbar_dimensions(HWND hWndParent, + int toolbuttonsize, + int buttonc, + int *x, + int *y, + int *width, int *height) { RECT rc; - const int cy_edit = 24; + const int cy_edit = 23; GetClientRect(hWndParent, &rc); - *x = (toolbuttonsize + 2) * (buttonc + 1) + (NSWS_THROBBER_WIDTH>>1); - *y = (((rc.bottom - rc.top) + 1) - cy_edit) >> 1; - *width = ((rc.right - rc.left) + 1) - *x - (NSWS_THROBBER_WIDTH>>1) - NSWS_THROBBER_WIDTH; + *x = (toolbuttonsize + 1) * (buttonc + 1) + (NSWS_THROBBER_WIDTH>>1); + *y = ((rc.bottom - 1) - cy_edit) >> 1; + *width = (rc.right - 1) - *x - (NSWS_THROBBER_WIDTH>>1) - NSWS_THROBBER_WIDTH; *height = cy_edit; } static LRESULT -nsws_window_toolbar_command(struct gui_window *gw, - int notification_code, - int identifier, +nsws_window_toolbar_command(struct gui_window *gw, + int notification_code, + int identifier, HWND ctrl_window) { LOG(("notification_code %d identifier %d ctrl_window %p", @@ -345,16 +361,16 @@ int urlx, urly, urlwidth, urlheight; WNDPROC toolproc; + LOG_WIN_MSG(hwnd, msg, wparam, lparam); + gw = nsws_get_gui_window(hwnd); - - LOG(("%s, hwnd %p, gw %p", msg_num_to_name(msg), hwnd, gw)); switch (msg) { case WM_SIZE: - urlbar_dimensions(hwnd, - gw->toolbuttonsize, - gw->toolbuttonc, + urlbar_dimensions(hwnd, + gw->toolbuttonsize, + gw->toolbuttonc, &urlx, &urly, &urlwidth, &urlheight); /* resize url */ @@ -372,15 +388,15 @@ break; case WM_COMMAND: - if (nsws_window_toolbar_command(gw, - HIWORD(wparam), - LOWORD(wparam), + if (nsws_window_toolbar_command(gw, + HIWORD(wparam), + LOWORD(wparam), (HWND)lparam) == 0) return 0; break; } - /* remove properties if window is being destroyed */ + /* remove properties if window is being destroyed */ if (msg == WM_NCDESTROY) { RemoveProp(hwnd, TEXT("GuiWnd")); toolproc = (WNDPROC)RemoveProp(hwnd, TEXT("OrigMsgProc")); @@ -391,11 +407,11 @@ if (toolproc == NULL) { /* the original toolbar procedure is not available */ return DefWindowProc(hwnd, msg, wparam, lparam); - } - + } + /* chain to the next handler */ return CallWindowProc(toolproc, hwnd, msg, wparam, lparam); - + } /** @@ -578,7 +594,7 @@ /** * creation of throbber */ -static HWND +static HWND nsws_window_throbber_create(struct gui_window *w) { HWND hwnd; @@ -623,7 +639,7 @@ return hImageList; } -/** create a urlbar and message handler +/** create a urlbar and message handler * * Create an Edit control for enerting urls */ @@ -633,15 +649,16 @@ int urlx, urly, urlwidth, urlheight; HWND hwnd; WNDPROC urlproc; - - urlbar_dimensions(hwndparent, - gw->toolbuttonsize, - gw->toolbuttonc, + HFONT hFont; + + urlbar_dimensions(hwndparent, + gw->toolbuttonsize, + gw->toolbuttonc, &urlx, &urly, &urlwidth, &urlheight); /* Create the edit control */ - hwnd = CreateWindowEx(0L, - TEXT("Edit"), + hwnd = CreateWindowEx(0L, + TEXT("Edit"), NULL, WS_CHILD | WS_BORDER | WS_VISIBLE | ES_LEFT | ES_AUTOHSCROLL, urlx, @@ -650,7 +667,7 @@ urlheight, hwndparent, (HMENU)IDC_MAIN_URLBAR, - hinstance, + hinstance, 0); if (hwnd == NULL) { @@ -661,15 +678,21 @@ SetProp(hwnd, TEXT("GuiWnd"), (HANDLE)gw); /* subclass the message handler */ - urlproc = (WNDPROC)SetWindowLongPtr(hwnd, - GWLP_WNDPROC, + urlproc = (WNDPROC)SetWindowLongPtr(hwnd, + GWLP_WNDPROC, (LONG_PTR)nsws_window_urlbar_callback); /* save the real handler */ SetProp(hwnd, TEXT("OrigMsgProc"), (HANDLE)urlproc); - LOG(("Created url bar hwnd %p", hwnd)); - + hFont = CreateFont(urlheight - 4, 0, 0, 0, FW_BOLD, FALSE, FALSE, FALSE, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | FF_SWISS, "Arial"); + if (hFont != NULL) { + LOG(("Setting font object")); + SendMessage(hwnd, WM_SETFONT, (WPARAM)hFont, 0); + } + + LOG(("Created url bar hwnd:%p, x:%d, y:%d, w:%d, h:%d", hwnd,urlx, urly, urlwidth, urlheight)); + return hwnd; } @@ -702,14 +725,12 @@ SetProp(hWndToolbar, TEXT("GuiWnd"), (HANDLE)gw); /* subclass the message handler */ - toolproc = (WNDPROC)SetWindowLongPtr(hWndToolbar, - GWLP_WNDPROC, + toolproc = (WNDPROC)SetWindowLongPtr(hWndToolbar, + GWLP_WNDPROC, (LONG_PTR)nsws_window_toolbar_callback); /* save the real handler */ SetProp(hWndToolbar, TEXT("OrigMsgProc"), (HANDLE)toolproc); - - /* remember how many buttons are being created */ gw->toolbuttonc = sizeof(tbButtons) / sizeof(TBBUTTON); @@ -755,7 +776,7 @@ /* if mouse button held down and pointer moved more than * minimum distance drag is happening */ if (((gw->mouse->state & (BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_PRESS_2)) != 0) && - (abs(x - gw->mouse->pressed_x) >= 5) && + (abs(x - gw->mouse->pressed_x) >= 5) && (abs(y - gw->mouse->pressed_y) >= 5)) { LOG(("Drag start state 0x%x", gw->mouse->state)); @@ -791,9 +812,9 @@ return 0; } -static LRESULT -nsws_drawable_mousedown(struct gui_window *gw, - int x, int y, +static LRESULT +nsws_drawable_mousedown(struct gui_window *gw, + int x, int y, browser_mouse_state button) { if ((gw == NULL) || @@ -947,7 +968,7 @@ si.fMask = SIF_POS; - if ((gw->bw != NULL) && + if ((gw->bw != NULL) && (gw->bw->current_content != NULL)) { si.nPos = MIN(si.nPos, content_get_width(gw->bw->current_content) * @@ -957,8 +978,8 @@ SetScrollInfo(hwnd, SB_HORZ, &si, TRUE); GetScrollInfo(hwnd, SB_HORZ, &si); if (si.nPos != mem) { - gui_window_set_scroll(gw, - gw->scrollx + gw->requestscrollx + si.nPos - mem, + gui_window_set_scroll(gw, + gw->scrollx + gw->requestscrollx + si.nPos - mem, gw->scrolly); } @@ -1152,10 +1173,9 @@ { struct gui_window *gw; + LOG_WIN_MSG(hwnd, msg, wparam, lparam); + gw = nsws_get_gui_window(hwnd); - - LOG(("%s, hwnd %p, gw %p", msg_num_to_name(msg), hwnd, gw)); - if (gw == NULL) { LOG(("Unable to find gui window structure for hwnd %p", hwnd)); return DefWindowProc(hwnd, msg, wparam, lparam); @@ -1227,7 +1247,7 @@ } static LRESULT -nsws_window_resize(struct gui_window *w, +nsws_window_resize(struct gui_window *gw, HWND hwnd, WPARAM wparam, LPARAM lparam) @@ -1235,35 +1255,35 @@ int x, y; RECT rmain, rstatus, rtool; - if ((w->toolbar == NULL) || - (w->urlbar == NULL) || - (w->statusbar == NULL)) + if ((gw->toolbar == NULL) || + (gw->urlbar == NULL) || + (gw->statusbar == NULL)) return 0; - SendMessage(w->statusbar, WM_SIZE, wparam, lparam); - SendMessage(w->toolbar, WM_SIZE, wparam, lparam); + SendMessage(gw->statusbar, WM_SIZE, wparam, lparam); + SendMessage(gw->toolbar, WM_SIZE, wparam, lparam); GetClientRect(hwnd, &rmain); - GetClientRect(w->toolbar, &rtool); - GetWindowRect(w->statusbar, &rstatus); - gui_window_get_scroll(w, &x, &y); - w->height = HIWORD(lparam) - (rtool.bottom - rtool.top) - (rstatus.bottom - rstatus.top); - w->width = LOWORD(lparam); - - if (w->drawingarea != NULL) { - MoveWindow(w->drawingarea, + GetClientRect(gw->toolbar, &rtool); + GetWindowRect(gw->statusbar, &rstatus); + gui_window_get_scroll(gw, &x, &y); + gw->height = HIWORD(lparam) - (rtool.bottom - rtool.top) - (rstatus.bottom - rstatus.top); + gw->width = LOWORD(lparam); + + if (gw->drawingarea != NULL) { + MoveWindow(gw->drawingarea, 0, rtool.bottom, - w->width, - w->height, + gw->width, + gw->height, true); } - nsws_window_update_forward_back(w); - - gui_window_set_scroll(w, x, y); - - if (w->toolbar != NULL) { - SendMessage(w->toolbar, TB_SETSTATE, + nsws_window_update_forward_back(gw); + + gui_window_set_scroll(gw, x, y); + + if (gw->toolbar != NULL) { + SendMessage(gw->toolbar, TB_SETSTATE, (WPARAM) IDM_NAV_STOP, MAKELONG(TBSTATE_INDETERMINATE, 0)); } @@ -1273,9 +1293,10 @@ static LRESULT -nsws_window_command(struct gui_window *gw, - int notification_code, - int identifier, +nsws_window_command(HWND hwnd, + struct gui_window *gw, + int notification_code, + int identifier, HWND ctrl_window) { LOG(("notification_code %x identifier %x ctrl_window %p", @@ -1283,7 +1304,7 @@ switch(identifier) { - case IDM_FILE_QUIT: + case IDM_FILE_QUIT: { struct gui_window *w; w = window_list; @@ -1384,7 +1405,7 @@ break; case IDM_NAV_BACK: - if ((gw->bw != NULL) && + if ((gw->bw != NULL) && (history_back_available(gw->bw->history))) { history_back(gw->bw, gw->bw->history); } @@ -1392,7 +1413,7 @@ break; case IDM_NAV_FORWARD: - if ((gw->bw != NULL) && + if ((gw->bw != NULL) && (history_forward_available(gw->bw->history))) { history_forward(gw->bw, gw->bw->history); } @@ -1524,12 +1545,18 @@ break; case IDM_HELP_CONTENTS: + nsws_window_go(hwnd, + "http://www.netsurf-browser.org/documentation/"); break; case IDM_HELP_GUIDE: + nsws_window_go(hwnd, + "http://www.netsurf-browser.org/documentation/guide"); break; case IDM_HELP_INFO: + nsws_window_go(hwnd, + "http://www.netsurf-browser.org/documentation/info"); break; case IDM_HELP_ABOUT: @@ -1556,19 +1583,18 @@ return 0; /* control message handled */ } + /** * callback for window events generally */ -LRESULT CALLBACK +LRESULT CALLBACK nsws_window_event_callback(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { struct gui_window *gw; + LOG_WIN_MSG(hwnd, msg, wparam, lparam); + gw = nsws_get_gui_window(hwnd); - - if ((msg!=WM_SETCURSOR) && (msg!=WM_MOUSEMOVE) &&(msg!=WM_NCHITTEST)) - LOG(("%s, hwnd %p, gw %p", msg_num_to_name(msg), hwnd, gw)); - if (gw == NULL) { LOG(("Unable to find gui window structure for hwnd %p", hwnd)); return DefWindowProc(hwnd, msg, wparam, lparam); @@ -1589,13 +1615,6 @@ return DefWindowProc(hwnd, msg, wparam, lparam); break; } - case WM_NCLBUTTONDOWN: { - int x,y; - x = GET_X_LPARAM(lparam); - y = GET_Y_LPARAM(lparam); - return DefWindowProc(hwnd, msg, wparam, lparam); - break; - } case WM_ENTERMENULOOP: nsws_update_edit(w); return DefWindowProc(hwnd, msg, wparam, lparam); @@ -1607,10 +1626,10 @@ break; case WM_COMMAND: - if (nsws_window_command(gw, HIWORD(wparam), LOWORD(wparam), (HWND)lparam) == 0) + if (nsws_window_command(hwnd, gw, HIWORD(wparam), LOWORD(wparam), (HWND)lparam) == 0) return 0; break; - + case WM_SIZE: return nsws_window_resize(gw, hwnd, wparam, lparam); @@ -1638,7 +1657,7 @@ w.cbClsExtra = 0; w.cbWndExtra = 0; w.hInstance = hinstance; - w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON)); + w.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDR_NETSURF_ICON)); w.hCursor = NULL; w.hbrBackground = (HBRUSH)(COLOR_MENU + 1); w.lpszMenuName = NULL; @@ -1731,6 +1750,9 @@ return NULL; } + /* set the gui window associated with this browser */ + SetProp(hwnd, TEXT("GuiWnd"), (HANDLE)gw); + nscss_screen_dpi = get_window_dpi(hwnd); if ((option_window_width >= 100) && @@ -1762,6 +1784,7 @@ bool new_tab) { struct gui_window *gw; + RECT rmain, rstatus, rtool; LOG(("Creating gui window for browser window %p", bw)); @@ -1803,10 +1826,20 @@ gw->main = nsws_window_create(gw); gw->toolbar = nsws_window_toolbar_create(gw, gw->main); gw->statusbar = nsws_window_statusbar_create(gw); + + + GetClientRect(gw->main, &rmain); + GetClientRect(gw->toolbar, &rtool); + GetWindowRect(gw->statusbar, &rstatus); + + gw->width = rmain.right; + gw->height = rmain.bottom - (rtool.bottom - rtool.top) - (rstatus.bottom - rstatus.top); + gw->drawingarea = CreateWindow(windowclassname_drawable, NULL, WS_VISIBLE | WS_CHILD, - 0, 0, 0, 0, + 0, rtool.bottom, + gw->width, gw->height, gw->main, NULL, hinstance, @@ -1821,8 +1854,6 @@ input_window = gw; open_windows++; ShowWindow(gw->main, SW_SHOWNORMAL); - ShowWindow(gw->drawingarea, SW_SHOWNORMAL); - break; case BROWSER_WINDOW_FRAME: @@ -2586,7 +2617,7 @@ /* If there is a url specified on the command line use it */ if (argc > 1) addr = argv[1]; - else + else addr = option_homepage_url; LOG(("calling browser_window_create")); Modified: trunk/netsurf/windows/gui.h URL: http://source.netsurf-browser.org/trunk/netsurf/windows/gui.h?rev=12131&r... ============================================================================== --- trunk/netsurf/windows/gui.h (original) +++ trunk/netsurf/windows/gui.h Thu Mar 24 19:14:34 2011 @@ -87,4 +87,13 @@ struct nsws_pointers *nsws_get_pointers(void); HICON nsws_window_get_ico(bool); +/** + * Cause a browser window to navigate to a url + * + * \param hwnd The win32 handle to the browser window or one of its decendants. + * \param url The URL to navigate to. + */ +bool nsws_window_go(HWND hwnd, const char *url); + + #endif Modified: trunk/netsurf/windows/res/resource.rc URL: http://source.netsurf-browser.org/trunk/netsurf/windows/res/resource.rc?r... ============================================================================== --- trunk/netsurf/windows/res/resource.rc (original) +++ trunk/netsurf/windows/res/resource.rc Thu Mar 24 19:14:34 2011 @@ -92,9 +92,9 @@ END POPUP "&Help" BEGIN - MENUITEM "&Contents",IDM_HELP_CONTENTS,GRAYED - MENUITEM "G&uide",IDM_HELP_GUIDE,GRAYED - MENUITEM "&Info",IDM_HELP_INFO,GRAYED + MENUITEM "&Contents",IDM_HELP_CONTENTS + MENUITEM "G&uide",IDM_HELP_GUIDE + MENUITEM "&Info",IDM_HELP_INFO MENUITEM SEPARATOR MENUITEM "&About NetSurf",IDM_HELP_ABOUT END @@ -117,17 +117,19 @@ END END -IDD_DLG_ABOUT DIALOGEX 10,10,206,180 +IDD_DLG_ABOUT DIALOGEX 10,10,206,133 CAPTION "About NetSurf" FONT 8,"MS Sans Serif",0,0,0 STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME BEGIN CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP|0x40L /*SS_REALSIZECONTROL*/,0,0,205,53 - CONTROL "",IDC_ABOUT_CONTENT,"Static",WS_CHILDWINDOW|WS_VISIBLE,10,60,185,63 - CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,143,160,54,15 - CONTROL "&Credits",IDC_BTN_CREDITS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,10,160,54,15 - CONTROL "&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,160,54,15 + CONTROL "NetSurf",IDC_ABOUT_VERSION,"Static",SS_LEFT,10,60,185,16 + CONTROL "NetSurf is a small fast browser",IDC_ABOUT_TEXT,"Static",SS_LEFT,10,83,185,8 + CONTROL "Copyright 2003-2011 The NetSurf Developers",IDC_ABOUT_COPYRIGHT,"Static",SS_LEFT,10,96,185,8 + CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,143,111,54,15 + CONTROL "&Credits",IDC_BTN_CREDITS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,10,111,54,15 + CONTROL "&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,111,54,15 END IDD_DLG_DOWNLOAD DIALOGEX 0,0,201,84 Modified: trunk/netsurf/windows/resourceid.h URL: http://source.netsurf-browser.org/trunk/netsurf/windows/resourceid.h?rev=... ============================================================================== --- trunk/netsurf/windows/resourceid.h (original) +++ trunk/netsurf/windows/resourceid.h Thu Mar 24 19:14:34 2011 @@ -41,9 +41,11 @@ #define IDD_DLG_ABOUT 1000 #define IDC_IMG1 1001 -#define IDC_ABOUT_CONTENT 1002 -#define IDC_BTN_CREDITS 1004 -#define IDC_BTN_LICENCE 1005 +#define IDC_ABOUT_VERSION 1002 +#define IDC_ABOUT_TEXT 1003 +#define IDC_ABOUT_COPYRIGHT 1004 +#define IDC_BTN_CREDITS 1005 +#define IDC_BTN_LICENCE 1006 #define IDD_DLG_DOWNLOAD 1100 #define IDC_DOWNLOAD_LABEL 1101 Modified: trunk/netsurf/windows/windbg.h URL: http://source.netsurf-browser.org/trunk/netsurf/windows/windbg.h?rev=1213... ============================================================================== --- trunk/netsurf/windows/windbg.h (original) +++ trunk/netsurf/windows/windbg.h Thu Mar 24 19:14:34 2011 @@ -19,7 +19,16 @@ #ifndef _NETSURF_WINDOWS_WINDBG_H_ #define _NETSURF_WINDOWS_WINDBG_H_ +#include "utils/log.h" + const char *msg_num_to_name(int msg); void win_perror(const char * lpszFunction); +#define LOG_WIN_MSG(h, m, w, l) \ + if (((m) != WM_SETCURSOR) && \ + ((m) != WM_MOUSEMOVE) && \ + ((m) != WM_NCHITTEST) && \ + ((m) != WM_ENTERIDLE)) \ + LOG(("%s, hwnd %p, w 0x%x, l 0x%x", msg_num_to_name(m), h, w, l)); + #endif

12 years, 2 months

1
0
0 / 0

r12130 jmb - in /trunk/iconv/unicode: ReadMe unicode.jmb1.p

by netsurf＠semichrome.net

Author: jmb Date: Thu Mar 24 17:54:31 2011 New Revision: 12130 URL: http://source.netsurf-browser.org?rev=12130&view=rev Log: Lose obsolete patch Removed: trunk/iconv/unicode/unicode.jmb1.p Modified: trunk/iconv/unicode/ReadMe Modified: trunk/iconv/unicode/ReadMe URL: http://source.netsurf-browser.org/trunk/iconv/unicode/ReadMe?rev=12130&r1... ============================================================================== --- trunk/iconv/unicode/ReadMe (original) +++ trunk/iconv/unicode/ReadMe Thu Mar 24 17:54:31 2011 @@ -2,13 +2,6 @@ --------------- The contents of this directory must be obtained from RISC OS Open. - -For the timebeing, it is necessary to apply the supplied patch to the -UnicodeLib source tree. Something like: - - patch -p0 -i unicode.jmb1.p - -should do the trick. The include directory should contain the exported headers: Removed: trunk/iconv/unicode/unicode.jmb1.p URL: http://source.netsurf-browser.org/trunk/iconv/unicode/unicode.jmb1.p?rev=... ============================================================================== --- trunk/iconv/unicode/unicode.jmb1.p (original) +++ trunk/iconv/unicode/unicode.jmb1.p (removed) @@ -1,540 +1,0 @@ -Index: c/enc_utf8 -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/enc_utf8,v -retrieving revision 1.9 -diff -u -r1.9 enc_utf8 ---- c/enc_utf8 10 Jun 2002 15:08:35 -0000 1.9 -+++ c/enc_utf8 29 Nov 2008 14:58:52 -0000 -@@ -81,22 +81,22 @@ - } - else - { -+ /* Reset the count of expected continuation bytes */ -+ ue->count = 0; -+ - if (ucs_out) - if (ucs_out(handle, 0xFFFD)) - { -- /* Character has been used, so ensure its counted */ -- count--; -+ /* Do not consume the invalid continuation byte */ - break; - } - -- ue->count = 0; -- - goto retry; - } - } - else - { -- if (c <= 0x80) -+ if (c < 0x80) - u = c; - else if (c < 0xC0 || c >= 0xFE) - u = 0xFFFD; -@@ -118,10 +118,14 @@ - - ue->first = 0; - -+ /* Disallow surrogates and FFFE/FFFF */ -+ if ((0xD800 <= u && u <= 0xE000) || u == 0xFFFE || u == 0xFFFF) -+ u = 0xFFFD; -+ - if (ucs_out) - if (ucs_out(handle, u)) - { -- /* Character has been used, so ensure its counted */ -+ /* Character has been used, so ensure it's counted */ - count--; - break; - } -Index: c/encoding -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/encoding,v -retrieving revision 1.39 -diff -u -r1.39 encoding ---- c/encoding 26 Aug 2005 15:02:17 -0000 1.39 -+++ c/encoding 29 Nov 2008 11:57:03 -0000 -@@ -67,20 +67,20 @@ - static EncList enclist[] = - { - { csASCII /* 3 */, 1, "/US-ASCII/", lang_ENGLISH, &enc_ascii, NULL, NULL }, -- { csISOLatin1 /* 4 */, 1, "/ISO-8859-1/ISO-IR-100/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x41\x1B\x2E\x42\x1B\x2F\x50", NULL }, /* Select G1 Latin-1, G2 Latin-2, G3 supplement */ -- { csISOLatin2 /* 5 */, 1, "/ISO-8859-2/ISO-IR-101/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x42\x1B\x2E\x41\x1B\x2F\x50", NULL }, /* Select G1 Latin-2, G2 Latin-1, G3 supplement */ -+ { csISOLatin1 /* 4 */, 1, "/ISO-8859-1/ISO-IR-100/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x41"/*\x1B\x2E\x42\x1B\x2F\x50"*/, NULL }, /* Select G1 Latin-1, G2 Latin-2, G3 supplement */ -+ { csISOLatin2 /* 5 */, 1, "/ISO-8859-2/ISO-IR-101/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x42"/*\x1B\x2E\x41\x1B\x2F\x50"*/, NULL }, /* Select G1 Latin-2, G2 Latin-1, G3 supplement */ - { csISOLatin3 /* 6 */, 1, "/ISO-8859-3/ISO-IR-109/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x43", NULL }, /* Select Latin-3 right half */ - { csISOLatin4 /* 7 */, 1, "/ISO-8859-4/ISO-IR-110/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x44", NULL }, /* Select Latin-4 right half */ - { csISOLatinCyrillic /* 8 */, 1, "/ISO-8859-5/ISO-IR-144/", lang_RUSSIAN, &enc_iso8859, "\x1B\x2D\x4C", NULL }, /* Select Cyrillic right half */ - { csISOLatinGreek /* 10 */, 1, "/ISO-8859-7/ISO-IR-126/", lang_GREEK, &enc_iso8859, "\x1B\x2D\x46", NULL }, /* Select Greek right half */ - { csISOLatinHebrew /* 11 */, 1, "/ISO-8859-8/ISO-IR-198/", lang_HEBREW, &enc_iso8859, "\x1B\x2D\x5E", NULL }, /* Select Hebrew right half */ -- { csISOLatin5 /* 12 */, 1, "/ISO-8859-9/ISO-IR-148/", lang_TURKISH, &enc_iso8859, "\x1B\x2D\x4D\x1B\x2E\x42\x1B\x2F\x50", NULL }, /* Select G1 Latin-5, G2 Latin-2, G3 supplement */ -- { csISOLatin6 /* 13 */, 1, "/ISO-8859-10/ISO-IR-157/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x56\x1B\x2E\x58", NULL }, /* Select Latin-6 right half, and Sami supplement as G2 */ -+ { csISOLatin5 /* 12 */, 1, "/ISO-8859-9/ISO-IR-148/", lang_TURKISH, &enc_iso8859, "\x1B\x2D\x4D"/*\x1B\x2E\x42\x1B\x2F\x50"*/, NULL }, /* Select G1 Latin-5, G2 Latin-2, G3 supplement */ -+ { csISOLatin6 /* 13 */, 1, "/ISO-8859-10/ISO-IR-157/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x56"/*\x1B\x2E\x58"*/, NULL }, /* Select Latin-6 right half, and Sami supplement as G2 */ - { csISOLatinThai, 1, "/ISO-8859-11/ISO-IR-166/", lang_THAI, &enc_iso8859, "\x1B\x2D\x54", NULL }, /* Select Thai right half */ - { csISOLatin7, 1, "/ISO-8859-13/ISO-IR-179/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x59", NULL }, /* Select Baltic Rim right half */ - { csISOLatin8, 1, "/ISO-8859-14/ISO-IR-199/", lang_IRISH, &enc_iso8859, "\x1B\x2D\x5F", NULL }, /* Select Celtic right half */ -- { csISOLatin9, 1, "/ISO-8859-15/ISO-IR-203/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x62\x1B\x2E\x42\x1B\x2F\x50", NULL }, /* Select G1 Latin-9, G2 Latin-2, G3 supplement */ -- { csISOLatin10, 1, "/ISO-8859-16/ISO-IR-226/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x66\x1B\x2E\x41\x1B\x2F\x50", NULL }, /* Select G1 Latin-10, G2 Latin-1, G3 supplement */ -+ { csISOLatin9, 1, "/ISO-8859-15/ISO-IR-203/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x62"/*\x1B\x2E\x42\x1B\x2F\x50"*/, NULL }, /* Select G1 Latin-9, G2 Latin-2, G3 supplement */ -+ { csISOLatin10, 1, "/ISO-8859-16/ISO-IR-226/", lang_ENGLISH, &enc_iso8859, "\x1B\x2D\x66"/*\x1B\x2E\x41\x1B\x2F\x50"*/, NULL }, /* Select G1 Latin-10, G2 Latin-1, G3 supplement */ - { csISO6937, 2, "/ISO-IR-156/", lang_ENGLISH, &enc_iso6937, "\x1B\x2D\x52", NULL }, /* Select ISO6937 right half */ - { csISO6937DVB, 2, "/X-ISO-6937-DVB/X-DVB/", lang_ENGLISH, &enc_iso6937, NULL, NULL }, - { csShiftJIS /* 17 */, 2, "/SHIFT_JIS/X-SJIS/", lang_JAPANESE, &enc_shiftjis, NULL, NULL }, -Index: c/iso2022 -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/iso2022,v -retrieving revision 1.19 -diff -u -r1.19 iso2022 ---- c/iso2022 25 Aug 2005 11:57:08 -0000 1.19 -+++ c/iso2022 29 Nov 2008 11:57:04 -0000 -@@ -32,6 +32,7 @@ - #include <stdio.h> - #include <string.h> - -+#include "charsets.h" - #include "encpriv.h" - #include "iso2022.h" - -@@ -66,8 +67,24 @@ - unsigned char tempset; - ISO2022_Set *oldset; - -+ /* Whether escape sequences are disabled -+ * -+ * Value: Meaning: -+ * 0 All escape sequences enabled -+ * 1 Only SS2/3 escape sequences enabled -+ * 2 All escape sequences disabled -+ */ - unsigned char esc_disabled; - -+ /* Whether C1 control characters are permitted -+ * -+ * Value: Meaning: -+ * 0 No C1 control characters permitted -+ * 1 Only 0x8E/0x8F permitted -+ * 2 All C1 control characters permitted -+ */ -+ unsigned char c1_permitted; -+ - /* Pending escape commands */ - unsigned char esc_pending; - unsigned char esc_multi; -@@ -136,7 +153,7 @@ - if (c == 0x00 || c == 0x5F) - { - *sync = 0; -- return c + 0x20; -+ return invoker == _GL ? c + 0x20 : 0xFFFD; - } - - if (!*sync) -@@ -150,8 +167,6 @@ - *sync = 0; - return u; - } -- -- NOT_USED(invoker); - } - - static UCS4 null_double_next_code(ISO2022_Set *s, int c, int invoker, unsigned char *sync) -@@ -379,6 +394,7 @@ - i->CR_s = C1; - i->GR_s = G1; - -+ i->c1_permitted = 2; - i->esc_disabled = 0; - i->esc_pending = i->esc_revision = 0; - i->tempset = 0; -@@ -394,18 +410,39 @@ - iso2022_select_set(i, C0, 32, C0_ISO646); - iso2022_select_set(i, C1, 32+1, C1_ISO6429); - -- /* ISO8859 and EUC variants of IOS2022 require preloading with -+ /* ISO8859 and EUC variants of ISO2022 require preloading with - escape sequences to get the appropriate tables */ - if (e->list_entry->preload) - { -+ char euc = 0; - unsigned int n = strlen(e->list_entry->preload); - if (n != e->read(e, NULL, (unsigned char *)e->list_entry->preload, n, NULL)) - return 0; -- -- /* if we've preloaded then we need to disable further escape -- * sequences otherwise stray control sequences (eg 8E, 8F) -- * will try and switch tables */ -- i->esc_disabled = 1; -+ -+ if (e->list_entry->identifier == csEUCPkdFmtJapanese || -+ /* e->list_entry->identifier == csKSC56011987 || */ -+ e->list_entry->identifier == csEUCKR || -+ e->list_entry->identifier == csGB2312) -+ euc = 1; -+ -+ /* If we've preloaded and we're not handling an EUC variant -+ * then we need to disable further escape sequences otherwise -+ * stray control sequences (eg 8E, 8F) will try and switch tables. -+ * -+ * If we're handling an EUC variant which has loaded tables into -+ * G2 and G3, then SS2/SS3 are permitted. */ -+ if (euc && ((simple_set *)i->Set[G2])->table && -+ ((simple_set *)i->Set[G3])->table) -+ { -+ i->esc_disabled = 1; -+ i->c1_permitted = 1; -+ } -+ else -+ { -+ i->esc_disabled = 2; -+ if (euc) -+ i->c1_permitted = 0; -+ } - } - - if (for_encoding != encoding_READ) -@@ -600,11 +637,17 @@ - UNIDBG(("iso2022: %02x\n", c)); - - /* check for illegal single shifts */ - if ((i->tempset == 1 && (c < 0x20 || c > 0x7F)) || - (i->tempset == 2 && (c < 0xA0))) - { - u = 0xFFFD; - } -+ /* or illegal continuation bytes */ -+ else if ((i->sync[_GL] && (c < 0x20 || c > 0x7F)) || -+ (i->sync[_GR] && (c < 0xA0))) -+ { -+ u = 0xFFFD; -+ } - else if (i->esc_pending) - { - u = iso2022_esc_cont(i, c); -@@ -622,7 +665,11 @@ - else if (c < 0xA0) - { - i->sync[_GL] = i->sync[_GR] = 0; -- u = i->CR->next_code(i->CR, c - 0x80, _CR, NULL); -+ if (i->c1_permitted == 2 || -+ (i->c1_permitted == 1 && (c == 0x8E || c == 0x8F))) -+ u = i->CR->next_code(i->CR, c - 0x80, _CR, NULL); -+ else -+ u = 0xFFFD; - } - else - { -@@ -638,9 +685,9 @@ - break; - case 0x0E: if (!i->esc_disabled) { iso2022_ls(i, G1); continue; } - break; -- case 0x8E: if (!i->esc_disabled) { iso2022_ss(i, G2); continue; } -+ case 0x8E: if (i->esc_disabled < 2) { iso2022_ss(i, G2); continue; } - break; -- case 0x8F: if (!i->esc_disabled) { iso2022_ss(i, G3); continue; } -+ case 0x8F: if (i->esc_disabled < 2) { iso2022_ss(i, G3); continue; } - break; - } - -@@ -877,6 +927,9 @@ - - /* UNIDBG(("scan_table: set %d table %p\n", set, setptr->table)); */ - -+ if (setptr->table == NULL) -+ continue; -+ - if ((i = encoding_lookup_in_table(u, setptr->table)) != -1) - { - *index = i; -@@ -907,8 +960,10 @@ - retry: - - /* control chars */ -- if (u < 0x0021) -+ if (u < 0x0021 || u == 0x007F) - buf[out++] = u; -+ else if ((enc->c1_permitted == 2 && 0x0080 <= u && u <= 0x009F)) -+ buf[out++] = u; - - /* main chars */ - else if (iso2022_scan_sets(enc, u, &index, &set, &n_entries)) -Index: c/iso6937 -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/iso6937,v -retrieving revision 1.1 -diff -u -r1.1 iso6937 ---- c/iso6937 25 Aug 2005 11:57:08 -0000 1.1 -+++ c/iso6937 29 Nov 2008 11:57:04 -0000 -@@ -354,11 +354,13 @@ - - static int iso6937_find_accent_pair(UCS4 u) - { -- for (int a = 1; a <= 15; a++) -+ int a, i; -+ -+ for (a = 1; a <= 15; a++) - { - if (iso6937_combination_table[a].combination) - { -- for (int i = 0; i < iso6937_combination_table[a].ncombinations; i++) -+ for (i = 0; i < iso6937_combination_table[a].ncombinations; i++) - { - if (iso6937_combination_table[a].combination[i].u == u) - { -Index: c/johab -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/johab,v -retrieving revision 1.6 -diff -u -r1.6 johab ---- c/johab 10 Jun 2002 15:08:35 -0000 1.6 -+++ c/johab 29 Nov 2008 11:57:05 -0000 -@@ -116,10 +116,10 @@ - /* Hangul is --X */ - static const unsigned char final_only[28] = - { -- 0, 0, 0, 0x33, 0, 0x35, 0x36, 0, -- 0, 0, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, -- 0x40, 0, 0, 0, 0x44, 0, 0, 0, -- 0, 0, 0, 0 -+ 0, 0, 0, 0x33, 0, 0x35, 0x36, -+ 0, 0, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, -+ 0x3F, 0x40, 0, 0, 0x44, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0 - }; - - u = 0x3100 + final_only[final]; -@@ -250,8 +250,10 @@ - } - else - { -- if (c < 0x80) -+ if (c < 0x80 && c != 0x5C) /* Standard ASCII... */ - u = c; -+ else if (c == 0x5C) /* ...except 0x5C, which maps to Won */ -+ u = 0x20A9; - else if ((c >= 0x84 && c <= 0xD3) || - (c >= 0xD8 && c <= 0xDE) || - (c >= 0xE0 && c <= 0xF9)) -@@ -333,13 +335,15 @@ - static int johab_write(EncodingPriv *e, UCS4 u, unsigned char **johab, int *bufsize) - { - Johab_Encoding *je = (Johab_Encoding *) e; -- int c = '?'; -+ int c = 0xFFFD; - - if (u == NULL_UCS4) - return 0; - -- if (u <= 0x7F) /* Basic Latin */ -+ if (u <= 0x7F && u != 0x5C) /* Basic Latin */ - c = u; -+ else if (u == 0x20A9) /* Won Sign, mapped to 0x5C */ -+ c = 0x5C; - else if (u >= 0xAC00 && u <= 0xD7A3) /* Hangul syllables */ - c = ucs_hangul_to_johab(u); - else if (u >= 0x3131 && u <= 0x3163) /* Modern Jamo */ -@@ -373,6 +377,11 @@ - } - } - -+ if (c == 0xFFFD && e->for_encoding == encoding_WRITE_STRICT) -+ return -1; -+ else if (c == 0xFFFD) -+ c = '?'; -+ - if ((*bufsize -= (c > 0xFF ? 2 : 1)) < 0 || !johab) - return 0; - -Index: c/shiftjis -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/shiftjis,v -retrieving revision 1.13 -diff -u -r1.13 shiftjis ---- c/shiftjis 10 Jun 2002 15:08:35 -0000 1.13 -+++ c/shiftjis 29 Nov 2008 11:57:05 -0000 -@@ -173,7 +173,7 @@ - else - { - if (c < 0x80) -- u = c == 0x5C ? 0x00A5 : c; /* CP932 is as Basic Latin, except for yen */ -+ u = c == 0x5C ? 0x00A5 : (c == 0x7E ? 0x203E : c); /* CP932 is as Basic Latin, except for yen and overbar */ - else if (c == 0x80) - u = 0x005C; /* Backslash - a Mac extension */ - else if (c < 0xA0) -@@ -217,7 +217,7 @@ - { - int i; - -- if (u >= 0x21 && u <= 0x7E && u != 0x5C) /* lower set is ASCII, except... */ -+ if (u >= 0x21 && u < 0x7E && u != 0x5C) /* lower set is ASCII, except... */ - { - *table_no = 0; - *index = u - 0x21; -@@ -231,6 +231,13 @@ - return 1; - } - -+ if (u == 0x203E) /* slot 7E is overbar */ -+ { -+ *table_no = 0; -+ *index = 0x7E - 0x21; -+ return 1; -+ } -+ - if ((i = encoding_lookup_in_table(u, sj->katakana)) != -1) - { - *table_no = 1; -Index: c/textconv -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/textconv,v -retrieving revision 1.4 -diff -u -r1.4 textconv ---- c/textconv 25 Aug 2005 11:57:08 -0000 1.4 -+++ c/textconv 29 Nov 2008 11:57:05 -0000 -@@ -67,8 +67,8 @@ - - static int src_enc = csCurrent; - static int dst_enc = csCurrent; --static FILE *in = stdin; --static FILE *out = stdout; -+static FILE *in; -+static FILE *out; - static Encoding *read, *write; - static char inbuf[256], outbuf[256]; - static unsigned int src_flags, dst_flags; -@@ -184,6 +184,15 @@ - return 1; - } - } -+ else -+ { -+ out = stdout; -+ } -+ } -+ else -+ { -+ in = stdin; -+ out = stdout; - } - - if (src_enc == dst_enc) -Index: c/unix -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/c/unix,v -retrieving revision 1.3 -diff -u -r1.3 unix ---- c/unix 5 Mar 2004 18:16:24 -0000 1.3 -+++ c/unix 29 Nov 2008 11:57:05 -0000 -@@ -33,6 +33,8 @@ - #include "layers_dbg.h" - #endif - -+#include <dirent.h> -+ - #include <string.h> - #include <stdio.h> - -@@ -40,9 +42,12 @@ - - int encoding__load_map_file(const char *leaf, UCS2 **ptable, int *pn_entries, int *palloc) - { -+ DIR *dir; - FILE *fh; - int flen; - char fname[1024]; -+ char *slash; -+ struct dirent *dp; - - void *table; - int n_entries; -@@ -59,6 +64,31 @@ - strncat(fname, leaf, sizeof(fname)); - fname[sizeof(fname)-1] = 0; - -+ /* We get to search the directory, because the leafname may be a prefix */ -+ slash = fname + strlen(fname); -+ while (slash > fname && *slash != '/') -+ slash--; -+ if (slash == fname) -+ return 0; -+ -+ *slash = '\0'; -+ slash++; -+ -+ dir = opendir(fname); -+ if (!dir) -+ return 0; -+ -+ while ((dp = readdir(dir)) != NULL) { -+ if (strncmp(dp->d_name, slash, strlen(slash)) == 0) { -+ *(slash - 1) = '/'; -+ *slash = '\0'; -+ strncat(fname, dp->d_name, sizeof(fname)); -+ break; -+ } -+ } -+ -+ closedir(dir); -+ - fh = fopen(fname, "rb"); - if (!fh) - return 0; -Index: ccsolaris/Makefile -=================================================================== -RCS file: /home/rool/cvsroot/castle/RiscOS/Sources/Lib/Unicode/ccsolaris/Makefile,v -retrieving revision 1.2 -diff -u -r1.2 Makefile ---- ccsolaris/Makefile 25 Aug 2005 11:57:08 -0000 1.2 -+++ ccsolaris/Makefile 29 Nov 2008 11:57:05 -0000 -@@ -17,9 +17,25 @@ - # - # Project: Unicode - --CC=gcc -+ifeq ($(findstring riscos,$(TARGET)),riscos) -+ GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin - --CCflags=-funsigned-char -+ CC = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) -+ -+ ifeq ($(findstring module,$(TARGET)),module) -+ PlatCCflags = -mmodule -+ endif -+ -+ PlatObjs = riscos.o -+else -+ CC = gcc -+ -+ PlatObjs = unix.o -+endif -+ -+HOST_CC = gcc -+ -+CCflags = -funsigned-char -g -O0 $(PlatCCflags) - - .c.o:; $(CC) -c -DDEBUG=0 $(CCflags) -o $@ $< - -@@ -43,7 +59,8 @@ - enc_system.o \ - acorn.o \ - combine.o \ -- unix.o -+ debug.o \ -+ $(PlatObjs) - - all: ucodelib.a textconv - -@@ -51,7 +68,10 @@ - ${AR} r $@ $(Objects) - - textconv: textconv.o ucodelib.a -- ${CC} -o $@ textconv.o ucodelib.a -+ ${CC} $(CCflags) -o $@ textconv.o ucodelib.a -+ -+mkunictype: mkunictype.c -+ ${HOST_CC} -o $@ $< - - clean: - @-rm mkunictype textconv

12 years, 2 months

1
0
0 / 0

r12129 chris_y - /trunk/netsurf/amiga/menu.c

by netsurf＠semichrome.net

Author: chris_y Date: Thu Mar 24 14:34:59 2011 New Revision: 12129 URL: http://source.netsurf-browser.org?rev=12129&view=rev Log: Fix crash when adding to hotlist Modified: trunk/netsurf/amiga/menu.c Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=12129&r1... ============================================================================== --- trunk/netsurf/amiga/menu.c (original) +++ trunk/netsurf/amiga/menu.c Thu Mar 24 14:34:59 2011 @@ -785,14 +785,14 @@ switch(itemnum) { case 0: // add + bw = gwin->bw; + if (bw == NULL || - bw->current_content - == NULL || - content_get_url(bw->current_content) - == NULL) - break; - hotlist_add_page(content_get_url(gwin->bw-> - current_content)); + bw->current_content == NULL || + content_get_url(bw->current_content) == NULL) + break; + + hotlist_add_page(content_get_url(bw->current_content)); break; case 1: // show

12 years, 2 months

1
0
0 / 0

r12128 stevef - /trunk/netsurf/riscos/sslcert.c

by netsurf＠semichrome.net

Author: stevef Date: Wed Mar 23 19:09:49 2011 New Revision: 12128 URL: http://source.netsurf-browser.org?rev=12128&view=rev Log: Force SSLCert pane to have a horizontal scroll bar and ensure initial extent calculation. Modified: trunk/netsurf/riscos/sslcert.c Modified: trunk/netsurf/riscos/sslcert.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/sslcert.c?rev=1212... ============================================================================== --- trunk/netsurf/riscos/sslcert.c (original) +++ trunk/netsurf/riscos/sslcert.c Wed Mar 23 19:09:49 2011 @@ -85,6 +85,8 @@ wimp_WINDOW_TITLE_ICON | wimp_WINDOW_SIZE_ICON | wimp_WINDOW_TOGGLE_ICON); + + ro_gui_cert_tree_template->flags |= wimp_WINDOW_HSCROLL; } /** @@ -221,7 +223,8 @@ state.visible.x1 = state.visible.x0 + istate.icon.extent.x1 - 20 - ro_get_vscroll_width(sslcert_window->pane); state.visible.x0 += istate.icon.extent.x0 + 20; - state.visible.y0 = state.visible.y1 + istate.icon.extent.y0 + 20; + state.visible.y0 = state.visible.y1 + istate.icon.extent.y0 + 20 + + ro_get_hscroll_height(sslcert_window->pane); state.visible.y1 += istate.icon.extent.y1 - 32; set_extent = false; @@ -266,6 +269,8 @@ ro_gui_cert_release_window(sslcert_window); return; } + + ro_treeview_set_origin(sslcert_window->tv, 0, 0); } /**

12 years, 2 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 March 2011