Merge branch 'develop' of https://www.github.com/runrev/livecode into refactor-syntax_6_7_rc_1_merge

runrevali · runrevali · commit db738e78c2e8 · 2014-08-26T17:05:03.000+01:00
Conflicts:
	ide
diff --git a/docs/notes/bugfix-11755.md b/docs/notes/bugfix-11755.md
@@ -0,0 +1 @@
+# flip graphic gives erroneous results with complex graphics
diff --git a/docs/notes/bugfix-12327.md b/docs/notes/bugfix-12327.md
diff --git a/docs/notes/bugfix-12880.md b/docs/notes/bugfix-12880.md
@@ -0,0 +1 @@
+# File->Exit should be File->Quit 
diff --git a/docs/notes/bugfix-13118.md b/docs/notes/bugfix-13118.md
@@ -0,0 +1 @@
+# Add Hi-DPI support option to Windows standalone settings dialog.
diff --git a/docs/notes/bugfix-13159.md b/docs/notes/bugfix-13159.md
@@ -0,0 +1 @@
+# Palettes not observing decorations under certain circumstances
diff --git a/docs/notes/bugfix-13190.md b/docs/notes/bugfix-13190.md
@@ -0,0 +1 @@
+# iOS standalone building fails with "cannot find valid identity"
diff --git a/docs/notes/bugfix-13191.md b/docs/notes/bugfix-13191.md
@@ -0,0 +1 @@
+# FIX: flip graphic horizontally and vertically for complex graphics
diff --git a/docs/notes/bugfix-13215.md b/docs/notes/bugfix-13215.md
@@ -0,0 +1 @@
+# Can't type in output field of message box
diff --git a/docs/notes/bugfix-13261.md b/docs/notes/bugfix-13261.md
@@ -0,0 +1 @@
+# Visual effect push problem
diff --git a/docs/notes/bugfix-13264.md b/docs/notes/bugfix-13264.md
@@ -0,0 +1 @@
+# App crashes when showing referenced images on Android devices
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -392,9 +392,9 @@ class MCDesktopStackSurface: public MCStackSurface
 	}
 	
     // MM-2014-07-31: [[ ThreadedRendering ]] Updated to wrap new platform surface API.
-	bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster)
+	bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
 	{
-		return MCPlatformSurfaceLockPixels(m_surface, p_area, r_raster);
+		return MCPlatformSurfaceLockPixels(m_surface, p_area, r_raster, r_locked_area);
 	}
 	
     // MM-2014-07-31: [[ ThreadedRendering ]] Updated to wrap new platform surface API.
diff --git a/engine/src/lnxstack.cpp b/engine/src/lnxstack.cpp
@@ -817,25 +817,26 @@ class MCLinuxStackSurface: public MCStackSurface
 	bool LockGraphics(MCGIntegerRectangle p_area, MCGContextRef& r_context, MCGRaster &r_raster)
 	{
 		MCGRaster t_raster;
-		if (LockPixels(p_area, t_raster))
+		MCGIntegerRectangle t_locked_area;
+		if (LockPixels(p_area, t_raster, t_locked_area))
 		{
             MCGContextRef t_context;
 			if (MCGContextCreateWithRaster(t_raster, t_context))
 			{
 				// Set origin
-				MCGContextTranslateCTM(t_context, -p_area . origin.x, -p_area . origin.y);
+				MCGContextTranslateCTM(t_context, -t_locked_area . origin.x, -t_locked_area . origin.y);
 
 				// Set clipping rect
                 MCGContextClipToRegion(t_context, m_region);
-				MCGContextClipToRect(t_context, MCGIntegerRectangleToMCGRectangle(p_area));
+				MCGContextClipToRect(t_context, MCGIntegerRectangleToMCGRectangle(t_locked_area));
 				
 				r_context = t_context;
                 r_raster = t_raster;
 				
 				return true;
 			}
 			
-			UnlockPixels(p_area, t_raster);
+			UnlockPixels(t_locked_area, t_raster);
 		}
 		
 		return false;
@@ -850,7 +851,7 @@ class MCLinuxStackSurface: public MCStackSurface
 		UnlockPixels(p_area, p_raster);
 	}
 
-	bool LockPixels(MCGIntegerRectangle p_area, MCGRaster &r_raster)
+	bool LockPixels(MCGIntegerRectangle p_area, MCGRaster &r_raster, MCGIntegerRectangle &r_locked_area)
 	{
 		if (m_bitmap == nil)
 			return false;
@@ -871,6 +872,9 @@ class MCLinuxStackSurface: public MCStackSurface
         r_raster . stride = m_raster . stride;
         r_raster . format = kMCGRasterFormat_xRGB;
         r_raster . pixels = t_bits;
+
+		r_locked_area = t_actual_area;
+
         return true;
 	}
 
diff --git a/engine/src/mac-av-player.mm b/engine/src/mac-av-player.mm
@@ -693,6 +693,13 @@ - (void)setPlayer:(AVPlayer *)player
     [m_view setPlayer: nil];
     [m_player removeTimeObserver:m_time_observer_token];
 
+    @try
+    {
+        [m_player removeObserver: m_observer forKeyPath: @"currentItem.loadedTimeRanges"];
+    }
+    @catch (id anException) {
+        //do nothing, obviously it wasn't attached because an exception was thrown
+    }
     [m_player release];
     
     // PM-2014-08-25: [[ Bug 13268 ]] Make sure we release the frame of the old movie before loading a new one
diff --git a/engine/src/mac-internal.h b/engine/src/mac-internal.h
@@ -366,7 +366,7 @@ class MCMacPlatformSurface: public MCPlatformSurface
 	virtual bool LockGraphics(MCGIntegerRectangle area, MCGContextRef& r_context, MCGRaster &r_raster);
 	virtual void UnlockGraphics(MCGIntegerRectangle area, MCGContextRef context, MCGRaster &raster);
 	
-	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster);
+	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area);
 	virtual void UnlockPixels(MCGIntegerRectangle area, MCGRaster& raster);
 	
 	virtual bool LockSystemContext(void*& r_context);
diff --git a/engine/src/mac-surface.mm b/engine/src/mac-surface.mm
@@ -87,7 +87,8 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 bool MCMacPlatformSurface::LockGraphics(MCGIntegerRectangle p_region, MCGContextRef& r_context, MCGRaster &r_raster)
 {
 	MCGRaster t_raster;
-	if (LockPixels(p_region, t_raster))
+	MCGIntegerRectangle t_locked_area;
+	if (LockPixels(p_region, t_raster, t_locked_area))
 	{
         MCGContextRef t_gcontext;
 		if (MCGContextCreateWithRaster(t_raster, t_gcontext))
@@ -99,10 +100,7 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 			MCGContextScaleCTM(t_gcontext, t_scale, t_scale);
 			
 			// Set origin
-            MCGIntegerRectangle t_bounds;
-            t_bounds = MCGRegionGetBounds(m_update_rgn);
-            
-			MCGContextTranslateCTM(t_gcontext, -p_region . origin . x, -p_region . origin . y);
+			MCGContextTranslateCTM(t_gcontext, -t_locked_area . origin . x, -t_locked_area . origin . y);
 			
 			// Set clipping rect
             MCGContextClipToRegion(t_gcontext, m_update_rgn);
@@ -113,6 +111,8 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 			
 			return true;
 		}
+		
+		UnlockPixels(t_locked_area, t_raster);
 	}
     return false;
 }
@@ -130,7 +130,7 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to use the new platform surface API.
 //  We create a single backing buffer for the entire surface (created the first time lock pixels is called)
 //  and return a raster that points to the desired region of the backing buffer.
-bool MCMacPlatformSurface::LockPixels(MCGIntegerRectangle p_region, MCGRaster& r_raster)
+bool MCMacPlatformSurface::LockPixels(MCGIntegerRectangle p_region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
 {
     MCGIntegerRectangle t_bounds;
     t_bounds = MCGRegionGetBounds(m_update_rgn);
@@ -164,6 +164,8 @@ CGRect MCMacFlipCGRect(const CGRect &p_rect, uint32_t p_surface_height)
     r_raster . format = kMCGRasterFormat_xRGB;
     r_raster . pixels = (uint8_t*)m_raster . pixels + (int32_t)((t_actual_area . origin . y - t_bounds . origin.y) * t_scale * m_raster . stride + (t_actual_area . origin . x - t_bounds . origin . x) * t_scale * sizeof(uint32_t));
     
+	r_locked_area = t_actual_area;
+	
     return true;
 }
 
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -671,25 +671,26 @@ class MCAndroidStackSurface: public MCStackSurface
     bool LockGraphics(MCGIntegerRectangle p_area, MCGContextRef &r_context, MCGRaster &r_raster)
 	{
 		MCGRaster t_raster;
-		if (LockPixels(p_area, t_raster))
+		MCGIntegerRectangle t_locked_area;
+		if (LockPixels(p_area, t_raster, t_locked_area))
 		{
             MCGContextRef t_context;
             if (MCGContextCreateWithRaster(t_raster, t_context))
 			{
 				// Set origin
-                MCGContextTranslateCTM(t_context, -p_area . origin . x, -p_area . origin . y);
+                MCGContextTranslateCTM(t_context, -t_locked_area . origin . x, -t_locked_area . origin . y);
                 
 				// Set clipping rect
                 MCGContextClipToRegion(t_context, m_region);
-				MCGContextClipToRect(t_context, MCGIntegerRectangleToMCGRectangle(p_area));
+				MCGContextClipToRect(t_context, MCGIntegerRectangleToMCGRectangle(t_locked_area));
 				
 				r_context = t_context;
                 r_raster = t_raster;
 				
 				return true;
 			}
 			
-			UnlockPixels(p_area, t_raster, false);
+			UnlockPixels(t_locked_area, t_raster, false);
 		}
 		
 		return false;
@@ -707,7 +708,7 @@ class MCAndroidStackSurface: public MCStackSurface
 		MCGRegionAddRegion(s_android_bitmap_dirty_region, m_region);
 	}
     
-    bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster)
+    bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
     {
         MCGIntegerRectangle t_actual_area;
         t_actual_area = MCGIntegerRectangleIntersection(p_area, MCGRegionGetBounds(m_region));
@@ -720,6 +721,9 @@ class MCAndroidStackSurface: public MCStackSurface
         r_raster . stride = s_android_bitmap_stride;
         r_raster . format = kMCGRasterFormat_xRGB;
 		r_raster.pixels = (uint8_t*)m_pixels + t_actual_area . origin . y * s_android_bitmap_stride + t_actual_area . origin . x * sizeof(uint32_t);
+
+		r_locked_area = t_actual_area;
+
         return true;
     }
 
@@ -818,15 +822,16 @@ class MCOpenGLStackSurface: public MCStackSurface
     bool LockGraphics(MCGIntegerRectangle p_area, MCGContextRef &r_context, MCGRaster &r_raster)
 	{
 		MCGRaster t_raster;
-		if (LockPixels(p_area, t_raster))
+		MCGIntegerRectangle t_locked_area;
+		if (LockPixels(p_area, t_raster, t_locked_area))
 		{
             MCGContextRef t_context;
             if (MCGContextCreateWithRaster(t_raster, t_context))
 			{
                 r_raster = t_raster;
 				return true;
 			}
-			UnlockPixels(p_area, t_raster, false);
+			UnlockPixels(t_locked_area, t_raster, false);
 		}
 		return false;
 	}
@@ -840,7 +845,7 @@ class MCOpenGLStackSurface: public MCStackSurface
 		UnlockPixels(p_area, p_raster);
 	}
 
-    bool LockPixels(MCGIntegerRectangle p_area, MCGRaster &r_raster)
+    bool LockPixels(MCGIntegerRectangle p_area, MCGRaster &r_raster, MCGIntegerRectangle &r_locked_area)
 	{
 		if (m_locked)
 			return false;
@@ -851,6 +856,8 @@ class MCOpenGLStackSurface: public MCStackSurface
 		r_raster.pixels = m_buffer_pixels;
 		r_raster.format = kMCGRasterFormat_xRGB;
         
+		r_locked_area = p_area;
+
 		m_locked = true;
         
 		return true;
@@ -1100,8 +1107,9 @@ void MCStack::preservescreenforvisualeffect(const MCRectangle& p_rect)
 	if (t_surface . Lock())
 	{
 		MCGRaster t_raster;
+		MCGIntegerRectangle t_locked_area;
 		// Lock the whole surface of the bitmap.
-		if (t_surface . LockPixels(t_rect, t_raster))
+		if (t_surface . LockPixels(t_rect, t_raster, t_locked_area))
 		{
 			// We need the contents of the last presented framebuffer. To ensure
 			// we get that, force an (OpenGL) update before reading the pixels.
diff --git a/engine/src/mbliphonegfx.mm b/engine/src/mbliphonegfx.mm
@@ -126,25 +126,26 @@ static void do_update(void *p_dirty)
 	bool LockGraphics(MCGIntegerRectangle p_area, MCGContextRef &r_context, MCGRaster &r_raster)
 	{
 		MCGRaster t_raster;
-		if (LockPixels(p_area, t_raster))
+		MCGIntegerRectangle t_locked_area;
+		if (LockPixels(p_area, t_raster, t_locked_area))
 		{
             MCGContextRef t_context;
             if (MCGContextCreateWithRaster(t_raster, t_context))
 			{
 				// Set origin
-                MCGContextTranslateCTM(t_context, -p_area . origin . x, -p_area . origin . y);
+                MCGContextTranslateCTM(t_context, -t_locked_area . origin . x, -t_locked_area . origin . y);
                 
 				// Set clipping rect
                 MCGContextClipToRegion(t_context, m_region);
-				MCGContextClipToRect(t_context, MCGIntegerRectangleToMCGRectangle(p_area));
+				MCGContextClipToRect(t_context, MCGIntegerRectangleToMCGRectangle(t_locked_area));
 				
 				r_context = t_context;
                 r_raster = t_raster;
 				
 				return true;
 			}
 			
-			UnlockPixels(p_area, t_raster, false);
+			UnlockPixels(t_locked_area, t_raster, false);
 		}
 		
 		return false;
@@ -159,7 +160,7 @@ void UnlockGraphics(MCGIntegerRectangle p_area, MCGContextRef p_context, MCGRast
 		UnlockPixels(p_area, p_raster, true);
 	}
 	
-    bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster)
+    bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
     {
         MCGIntegerRectangle t_actual_area;
         t_actual_area = MCGIntegerRectangleIntersection(p_area, MCGRegionGetBounds(m_region));
@@ -176,6 +177,9 @@ bool LockPixels(MCGIntegerRectangle p_area, MCGRaster& r_raster)
             r_raster . stride = r_raster . width * sizeof(uint32_t);
             r_raster . format = kMCGRasterFormat_xRGB;
             r_raster . pixels = t_bits;
+
+			r_locked_area = t_actual_area;
+
             return true;
         }
         
diff --git a/engine/src/platform-internal.h b/engine/src/platform-internal.h
@@ -30,7 +30,7 @@ class MCPlatformSurface
 	virtual bool LockGraphics(MCGIntegerRectangle area, MCGContextRef& r_context, MCGRaster &r_raster) = 0;
 	virtual void UnlockGraphics(MCGIntegerRectangle area, MCGContextRef context, MCGRaster &raster) = 0;
 	
-	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster) = 0;
+	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area) = 0;
 	virtual void UnlockPixels(MCGIntegerRectangle area, MCGRaster& raster) = 0;
 	
 	virtual bool LockSystemContext(void*& r_context) = 0;
diff --git a/engine/src/platform-surface.cpp b/engine/src/platform-surface.cpp
@@ -48,9 +48,9 @@ void MCPlatformSurfaceUnlockGraphics(MCPlatformSurfaceRef p_surface, MCGIntegerR
 }
 
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to use new platform surface API.
-bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef p_surface, MCGIntegerRectangle p_region, MCGRaster& r_raster)
+bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef p_surface, MCGIntegerRectangle p_region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area)
 {
-	return p_surface -> LockPixels(p_region, r_raster);
+	return p_surface -> LockPixels(p_region, r_raster, r_locked_area);
 }
 
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to use new platform surface API.
diff --git a/engine/src/platform.h b/engine/src/platform.h
@@ -903,7 +903,8 @@ bool MCPlatformSurfaceLockGraphics(MCPlatformSurfaceRef surface, MCGIntegerRecta
 void MCPlatformSurfaceUnlockGraphics(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGContextRef p_context, MCGRaster& p_raster);
 
 // MM-2014-07-31: [[ ThreadedRendering ]] Updated to match new platform surface API.
-bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGRaster& r_raster);
+// IM-2014-08-26: [[ Bug 13261 ]] Return the actual locked area covered by the pixels
+bool MCPlatformSurfaceLockPixels(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area);
 void MCPlatformSurfaceUnlockPixels(MCPlatformSurfaceRef surface, MCGIntegerRectangle region, MCGRaster& p_raster);
 
 bool MCPlatformSurfaceLockSystemContext(MCPlatformSurfaceRef surface, void*& r_context);
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
@@ -3555,7 +3555,7 @@ void MCPlayer::handle_mdown(int p_which)
             t_duration = getduration();
             
             // PM-2014-08-22 [[ Bug 13257 ]] Make sure t_new_time will not overflow
-            t_new_time = _muludiv64(mx - t_part_well_rect . x, t_duration, t_part_well_rect . width);
+            t_new_time = _muludiv64(t_duration, mx - t_part_well_rect . x, t_part_well_rect . width);
             
             // PM-2014-07-09: [[ Bug 12753 ]] If video is playing and we click before the starttime, don't allow video to be played outside the selection
             if (!ispaused() && t_new_time < starttime && getflag(F_PLAY_SELECTION))
@@ -3685,8 +3685,11 @@ void MCPlayer::handle_mfocus(int x, int y)
                 int32_t t_new_time, t_duration;
                 t_duration = getduration();
                 
+                if (x < t_part_well_rect . x)
+                    x = t_part_well_rect . x;
+                
                 // PM-2014-08-22 [[ Bug 13257 ]] Make sure t_new_time will not overflow
-                t_new_time = _muludiv64(x - t_part_well_rect . x, t_duration, t_part_well_rect . width);
+                t_new_time = _muludiv64(t_duration, x - t_part_well_rect . x, t_part_well_rect . width);
                 
                 if (t_new_time < 0)
                     t_new_time = 0;
@@ -3709,7 +3712,7 @@ void MCPlayer::handle_mfocus(int x, int y)
                     x = t_part_well_rect . x;
                 
                 // PM-2014-08-22 [[ Bug 13257 ]] Make sure t_new_start_time will not overflow
-                t_new_start_time = _muludiv64(x - t_part_well_rect . x, t_duration, t_part_well_rect . width);
+                t_new_start_time = _muludiv64(t_duration, x - t_part_well_rect . x, t_part_well_rect . width);
                 
                 if (t_new_start_time >= endtime)
                     t_new_start_time = endtime;
@@ -3734,7 +3737,7 @@ void MCPlayer::handle_mfocus(int x, int y)
                 t_duration = getduration();
                 
                 // PM-2014-08-22 [[ Bug 13257 ]] Make sure t_new_finish_time will not overflow
-                t_new_finish_time = _muludiv64(x - t_part_well_rect . x, t_duration, t_part_well_rect . width);
+                t_new_finish_time = _muludiv64(t_duration, x - t_part_well_rect . x, t_part_well_rect . width);
                 
                 if (t_new_finish_time <= starttime)
                     t_new_finish_time = starttime;
@@ -3890,7 +3893,7 @@ void MCPlayer::handle_shift_mdown(int p_which)
             t_old_end = getendtime();
             
             // PM-2014-08-22 [[ Bug 13257 ]] Make sure t_new_time will not overflow
-            t_new_time = _muludiv64(mx - t_part_well_rect . x, t_duration, t_part_well_rect . width);
+            t_new_time = _muludiv64(t_duration, mx - t_part_well_rect . x, t_part_well_rect . width);
 
             // If click before current starttime, adjust that.
             // If click after current endtime, adjust that.
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -107,7 +107,8 @@ class MCStackSurface
 	
 	// Lock the pixels within the given region. The bits are returned relative
 	// to the top-left of the region.
-	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster) = 0;
+	// IM-2014-08-26: [[ Bug 13261 ]] Return the actual locked area covered by the pixels
+	virtual bool LockPixels(MCGIntegerRectangle area, MCGRaster& r_raster, MCGIntegerRectangle &r_locked_area) = 0;
 	// Unlock the surface.
 	virtual void UnlockPixels(MCGIntegerRectangle area, MCGRaster& raster) = 0;
 	
diff --git a/engine/src/sysunxthreads.cpp b/engine/src/sysunxthreads.cpp
diff --git a/engine/src/tilecachesw.cpp b/engine/src/tilecachesw.cpp
diff --git a/engine/src/w32stack.cpp b/engine/src/w32stack.cpp
diff --git a/ide b/ide

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# flip graphic gives erroneous results with complex graphics`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Add Hi-DPI support option to Windows standalone settings dialog.`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Palettes not observing decorations under certain circumstances`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# iOS standalone building fails with "cannot find valid identity"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# FIX: flip graphic horizontally and vertically for complex graphics`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Can't type in output field of message box`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# App crashes when showing referenced images on Android devices`