netsurf: branch tlsa/selection-search-refactor updated. release/3.0-79-g6c1148c

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Tue May 14 11:59:30 BST 2013


Gitweb links:

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

The branch, tlsa/selection-search-refactor has been updated
       via  6c1148c8c6e77c313eeb1e104da3c81ba1eb1822 (commit)
       via  d34f03e69ef241db4eac442bce5d1143920bc3da (commit)
       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)
       via  0a91a057e96769d5984d7ff39da5f5faf64b72af (commit)
       via  bb9a7bbe6d7e824431812a8f4748635c1eb421dd (commit)
      from  4713683a7ac15246d846f2498fdb4d8c309a2888 (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=6c1148c8c6e77c313eeb1e104da3c81ba1eb1822
commit 6c1148c8c6e77c313eeb1e104da3c81ba1eb1822
Merge: 4713683 d34f03e
Author: Michael Drake <tlsa at netsurf-browser.org>
Commit: Michael Drake <tlsa at netsurf-browser.org>

    Merge branch 'master' of git://git.netsurf-browser.org/netsurf into tlsa/selection-search-refactor



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

Summary of changes:
 Makefile                |   17 +++++++++++++++--
 amiga/Makefile.defaults |    6 ++++++
 amiga/context_menu.c    |    2 +-
 amiga/gui.c             |   11 ++++++++---
 amiga/menu.c            |   29 ++++++++++++++++++-----------
 amiga/plotters.c        |    3 +--
 framebuffer/gui.c       |    4 ++++
 utils/jenkins-build.sh  |   45 ++++++++++++++++++++++++++++++++++++++++++---
 8 files changed, 95 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index df13b5e..32b1afd 100644
--- a/Makefile
+++ b/Makefile
@@ -271,8 +271,21 @@ else
                 CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
               endif
 	    else
-              # All other targets (GTK, Framebuffer)
-              PKG_CONFIG := pkg-config
+              ifeq ($(findstring framebuffer,$(TARGET)),framebuffer)
+                ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+                  PKG_CONFIG := pkg-config
+                else
+                  PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config                
+                endif
+
+                ifneq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+                  CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+                  CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
+                endif
+              else
+                # All native targets (GTK)
+                PKG_CONFIG := pkg-config
+              endif
             endif
           endif
         endif
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);
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index d063475..3ceb814 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -818,6 +818,10 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 	case NSFB_EVENT_KEY_DOWN:
 		switch (cbi->event->value.keycode) {
 
+		case NSFB_KEY_DELETE:
+			browser_window_key_press(gw->bw, KEY_DELETE_RIGHT);
+			break;
+
 		case NSFB_KEY_PAGEUP:
 			if (browser_window_key_press(gw->bw,
 					KEY_PAGE_UP) == false)
diff --git a/utils/jenkins-build.sh b/utils/jenkins-build.sh
index 0fe834c..ea8a520 100755
--- a/utils/jenkins-build.sh
+++ b/utils/jenkins-build.sh
@@ -149,7 +149,7 @@ case ${TARGET} in
 
     "gtk")
 	case ${label} in
-	    "linux")
+	    "x86_64-linux-gnu")
 		ARTIFACT_TARGET=Linux
 		;;
 
@@ -167,10 +167,49 @@ case ${TARGET} in
 
     "framebuffer")
 	case ${label} in
-	    "linux")
+	    "x86_64-linux-gnu")
 		ARTIFACT_TARGET=Linux
 		;;
 
+	    "i686-apple-darwin10")
+		ARTIFACT_TARGET=Darwin
+		;;
+
+	    "powerpc-apple-darwin9")
+		ARTIFACT_TARGET=powerpc-apple-darwin9
+		;;
+
+	    "arm-unknown-riscos")
+		ARTIFACT_TARGET=riscos
+		export GCCSDK_INSTALL_ENV=/opt/netsurf/${label}/env
+		export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${label}/cross/bin
+		;;
+
+	    "m68k-atari-mint")
+		ARTIFACT_TARGET=m68k-atari-mint
+		export GCCSDK_INSTALL_ENV=/opt/netsurf/${label}/env
+		export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${label}/cross/bin
+		;;
+
+	    "m5475-atari-mint")
+		ATARIARCH=v4e
+		ARTIFACT_TARGET=m5475-atari-mint
+		export GCCSDK_INSTALL_ENV=/opt/netsurf/${label}/env
+		export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${label}/cross/bin
+		;;
+
+	    "i686-w64-mingw32")
+		ARTIFACT_TARGET=windows
+		export GCCSDK_INSTALL_ENV=/opt/netsurf/${label}/env
+		export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${label}/cross/bin
+		;;
+
+	    "ppc-amigaos")
+		ARTIFACT_TARGET=amiga
+		export GCCSDK_INSTALL_ENV=/opt/netsurf/${label}/env
+		export GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/${label}/cross/bin
+		;;
+
 	    *)
 		echo "Target \"${TARGET}\" cannot be built on \"${label})\""
 		exit 1
@@ -186,7 +225,7 @@ case ${TARGET} in
     "monkey")
 	# monkey target can be built on most of the supported architectures
 	case ${label} in
-	    "linux")
+	    "x86_64-linux-gnu")
 		ARTIFACT_TARGET=Linux
 		;;
 


-- 
NetSurf Browser



More information about the netsurf-commits mailing list