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

r13079 jmb - /trunk/netsurf/utils/svn-testament.pl

by netsurf＠semichrome.net

Author: jmb Date: Mon Oct 24 17:52:12 2011 New Revision: 13079 URL: http://source.netsurf-browser.org?rev=13079&view=rev Log: Appease ancient Perl installs. Modified: trunk/netsurf/utils/svn-testament.pl Modified: trunk/netsurf/utils/svn-testament.pl URL: http://source.netsurf-browser.org/trunk/netsurf/utils/svn-testament.pl?re... ============================================================================== --- trunk/netsurf/utils/svn-testament.pl (original) +++ trunk/netsurf/utils/svn-testament.pl Mon Oct 24 17:52:12 2011 @@ -1,7 +1,6 @@ #!/usr/bin/perl -w use strict; -use File::Temp; =head1 @@ -25,9 +24,33 @@ $svn_present = 1; } +sub compat_tmpnam { + #Â File::Temp was introduced in Perl 5.6.1 + my $have_file_tmp = eval { require File::Temp }; + + if ( ! $have_file_tmp ) { + return "$$.svnt"; + } else { + return File::Temp::tmpnam(); + } +} + +sub compat_md5_hex { + # Digest::MD5 was introduced in Perl 5.7.1 + my $have_digest_md5 = eval { require Digest::MD5 }; + my $have_md5 = eval { require MD5 }; + my $data = shift; + + if ( ! $have_digest_md5 ) { + return MD5->hexhash($data); + } else { + return Digest::MD5->new->add($data)->hexdigest; + } +} + sub gather_output { my $cmd = shift; - my $tmpfile = File::Temp::tmpnam(); + my $tmpfile = compat_tmpnam(); local $/ = undef(); system("$cmd > $tmpfile"); open(my $CMDH, "<", $tmpfile); @@ -133,8 +156,6 @@ } $testament .= " \\\n}\n"; -use Digest::MD5 qw(md5_hex); - my $oldcsum = ""; if ( -e $targetfile ) { open(my $OLDVALUES, "<", $targetfile); @@ -146,7 +167,7 @@ close($OLDVALUES); } -my $newcsum = md5_hex($testament); +my $newcsum = compat_md5_hex($testament); if ($oldcsum ne $newcsum) { print "TESTMENT: $targetfile\n"; @@ -188,5 +209,6 @@ return 0 if ($fn =~ /\.a$/); # Don't care for extraneous archive files return 0 if ($fn =~ /\.md5$/); # Don't care for md5sum files return 0 if ($fn =~ /\.map$/); # Don't care for map files + return 0 if ($fn =~ /\.svnt$/); # Don't care for testament temp files return 1; }

11 years, 3 months

1
0
0 / 0

r13078 chris_y - /trunk/netsurf/!NetSurf/Resources/it/Messages

by netsurf＠semichrome.net

Author: chris_y Date: Sun Oct 23 16:12:15 2011 New Revision: 13078 URL: http://source.netsurf-browser.org?rev=13078&view=rev Log: Updated translation from Samir Hawamdeh Modified: trunk/netsurf/!NetSurf/Resources/it/Messages Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/it/Messages Sun Oct 23 16:12:15 2011 @@ -1,7 +1,7 @@ -# Italian messages for NetSurf 2.8/3.0 Development (Revision 12773) -# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture) -# 7.09.2011 -# ========================================================================= +# Italian messages for NetSurf 2.9/3.0 Development (Revision 13076) +# Translated by Samir Hawamdeh (http://www.betatesting.it/backforthefuture) for ATO Italia +# 23.10.2011 +# ======================================================================================== # # Description # ----------- @@ -48,7 +48,7 @@ # Page:Pagina Object:Oggetto -Navigate:Navigazione +Navigate:Visualizza View:Display Utilities:UtilitÃ Help:Aiuto @@ -99,11 +99,11 @@ # Main -> Navigate menu # Home:Pagina iniziale -Back:Indietro di una pagina -Forward:Avanti di una pagina +Back:Indietro +Forward:Avanti UpLevel:Livello superiore -Reload:Ricarica questa pagina ^F5 -Stop:Stoppa caricamento della pagina +Reload:Ricarica +Stop:Stop # Main -> Display menu # @@ -223,8 +223,8 @@ ProxyType:Tipo di Proxy ProxyNone:Nessuno ProxyNoAuth:Semplice -ProxyBasic:Autentificazione di Base -ProxyNTLM:Autentificazione NTLM +ProxyBasic:Autentificato di base +ProxyNTLM:Autentificato NTLM # # Fonts pane Fonts:Font @@ -268,7 +268,7 @@ # Browser menu # -Browser:Navigazione +Browser:Visualizza HistGlobalNS:Mostra cronologia globale... HistLocalNS:Mostra cronologia locale... FindTextNS:Trova testo... @@ -303,16 +303,15 @@ CopyClip:Copia nella clipboard SaveAs:Salva come... SaveIFF:Salva come IFF... -SaveComplete:Save complete... -Close:Close +SaveComplete:Salva Tutto... +Close:Chiudi ObjShow:Mostra oggetto Frame:Frame -FrameNewWin:Show in new window -FrameNewTab:Show in new tab -FrameOnly:Show only this frame - +FrameNewWin:Apri frame in nuova finestra... +FrameNewTab:Apri frame in nuova scheda +FrameOnly:Apri frame in questa finestra SelectFile:Seleziona file... -ExternalApp:Apri con un'applicazione esterna +ExternalApp:Apri con applicazione esterna # Treeview interface tokens # ========================= @@ -1269,7 +1268,7 @@ HelpInterfaceConfig11:\Sreset the Interface options back to their default values. HelpInterfaceConfig12:\Sclose this \w without saving changes.|M\Areturn the interface options to the last saved configuration. HelpInterfaceConfig13:\Ssave these settings and close the \w.|M\Asave these settings without closing the \w. -HelpInterfaceConfig16:This indicates whether NetSurf will use an external hotlist client if available, in preference to the internal hotlist. +HelpInterfaceConfig16:This indicates whether NetSurf will use an external hotlist client if available, in preference to the internal hotlist. HelpLanguageConfig:\Tlanguage configuration \w HelpLanguageConfig3:\Tcurrently selected interface language.|MThe interface language is the language used for NetSurf's messages and dialogue boxes. @@ -1374,9 +1373,9 @@ Proxy:Proxy HTTP Fetching:Ricezione -FetchesMax:Ricezione massima -FetchesHost:Ricezione per host -FetchesCached:Ricezione su cache +FetchesMax:Massima +FetchesHost:Per host +FetchesCached:Su cache # Rendering tab # @@ -1424,11 +1423,11 @@ Downloads:Trasferimenti ConfirmOverwrite:Richiedi conferma prima di sovrascrivere -DownloadDir:Percorso predefinito per i trasferimenti +DownloadDir:Percorso predefinito TabbedBrowsing:Navigazione a schede -TabActive:Apri in sottofondo le nuove schede aperte da un link -TabMiddle:Tasto centrale del mouse per l'apertura delle schede (Tab) -TabLast:Apri nuove schede dopo tutte quelle correntemente aperte +TabActive:Apri le nuove schede in sottofondo +TabMiddle:Tasto centrale per l'apertura delle schede +TabLast:Apri le nuove schede dopo quella corrente DownloadNotify:Notifica al completamento (Ringhio) SearchWeb:Ricerca nel Web SearchURL:Ricerca da barra URL

11 years, 3 months

1
0
0 / 0

r13077 chris_y - /trunk/netsurf/Makefile.defaults

by netsurf＠semichrome.net

Author: chris_y Date: Sun Oct 23 08:22:21 2011 New Revision: 13077 URL: http://source.netsurf-browser.org?rev=13077&view=rev Log: Disable Sprite support - DataTypes can handle these. Modified: trunk/netsurf/Makefile.defaults Modified: trunk/netsurf/Makefile.defaults URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.defaults?rev=130... ============================================================================== --- trunk/netsurf/Makefile.defaults (original) +++ trunk/netsurf/Makefile.defaults Sun Oct 23 08:22:21 2011 @@ -218,7 +218,7 @@ # Enable NetSurf's use of librosprite for displaying RISC OS Sprites # Valid options: YES, NO, AUTO - NETSURF_USE_ROSPRITE := YES + NETSURF_USE_ROSPRITE := NO # Enable NetSurf's use of libmng for displaying MNGs, JNGs and PNGs # Valid options: YES, NO (at least one of PNG/MNG/DT highly recommended)

11 years, 3 months

1
0
0 / 0

r13076 chris_y - in /trunk/netsurf: !NetSurf/Resources/de/ !NetSurf/Resources/en/ !NetSurf/Resources/fr/ !NetSurf/Resources/it/ !NetSurf/Resources/nl/ amiga/

by netsurf＠semichrome.net

Author: chris_y Date: Sun Oct 23 08:15:44 2011 New Revision: 13076 URL: http://source.netsurf-browser.org?rev=13076&view=rev Log: Complete extended context menus Modified: trunk/netsurf/!NetSurf/Resources/de/Messages trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/!NetSurf/Resources/fr/Messages trunk/netsurf/!NetSurf/Resources/it/Messages trunk/netsurf/!NetSurf/Resources/nl/Messages trunk/netsurf/amiga/context_menu.c trunk/netsurf/amiga/drag.c trunk/netsurf/amiga/file.c trunk/netsurf/amiga/file.h trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/menu.c Modified: trunk/netsurf/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/de/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/de/Messages Sun Oct 23 08:15:44 2011 @@ -299,6 +299,8 @@ CopyClip:Inhalt ins Clipboard SaveAs:Speichern als... SaveIFF:Speichern als IFF... +SaveComplete:Save complete... +Close:Close ObjShow:Zeige Objekt Frame:Frame FrameNewWin:Show in new window 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 Sun Oct 23 08:15:44 2011 @@ -301,6 +301,8 @@ CopyClip:Copy to clipboard SaveAs:Save as... SaveIFF:Save as IFF... +SaveComplete:Save complete... +Close:Close ObjShow:Show object Frame:Frame FrameNewWin:Show in new window Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/fr/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/fr/Messages Sun Oct 23 08:15:44 2011 @@ -299,6 +299,8 @@ CopyClip:Copy to clipboard SaveAs:Save as... SaveIFF:Save as IFF... +SaveComplete:Save complete... +Close:Close ObjShow:Show object Frame:Frame FrameNewWin:Show in new window Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/it/Messages Sun Oct 23 08:15:44 2011 @@ -303,6 +303,8 @@ CopyClip:Copia nella clipboard SaveAs:Salva come... SaveIFF:Salva come IFF... +SaveComplete:Save complete... +Close:Close ObjShow:Mostra oggetto Frame:Frame FrameNewWin:Show in new window Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/nl/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/nl/Messages Sun Oct 23 08:15:44 2011 @@ -299,6 +299,8 @@ CopyClip:Copy to clipboard SaveAs:Save as... SaveIFF:Save as IFF... +SaveComplete:Save complete... +Close:Close ObjShow:Show object Frame:Frame FrameNewWin:Show in new window 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 Sun Oct 23 08:15:44 2011 @@ -38,10 +38,11 @@ #include "amiga/plugin_hack.h" #include "amiga/theme.h" #include "amiga/utf8.h" -#include "desktop/textinput.h" +#include "desktop/history_core.h" +#include "desktop/hotlist.h" #include "desktop/selection.h" #include "desktop/searchweb.h" -#include "desktop/history_core.h" +#include "desktop/textinput.h" #include "render/box.h" #include "render/form.h" #include "utils/utf8.h" @@ -62,6 +63,7 @@ CMID_URLOPEN, CMID_URLOPENWIN, CMID_URLOPENTAB, + CMID_URLHOTLIST, CMID_SAVEURL, CMID_SHOWOBJ, CMID_COPYOBJ, @@ -75,12 +77,14 @@ CMID_SELCOPY, CMID_SELPASTE, CMID_SELSEARCH, + CMID_SELSAVE, CMID_FRAMEWIN, CMID_FRAMETAB, CMID_FRAMESHOW, CMID_FRAMERELOAD, CMID_FRAMECOPYURL, CMID_FRAMESAVE, + CMID_FRAMESAVECOMPLETE, CMID_PLUGINCMD, CMID_NAVHOME, CMID_NAVBACK, @@ -117,7 +121,7 @@ } ctxmenulab[CMID_SELECTFILE] = ami_utf8_easy((char *)messages_get("SelectFile")); - ctxmenulab[CMID_COPYURL] = ami_utf8_easy((char *)messages_get("CopyURL")); + ctxmenulab[CMID_SHOWOBJ] = ami_utf8_easy((char *)messages_get("ObjShow")); ctxmenulab[CMID_RELOADOBJ] = ami_utf8_easy((char *)messages_get("ObjReload")); ctxmenulab[CMID_COPYOBJ] = ami_utf8_easy((char *)messages_get("CopyURL")); @@ -134,11 +138,17 @@ ctxmenulab[CMID_FRAMEWIN] = ami_utf8_easy((char *)messages_get("FrameNewWin")); ctxmenulab[CMID_FRAMETAB] = ami_utf8_easy((char *)messages_get("FrameNewTab")); ctxmenulab[CMID_FRAMESHOW] = ami_utf8_easy((char *)messages_get("FrameOnly")); + ctxmenulab[CMID_FRAMESAVE] = ami_utf8_easy((char *)messages_get("SaveAs")); + ctxmenulab[CMID_FRAMESAVECOMPLETE] = ami_utf8_easy((char *)messages_get("SaveComplete")); + ctxmenulab[CMID_FRAMECOPYURL] = ami_utf8_easy((char *)messages_get("CopyURL")); + ctxmenulab[CMID_FRAMERELOAD] = ami_utf8_easy((char *)messages_get("ObjReload")); ctxmenulab[CMID_SAVEURL] = ami_utf8_easy((char *)messages_get("LinkDload")); ctxmenulab[CMID_URLOPEN] = ami_utf8_easy((char *)messages_get("Open")); ctxmenulab[CMID_URLOPENWIN] = ami_utf8_easy((char *)messages_get("LinkNewWin")); ctxmenulab[CMID_URLOPENTAB] = ami_utf8_easy((char *)messages_get("LinkNewTab")); + ctxmenulab[CMID_URLHOTLIST] = ami_utf8_easy((char *)messages_get("HotlistAdd")); + ctxmenulab[CMID_COPYURL] = ami_utf8_easy((char *)messages_get("CopyURL")); ctxmenulab[CMID_NAVHOME] = ami_utf8_easy((char *)messages_get("Home")); ctxmenulab[CMID_NAVBACK] = ami_utf8_easy((char *)messages_get("Back")); @@ -152,6 +162,7 @@ ctxmenulab[CMID_SELALL] = ami_utf8_easy((char *)messages_get("SelectAllNS")); ctxmenulab[CMID_SELCLEAR] = ami_utf8_easy((char *)messages_get("ClearNS")); ctxmenulab[CMID_SELSEARCH] = ami_utf8_easy((char *)messages_get("SearchWeb")); + ctxmenulab[CMID_SELSAVE] = ami_utf8_easy((char *)messages_get("SaveAs")); ctxmenulab[CMID_PLUGINCMD] = ami_utf8_easy((char *)messages_get("ExternalApp")); @@ -203,6 +214,7 @@ PMIA_Title, (ULONG)ctxmenulab[CMID_PAGESAVECOMPLETE], PMIA_ID, CMID_PAGESAVECOMPLETE, PMIA_UserData, userdata, + PMIA_Disabled, (content_get_type(userdata) != CONTENT_HTML), TAG_DONE), PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, PMIA_Title, ~0, @@ -251,7 +263,7 @@ PMIA_Title, ~0, TAG_DONE), PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_RELOADOBJ], + PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMERELOAD], PMIA_ID, CMID_FRAMERELOAD, PMIA_UserData, userdata, TAG_DONE), @@ -259,7 +271,7 @@ PMIA_Title, ~0, TAG_DONE), PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_COPYOBJ], + PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMECOPYURL], PMIA_ID, CMID_FRAMECOPYURL, PMIA_UserData, nsurl_access(content_get_url(userdata)), TAG_DONE), @@ -267,9 +279,15 @@ PMIA_Title, ~0, TAG_DONE), PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, - PMIA_Title, (ULONG)ctxmenulab[CMID_SAVEOBJ], + PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESAVE], PMIA_ID, CMID_FRAMESAVE, PMIA_UserData, userdata, + TAG_DONE), + PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, + PMIA_Title, (ULONG)ctxmenulab[CMID_FRAMESAVECOMPLETE], + PMIA_ID, CMID_FRAMESAVECOMPLETE, + PMIA_UserData, userdata, + PMIA_Disabled, (content_get_type(userdata) != CONTENT_HTML), TAG_DONE), TAG_DONE), TAG_DONE), @@ -345,6 +363,11 @@ PMIA_UserData, userdata, TAG_DONE), PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, + PMIA_Title, (ULONG)ctxmenulab[CMID_URLHOTLIST], + PMIA_ID, CMID_URLHOTLIST, + PMIA_UserData, userdata, + TAG_DONE), + PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, PMIA_Title, ~0, TAG_DONE), PMA_AddItem, NewObject(POPUPMENU_GetItemClass(), NULL, @@ -458,6 +481,11 @@ PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, PMIA_Title, (ULONG)ctxmenulab[CMID_SELSEARCH], PMIA_ID,CMID_SELSEARCH, + PMIA_Disabled, disabled_noselection, + TAG_DONE), + PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL, + PMIA_Title, (ULONG)ctxmenulab[CMID_SELSAVE], + PMIA_ID,CMID_SELSAVE, PMIA_Disabled, disabled_noselection, TAG_DONE), TAG_DONE), @@ -525,7 +553,7 @@ struct box *curbox; int box_x=0; int box_y=0; - bool no_sel = true, add_nav_menu = true; + bool no_more_menus = false; bool menuhascontent = false; ULONG ret = 0; struct contextual_content ccdata; @@ -589,57 +617,16 @@ } else { - browser_window_get_contextual_content(gwin->bw, x, y, &ccdata); - - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_PAGE, cc); - menuhascontent = true; - - if(ccdata.main && (ccdata.main != cc)) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_FRAME, ccdata.main); - menuhascontent = true; - } - - if(ccdata.link_url) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_URL, (char *)ccdata.link_url); - menuhascontent = true; - } - - if(ccdata.object) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_OBJECT, ccdata.object); - menuhascontent = true; - } - - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_NAVIGATE, gwin->bw); - menuhascontent = true; - - if(content_get_type(cc) == CONTENT_TEXTPLAIN) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_SEL, gwin->bw); - menuhascontent = true; - } - if(content_get_type(cc) == CONTENT_HTML) { curbox = html_get_box_tree(gwin->bw->current_content); - while(curbox = box_at_point(curbox,x,y,&box_x,&box_y,&cc)) + while(curbox = box_at_point(curbox, x, y, &box_x, &box_y, &cc)) { if (curbox->style && css_computed_visibility(curbox->style) == CSS_VISIBILITY_HIDDEN) continue; - if(no_sel && (curbox->text) || - (curbox->gadget && ((curbox->gadget->type == GADGET_TEXTBOX) || - (curbox->gadget->type == GADGET_TEXTAREA) || - (curbox->gadget->type == GADGET_PASSWORD)))) - { - ami_context_menu_add_submenu(ctxmenuobj, CMSUB_SEL, gwin->bw); - no_sel = false; - menuhascontent = true; - } if (curbox->gadget) { switch (curbox->gadget->type) @@ -647,19 +634,55 @@ case GADGET_FILE: ami_context_menu_add_submenu(ctxmenuobj, CMID_SELECTFILE, curbox); menuhascontent = true; - add_nav_menu = false; + no_more_menus = true; break; } } } } + + if(no_more_menus == false) + { + browser_window_get_contextual_content(gwin->bw, x, y, &ccdata); + + ami_context_menu_add_submenu(ctxmenuobj, CMSUB_PAGE, cc); + menuhascontent = true; + + if(ccdata.main && (ccdata.main != cc)) + { + ami_context_menu_add_submenu(ctxmenuobj, CMSUB_FRAME, ccdata.main); + menuhascontent = true; + } + + if(ccdata.link_url) + { + ami_context_menu_add_submenu(ctxmenuobj, CMSUB_URL, (char *)ccdata.link_url); + menuhascontent = true; + } + + if(ccdata.object) + { + ami_context_menu_add_submenu(ctxmenuobj, CMSUB_OBJECT, ccdata.object); + menuhascontent = true; + } + + ami_context_menu_add_submenu(ctxmenuobj, CMSUB_NAVIGATE, gwin->bw); + menuhascontent = true; + + if(content_get_type(cc) == CONTENT_HTML || + content_get_type(cc) == CONTENT_TEXTPLAIN) + { + ami_context_menu_add_submenu(ctxmenuobj, CMSUB_SEL, gwin->bw); + menuhascontent = true; + } + } } if(!menuhascontent) return; - gui_window_set_pointer(gwin->bw->window,GUI_POINTER_DEFAULT); - - IDoMethod(ctxmenuobj,PM_OPEN,gwin->win); + gui_window_set_pointer(gwin->bw->window, GUI_POINTER_DEFAULT); + + IDoMethod(ctxmenuobj, PM_OPEN, gwin->win); } static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved) @@ -716,6 +739,15 @@ ami_file_open(gwin); break; + case CMID_PAGECLOSE: + browser_window_destroy(gwin->bw); + break; + + case CMID_URLHOTLIST: + case CMID_PAGEHOTLIST: + hotlist_add_page(userdata); + break; + case CMID_FRAMECOPYURL: case CMID_COPYURL: case CMID_COPYOBJ: @@ -776,15 +808,19 @@ case CMID_SAVEOBJ: case CMID_PAGESAVE: - ami_file_save_req(AMINS_SAVE_SOURCE, gwin, (struct hlcache_handle *)userdata); + ami_file_save_req(AMINS_SAVE_SOURCE, gwin, + (struct hlcache_handle *)userdata, NULL); break; case CMID_PAGESAVECOMPLETE: - ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, (struct hlcache_handle *)userdata); + case CMID_FRAMESAVECOMPLETE: + ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, + (struct hlcache_handle *)userdata, NULL); break; case CMID_SAVEIFFOBJ: - ami_file_save_req(AMINS_SAVE_IFF, gwin, (struct hlcache_handle *)userdata); + ami_file_save_req(AMINS_SAVE_IFF, gwin, + (struct hlcache_handle *)userdata, NULL); break; case CMID_PLUGINCMD: @@ -847,6 +883,11 @@ browser_window_key_press(gwin->bw, KEY_CLEAR_SELECTION); break; + case CMID_SELSAVE: + ami_file_save_req(AMINS_SAVE_SELECTION, gwin, NULL, + browser_window_get_selection(gwin->bw)); + break; + case CMID_SELSEARCH: { struct ami_text_selection *sel; Modified: trunk/netsurf/amiga/drag.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/drag.c?rev=13076&r1... ============================================================================== --- trunk/netsurf/amiga/drag.c (original) +++ trunk/netsurf/amiga/drag.c Sun Oct 23 08:15:44 2011 @@ -153,15 +153,13 @@ BPTR fh = 0; AddPart(path, content_get_title(c), 1024); - ami_file_save(AMINS_SAVE_SOURCE, path, win, c, NULL); + ami_file_save(AMINS_SAVE_SOURCE, path, win, c, NULL, NULL); } break; case GUI_SAVE_TEXT_SELECTION: // selection AddPart(path,"netsurf_text_file",1024); - if(!ami_download_check_overwrite(path, win, 0)) - break; - selection_save_text((struct selection *)drag_save_data,path); + ami_file_save(AMINS_SAVE_SELECTION, path, win, NULL, NULL, NULL); break; case GUI_SAVE_COMPLETE: @@ -171,7 +169,7 @@ AddPart(path, content_get_title(c), 1024); - ami_file_save(AMINS_SAVE_COMPLETE, path, win, c, drag_save_gui->favicon); + ami_file_save(AMINS_SAVE_COMPLETE, path, win, c, drag_save_gui->favicon, NULL); } break; @@ -180,7 +178,7 @@ hlcache_handle *c = drag_save_data; AddPart(path, content_get_title(c), 1024); - ami_file_save(AMINS_SAVE_IFF, path, win, c, NULL); + ami_file_save(AMINS_SAVE_IFF, path, win, c, NULL, NULL); } break; Modified: trunk/netsurf/amiga/file.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/file.c?rev=13076&r1... ============================================================================== --- trunk/netsurf/amiga/file.c (original) +++ trunk/netsurf/amiga/file.c Sun Oct 23 08:15:44 2011 @@ -34,6 +34,7 @@ #include "desktop/save_complete.h" #include "desktop/save_pdf/pdf_plotters.h" #include "desktop/save_text.h" +#include "desktop/selection.h" #include "utils/messages.h" #include "utils/url.h" @@ -100,7 +101,8 @@ } void ami_file_save(int type, char *fname, struct Window *win, - struct hlcache_handle *object, struct hlcache_handle *favicon) + struct hlcache_handle *object, struct hlcache_handle *favicon, + struct selection *sel) { BPTR lock = 0; const char *source_data; @@ -157,29 +159,34 @@ } #endif break; + + case AMINS_SAVE_SELECTION: + selection_save_text(sel, fname); + break; } FClose(fh); } - SetComment(fname, nsurl_access(content_get_url(object))); + if(object) SetComment(fname, nsurl_access(content_get_url(object))); } } ami_update_pointer(win, GUI_POINTER_DEFAULT); } -void ami_file_save_req(int type, struct gui_window_2 *gwin, struct hlcache_handle *object) +void ami_file_save_req(int type, struct gui_window_2 *gwin, + struct hlcache_handle *object, struct selection *sel) { char *fname = AllocVec(1024, MEMF_CLEAR | MEMF_PRIVATE); if(AslRequestTags(savereq, ASLFR_TitleText, messages_get("NetSurf"), ASLFR_Screen, scrn, - ASLFR_InitialFile, FilePart(nsurl_access(content_get_url(object))), + ASLFR_InitialFile, object ? FilePart(nsurl_access(content_get_url(object))) : "", TAG_DONE)) { strlcpy(fname, savereq->fr_Drawer, 1024); AddPart(fname, savereq->fr_File, 1024); - ami_file_save(type, fname, gwin->win, object, gwin->bw->window->favicon); + ami_file_save(type, fname, gwin->win, object, gwin->bw->window->favicon, sel); } if(fname) FreeVec(fname); Modified: trunk/netsurf/amiga/file.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/file.h?rev=13076&r1... ============================================================================== --- trunk/netsurf/amiga/file.h (original) +++ trunk/netsurf/amiga/file.h Sun Oct 23 08:15:44 2011 @@ -19,6 +19,7 @@ #include "amiga/gui.h" struct hlcache_object; +struct selection; struct FileRequester *filereq; struct FileRequester *savereq; @@ -29,6 +30,7 @@ AMINS_SAVE_COMPLETE, AMINS_SAVE_PDF, AMINS_SAVE_IFF, + AMINS_SAVE_SELECTION, }; @@ -37,6 +39,7 @@ void ami_file_open(struct gui_window_2 *gwin); void ami_file_save_req(int type, struct gui_window_2 *gwin, - struct hlcache_handle *object); + struct hlcache_handle *object, struct selection *sel); void ami_file_save(int type, char *fname, struct Window *win, - struct hlcache_handle *object, struct hlcache_handle *favicon); + struct hlcache_handle *object, struct hlcache_handle *favicon, + struct selection *sel); Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13076&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sun Oct 23 08:15:44 2011 @@ -1426,7 +1426,8 @@ break; case 's': - ami_file_save_req(AMINS_SAVE_SOURCE, gwin, gwin->bw->current_content); + ami_file_save_req(AMINS_SAVE_SOURCE, gwin, + gwin->bw->current_content, NULL); break; case 'p': Modified: trunk/netsurf/amiga/menu.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/menu.c?rev=13076&r1... ============================================================================== --- trunk/netsurf/amiga/menu.c (original) +++ trunk/netsurf/amiga/menu.c Sun Oct 23 08:15:44 2011 @@ -474,23 +474,28 @@ switch(subnum) { case 0: - ami_file_save_req(AMINS_SAVE_SOURCE, gwin, gwin->bw->current_content); + ami_file_save_req(AMINS_SAVE_SOURCE, gwin, + gwin->bw->current_content, NULL); break; case 1: - ami_file_save_req(AMINS_SAVE_TEXT, gwin, gwin->bw->current_content); + ami_file_save_req(AMINS_SAVE_TEXT, gwin, + gwin->bw->current_content, NULL); break; case 2: - ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, gwin->bw->current_content); + ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, + gwin->bw->current_content, NULL); break; case 3: - ami_file_save_req(AMINS_SAVE_PDF, gwin, gwin->bw->current_content); + ami_file_save_req(AMINS_SAVE_PDF, gwin, + gwin->bw->current_content, NULL); break; case 4: // iff - ami_file_save_req(AMINS_SAVE_IFF, gwin, gwin->bw->current_content); + ami_file_save_req(AMINS_SAVE_IFF, gwin, + gwin->bw->current_content, NULL); break; } break;

11 years, 3 months

1
0
0 / 0

r13075 chris_y - /trunk/netsurf/amiga/plotters.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Oct 22 09:26:56 2011 New Revision: 13075 URL: http://source.netsurf-browser.org?rev=13075&view=rev Log: Revert r13074 - doesn't actually fix the problem Modified: trunk/netsurf/amiga/plotters.c Modified: trunk/netsurf/amiga/plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=1307... ============================================================================== --- trunk/netsurf/amiga/plotters.c (original) +++ trunk/netsurf/amiga/plotters.c Sat Oct 22 09:26:56 2011 @@ -704,9 +704,6 @@ } InstallLayerHook(glob->rp->Layer,bfh); - - if(xm == xf) xf += 1; - if(ym == yf) yf += 1; EraseRect(glob->rp,xm,ym,xf,yf);

11 years, 3 months

1
0
0 / 0

r13074 chris_y - /trunk/netsurf/amiga/plotters.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Oct 22 09:16:03 2011 New Revision: 13074 URL: http://source.netsurf-browser.org?rev=13074&view=rev Log: Fix the plotting of tiled bitmaps. EraseRect() appears to have a bug where it won't draw anything if ymin==ymax Modified: trunk/netsurf/amiga/plotters.c Modified: trunk/netsurf/amiga/plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/plotters.c?rev=1307... ============================================================================== --- trunk/netsurf/amiga/plotters.c (original) +++ trunk/netsurf/amiga/plotters.c Sat Oct 22 09:16:03 2011 @@ -704,6 +704,9 @@ } InstallLayerHook(glob->rp->Layer,bfh); + + if(xm == xf) xf += 1; + if(ym == yf) yf += 1; EraseRect(glob->rp,xm,ym,xf,yf);

11 years, 3 months

1
0
0 / 0

r13073 chris_y - /trunk/netsurf/amiga/file.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Oct 22 09:03:47 2011 New Revision: 13073 URL: http://source.netsurf-browser.org?rev=13073&view=rev Log: Fix save_complete Modified: trunk/netsurf/amiga/file.c Modified: trunk/netsurf/amiga/file.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/file.c?rev=13073&r1... ============================================================================== --- trunk/netsurf/amiga/file.c (original) +++ trunk/netsurf/amiga/file.c Sat Oct 22 09:03:47 2011 @@ -112,52 +112,54 @@ if(ami_download_check_overwrite(fname, win, 0)) { - if(fh = FOpen(fname, MODE_NEWFILE,0)) + if(type == AMINS_SAVE_COMPLETE) { - switch(type) + if(lock = CreateDir(fname)) { - case AMINS_SAVE_SOURCE: - if((source_data = content_get_source_data(object, &source_size))) - FWrite(fh, source_data, 1, source_size); - break; - - case AMINS_SAVE_COMPLETE: - if(lock = CreateDir(fname)) - { - UnLock(lock); - save_complete(object, fname); - amiga_icon_superimpose_favicon(fname, favicon, NULL); - } - break; - - case AMINS_SAVE_TEXT: - save_as_text(object, fname); - break; - - case AMINS_SAVE_PDF: + UnLock(lock); + save_complete(object, fname); + amiga_icon_superimpose_favicon(fname, favicon, NULL); + } + } + else + { + if(fh = FOpen(fname, MODE_NEWFILE,0)) + { + switch(type) + { + case AMINS_SAVE_SOURCE: + if((source_data = content_get_source_data(object, &source_size))) + FWrite(fh, source_data, 1, source_size); + break; + + case AMINS_SAVE_TEXT: + save_as_text(object, fname); + break; + + case AMINS_SAVE_PDF: #ifdef WITH_PDF_EXPORT - if(save_as_pdf(object, fname)) - amiga_icon_superimpose_favicon(fname, favicon, "pdf"); + if(save_as_pdf(object, fname)) + amiga_icon_superimpose_favicon(fname, favicon, "pdf"); #endif - break; - - case AMINS_SAVE_IFF: - if((bm = content_get_bitmap(object))) - { - bm->url = (char *)nsurl_access(content_get_url(object)); - bm->title = (char *)content_get_title(object); - bitmap_save(bm, fname, 0); - } + break; + + case AMINS_SAVE_IFF: + if((bm = content_get_bitmap(object))) + { + bm->url = (char *)nsurl_access(content_get_url(object)); + bm->title = (char *)content_get_title(object); + bitmap_save(bm, fname, 0); + } #ifdef WITH_NS_SVG - else if(ami_mime_compare(object, "svg") == true) - { - ami_save_svg(object, fname); - } + else if(ami_mime_compare(object, "svg") == true) + { + ami_save_svg(object, fname); + } #endif - break; + break; + } + FClose(fh); } - - FClose(fh); SetComment(fname, nsurl_access(content_get_url(object))); } }

11 years, 3 months

1
0
0 / 0

r13072 chris_y - /trunk/netsurf/amiga/gui.c

by netsurf＠semichrome.net

Author: chris_y Date: Sat Oct 22 08:52:13 2011 New Revision: 13072 URL: http://source.netsurf-browser.org?rev=13072&view=rev Log: Avoid horizontal pixel-height lines of the background appearing when "fast scrolling" down the page. There is a similar problem with scrolling up pages which may be a bug in ami_do_redraw_limits or plotters (probably bitmap tile plotter), as drawing additional pixel lines after scrolling is not redrawing the affected area. Example sites where this problem is apparent: http://www.nintendolife.com (border pattern does not redraw) http://www.amigaos.net/content/72/supported-hardware (clouds show through the main text area) Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13072&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Oct 22 08:52:13 2011 @@ -3229,8 +3229,6 @@ void gui_window_update_box(struct gui_window *g, const struct rect *rect) { - ULONG sx,sy; - if(!g) return; ami_do_redraw_limits(g, g->shared->bw, @@ -3292,9 +3290,9 @@ if(vcurrent>oldv) { ami_do_redraw_limits(g->bw->window, g->bw, - hcurrent, (height / g->bw->scale) + oldv, + hcurrent, (height / g->bw->scale) + oldv - 1, hcurrent + (width / g->bw->scale), - vcurrent + (height / g->bw->scale)); + vcurrent + (height / g->bw->scale) + 1); } else if(vcurrent<oldv) {

11 years, 3 months

1
0
0 / 0

r13071 vince - /trunk/netsurf/render/hubbub_binding.c

by netsurf＠semichrome.net

Author: vince Date: Wed Oct 19 10:28:47 2011 New Revision: 13071 URL: http://source.netsurf-browser.org?rev=13071&view=rev Log: fix infinite loop when copying private data Modified: trunk/netsurf/render/hubbub_binding.c Modified: trunk/netsurf/render/hubbub_binding.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/hubbub_binding.c?r... ============================================================================== --- trunk/netsurf/render/hubbub_binding.c (original) +++ trunk/netsurf/render/hubbub_binding.c Wed Oct 19 10:28:47 2011 @@ -365,6 +365,7 @@ pvt->base.classes[pvt->base.nclasses] = lwc_string_ref(p->base.classes[ pvt->base.nclasses]); + pvt->base.nclasses++; } }

11 years, 3 months

1
0
0 / 0

r13070 stevef - /trunk/netsurf/riscos/window.c

by netsurf＠semichrome.net

Author: stevef Date: Tue Oct 18 16:41:45 2011 New Revision: 13070 URL: http://source.netsurf-browser.org?rev=13070&view=rev Log: Ensure file content is terminated (bug #1866212). Modified: trunk/netsurf/riscos/window.c Modified: trunk/netsurf/riscos/window.c URL: http://source.netsurf-browser.org/trunk/netsurf/riscos/window.c?rev=13070... ============================================================================== --- trunk/netsurf/riscos/window.c (original) +++ trunk/netsurf/riscos/window.c Tue Oct 18 16:41:45 2011 @@ -4315,7 +4315,11 @@ return true; /* was for us, but it didn't work! */ } - buf = malloc(size); + /* Allocate one byte more than needed to ensure that the buffer is + * always terminated, regardless of file contents. + */ + + buf = calloc(size + 1, sizeof(char)); if (!buf) { warn_user("NoMemory", NULL); return true; @@ -4323,6 +4327,7 @@ error = xosfile_load_stamped(filename, (byte*)buf, NULL, NULL, NULL, NULL, NULL); + if (error) { LOG(("xosfile_load_stamped: 0x%x:%s", error->errnum, error->errmess));

11 years, 3 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits October 2011