netsurf: branch master updated. release/3.0-68-gba0cf5c

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Sun May 12 20:39:02 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/ba0cf5c949cd467dca4e4c777bfdfaf36edad47a
...commit http://git.netsurf-browser.org/netsurf.git/commit/ba0cf5c949cd467dca4e4c777bfdfaf36edad47a
...tree http://git.netsurf-browser.org/netsurf.git/tree/ba0cf5c949cd467dca4e4c777bfdfaf36edad47a

The branch, master has been updated
       via  ba0cf5c949cd467dca4e4c777bfdfaf36edad47a (commit)
       via  94205ed48ced616cb0f662bf8b3d6949833e111b (commit)
       via  6d7adac89ebc86a559a72bd91ec72f2e3d3bd568 (commit)
       via  0b028e41c6ff7c13d2e00bfa03c7c908234a629b (commit)
       via  1304a939c35e44f121159b87d1ab9b2883b86b85 (commit)
       via  a752390abefb0b50a5d1239135e6f033eddb019d (commit)
       via  57e5f7d89aa9b3ab559ff0f43b4884666bbb4b8c (commit)
       via  32df2bebdde7654178d120ad090f9966f1beaa10 (commit)
       via  c2783ac1d45ddc44953629203e9a3feba0fd41ee (commit)
      from  0a91a057e96769d5984d7ff39da5f5faf64b72af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ba0cf5c949cd467dca4e4c777bfdfaf36edad47a
commit ba0cf5c949cd467dca4e4c777bfdfaf36edad47a
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    put it back in a state where it stays enabled

diff --git a/amiga/gui.c b/amiga/gui.c
index 68b51d3..97e45e5 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1591,8 +1591,6 @@ void ami_handle_msg(void)
 							}
 							gwin->prev_mouse_state = gwin->mouse_state;
 							gwin->mouse_state=0;
-							
-							ami_menu_update_disabled(gwin->bw->window, gwin->bw->current_content);
 						break;
 
 						case MIDDLEUP:


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=94205ed48ced616cb0f662bf8b3d6949833e111b
commit 94205ed48ced616cb0f662bf8b3d6949833e111b
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    more futile attempts to get the copy option to behave

diff --git a/amiga/menu.c b/amiga/menu.c
index c1cf88e..7b847bc 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -639,11 +639,6 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 
 	if(nsoption_bool(kiosk_mode) == true) return;
 
-	OffMenu(win,AMI_MENU_CUT);
-	OffMenu(win,AMI_MENU_COPY);
-	OffMenu(win,AMI_MENU_PASTE);
-	OffMenu(win,AMI_MENU_CLEAR);
-
 	if(content_get_type(c) <= CONTENT_CSS)
 	{
 		OnMenu(win,AMI_MENU_SAVEAS_TEXT);
@@ -655,13 +650,20 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 		{
 			OnMenu(win,AMI_MENU_COPY);
 			OnMenu(win,AMI_MENU_CLEAR);
+		} else {
+			OffMenu(win,AMI_MENU_COPY);
+			OffMenu(win,AMI_MENU_CLEAR);	
 		}
 
 		if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_CUT)
 			OnMenu(win,AMI_MENU_CUT);
+		else
+			OffMenu(win,AMI_MENU_CUT);		
 		
 		if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_PASTE)
 			OnMenu(win,AMI_MENU_PASTE);
+		else
+			OffMenu(win,AMI_MENU_PASTE);
 
 		OnMenu(win,AMI_MENU_SELECTALL);
 		OnMenu(win,AMI_MENU_FIND);
@@ -669,6 +671,10 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 	}
 	else
 	{
+		OffMenu(win,AMI_MENU_CUT);
+		OffMenu(win,AMI_MENU_PASTE);
+		OffMenu(win,AMI_MENU_CLEAR);
+
 		OffMenu(win,AMI_MENU_SAVEAS_TEXT);
 		OffMenu(win,AMI_MENU_SAVEAS_COMPLETE);
 #ifdef WITH_PDF_EXPORT
@@ -688,6 +694,7 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 		}
 		else
 		{
+			OffMenu(win,AMI_MENU_COPY);
 			OffMenu(win,AMI_MENU_SAVEAS_IFF);
 		}
 	}


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6d7adac89ebc86a559a72bd91ec72f2e3d3bd568
commit 6d7adac89ebc86a559a72bd91ec72f2e3d3bd568
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Update the edit menu after every click, to be safe.

diff --git a/amiga/gui.c b/amiga/gui.c
index 97e45e5..68b51d3 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1591,6 +1591,8 @@ void ami_handle_msg(void)
 							}
 							gwin->prev_mouse_state = gwin->mouse_state;
 							gwin->mouse_state=0;
+							
+							ami_menu_update_disabled(gwin->bw->window, gwin->bw->current_content);
 						break;
 
 						case MIDDLEUP:
diff --git a/desktop/selection.c b/desktop/selection.c
index 280edcd..13a1293 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -283,7 +283,6 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
 		 * selection, Otherwise clear on release (to allow for drags) */
 
 			selection_clear(s, true);
-			gui_clear_selection(top->window);
 		} else if (mouse & BROWSER_MOUSE_DRAG_1) {
 			/* start new selection drag */
 


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0b028e41c6ff7c13d2e00bfa03c7c908234a629b
commit 0b028e41c6ff7c13d2e00bfa03c7c908234a629b
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    more fix of edit menu updates

diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index b8ebf5e..c6c9be8 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -485,7 +485,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
 						PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
 							PMIA_Title, (ULONG)ctxmenulab[CMID_SELCUT],
 							PMIA_ID,CMID_SELCUT,
-							PMIA_Disabled, !(browser_window_get_editor_flags(bw) & BW_EDITOR_CAN_PASTE),
+							PMIA_Disabled, !(browser_window_get_editor_flags(bw) & BW_EDITOR_CAN_CUT),
 							PMIA_CommKey, "X",
 						TAG_DONE),
 						PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
diff --git a/desktop/selection.c b/desktop/selection.c
index 13a1293..280edcd 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -283,6 +283,7 @@ bool selection_click(struct selection *s, browser_mouse_state mouse,
 		 * selection, Otherwise clear on release (to allow for drags) */
 
 			selection_clear(s, true);
+			gui_clear_selection(top->window);
 		} else if (mouse & BROWSER_MOUSE_DRAG_1) {
 			/* start new selection drag */
 


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1304a939c35e44f121159b87d1ab9b2883b86b85
commit 1304a939c35e44f121159b87d1ab9b2883b86b85
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    stop the build whinging about NETSURF_USE_JS := AUTO

diff --git a/amiga/Makefile.defaults b/amiga/Makefile.defaults
index 42bcb73..5ff1b69 100644
--- a/amiga/Makefile.defaults
+++ b/amiga/Makefile.defaults
@@ -36,5 +36,11 @@
   # Valid options: YES, NO, AUTO
   NETSURF_USE_AMIGA_CAIRO := AUTO
 
+  # Enable NetSurf's use of Spidermonkey 1.80+
+  # Only here to stop the build complaining;
+  # enable NETSURF_USE_MOZJS instead for JavaScript support
+  # Valid options: NO 
+  NETSURF_USE_JS := NO
+  
   # Optimisation levels
   CFLAGS += -O2 -gstabs


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a752390abefb0b50a5d1239135e6f033eddb019d
commit a752390abefb0b50a5d1239135e6f033eddb019d
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    attempt fix edit menu item disable

diff --git a/amiga/menu.c b/amiga/menu.c
index 7334f77..c1cf88e 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -655,11 +655,14 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 		{
 			OnMenu(win,AMI_MENU_COPY);
 			OnMenu(win,AMI_MENU_CLEAR);
-
-			if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_CUT)
-				OnMenu(win,AMI_MENU_CUT);
 		}
-		if(g->c_h) OnMenu(win,AMI_MENU_PASTE);
+
+		if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_CUT)
+			OnMenu(win,AMI_MENU_CUT);
+		
+		if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_PASTE)
+			OnMenu(win,AMI_MENU_PASTE);
+
 		OnMenu(win,AMI_MENU_SELECTALL);
 		OnMenu(win,AMI_MENU_FIND);
 		OffMenu(win,AMI_MENU_SAVEAS_IFF);
@@ -671,9 +674,7 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 #ifdef WITH_PDF_EXPORT
 		OffMenu(win,AMI_MENU_SAVEAS_PDF);
 #endif
-		OffMenu(win,AMI_MENU_PASTE);
 		OffMenu(win,AMI_MENU_SELECTALL);
-		OffMenu(win,AMI_MENU_CLEAR);
 		OffMenu(win,AMI_MENU_FIND);
 
 #ifdef WITH_NS_SVG
@@ -687,7 +688,6 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 		}
 		else
 		{
-			OffMenu(win,AMI_MENU_COPY);
 			OffMenu(win,AMI_MENU_SAVEAS_IFF);
 		}
 	}


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=57e5f7d89aa9b3ab559ff0f43b4884666bbb4b8c
commit 57e5f7d89aa9b3ab559ff0f43b4884666bbb4b8c
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    attempt fix cut disable on context menu

diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 6ee08f5..b8ebf5e 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -485,7 +485,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
 						PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
 							PMIA_Title, (ULONG)ctxmenulab[CMID_SELCUT],
 							PMIA_ID,CMID_SELCUT,
-							PMIA_Disabled, disabled_noselection && disabled_readonly,
+							PMIA_Disabled, !(browser_window_get_editor_flags(bw) & BW_EDITOR_CAN_PASTE),
 							PMIA_CommKey, "X",
 						TAG_DONE),
 						PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=32df2bebdde7654178d120ad090f9966f1beaa10
commit 32df2bebdde7654178d120ad090f9966f1beaa10
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    git being annoying

diff --git a/amiga/plotters.c b/amiga/plotters.c
index 884b1ce..8a1ce4d 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -169,8 +169,7 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
 		 * hard lockup or odd/missing graphical effects.
 		 */
 
-		if(depth == 32)
-			friend = scrn->RastPort.BitMap;
+		if(depth == 32) friend = scrn->RastPort.BitMap;
 	}
 
 	if(nsoption_int(redraw_tile_size_x) <= 0) nsoption_set_int(redraw_tile_size_x, scrn->Width);


commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c2783ac1d45ddc44953629203e9a3feba0fd41ee
commit c2783ac1d45ddc44953629203e9a3feba0fd41ee
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    change zoom button window dimensions test suff

diff --git a/amiga/gui.c b/amiga/gui.c
index b0c1c7e..97e45e5 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4424,12 +4424,17 @@ void gui_window_get_dimensions(struct gui_window *g, int *width, int *height,
 
 void gui_window_update_extent(struct gui_window *g)
 {
-	struct IBox *bbox;
+	struct IBox *bbox, zbox;
 	ULONG cur_tab = 0;
 
 	if(!g) return;
 	if(!g->shared->bw->current_content) return;
-
+	/*
+	zbox.Top = ~0;
+	zbox.Left = ~0;
+	zbox.Width = (WORD)(content_get_width(g->shared->bw->current_content) * g->shared->bw->scale);
+	zbox.Height = (WORD)(content_get_height(g->shared->bw->current_content) * g->shared->bw->scale);
+	*/
 	if(g->tab_node && (g->shared->tabs > 1)) GetAttr(CLICKTAB_Current,
 				g->shared->objects[GID_TABS], (ULONG *)&cur_tab);
 
@@ -4459,7 +4464,7 @@ void gui_window_update_extent(struct gui_window *g)
 				SCROLLER_Visible, bbox->Width,
 				TAG_DONE);
 		}
-
+		//SetWindowAttr(g->shared->win, WA_Zoom, &zbox, sizeof(ULONG));
 	}
 	g->shared->new_content = true;
 }


-----------------------------------------------------------------------

Summary of changes:
 amiga/Makefile.defaults |    6 ++++++
 amiga/context_menu.c    |    2 +-
 amiga/gui.c             |   11 ++++++++---
 amiga/menu.c            |   29 ++++++++++++++++++-----------
 amiga/plotters.c        |    3 +--
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/amiga/Makefile.defaults b/amiga/Makefile.defaults
index 42bcb73..5ff1b69 100644
--- a/amiga/Makefile.defaults
+++ b/amiga/Makefile.defaults
@@ -36,5 +36,11 @@
   # Valid options: YES, NO, AUTO
   NETSURF_USE_AMIGA_CAIRO := AUTO
 
+  # Enable NetSurf's use of Spidermonkey 1.80+
+  # Only here to stop the build complaining;
+  # enable NETSURF_USE_MOZJS instead for JavaScript support
+  # Valid options: NO 
+  NETSURF_USE_JS := NO
+  
   # Optimisation levels
   CFLAGS += -O2 -gstabs
diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index 6ee08f5..c6c9be8 100644
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -485,7 +485,7 @@ void ami_context_menu_add_submenu(Object *ctxmenuobj, ULONG cmsub, void *userdat
 						PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
 							PMIA_Title, (ULONG)ctxmenulab[CMID_SELCUT],
 							PMIA_ID,CMID_SELCUT,
-							PMIA_Disabled, disabled_noselection && disabled_readonly,
+							PMIA_Disabled, !(browser_window_get_editor_flags(bw) & BW_EDITOR_CAN_CUT),
 							PMIA_CommKey, "X",
 						TAG_DONE),
 						PMA_AddItem,NewObject(POPUPMENU_GetItemClass(), NULL,
diff --git a/amiga/gui.c b/amiga/gui.c
index b0c1c7e..97e45e5 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4424,12 +4424,17 @@ void gui_window_get_dimensions(struct gui_window *g, int *width, int *height,
 
 void gui_window_update_extent(struct gui_window *g)
 {
-	struct IBox *bbox;
+	struct IBox *bbox, zbox;
 	ULONG cur_tab = 0;
 
 	if(!g) return;
 	if(!g->shared->bw->current_content) return;
-
+	/*
+	zbox.Top = ~0;
+	zbox.Left = ~0;
+	zbox.Width = (WORD)(content_get_width(g->shared->bw->current_content) * g->shared->bw->scale);
+	zbox.Height = (WORD)(content_get_height(g->shared->bw->current_content) * g->shared->bw->scale);
+	*/
 	if(g->tab_node && (g->shared->tabs > 1)) GetAttr(CLICKTAB_Current,
 				g->shared->objects[GID_TABS], (ULONG *)&cur_tab);
 
@@ -4459,7 +4464,7 @@ void gui_window_update_extent(struct gui_window *g)
 				SCROLLER_Visible, bbox->Width,
 				TAG_DONE);
 		}
-
+		//SetWindowAttr(g->shared->win, WA_Zoom, &zbox, sizeof(ULONG));
 	}
 	g->shared->new_content = true;
 }
diff --git a/amiga/menu.c b/amiga/menu.c
index 7334f77..7b847bc 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -639,11 +639,6 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 
 	if(nsoption_bool(kiosk_mode) == true) return;
 
-	OffMenu(win,AMI_MENU_CUT);
-	OffMenu(win,AMI_MENU_COPY);
-	OffMenu(win,AMI_MENU_PASTE);
-	OffMenu(win,AMI_MENU_CLEAR);
-
 	if(content_get_type(c) <= CONTENT_CSS)
 	{
 		OnMenu(win,AMI_MENU_SAVEAS_TEXT);
@@ -655,25 +650,37 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c)
 		{
 			OnMenu(win,AMI_MENU_COPY);
 			OnMenu(win,AMI_MENU_CLEAR);
-
-			if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_CUT)
-				OnMenu(win,AMI_MENU_CUT);
+		} else {
+			OffMenu(win,AMI_MENU_COPY);
+			OffMenu(win,AMI_MENU_CLEAR);	
 		}
-		if(g->c_h) OnMenu(win,AMI_MENU_PASTE);
+
+		if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_CUT)
+			OnMenu(win,AMI_MENU_CUT);
+		else
+			OffMenu(win,AMI_MENU_CUT);		
+		
+		if(browser_window_get_editor_flags(g->shared->bw) & BW_EDITOR_CAN_PASTE)
+			OnMenu(win,AMI_MENU_PASTE);
+		else
+			OffMenu(win,AMI_MENU_PASTE);
+
 		OnMenu(win,AMI_MENU_SELECTALL);
 		OnMenu(win,AMI_MENU_FIND);
 		OffMenu(win,AMI_MENU_SAVEAS_IFF);
 	}
 	else
 	{
+		OffMenu(win,AMI_MENU_CUT);
+		OffMenu(win,AMI_MENU_PASTE);
+		OffMenu(win,AMI_MENU_CLEAR);
+
 		OffMenu(win,AMI_MENU_SAVEAS_TEXT);
 		OffMenu(win,AMI_MENU_SAVEAS_COMPLETE);
 #ifdef WITH_PDF_EXPORT
 		OffMenu(win,AMI_MENU_SAVEAS_PDF);
 #endif
-		OffMenu(win,AMI_MENU_PASTE);
 		OffMenu(win,AMI_MENU_SELECTALL);
-		OffMenu(win,AMI_MENU_CLEAR);
 		OffMenu(win,AMI_MENU_FIND);
 
 #ifdef WITH_NS_SVG
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 884b1ce..8a1ce4d 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -169,8 +169,7 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
 		 * hard lockup or odd/missing graphical effects.
 		 */
 
-		if(depth == 32)
-			friend = scrn->RastPort.BitMap;
+		if(depth == 32) friend = scrn->RastPort.BitMap;
 	}
 
 	if(nsoption_int(redraw_tile_size_x) <= 0) nsoption_set_int(redraw_tile_size_x, scrn->Width);


-- 
NetSurf Browser



More information about the netsurf-commits mailing list