Merge remote-tracking branch 'upstream/develop-8.1' into merge-develop-8.1-12.05.2017

livecodepanos · livecodepanos · commit 1fa3f73716e5 · 2017-05-12T17:27:49.000+01:00
diff --git a/builder/builder_utilities.livecodescript b/builder/builder_utilities.livecodescript
@@ -1,7 +1,7 @@
 ﻿script "BuilderUtilities"
 
 constant kMergExtVersion = "2017-4-6"
-constant kTSNetVersion = "1.2.8"
+constant kTSNetVersion = "1.2.9"
 
 local sEngineDir
 local sWorkDir
diff --git a/docs/notes/bugfix-18939.md b/docs/notes/bugfix-18939.md
@@ -0,0 +1 @@
+# Fix player image incorrectly scaled in edit mode
diff --git a/docs/notes/bugfix-19509.md b/docs/notes/bugfix-19509.md
@@ -0,0 +1 @@
+# Make sure Android Studio works with LiveCode
diff --git a/docs/notes/bugfix-19541.md b/docs/notes/bugfix-19541.md
@@ -0,0 +1 @@
+# Fix clipboard ownership checks on windows causing private clipboard data to be cleared
diff --git a/docs/notes/bugfix-19587.md b/docs/notes/bugfix-19587.md
@@ -0,0 +1,8 @@
+# Fix deletion of the target in safe cases
+
+You can now safely 'delete the target' as long as there are
+no handlers on the stack owned by the target.
+
+After deleting 'the target', 'the target' will become
+empty which will result in an execution error when an attempt
+is made to dereference it.
diff --git a/docs/notes/bugfix-19620.md b/docs/notes/bugfix-19620.md
@@ -0,0 +1 @@
+# Update cursor when entering window on windows
diff --git a/docs/notes/bugfix-19630.md b/docs/notes/bugfix-19630.md
@@ -0,0 +1 @@
+# Make sure setting the iphoneSetAudioCategory is respected
diff --git a/docs/notes/bugfix-19633.md b/docs/notes/bugfix-19633.md
@@ -0,0 +1 @@
+# Modify tsNet libUrl wrapper to treat HTTP status codes > 400 as errors
diff --git a/docs/notes/bugfix-19635.md b/docs/notes/bugfix-19635.md
@@ -0,0 +1,5 @@
+# Ensure browser widgets are in the correct location
+
+Browser widgets in nested groups now remain in the correct location
+rather than shifting down vertically out of sync with everything
+else.
diff --git a/docs/notes/bugfix-19637.md b/docs/notes/bugfix-19637.md
@@ -0,0 +1,2 @@
+# Errors building iOS standalones should only be reported once
+
diff --git a/docs/notes/bugfix-19649.md b/docs/notes/bugfix-19649.md
@@ -0,0 +1 @@
+# Correctly parse multiple bytes escaped as hex in the format function
diff --git a/docs/notes/bugfix-19650.md b/docs/notes/bugfix-19650.md
@@ -0,0 +1 @@
+# Fix tsNet proxy support on Linux, OS X and Android
diff --git a/docs/notes/bugfix-19666.md b/docs/notes/bugfix-19666.md
@@ -0,0 +1 @@
+# Make sure you can set more than one javascriptHandlers on CEF Browser
diff --git a/docs/notes/bugfix-19672.md b/docs/notes/bugfix-19672.md
@@ -0,0 +1 @@
+# Prevent crash on throwing certain errors
diff --git a/docs/notes/feature-suppress_standalone_success_msg.md b/docs/notes/feature-suppress_standalone_success_msg.md
@@ -0,0 +1,5 @@
+# Add param that suppresses success message when building standalone
+
+By default `revSaveAsStandalone` displays the message `answer information "Standalone application saved successfully."` when it is done. You can turn off this message by setting the test environment to true but doing so suppresses all error messages and other feedback as well.
+
+I am calling `revSaveAsStandalone` from my own scripts multiple times and want feedback and error reporting but not the success message. Adding an additional parameter to `revSaveAsStandalone` that suppress the success message would allow this.
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -242,6 +242,9 @@ void MCStack::syncscroll(void)
     // AL-2014-07-22: [[ Bug 12764 ]] Update the stack viewport after applying menu scroll
     view_setstackviewport(rect);
 	// COCOA-TODO: Make sure contained views also scroll (?)
+
+	// IM-2017-05-04: [[ Bug 19327 ]] Notify layers of transform change after scroll sync
+	OnViewTransformChanged();
 }
 
 void MCStack::start_externals()
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -246,6 +246,10 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa
 
 	if ((stat == ES_NOT_HANDLED || stat == ES_PASS) && m_externals != nil)
 	{
+        // TODO[19681]: This can be removed when all engine messages are sent with
+        // target.
+        bool t_target_was_valid = MCtargetptr.IsValid();
+    
 		Exec_stat oldstat = stat;
 		stat = m_externals -> Handle(this, htype, mess, params);
 
@@ -256,6 +260,15 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa
 
 		if (oldstat == ES_PASS && stat == ES_NOT_HANDLED)
 			stat = ES_PASS;
+        
+        if (stat == ES_PASS || stat == ES_NOT_HANDLED)
+        {
+            if (t_target_was_valid && !MCtargetptr.IsValid())
+            {
+                stat = ES_NORMAL;
+                t_has_passed = false;
+            }
+        }
 	}
 
 //#ifdef TARGET_SUBPLATFORM_IPHONE
@@ -283,8 +296,21 @@ Exec_stat MCDispatch::handle(Handler_type htype, MCNameRef mess, MCParameter *pa
 
     if ((stat == ES_NOT_HANDLED || stat == ES_PASS))
     {
+        // TODO[19681]: This can be removed when all engine messages are sent with
+        // target.
+        bool t_target_was_valid = MCtargetptr.IsValid();
+        
         extern Exec_stat MCEngineHandleLibraryMessage(MCNameRef name, MCParameter *params);
         stat = MCEngineHandleLibraryMessage(mess, params);
+        
+        if (stat == ES_PASS || stat == ES_NOT_HANDLED)
+        {
+            if (t_target_was_valid && !MCtargetptr.IsValid())
+            {
+                stat = ES_NORMAL;
+                t_has_passed = false;
+            }
+        }
     }
     
 	if (MCmessagemessages && stat != ES_PASS && MCtargetptr)
diff --git a/engine/src/exec-engine.cpp b/engine/src/exec-engine.cpp
@@ -1226,24 +1226,13 @@ void MCEngineExecDispatch(MCExecContext& ctxt, int p_handler_type, MCNameRef p_m
 	MCdynamicpath = MCdynamiccard.IsValid();
 	if (t_stat == ES_PASS || t_stat == ES_NOT_HANDLED)
     {
-        /* If the target object was deleted in the frontscript, prevent
-         * normal message dispatch as if the frontscript did not pass the
-         * message. */
-        if (t_object)
+        switch(t_stat = t_object -> handle((Handler_type)p_handler_type, p_message, p_parameters, t_object.Get()))
         {
-            MCObjectExecutionLock t_object_lock(t_object);
-            switch(t_stat = t_object -> handle((Handler_type)p_handler_type, p_message, p_parameters, t_object.Get()))
-            {
-            case ES_ERROR:
-                ctxt . LegacyThrow(EE_DISPATCH_BADCOMMAND, p_message);
-                break;
-            default:
-                break;
-            }
-        }
-        else
-        {
-            t_stat = ES_NORMAL;
+        case ES_ERROR:
+            ctxt . LegacyThrow(EE_DISPATCH_BADCOMMAND, p_message);
+            break;
+        default:
+            break;
         }
     }
 	
diff --git a/engine/src/exec-strings.cpp b/engine/src/exec-strings.cpp
@@ -1055,7 +1055,7 @@ void MCStringsEvalFormat(MCExecContext& ctxt, MCStringRef p_format, MCValueRef*
                     /* UNCHECKED */ MCNumberParseUnicodeChars(t_hexa_num, 4, &t_number);
 
                     t_result_char = MCNumberFetchAsUnsignedInteger(*t_number);
-                    format += 2;
+                    format++;
 				}
 				break;
 			default:
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -348,6 +348,8 @@ void MCGroup::geometrychanged(const MCRectangle &p_rect)
 
 void MCGroup::viewportgeometrychanged(const MCRectangle &p_rect)
 {
+    MCControl::viewportgeometrychanged(p_rect);
+
 	MCRectangle t_viewport;
 	t_viewport = MCU_intersect_rect(p_rect, getrect());
 
diff --git a/engine/src/mac-window.mm b/engine/src/mac-window.mm
@@ -1524,25 +1524,8 @@ - (void)handleKeyPress: (NSEvent *)event isDown: (BOOL)pressed
 
 - (void)setFrameSize: (NSSize)size
 {
-	CGFloat t_height_diff = size.height - [self frame].size.height;
-	
 	[super setFrameSize: size];
-	
-	// IM-2014-03-28: [[ Bug 12046 ]] Adjust subviews upward to retain same height from top of view
-	NSArray *t_subviews;
-	t_subviews = [self subviews];
-	for (uint32_t i = 0; i < [t_subviews count]; i++)
-	{
-		NSView *t_subview;
-		t_subview = [t_subviews objectAtIndex:i];
-		
-		NSPoint t_origin;
-		t_origin = [t_subview frame].origin;
-		t_origin.y += t_height_diff;
-		
-		[t_subview setFrameOrigin:t_origin];
-	}
-	
+    
 	if ([self window] == nil)
 		return;
 	
@@ -1649,16 +1632,18 @@ - (void)setFrameSize: (NSSize)size
 		NSView *t_subview;
 		t_subview = [t_subviews objectAtIndex:i];
 		
-		// Don't adjust the app view, as it gets resized below.
-		if (t_subview != m_window->GetView())
-		{
+        // Adjust any layers added by externals (revbrowser).
+        if ([t_subview respondsToSelector:@selector(com_runrev_livecode_nativeViewId)])
+        {
 			NSPoint t_origin;
 			t_origin = [t_subview frame].origin;
-			t_origin.y += t_height_diff;
+			
+            t_origin.y += t_height_diff;
 			
 			[t_subview setFrameOrigin:t_origin];
 		}
 	}
+    
 	MCMacPlatformWindow *t_window = m_window;
     if (t_window != nil)
         [t_window -> GetView() setFrameSize: size];
diff --git a/engine/src/mblhandlers.cpp b/engine/src/mblhandlers.cpp
@@ -2627,7 +2627,7 @@ Exec_stat MCHandleSetAudioCategory(void *context, MCParameter *p_parameters)
     t_category = kMCSoundAudioCategoryUnknown;
     if (t_success)
     {
-        MCSoundAudioCategoryFromString(*t_category_string);
+        t_category = MCSoundAudioCategoryFromString(*t_category_string);
     }
     
     if (t_success)
diff --git a/engine/src/native-layer-mac.mm b/engine/src/native-layer-mac.mm
@@ -139,22 +139,23 @@
 	MCRectangle t_view_rect;
 	t_view_rect = MCRectangleGetTransformedBounds(p_rect, m_object->getstack()->getviewtransform());
 	
-	int32_t t_gp_height;
-	
-	NSWindow *t_window = getStackWindow();
-	if (t_window != nil)
-		t_gp_height = (int32_t)[[t_window contentView] frame].size.height;
-	else
-		t_gp_height = m_object->getcard()->getrect().height;
-	
+    MCRectangle t_parent_view_rect;
+    t_parent_view_rect = MCRectangleGetTransformedBounds(m_object->getparent()->getrect(), m_object->getstack()->getviewtransform());
+    
+    // First compute rect of this object relative to parent
+    t_view_rect.y -= t_parent_view_rect.y;
+    t_view_rect.x -= t_parent_view_rect.x;
+    
+    // Now compute the (y-inverted) NSView rect
 	NSRect t_rect;
-	t_rect = NSMakeRect(t_view_rect.x, t_gp_height - (t_view_rect.y + t_view_rect.height), t_view_rect.width, t_view_rect.height);
+	t_rect = NSMakeRect(t_view_rect.x, t_parent_view_rect.height - (t_view_rect.y + t_view_rect.height), t_view_rect.width, t_view_rect.height);
 	
 	return t_rect;
 }
 
 void MCNativeLayerMac::doSetViewportGeometry(const MCRectangle &p_rect)
 {
+    doSetGeometry(m_object->getrect());
 }
 
 void MCNativeLayerMac::doSetGeometry(const MCRectangle &p_rect)
@@ -256,49 +257,14 @@
 
 //////////
 
-// IM-2015-12-16: [[ NativeLayer ]] Keep the coordinate system of group contents the same as
-//                the top-level window view by keeping its bounds the same as its frame.
-//                This allows us to place contents in terms of window coords without having to
-//                adjust for the location of the group container.
 @interface com_runrev_livecode_MCContainerView: NSView
 
-- (void)setFrameOrigin:(NSPoint)newOrigin;
-- (void)setFrameSize:(NSSize)newSize;
-
 @end
 
 @compatibility_alias MCContainerView com_runrev_livecode_MCContainerView;
 
 @implementation com_runrev_livecode_MCContainerView
 
-- (void)setFrameOrigin:(NSPoint)newOrigin
-{
-    /* By default, NSViews don't adjust the positions or sizes of their
-     * contents when their geometry changes.  There is an autoresizing
-     * behaviour that we could turn on, but we don't because it doesn't have
-     * the properties that we require for a LiveCode group.  It's therefore
-     * necessary to manually nudge subviews around when the position of a
-     * container view is adjusted. */
-    NSPoint t_origin = [self frame].origin;
-    NSPoint t_delta = {newOrigin.x - t_origin.x, newOrigin.y - t_origin.y};
-
-    for (NSView *t_subview in [self subviews])
-    {
-        NSPoint t_suborigin = [t_subview frame].origin;
-        [t_subview setFrameOrigin: {t_suborigin.x + t_delta.x,
-                                    t_suborigin.y + t_delta.y}];
-    }
-
-	[super setFrameOrigin:newOrigin];
-	[self setBoundsOrigin:newOrigin];
-}
-
-- (void)setFrameSize:(NSSize)newSize
-{
-	[super setFrameSize:newSize];
-	[self setBoundsSize:newSize];
-}
-
 @end
 
 bool MCNativeLayer::CreateNativeContainer(MCObject *p_object, void *&r_view)
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -1078,6 +1078,10 @@ Exec_stat MCObject::handleself(Handler_type p_handler_type, MCNameRef p_message,
 	Exec_stat t_stat;
 	t_stat = ES_NOT_HANDLED;
 
+    // TODO[19681]: This can be removed when all engine messages are sent with
+    // target.
+    bool t_target_was_valid = MCtargetptr.IsValid();
+    
 	MCObjectExecutionLock self_lock(this);
 
 	// Make sure this object has its script compiled.
@@ -1138,6 +1142,14 @@ Exec_stat MCObject::handleself(Handler_type p_handler_type, MCNameRef p_message,
 		if (t_stat == ES_ERROR || t_stat == ES_EXIT_ALL)
 			return t_stat;
 	}
+    
+    if (t_stat == ES_PASS || t_stat == ES_NOT_HANDLED)
+    {
+        if (t_target_was_valid && !MCtargetptr.IsValid())
+        {
+            t_main_stat = ES_NORMAL;
+        }
+    }
 
 	// Return the result of executing the main handler in the object
 	return t_main_stat;
@@ -2081,7 +2093,8 @@ Exec_stat MCObject::dispatch(Handler_type p_type, MCNameRef p_message, MCParamet
         MCAssert(!MCtargetptr || MCtargetptr.IsBoundTo(this));
         if (MCtargetptr)
         {
-            MCObjectExecutionLock t_target_lock(this);
+            // MAY-DELETE: Handle the message - this (MCtargetptr) might be unbound
+            // after this call if it is deleted.
             t_stat = handle(p_type, p_message, p_params, this);
         }
         else
@@ -2163,8 +2176,8 @@ Exec_stat MCObject::message(MCNameRef mess, MCParameter *paramptr, Boolean chang
                  * frontscript did not pass the message. */
                 if (t_self_handle)
                 {
-                    MCObjectExecutionLock t_self_lock(this);
-                    // PASS STATE FIX
+                    // MAY-DELETE: Handle the message - this might be unbound after
+                    // this call if it is deleted.
                     Exec_stat oldstat = stat;
                     stat = handle(HT_MESSAGE, mess, paramptr, this);
                     if (oldstat == ES_PASS && stat == ES_NOT_HANDLED)
diff --git a/engine/src/objectprops.cpp b/engine/src/objectprops.cpp
@@ -292,7 +292,8 @@ Exec_stat MCObject::sendgetprop(MCExecContext& ctxt, MCNameRef p_set_name, MCNam
             MCAssert(!MCtargetptr || MCtargetptr.IsBoundTo(this));
             if (MCtargetptr)
             {
-                MCObjectExecutionLock t_self_lock(this);
+                // MAY-DELETE: Handle the message - this/MCtargetptr might be unbound after
+                // this call if it is deleted.
                 t_stat = handle(HT_GETPROP, t_getprop_name, &p1, this);
             }
             else
@@ -396,7 +397,8 @@ Exec_stat MCObject::sendsetprop(MCExecContext& ctxt, MCNameRef p_set_name, MCNam
             MCAssert(!MCtargetptr || MCtargetptr.IsBoundTo(this));
             if (MCtargetptr)
             {
-                MCObjectExecutionLock t_self_lock(this);
+                // MAY-DELETE: Handle the message - this/MCtargetptr might be unbound after
+                // this call if it is deleted.
                 t_stat = handle(HT_SETPROP, t_setprop_name, &p1, this);
             }
             else
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
@@ -2345,8 +2345,14 @@ void MCPlayer::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 					MCGImageCreateWithRaster(t_raster, t_image.image);
 				else
 					MCGImageCreateWithRasterNoCopy(t_raster, t_image.image);
+				
 				if (t_image . image != nil)
+				{
+					// IM-2017-05-11: [[ Bug 18939 ]] Set x/y scales for image, which may be scaled.
+					t_image.x_scale = MCGFloat(MCGImageGetWidth(t_image.image)) / MCGFloat(trect.width);
+					t_image.y_scale = MCGFloat(MCGImageGetHeight(t_image.image)) / MCGFloat(trect.height);
 					dc -> drawimage(t_image, 0, 0, trect.width, trect.height, trect.x, trect.y);
+				}
 				
 				MCGImageRelease(t_image.image);
 				MCPlatformUnlockPlayerBitmap(m_platform_player, t_bitmap);
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
diff --git a/engine/src/w32-clipboard.cpp b/engine/src/w32-clipboard.cpp
diff --git a/engine/src/w32dcw32.cpp b/engine/src/w32dcw32.cpp
diff --git a/ide-support/revdeploylibraryandroid.livecodescript b/ide-support/revdeploylibraryandroid.livecodescript
diff --git a/ide-support/revsaveasandroidstandalone.livecodescript b/ide-support/revsaveasandroidstandalone.livecodescript
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
diff --git a/libbrowser/src/libbrowser_cef.cpp b/libbrowser/src/libbrowser_cef.cpp
diff --git a/libfoundation/src/foundation-record.cpp b/libfoundation/src/foundation-record.cpp
diff --git a/libfoundation/src/foundation-typeinfo.cpp b/libfoundation/src/foundation-typeinfo.cpp
diff --git a/tests/lcs/core/engine/target.livecodescript b/tests/lcs/core/engine/target.livecodescript
diff --git a/tests/lcs/core/strings/format.livecodescript b/tests/lcs/core/strings/format.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix player image incorrectly scaled in edit mode`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure Android Studio works with LiveCode`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix clipboard ownership checks on windows causing private clipboard data to be cleared`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Update cursor when entering window on windows`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Make sure setting the iphoneSetAudioCategory is respected`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Modify tsNet libUrl wrapper to treat HTTP status codes > 400 as errors`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Errors building iOS standalones should only be reported once`
	`2`	`+`