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

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

by netsurf＠semichrome.net

Author: chris_y Date: Sat Jun 18 12:58:36 2011 New Revision: 12490 URL: http://source.netsurf-browser.org?rev=12490&view=rev Log: screen type should be PUBLICSCREEN not CUSTOMSCREEN Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12490&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Jun 18 12:58:36 2011 @@ -545,11 +545,11 @@ } scrn = OpenScreenTags(NULL, - SA_DisplayID,id, - SA_Title,nsscreentitle, - SA_Type,CUSTOMSCREEN, - SA_PubName,"NetSurf", - SA_LikeWorkbench,TRUE, + SA_DisplayID, id, + SA_Title, nsscreentitle, + SA_Type, PUBLICSCREEN, + SA_PubName, "NetSurf", + SA_LikeWorkbench, TRUE, SA_PubSig, screen_signal, TAG_DONE);

11 years, 11 months

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: chris_y Date: Sat Jun 18 12:40:27 2011 New Revision: 12489 URL: http://source.netsurf-browser.org?rev=12489&view=rev Log: initialise context menus regardless of user's preferences on startup Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12489&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Jun 18 12:40:27 2011 @@ -502,7 +502,7 @@ plot=amiplot; - if(option_context_menu) ami_context_menu_init(); + ami_context_menu_init(); window_list = NewObjList(); @@ -952,7 +952,7 @@ struct IBox *bbox; struct nsObject *node; struct nsObject *nnode; - struct gui_window_2 *gwin,*destroywin=NULL; + struct gui_window_2 *gwin = NULL; struct MenuItem *item; struct InputEvent *ie; struct Node *tabnode; @@ -2196,7 +2196,7 @@ FreeVec(nsscreentitle); - if(option_context_menu) ami_context_menu_free(); + ami_context_menu_free(); ami_mouse_pointers_free(); ami_clipboard_free();

11 years, 11 months

1
0
0 / 0

r12488 chris_y - /trunk/netsurf/amiga/context_menu.c

by netsurf＠semichrome.net

Author: chris_y Date: Fri Jun 17 17:49:20 2011 New Revision: 12488 URL: http://source.netsurf-browser.org?rev=12488&view=rev Log: missing include Modified: trunk/netsurf/amiga/context_menu.c 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 Fri Jun 17 17:49:20 2011 @@ -29,6 +29,7 @@ #include "amiga/context_menu.h" #include "amiga/clipboard.h" #include "amiga/bitmap.h" +#include "amiga/filetype.h" #include "amiga/gui.h" #include "amiga/history_local.h" #include "amiga/iff_dr2d.h" @@ -363,7 +364,6 @@ no_sel = false; menuhascontent = true; } - if(curbox->object && (content_get_type(curbox->object) == CONTENT_PLUGIN)) {

11 years, 11 months

1
0
0 / 0

r12487 chris_y - /trunk/netsurf/amiga/options.h

by netsurf＠semichrome.net

Author: chris_y Date: Fri Jun 17 17:49:01 2011 New Revision: 12487 URL: http://source.netsurf-browser.org?rev=12487&view=rev Log: disable context menus until i figure out why they have suddenly started crashing Modified: trunk/netsurf/amiga/options.h Modified: trunk/netsurf/amiga/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=12487... ============================================================================== --- trunk/netsurf/amiga/options.h (original) +++ trunk/netsurf/amiga/options.h Fri Jun 17 17:49:01 2011 @@ -74,7 +74,7 @@ int option_cache_bitmaps = 0; \ char *option_theme = 0; \ bool option_utf8_clipboard = false; \ -bool option_context_menu = true; \ +bool option_context_menu = false; \ bool option_sticky_context_menu = false; \ bool option_truecolour_mouse_pointers = false; \ bool option_use_os_pointers = true; \

11 years, 11 months

1
0
0 / 0

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

by netsurf＠semichrome.net

Author: chris_y Date: Thu Jun 16 13:46:43 2011 New Revision: 12486 URL: http://source.netsurf-browser.org?rev=12486&view=rev Log: Reinstate waiting for visitor windows to close if the public screen could not be closed. Do it properly this time, with signals. Modified: trunk/netsurf/amiga/gui.c Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12486&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Thu Jun 16 13:46:43 2011 @@ -30,6 +30,7 @@ #include "desktop/tree.h" #include "image/ico.h" #include "render/form.h" +#include "utils/log.h" #include "utils/messages.h" #include "utils/utf8.h" #include "utils/utils.h" @@ -145,6 +146,7 @@ BOOL locked_screen = FALSE; BOOL screen_closed = FALSE; +ULONG screen_signal = -1; struct MsgPort *applibport = NULL; ULONG applibsig = 0; @@ -310,6 +312,8 @@ ASLFR_RejectIcons,TRUE, ASLFR_InitialDrawer,option_download_dir, TAG_DONE); + + screen_signal = AllocSignal(-1); } void ami_set_options(void) @@ -546,6 +550,7 @@ SA_Type,CUSTOMSCREEN, SA_PubName,"NetSurf", SA_LikeWorkbench,TRUE, + SA_PubSig, screen_signal, TAG_DONE); if(scrn) @@ -1652,7 +1657,8 @@ // WINDOW_Icon, dobj, TAG_DONE); RA_Iconify(gwin->objects[OID_MAIN]); - screen_closed = CloseScreen(scrn); + if(locked_screen == FALSE) + screen_closed = CloseScreen(scrn); } break; @@ -2109,7 +2115,8 @@ } else { - if(CloseScreen(scrn)) scrn = NULL; + if(locked_screen == FALSE) + if(CloseScreen(scrn)) scrn = NULL; } } @@ -2147,6 +2154,17 @@ /* last window closed, so exit */ netsurf_quit = true; } +} + +void ami_gui_close_screen(struct Screen *scrn) +{ + ULONG scrnsig = 1 << screen_signal; + + if(CloseScreen(scrn)) return; + + LOG(("Waiting for visitor windows to close...")); + Wait(scrnsig); + CloseScreen(scrn); } void gui_quit(void) @@ -2172,9 +2190,9 @@ ami_close_fonts(); - /* Have a go at closing the public screen, apparently this is OK to do - even if it isn't our screen (ie. locked_screen != NULL) */ - CloseScreen(scrn); + /* If it is our public screen, close it or wait until the visitor windows leave */ + if(locked_screen == FALSE) ami_gui_close_screen(scrn); + FreeSignal(screen_signal); FreeVec(nsscreentitle);

11 years, 11 months

1
0
0 / 0

r12485 tlsa - /trunk/netsurf/desktop/browser.c

by netsurf＠semichrome.net

Author: tlsa Date: Thu Jun 16 04:07:13 2011 New Revision: 12485 URL: http://source.netsurf-browser.org?rev=12485&view=rev Log: Give the selection context the current bw when it's created. Modified: trunk/netsurf/desktop/browser.c Modified: trunk/netsurf/desktop/browser.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/browser.c?rev=124... ============================================================================== --- trunk/netsurf/desktop/browser.c (original) +++ trunk/netsurf/desktop/browser.c Thu Jun 16 04:07:13 2011 @@ -238,7 +238,9 @@ bw->border = true; bw->no_resize = true; bw->last_action = wallclock(); + bw->sel = selection_create(); + selection_set_browser_window(bw->sel, bw); /* gui window */ /* from the front end's pov, it clones the top level browser window,

11 years, 11 months

1
0
0 / 0

r12484 chris_y - in /trunk/netsurf/amiga: drag.c filetype.c filetype.h

by netsurf＠semichrome.net

Author: chris_y Date: Wed Jun 15 16:53:49 2011 New Revision: 12484 URL: http://source.netsurf-browser.org?rev=12484&view=rev Log: convert from mimetype to filetype rather than simple content type to filetype, where available Modified: trunk/netsurf/amiga/drag.c trunk/netsurf/amiga/filetype.c trunk/netsurf/amiga/filetype.h Modified: trunk/netsurf/amiga/drag.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/drag.c?rev=12484&r1... ============================================================================== --- trunk/netsurf/amiga/drag.c (original) +++ trunk/netsurf/amiga/drag.c Wed Jun 15 16:53:49 2011 @@ -66,7 +66,7 @@ { case GUI_SAVE_OBJECT_ORIG: // object case GUI_SAVE_SOURCE: - filetype = ami_content_type_to_file_type(content_get_type(c)); + filetype = ami_mime_content_to_filetype(c); break; case GUI_SAVE_COMPLETE: filetype = "drawer"; Modified: trunk/netsurf/amiga/filetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/filetype.c?rev=1248... ============================================================================== --- trunk/netsurf/amiga/filetype.c (original) +++ trunk/netsurf/amiga/filetype.c Wed Jun 15 16:53:49 2011 @@ -148,8 +148,6 @@ const char *ami_content_type_to_file_type(content_type type) { - /* TODO: Can we pass MIME types to this function instead? */ - switch(type) { case CONTENT_HTML: @@ -162,6 +160,10 @@ case CONTENT_CSS: return "css"; + break; + + case CONTENT_IMAGE: + return "picture"; break; default: @@ -252,6 +254,7 @@ void ami_mime_free(void) { + ami_mime_dump(); FreeObjList(ami_mime_list); } @@ -508,6 +511,22 @@ } } +const char *ami_mime_content_to_filetype(struct hlcache_handle *c) +{ + struct Node *node; + lwc_string *filetype; + lwc_string *mimetype; + + mimetype = content_get_mime_type(c); + + node = ami_mime_to_filetype(mimetype, &filetype, NULL); + + if(node && (filetype != NULL)) + return lwc_string_data(filetype); + else + return ami_content_type_to_file_type(content_get_type(c)); +} + /** * Return all MIME types containing a plugincmd * Modified: trunk/netsurf/amiga/filetype.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/filetype.h?rev=1248... ============================================================================== --- trunk/netsurf/amiga/filetype.h (original) +++ trunk/netsurf/amiga/filetype.h Wed Jun 15 16:53:49 2011 @@ -37,7 +37,9 @@ struct Node *ami_mime_to_filetype(lwc_string *mimetype, lwc_string **filetype, struct Node *start_node); +const char *ami_mime_content_to_filetype(struct hlcache_handle *c); lwc_string *ami_mime_content_to_cmd(struct hlcache_handle *c); + struct Node *ami_mime_has_cmd(lwc_string **mimetype, struct Node *start_node); bool ami_mime_compare(struct hlcache_handle *c, const char *type);

11 years, 11 months

1
0
0 / 0

r12483 chris_y - in /trunk/netsurf/amiga: dist/Install pkg/makepackage

by netsurf＠semichrome.net

Author: chris_y Date: Wed Jun 15 12:42:01 2011 New Revision: 12483 URL: http://source.netsurf-browser.org?rev=12483&view=rev Log: remove zlib update Modified: trunk/netsurf/amiga/dist/Install trunk/netsurf/amiga/pkg/makepackage Modified: trunk/netsurf/amiga/dist/Install URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/Install?rev=12... ============================================================================== --- trunk/netsurf/amiga/dist/Install (original) +++ trunk/netsurf/amiga/dist/Install Wed Jun 15 12:42:01 2011 @@ -478,12 +478,6 @@ (p_copysobj @each-name) (set #complete (+ #complete 2)) ) - - (working "Creating Shared Objects Links") - - (p_linksobj "libz.so.1.2.5" "libz.so") - (p_linksobj "libz.so.1.2.5" "libz.so.1") - (p_linksobj "libz.so.1.2.5" "libz.so.1.2") ) ) 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 Wed Jun 15 12:42:01 2011 @@ -24,5 +24,5 @@ copy libs:parserutils.library libs:nsgif.library libs:nsbmp.library libs:iconv.library libs:hubbub.library ram:NetSurf/Libs ; libs:css.library libs:wapcaplet.library makedir ram:NetSurf/SObjs -copy sobjs:libjpeg.so.8 sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so ram:NetSurf/SObjs clone +copy sobjs:libjpeg.so.8 sobjs:libxml2.so.9 sobjs:libcurl.so.7 sobjs:librtmp.so.0 sobjs:libsvgtiny.so.0 sobjs:libssl.so.1.0.0 sobjs:libcrypto.so.1.0.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libpng12.so ram:NetSurf/SObjs clone ;sobjs:libhpdf-2.2.0.so.0.0

11 years, 11 months

1
0
0 / 0

r12482 chris_y - in /trunk/netsurf/amiga: dist/NetSurf.guide gui.c options.h

by netsurf＠semichrome.net

Author: chris_y Date: Wed Jun 15 12:40:36 2011 New Revision: 12482 URL: http://source.netsurf-browser.org?rev=12482&view=rev Log: remove no_iframes Modified: trunk/netsurf/amiga/dist/NetSurf.guide trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/options.h Modified: trunk/netsurf/amiga/dist/NetSurf.guide URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/dist/NetSurf.guide?... ============================================================================== --- trunk/netsurf/amiga/dist/NetSurf.guide (original) +++ trunk/netsurf/amiga/dist/NetSurf.guide Wed Jun 15 12:40:36 2011 @@ -40,7 +40,6 @@ There are a couple of Amiga-specific options which can only be changed directly in the file. These are: @{b}kiosk_mode@{ub} No gadgets -@{b}no_iframes@{ub} Disable IFrames @{b}printer_unit@{ub} Specifies which printer.device unit to print to @{b}drag_save_icons@{ub} Enables displaying Workbench-style transparent icons under the pointer when performing drag saves (ctrl-drag of objects available if NetSurf is running on the Workbench screen) and text selection drags. If set to 0 the pointer style will change instead. OS 4.0 users may want to set this to 0 as icons will appear opaque and obscure the drop position. @{b}cairo_renderer@{ub} Set rendering engine (SObjs version only). 0 = graphics.library, 1 = Cairo/graphics.library mixed (recommended), 2 = Full Cairo. Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=12482&r1=... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Wed Jun 15 12:40:36 2011 @@ -2334,8 +2334,6 @@ char closetab[100],closetab_s[100],closetab_g[100]; char addtab[100],addtab_s[100],addtab_g[100]; char tabthrobber[100]; - - if((bw->browser_window_type == BROWSER_WINDOW_IFRAME) && option_no_iframes) return NULL; if(!scrn) ami_openscreenfirst(); Modified: trunk/netsurf/amiga/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=12482... ============================================================================== --- trunk/netsurf/amiga/options.h (original) +++ trunk/netsurf/amiga/options.h Wed Jun 15 12:40:36 2011 @@ -26,7 +26,6 @@ extern char *option_modeid; extern int option_cache_bitmaps; extern char *option_theme; -extern bool option_no_iframes; extern bool option_utf8_clipboard; extern bool option_context_menu; extern bool option_sticky_context_menu; @@ -74,7 +73,6 @@ char *option_modeid = 0; \ int option_cache_bitmaps = 0; \ char *option_theme = 0; \ -bool option_no_iframes = true; \ bool option_utf8_clipboard = false; \ bool option_context_menu = true; \ bool option_sticky_context_menu = false; \ @@ -122,7 +120,6 @@ { "screen_modeid", OPTION_STRING, &option_modeid}, \ { "cache_bitmaps", OPTION_INTEGER, &option_cache_bitmaps}, \ { "theme", OPTION_STRING, &option_theme}, \ -{ "no_iframes", OPTION_BOOL, &option_no_iframes}, \ { "clipboard_write_utf8", OPTION_BOOL, &option_utf8_clipboard}, \ { "context_menu", OPTION_BOOL, &option_context_menu}, \ { "sticky_context_menu", OPTION_BOOL, &option_sticky_context_menu}, \

11 years, 11 months

1
0
0 / 0

r12481 chris_y - /trunk/netsurf/amiga/clipboard.c

by netsurf＠semichrome.net

Author: chris_y Date: Wed Jun 15 12:40:12 2011 New Revision: 12481 URL: http://source.netsurf-browser.org?rev=12481&view=rev Log: avoid crash Modified: trunk/netsurf/amiga/clipboard.c Modified: trunk/netsurf/amiga/clipboard.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/clipboard.c?rev=124... ============================================================================== --- trunk/netsurf/amiga/clipboard.c (original) +++ trunk/netsurf/amiga/clipboard.c Wed Jun 15 12:40:12 2011 @@ -98,7 +98,8 @@ { if(!g) return; if(!g->shared->win) return; - if(g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL) return; + if((g->shared->bw) && + (g->shared->bw->browser_window_type != BROWSER_WINDOW_NORMAL)) return; if(option_kiosk_mode == true) return; OffMenu(g->shared->win, AMI_MENU_CLEAR);

11 years, 11 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits June 2011