[[ FullscreenMode ]] Add MCStack::view_configure to reconfigure view bounds after window rect changes

livecodeian · livecodeian · commit 12eec7605d9d · 2013-10-10T12:16:31.000+01:00
[[ FullscreenMode ]] Fix Linux popup location &amp; mouse position offsets
diff --git a/engine/src/cmdss.cpp b/engine/src/cmdss.cpp
@@ -861,7 +861,7 @@ Exec_stat MCGo::exec(MCExecPoint &ep)
 		
 		// MW-2011-10-17: [[ Bug 9811 ]] Make sure we configure the new card now.
 		MCRedrawDisableScreenUpdates();
-		sptr -> configure(True);
+		sptr -> view_configure(True);
 		MCRedrawEnableScreenUpdates();
 			
 		Boolean t_abort;
diff --git a/engine/src/dispatch.cpp b/engine/src/dispatch.cpp
@@ -1261,7 +1261,7 @@ void MCDispatch::configure(Window w)
 {
 	MCStack *target = findstackd(w);
 	if (target != NULL)
-		target->configure(True);
+		target->view_configure(true);
 }
 
 void MCDispatch::enter(Window w)
diff --git a/engine/src/eventqueue.cpp b/engine/src/eventqueue.cpp
@@ -239,7 +239,7 @@ static void MCEventQueueDispatchEvent(MCEvent *p_event)
 		break;
 
 	case kMCEventTypeWindowReshape:
-		t_event -> window . stack -> configure(True);
+		t_event -> window . stack -> view_configure(true);
 		break;
 			
 	case kMCEventTypeMouseFocus:
diff --git a/engine/src/lnxdce.cpp b/engine/src/lnxdce.cpp
@@ -274,10 +274,13 @@ Boolean MCScreenDC::getmouseclick(uint2 button, Boolean& r_abort)
 				        || bpevent->state >> 8 & 0x1F & ~(0x1L << button - 1))
 				{
 					setmods(bpevent->state, 0, bpevent->button, False);
-					MCclickstackptr = MCmousestackptr;
 					// IM-2013-08-12: [[ ResIndependence ]] Scale mouse coordinates to user space
-					MCclicklocx = bpevent->x / t_device_scale;
-					MCclicklocy = bpevent->y / t_device_scale;
+					MCPoint t_clickloc;
+					t_clickloc = MCPointMake(bpevent->x / t_device_scale, bpevent->y / t_device_scale);
+					
+					// IM-2013-10-09: [[ FullscreenMode ]] Update clickloc with MCscreen getters & setters
+					MCscreen->setclickloc(MCmousestackptr, t_clickloc);
+					
 					pressptr = tptr;
 					tptr = (MCEventnode *)tptr->next();
 					break;
diff --git a/engine/src/lnxdclnx.cpp b/engine/src/lnxdclnx.cpp
@@ -568,12 +568,13 @@ Boolean MCScreenDC::handle(Boolean dispatch, Boolean anyevent,
 			t_scale = MCResGetDeviceScale();
 			
 			MCPoint t_mouseloc;
-			t_mouseloc.x = mevent->x / t_scale;
-			t_mouseloc.y = mevent->y / t_scale;
+			t_mouseloc = MCPointMake(mevent->x / t_scale, mevent->y / t_scale);
 			
-			MCmousex = t_mouseloc.x;
-			MCmousey = t_mouseloc.y;
-			MCmousestackptr = MCdispatcher->findstackd(mevent->window);
+			MCStack *t_mousestack;
+			t_mousestack = MCdispatcher->findstackd(mevent->window);
+			
+			// IM-2013-10-09: [[ FullscreenMode ]] Update mouseloc with MCscreen getters & setters
+			MCscreen->setmouseloc(t_mousestack, t_mouseloc);
 			
 			//XDND
 			if ( !dragclick && (MCU_abs(MCmousex - MCclicklocx) > 4 || MCU_abs(MCmousey - MCclicklocy) > 4) && MCbuttonstate != 0  ) 
@@ -611,18 +612,16 @@ Boolean MCScreenDC::handle(Boolean dispatch, Boolean anyevent,
 			MCGFloat t_scale;
 			t_scale = MCResGetDeviceScale();
 			
-			MCGPoint t_clickloc;
-			t_clickloc.x = brevent->x / t_scale;
-			t_clickloc.y = brevent->y / t_scale;
+			MCPoint t_clickloc;
+			t_clickloc = MCPointMake(brevent->x / t_scale, brevent->y / t_scale);
 			
-			MCGPoint t_oldclickloc;
-			t_oldclickloc.x = MCclicklocx;
-			t_oldclickloc.y = MCclicklocy;
+			MCStack *t_old_clickstack;
+			MCPoint t_oldclickloc;
+			MCscreen->getclickloc(t_old_clickstack, t_oldclickloc);
 			
-			MCclicklocx = t_clickloc.x;
-			MCclicklocy = t_clickloc.y;
+			// IM-2013-10-09: [[ FullscreenMode ]] Update clickloc with MCscreen getters & setters
+			MCscreen->setclickloc(MCmousestackptr, t_clickloc);
 			
-			MCclickstackptr = MCmousestackptr;
 			if (dispatch)
 			{
 				if (bpevent->window != MCtracewindow)
diff --git a/engine/src/mblandroiddc.cpp b/engine/src/mblandroiddc.cpp
@@ -492,7 +492,7 @@ void MCScreenDC::do_fit_window(bool p_immediate_resize, bool p_post_message)
 	if (p_post_message)
 	{
 		if (p_immediate_resize)
-			((MCStack *)m_current_window) -> configure(True);
+			((MCStack *)m_current_window) -> view_configure(true);
 		else
 			MCEventQueuePostWindowReshape((MCStack *)m_current_window);
 
diff --git a/engine/src/mbliphonedc.mm b/engine/src/mbliphonedc.mm
@@ -744,7 +744,7 @@ static void MCScreenDCDoSnapshot(void *p_env)
 	if (p_post_message)
 	{
 		if (p_immediate_resize)
-			((MCStack *)m_current_window) -> configure(True);
+			((MCStack *)m_current_window) -> view_configure(true);
 		else
 			MCEventQueuePostWindowReshape((MCStack *)m_current_window);
 	}
diff --git a/engine/src/osxspec.cpp b/engine/src/osxspec.cpp
@@ -294,7 +294,7 @@ static pascal OSStatus WinEvtHndlr(EventHandlerCallRef ehcf, EventRef event, voi
 			
 			// MW-2007-08-29: [[ Bug 4846 ]] Ensure a moveStack message is sent whenever the window moves
 			if ((attributes & kWindowBoundsChangeSizeChanged) != 0 || ((attributes & kWindowBoundsChangeUserDrag) != 0 && (attributes & kWindowBoundsChangeOriginChanged) != 0))
-				sptr->configure(True);//causes a redraw and recalculation
+				sptr->view_configure(true);//causes a redraw and recalculation
 		}
 		else if (GetEventKind(event) == kEventWindowInit && sptr != NULL)
 		{
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -372,6 +372,14 @@ class MCStack : public MCObject
 	void view_activatetilecache(void);
 	void view_compacttilecache(void);
 	
+	// IM-2013-10-10: [[ FullscreenMode ]] Reconfigure view after window rect changes
+	void view_configure(bool p_user);
+	
+	// IM-2013-10-10: [[ FullscreenMode ]] Update the on-screen bounds of the view
+	void view_setrect(const MCRectangle &p_new_rect);
+	// IM-2013-10-10: [[ FullscreenMode ]] Notify view of changes to its bounds
+	void view_on_rect_changed(void);
+	
 	//////////
 	
 	// Return the stack -> device coordinate transform
diff --git a/engine/src/stack2.cpp b/engine/src/stack2.cpp
@@ -166,7 +166,11 @@ void MCStack::configure(Boolean user)
 	if (view_getfullscreen())
 		trect = view_setstackviewport(old_rect);
 	else
-		mode_getrealrect(trect);
+	{
+		// IM-2013-10-09: [[ FullscreenMode ]] Non-fullscreen stacks should use
+		// the whole view rect
+		trect = view_getrect();
+	}
 	if (trect.width != 0 && trect.height != 0
 	        && (trect.width != rect.width || trect.height != rect.height))
 	{
@@ -2105,7 +2109,7 @@ Exec_stat MCStack::openrect(const MCRectangle &rel, Window_mode wm, MCStack *par
 
 			// MW-2009-09-09: If this is a plugin window, then we need to send a resizeStack
 			//   as we have no control over the size of the window...
-			configure(window != DNULL ? False : True);
+			view_configure(window != DNULL ? False : True);
 		}
 
 		// MW-2008-10-31: [[ ParentScripts ]] Send openControl appropriately
diff --git a/engine/src/stackview.cpp b/engine/src/stackview.cpp
@@ -236,6 +236,9 @@ MCGAffineTransform view_get_stack_transform(MCStackFullscreenMode p_mode, MCRect
 
 	switch (p_mode)
 	{
+	case kMCStackFullscreenModeNone:
+		return MCGAffineTransformMakeIdentity();
+		
 	case kMCStackFullscreenResize:
 		return MCGAffineTransformMakeIdentity();
 
@@ -266,48 +269,69 @@ MCGAffineTransform view_get_stack_transform(MCStackFullscreenMode p_mode, MCRect
 	}
 }
 
+void MCStack::view_on_rect_changed(void)
+{
+	// IM-2013-10-03: [[ FullscreenMode ]] if the view rect has changed, update the tilecache geometry
+	if (m_view_tilecache != nil)
+	{
+		MCRectangle t_device_rect;
+		t_device_rect = MCGRectangleGetIntegerInterior(MCResUserToDeviceRect(m_view_rect));
+
+		MCTileCacheSetViewport(m_view_tilecache, t_device_rect);
+	}
+	
+	if (view_getfullscreen())
+		m_view_redraw = true;
+}
+
+void MCStack::view_setrect(const MCRectangle &p_rect)
+{
+	if (MCU_equal_rect(p_rect, m_view_rect))
+		return;
+	
+	// IM-2013-10-08: [[ FullscreenMode ]] Update view rect before calling setsizehints()
+	m_view_rect = p_rect;
+	
+	// IM-2013-10-03: [[ FullscreenMode ]] if the view rect has changed, update the window geometry
+	MCRectangle t_device_rect;
+	t_device_rect = MCGRectangleGetIntegerInterior(MCResUserToDeviceRect(m_view_rect));
+
+	// IM-2013-10-08: [[ FullscreenMode ]] Update window size hints when setting the view geometry.
+	setsizehints();
+	device_setgeom(t_device_rect);
+	
+	view_on_rect_changed();
+}
+
 MCRectangle MCStack::view_setstackviewport(const MCRectangle &p_rect)
 {
-	MCRectangle t_stack_rect, t_view_rect;
+	MCRectangle t_view_rect;
 	MCGAffineTransform t_transform;
 	
+	MCStackFullscreenMode t_mode;
+	
 	if (view_getfullscreen())
 	{
+		t_mode = m_view_fullscreenmode;
+		
 		const MCDisplay *t_display;
 		t_display = MCscreen -> getnearestdisplay(p_rect);
 
 		t_view_rect = MCscreen->fullscreenrect(t_display);
 		t_view_rect . x = t_view_rect . y = 0;
 		
-		t_stack_rect = view_constrainstackviewport(p_rect);
-		t_transform = view_get_stack_transform(m_view_fullscreenmode, t_stack_rect, t_view_rect);
-
-		m_view_redraw = true;
 	}
 	else
 	{
+		t_mode = kMCStackFullscreenModeNone;
 		t_view_rect = p_rect;
-
-		t_stack_rect = p_rect;
-		t_transform = MCGAffineTransformMakeIdentity();
 	}
 	
-	if (!MCU_equal_rect(t_view_rect, m_view_rect))
-	{
-		// IM-2013-10-03: [[ FullscreenMode ]] if the view rect has changed, update the window & tilecache geometry
-		MCRectangle t_device_rect;
-		t_device_rect = MCGRectangleGetIntegerInterior(MCResUserToDeviceRect(t_view_rect));
-		
-		// IM-2013-10-08: [[ FullscreenMode ]] Update view rect before calling setsizehints()
-		m_view_rect = t_view_rect;
-
-		// IM-2013-10-08: [[ FullscreenMode ]] Update window size hints when setting the view geometry.
-		setsizehints();
-		device_setgeom(t_device_rect);
-		
-		if (m_view_tilecache != nil)
-			MCTileCacheSetViewport(m_view_tilecache, t_device_rect);
-	}
+	view_setrect(t_view_rect);
+	
+	m_view_stack_rect = view_constrainstackviewport(p_rect);
+	
+	t_transform = view_get_stack_transform(m_view_fullscreenmode, m_view_stack_rect, m_view_rect);
 	
 	// IM-2013-10-03: [[ FullscreenMode ]] if the transform has changed, redraw everything
 	if (!MCGAffineTransformIsEqual(t_transform, m_view_transform))
@@ -316,11 +340,22 @@ MCRectangle MCStack::view_setstackviewport(const MCRectangle &p_rect)
 		dirtyall();
 	}
 	
-	m_view_stack_rect = t_stack_rect;
-	
 	return m_view_stack_rect;
 }
 
+void MCStack::view_configure(bool p_user)
+{
+	MCRectangle t_view_rect;
+	mode_getrealrect(t_view_rect);
+	
+	if (!MCU_equal_rect(t_view_rect, m_view_rect))
+	{
+		m_view_rect = t_view_rect;
+		view_on_rect_changed();
+	}
+	configure(p_user);
+}
+
 MCRectangle MCStack::view_getstackviewport()
 {
 	return m_view_stack_rect;
diff --git a/engine/src/w32dcw32.cpp b/engine/src/w32dcw32.cpp
@@ -1128,12 +1128,12 @@ LRESULT CALLBACK MCWindowProc(HWND hwnd, UINT msg, WPARAM wParam,
 					if (target->isiconic())
 					{
 						MCstacks->restack(target);
-						target->configure(True);
+						target->view_configure(true);
 						target->uniconify();
 						SetWindowPos((HWND)target -> getwindow() -> handle . window, NULL, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER);
 					}
 					else
-						target->configure(True);
+						target->view_configure(true);
 				curinfo->handled = True;
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1261,7 +1261,7 @@ void MCDispatch::configure(Window w)`
`1261`	`1261`	`{`
`1262`	`1262`	`MCStack *target = findstackd(w);`
`1263`	`1263`	`if (target != NULL)`
`1264`		`- target->configure(True);`
	`1264`	`+ target->view_configure(true);`
`1265`	`1265`	`}`
`1266`	`1266`
`1267`	`1267`	`void MCDispatch::enter(Window w)`
Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,7 @@ void MCScreenDC::do_fit_window(bool p_immediate_resize, bool p_post_message)`
`492`	`492`	`if (p_post_message)`
`493`	`493`	`{`
`494`	`494`	`if (p_immediate_resize)`
`495`		`- ((MCStack *)m_current_window) -> configure(True);`
	`495`	`+ ((MCStack *)m_current_window) -> view_configure(true);`
`496`	`496`	`else`
`497`	`497`	`MCEventQueuePostWindowReshape((MCStack *)m_current_window);`
`498`	`498`
Original file line number	Diff line number	Diff line change
`@@ -744,7 +744,7 @@ static void MCScreenDCDoSnapshot(void *p_env)`
`744`	`744`	`if (p_post_message)`
`745`	`745`	`{`
`746`	`746`	`if (p_immediate_resize)`
`747`		`- ((MCStack *)m_current_window) -> configure(True);`
	`747`	`+ ((MCStack *)m_current_window) -> view_configure(true);`
`748`	`748`	`else`
`749`	`749`	`MCEventQueuePostWindowReshape((MCStack *)m_current_window);`
`750`	`750`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ static pascal OSStatus WinEvtHndlr(EventHandlerCallRef ehcf, EventRef event, voi`
`294`	`294`
`295`	`295`	`// MW-2007-08-29: [[ Bug 4846 ]] Ensure a moveStack message is sent whenever the window moves`
`296`	`296`	`if ((attributes & kWindowBoundsChangeSizeChanged) != 0 \|\| ((attributes & kWindowBoundsChangeUserDrag) != 0 && (attributes & kWindowBoundsChangeOriginChanged) != 0))`
`297`		`- sptr->configure(True);//causes a redraw and recalculation`
	`297`	`+ sptr->view_configure(true);//causes a redraw and recalculation`
`298`	`298`	`}`
`299`	`299`	`else if (GetEventKind(event) == kEventWindowInit && sptr != NULL)`
`300`	`300`	`{`