Merge pull request livecode#4588 from peter-b/merge_develop-8.1_develop_20160929

peter-b · web-flow · commit 9e6e942b2ca3 · 2016-09-29T12:16:14.000+01:00
Merge develop-8.1 into develop
diff --git a/docs/dictionary/function/libUrlMultipartFormAddPart.lcdoc b/docs/dictionary/function/libUrlMultipartFormAddPart.lcdoc
@@ -21,25 +21,33 @@ Platforms: desktop, server
 Security: network
 
 Example:
-put empty into tForm
-put "dave" into tName
-put "hello" into tMessage
-if libURLMultipartFormData (tForm, "name", tName, "message", tMessage) \
-     is not empty then
-   ##handle error and exit
-end if
-set the httpHeaders to line 1 of tForm
-delete line 1 of tForm
-put "&lt;file&gt;" & "C:/myfile.gif" into tFile
-put "image/gif" into tType
-put "binary" into tEnc
-if libURLMultipartFormAddPart(tForm,"file", tFile, tType, tEnc) \
-    is empty then
-   ##handle error and exit
-else
-   post tForm to url tURL
-   set the httpHeaders to empty
-end if
+command UploadFileToServer pName, pMessage, pFilename
+  put the httpHeaders into tOrigHeaders
+  put empty into tForm
+  put libURLMultipartFormData (tForm, "name", pName, "message", pMessage) into tError
+  
+  if tError is empty then
+    set the httpHeaders to line 1 of tForm
+    delete line 1 of tForm
+    put "&lt;file&gt;" & pFilename into tFile
+    put "image/gif" into tType
+    put "binary" into tEnc
+    put libURLMultipartFormAddPart(tForm,"file", tFile, tType, tEnc) into tError
+  end if
+ 
+  if tError is empty then
+    post tForm to url tURL
+    put the result into tError
+  end if
+  
+  set the httpHeaders to tOrigHeaders
+  
+  if tError is not empty then
+    return tError for error
+  else
+    return empty for value
+  end if
+end UploadFileToServer
 
 Parameters:
 value:
diff --git a/docs/notes/bugfix-15384.md b/docs/notes/bugfix-15384.md
@@ -0,0 +1 @@
+# Fix incorrect handling of a 204 response from a server.
diff --git a/docs/notes/bugfix-17247.md b/docs/notes/bugfix-17247.md
@@ -1 +1 @@
-# Remove selection artefacts when handles are drawn outside of parent group rect
+# Remove selection artefacts when handles are drawn outside of parent group rect
diff --git a/docs/notes/bugfix-17779.md b/docs/notes/bugfix-17779.md
@@ -0,0 +1 @@
+# Fix scrolling group drawing outside its bounds when acceleratedRendering used.
diff --git a/docs/notes/bugfix-18349.md b/docs/notes/bugfix-18349.md
@@ -0,0 +1 @@
+# Fix variable contents modified when used to set stack name
diff --git a/docs/notes/bugfix-18472.md b/docs/notes/bugfix-18472.md
@@ -0,0 +1 @@
+# 'load url' is not properly cleaned up on socketError 
diff --git a/docs/notes/bugfix-18488.md b/docs/notes/bugfix-18488.md
@@ -0,0 +1 @@
+# Error returned by hostnametoaddress was not being reported in libURL.
diff --git a/docs/notes/bugfix-18496.md b/docs/notes/bugfix-18496.md
@@ -0,0 +1 @@
+# Fix memory leak when using filter on unicode strings
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -3046,6 +3046,20 @@ void MCCard::drawselectedchildren(MCDC *dc)
     while (tptr != objptrs);
 }
 
+void MCCard::dirtyselection(const MCRectangle &p_rect)
+{
+	// redraw marquee rect
+	// selrect with 0 width or height will still draw a 1px line, so increase rect size to account for this.
+	layer_dirtyrect(MCU_reduce_rect(p_rect, -1));
+	
+	// redraw selection handles
+	MCRectangle t_handles[8];
+	MCControl::sizerects(p_rect, t_handles);
+
+	for (uint32_t i = 0; i < 8; i++)
+		layer_dirtyrect(t_handles[i]);
+}
+
 bool MCCard::updatechildselectedrect(MCRectangle& x_rect)
 {
     bool t_updated;
diff --git a/engine/src/card.h b/engine/src/card.h
@@ -217,6 +217,11 @@ class MCCard : public MCObject
 	// IM-2013-09-13: [[ RefactorGraphics ]] render the card selection rect
 	void drawselectionrect(MCContext *);
     void drawselectedchildren(MCDC *dc);
+	
+	// IM-2016-09-26: [[ Bug 17247 ]] request redraw of the area occupied by
+	//      selection marquee + handles
+	void dirtyselection(const MCRectangle &p_rect);
+	
     bool updatechildselectedrect(MCRectangle& x_rect);
     
 	Exec_stat openbackgrounds(bool p_is_preopen, MCCard *p_other);
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -433,6 +433,8 @@ void MCControl::select()
 
 	// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
 	layer_redrawall();
+	
+	getcard()->dirtyselection(rect);
 }
 
 void MCControl::deselect()
@@ -446,6 +448,8 @@ void MCControl::deselect()
 		// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
 		layer_redrawall();
         
+		getcard()->dirtyselection(rect);
+
         state &= ~(CS_SELECTED | CS_MOVE | CS_SIZE | CS_CREATE);
 	}
 }
@@ -790,30 +794,30 @@ void MCControl::redraw(MCDC *dc, const MCRectangle &dirty)
 	}
 }
 
-void MCControl::sizerects(MCRectangle *rects)
+void MCControl::sizerects(const MCRectangle &p_object_rect, MCRectangle r_rects[8])
 {
 	int2 x[3];
 	int2 y[3];
 
 	uint2 handlesize = MCsizewidth;
-    
-    x[0] = rect.x - (handlesize >> 1);
- 	x[1] = rect.x + ((rect.width - handlesize) >> 1);
-    x[2] = rect.x + rect.width - (handlesize >> 1);
-    y[0] = rect.y - (handlesize >> 1);
- 	y[1] = rect.y + ((rect.height - handlesize) >> 1);
-    y[2] = rect.y + rect.height - (handlesize >> 1);
 
+	x[0] = p_object_rect.x - (handlesize >> 1);
+	x[1] = p_object_rect.x + ((p_object_rect.width - handlesize) >> 1);
+	x[2] = p_object_rect.x + p_object_rect.width - (handlesize >> 1);
+	y[0] = p_object_rect.y - (handlesize >> 1);
+	y[1] = p_object_rect.y + ((p_object_rect.height - handlesize) >> 1);
+	y[2] = p_object_rect.y + p_object_rect.height - (handlesize >> 1);
+	
 	uint2 i;
 	uint2 j;
 	uint2 k = 0;
 	for (i = 0 ; i < 3 ; i++)
 		for (j = 0 ; j < 3 ; j++)
 			if (i != 1 || j != 1)
 			{
-				rects[k].width = rects[k].height = handlesize;
-				rects[k].x = x[j];
-				rects[k].y = y[i];
+				r_rects[k].width = r_rects[k].height = handlesize;
+				r_rects[k].x = x[j];
+				r_rects[k].y = y[i];
 				k++;
 			}
 }
@@ -833,7 +837,7 @@ void MCControl::drawselected(MCDC *dc)
     drawmarquee(dc, rect);
     
     MCRectangle rects[8];
-    sizerects(rects);
+    sizerects(rect, rects);
     if (flags & F_LOCK_LOCATION)
         dc->setfillstyle(FillStippled, nil, 0, 0);
     else
@@ -1173,7 +1177,7 @@ uint2 MCControl::sizehandles(int2 px, int2 py)
 	if (!(flags & F_LOCK_LOCATION))
 	{
 		MCRectangle rects[8];
-		sizerects(rects);
+		sizerects(rect, rects);
 		int2 i;
 		for (i = 7 ; i >= 0 ; i--)
         {
@@ -1719,9 +1723,6 @@ MCRectangle MCControl::geteffectiverect(void) const
 	MCRectangle t_rect;
 	t_rect = MCU_reduce_rect(rect, -gettransient());
 
-    if (state & CS_SELECTED)
-        t_rect = MCU_reduce_rect(t_rect, -MCsizewidth);
-    
 	if (m_bitmap_effects != nil)
 		MCBitmapEffectsComputeBounds(m_bitmap_effects, t_rect, t_rect);
 
diff --git a/engine/src/exec-interface-stack.cpp b/engine/src/exec-interface-stack.cpp
@@ -412,20 +412,25 @@ void MCStack::SetName(MCExecContext& ctxt, MCStringRef p_name)
 	}
 
 	// We don't allow ',' in stack names - so coerce to '_'.
-	MCStringFindAndReplaceChar(p_name, ',', '_', kMCCompareExact);
+	MCAutoStringRef t_new_string;
+	if (t_success)
+		t_success = MCStringMutableCopy(p_name, &t_new_string);
+	
+	if (t_success)
+		t_success = MCStringFindAndReplaceChar(*t_new_string, ',', '_', kMCCompareExact);
 
 	if (t_success)
 	{
 		// If the name is going to be empty, coerce to 'Untitled'.
-		if (MCStringGetLength(p_name) == 0)
+		if (MCStringGetLength(*t_new_string) == 0)
 		{
 			MCAutoStringRef t_untitled;
 			t_success = MCStringCreateWithCString(MCuntitledstring, &t_untitled);
 			if (t_success)
 				MCObject::SetName(ctxt, *t_untitled);
 		}
 		else
-			MCObject::SetName(ctxt, p_name);
+			MCObject::SetName(ctxt, *t_new_string);
 	}
 
 	if (t_success && !ctxt . HasError())
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -2086,6 +2086,13 @@ bool MCGroup::computeminrect(Boolean scrolling)
 			t_all = true;
 		state = oldstate;
 		
+		// IM-2016-09-27: [[ Bug 17779 ]] redrawselection handles if selected
+		if (getselected())
+		{
+			getcard()->dirtyselection(oldrect);
+			getcard()->dirtyselection(rect);
+		}
+		
 		// IM-2015-12-16: [[ NativeLayer ]] The group rect has changed, so send geometry change notification.
 		geometrychanged(getrect());
 		
@@ -3115,22 +3122,3 @@ void MCGroup::scheduledelete(bool p_is_child)
 		while(t_control != controls);
 	}
 }
-
-MCRectangle MCGroup::geteffectiverect(void) const
-{
-    MCRectangle t_rect;
-    t_rect = MCControl::geteffectiverect();
-    
-    if (controls != NULL)
-    {
-        MCControl *t_control;
-        t_control = controls;
-        do
-        {   t_rect = MCU_union_rect(t_rect, t_control -> geteffectiverect());
-            t_control = t_control -> next();
-        }
-        while(t_control != controls);
-    }
-    
-    return t_rect;
-}
diff --git a/engine/src/group.h b/engine/src/group.h
@@ -150,11 +150,6 @@ class MCGroup : public MCControl
     
     virtual bool isdeletable(bool p_check_flag);
     
-    // This call computes the pixel bounds of the group, rather than
-    // just its active bounds - transients, bitmap effects and selection
-    // handles of a group's children may extend beyond the group's bounds.
-    virtual MCRectangle geteffectiverect(void) const;
-    
     void drawselectedchildren(MCDC *dc);
     bool updatechildselectedrect(MCRectangle& x_rect);
     
diff --git a/engine/src/mccontrol.h b/engine/src/mccontrol.h
@@ -156,7 +156,9 @@ class MCControl : public MCObject
 
 	void redraw(MCDC *dc, const MCRectangle &dirty);
 
-	void sizerects(MCRectangle *rects);
+	// IM-2016-09-26: [[ Bug 17247 ]] Return rect of selection handles for the given object rect
+	static void sizerects(const MCRectangle &p_object_rect, MCRectangle rects[8]);
+	
 	void drawselected(MCDC *dc);
 	void drawarrow(MCDC *dc, int2 x, int2 y, uint2 size,
 	               Arrow_direction dir, Boolean border, Boolean hilite);
diff --git a/engine/src/osxprinter.cpp b/engine/src/osxprinter.cpp
@@ -1111,25 +1111,16 @@ static void FreeData(void *info, const void *data, size_t size)
 	free(info);
 }
 
-static CGColorSpaceRef OSX_CGColorSpaceCreateWithProfile(const char *p_profile_path)
+static CGColorSpaceRef OSX_CGColorSpaceCreateWithProfile(CFStringRef p_name)
 {
-	OSStatus t_err;
-	t_err = noErr;
-
-	CMProfileLocation t_location;
-	t_location . locType = cmPathBasedProfile;
-	strcpy(t_location . u . pathLoc . path, p_profile_path);
-	
-	CMProfileRef t_profile;
-	t_profile = NULL;
-	
-	t_err = CMOpenProfile(&t_profile, &t_location);
-	if (t_err == noErr)
+	ColorSyncProfileRef t_profile =
+		ColorSyncProfileCreateWithName(p_name);
+	if (t_profile != nil)
 	{
 		CGColorSpaceRef t_colorspace;
 		t_colorspace = CGColorSpaceCreateWithPlatformColorSpace(t_profile);
 		
-		CMCloseProfile(t_profile);
+		CFRelease(t_profile);
 		
 		return t_colorspace;
 	}
@@ -1142,7 +1133,7 @@ static CGColorSpaceRef OSX_CGColorSpaceCreateGenericGray(void)
 	static CGColorSpaceRef s_colorspace = NULL;
 	if (s_colorspace == NULL)
 	{
-		s_colorspace = OSX_CGColorSpaceCreateWithProfile("/System/Library/ColorSync/Profiles/Generic Gray Profile.icc");
+		s_colorspace = OSX_CGColorSpaceCreateWithProfile(kColorSyncGenericGrayProfile);
 		if (s_colorspace == NULL)
 			s_colorspace = CGColorSpaceCreateDeviceGray();
 	}
@@ -1157,7 +1148,7 @@ CGColorSpaceRef OSX_CGColorSpaceCreateGenericRGB(void)
 	static CGColorSpaceRef s_colorspace = NULL;
 	if (s_colorspace == NULL)
 	{
-		s_colorspace = OSX_CGColorSpaceCreateWithProfile("/System/Library/ColorSync/Profiles/Generic RGB Profile.icc");
+		s_colorspace = OSX_CGColorSpaceCreateWithProfile(kColorSyncGenericRGBProfile);
 		if (s_colorspace == NULL)
 			s_colorspace = CGColorSpaceCreateDeviceRGB();
 	}
diff --git a/engine/src/redraw.cpp b/engine/src/redraw.cpp
@@ -358,6 +358,10 @@ void MCControl::layer_setrect(const MCRectangle& p_new_rect, bool p_redraw_all)
 		return;
 	}
 
+	// IM-2016-09-26: [[ Bug 17247 ]] dirty old selection rect
+	if (getselected())
+		getcard()->dirtyselection(rect);
+	
 	MCRectangle t_old_effectiverect;
 	t_old_effectiverect = geteffectiverect();
 
@@ -369,6 +373,10 @@ void MCControl::layer_setrect(const MCRectangle& p_new_rect, bool p_redraw_all)
 		
 	setrect(p_new_rect);
 
+	// IM-2016-09-26: [[ Bug 17247 ]] dirty new selection rect
+	if (getselected())
+		getcard()->dirtyselection(rect);
+
 	layer_changeeffectiverect(t_old_effectiverect, p_redraw_all, t_is_visible);
 }
 
@@ -555,8 +563,12 @@ void MCControl::layer_dirtyeffectiverect(const MCRectangle& p_effective_rect, bo
 			return;
 		}
 		
-		// Otherwise intersect the dirty rect with the parent's effective rect.
-		t_dirty_rect = MCU_intersect_rect(t_dirty_rect, t_parent_control -> geteffectiverect());
+		// Otherwise intersect the dirty rect with the parent's rect.
+		t_dirty_rect = MCU_intersect_rect(t_dirty_rect, t_control -> parent -> getrect());
+
+		// Expand due to bitmap effects (if any).
+		if (t_parent_control -> m_bitmap_effects != nil)
+			MCBitmapEffectsComputeBounds(t_parent_control -> m_bitmap_effects, t_dirty_rect, t_dirty_rect);
 
 		t_control = t_parent_control;
 	}
diff --git a/engine/src/sellst.cpp b/engine/src/sellst.cpp
@@ -540,12 +540,9 @@ void MCSellist::continuemove(int2 x, int2 y)
 		}
 		if (cptr->moveable())
 		{
-			// IM-2014-09-09: [[ Bug 13222 ]] Use the layer_setrect method to ensure the old
-			// effectiverect is appropriately dirtied when edittools are displayed for a graphic
-			if (cptr->resizeparent())
-				cptr->setrect(trect);
-			else
-				cptr->layer_setrect(trect, false);
+			// IM-2016-09-27: [[ Bug 17779 ]] Change to always calling layer_setrect, which invalidates selection handles if required.
+			cptr->layer_setrect(trect, false);
+			cptr->resizeparent();
 		}
 		tptr = tptr->next();
 	}
diff --git a/ide-support/revliburl.livecodescript b/ide-support/revliburl.livecodescript
diff --git a/libfoundation/include/foundation-auto.h b/libfoundation/include/foundation-auto.h
diff --git a/libfoundation/include/foundation-text.h b/libfoundation/include/foundation-text.h
diff --git a/libfoundation/src/foundation-string.cpp b/libfoundation/src/foundation-string.cpp
diff --git a/libfoundation/src/foundation-text.cpp b/libfoundation/src/foundation-text.cpp
diff --git a/libfoundation/src/foundation-unicode.cpp b/libfoundation/src/foundation-unicode.cpp
diff --git a/tests/lcs/core/interface/stack.livecodescript b/tests/lcs/core/interface/stack.livecodescript
diff --git a/tests/lcs/liburl/status_codes.livecodescript b/tests/lcs/liburl/status_codes.livecodescript

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix incorrect handling of a 204 response from a server.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# Remove selection artefacts when handles are drawn outside of parent group rect`
	`1`	`+# Remove selection artefacts when handles are drawn outside of parent group rect`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix scrolling group drawing outside its bounds when acceleratedRendering used.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix variable contents modified when used to set stack name`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# 'load url' is not properly cleaned up on socketError`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Error returned by hostnametoaddress was not being reported in libURL.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix memory leak when using filter on unicode strings`