[[ IgnoreMouseEvents ]] Implemented the ignoreMouseEvents property which will make a stack transparent to mouse events.

Monte Goulding · Monte Goulding · commit eac8dbfbf8f9 · 2014-06-02T15:34:01.000+10:00
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -207,6 +207,9 @@ void MCStack::realize(void)
 		// Sort out drawers
 		
 		updatemodifiedmark();
+        
+        // MERG-2014-06-02: [[ IgnoreMouseEvents ]] update the window with the ignore mouse events property
+        updateignoremouseevents();
 	}
 	
 	start_externals();
@@ -276,6 +279,16 @@ void MCStack::updatemodifiedmark(void)
 	MCPlatformSetWindowBoolProperty(window, kMCPlatformWindowPropertyHasModifiedMark, getextendedstate(ECS_MODIFIED_MARK) == True);
 }
 
+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] update the window with the ignore mouse events property
+void MCStack::updateignoremouseevents(void)
+{
+	if (window == nil)
+		return;
+	
+	MCPlatformSetWindowBoolProperty(window, kMCPlatformWindowPropertyIgnoreMouseEvents, getextendedstate(ECS_IGNORE_MOUSE_EVENTS) == True);
+}
+
+
 // MW-2011-09-11: [[ Redraw ]] Force an immediate update of the window within the given
 //   region. The actual rendering is done by deferring to the 'redrawwindow' method.
 void MCStack::view_platform_updatewindow(MCRegionRef p_region)
diff --git a/engine/src/lextable.cpp b/engine/src/lextable.cpp
@@ -952,6 +952,8 @@ LT factor_table[] =
         {"id", TT_PROPERTY, P_ID},
         {"idlerate", TT_PROPERTY, P_IDLE_RATE},
         {"idleticks", TT_PROPERTY, P_IDLE_TICKS},
+        // MERG-2014-06-02: [[ IgnoreMouseEvents ]] ignoreMouseEvents stack property
+        {"ignoremouseevents", TT_PROPERTY, P_IGNORE_MOUSE_EVENTS},
         {"image", TT_CHUNK, CT_IMAGE},
 		{"imagecachelimit", TT_PROPERTY, P_IMAGE_CACHE_LIMIT},
 		{"imagecacheusage", TT_PROPERTY, P_IMAGE_CACHE_USAGE},
diff --git a/engine/src/lnxstack.cpp b/engine/src/lnxstack.cpp
@@ -655,6 +655,11 @@ void MCStack::updatemodifiedmark(void)
 {
 }
 
+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] Stub for ignoreMouseEvents.
+void MCStack::updateignoremouseevents(void)
+{
+}
+
 void MCStack::redrawicon(void)
 {
 }
diff --git a/engine/src/mac-window.mm b/engine/src/mac-window.mm
@@ -1815,6 +1815,11 @@ - (void)setFrameSize: (NSSize)size
     if (m_changes . hides_on_suspend_changed)
         [m_window_handle setHidesOnDeactivate: m_hides_on_suspend];
     
+    // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Sync ignoreMouseEvents.
+    if (m_changes . ignore_mouse_events_changed)
+        [m_window_handle setIgnoresMouseEvents: m_ignore_mouse_events];
+    
+    
 	m_synchronizing = false;
 }
 
diff --git a/engine/src/mblstack.cpp b/engine/src/mblstack.cpp
@@ -159,6 +159,11 @@ void MCStack::updatemodifiedmark(void)
 {
 }
 
+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] Stub for ignoreMouseEvents.
+void MCStack::updateignoremouseevents(void)
+{
+}
+
 void MCStack::redrawicon(void)
 {
 }
diff --git a/engine/src/objdefs.h b/engine/src/objdefs.h
@@ -502,6 +502,9 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 // If this is set then this stack needs parentScripts resolve
 #define ECS_USES_PARENTSCRIPTS	(1UL << 18)
 
+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] If this is set then the stack is transparent to mouse events
+#define ECS_IGNORE_MOUSE_EVENTS (1UL << 17)
+
 // Has handlers
 #define HH_IDLE                 (1UL << 0)
 #define HH_MOUSE_WITHIN         (1UL << 1)
diff --git a/engine/src/parsedef.h b/engine/src/parsedef.h
@@ -942,6 +942,8 @@ enum Properties {
     P_PRIVATE_COLORS,
     P_IDLE_RATE,
     P_IDLE_TICKS,
+    // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Property tag for 'the ignoreMouseEvents' of stacks.
+    P_IGNORE_MOUSE_EVENTS,
     P_BLINK_RATE,
     P_RECURSION_LIMIT,
     P_REPEAT_RATE,
diff --git a/engine/src/platform-internal.h b/engine/src/platform-internal.h
@@ -202,6 +202,9 @@ class MCPlatformWindow
         bool cursor_changed : 1;
         
         bool hides_on_suspend_changed : 1;
+        
+        // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Changed flag for ignore mouse events.
+        bool ignore_mouse_events_changed : 1;
 	} m_changes;
 	MCPlatformWindowStyle m_style;
 	char *m_title;
@@ -220,6 +223,8 @@ class MCPlatformWindow
 		bool m_has_modified_mark : 1;
 		bool m_use_live_resizing : 1;
         bool m_hides_on_suspend : 1;
+        // MERG-2014-06-02: [[ IgnoreMouseEvents ]] ignoreMouseEvents property
+        bool m_ignore_mouse_events : 1;
 	};
 	
 	// Universal state.
diff --git a/engine/src/platform-window.cpp b/engine/src/platform-window.cpp
@@ -49,6 +49,8 @@ MCPlatformWindow::MCPlatformWindow(void)
 	m_has_modified_mark = false;
 	m_use_live_resizing = false;
     m_hides_on_suspend = false;
+    // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Default ignoreMouseEvents to false
+    m_ignore_mouse_events = false;
 	
     // MW-2014-05-02: [[ Bug 12348 ]] Make sure we initialize this value appropriately.
     m_use_text_input = false;
@@ -357,6 +359,12 @@ void MCPlatformWindow::SetProperty(MCPlatformWindowProperty p_property, MCPlatfo
 			m_hides_on_suspend = *(bool *)p_value;
 			m_changes . hides_on_suspend_changed = true;
 			break;
+        // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Handle ignoreMouseEvents.
+        case kMCPlatformWindowPropertyIgnoreMouseEvents:
+			assert(p_type == kMCPlatformPropertyTypeBool);
+			m_ignore_mouse_events = *(bool *)p_value;
+			m_changes . ignore_mouse_events_changed = true;
+			break;
 		default:
 			assert(false);
 			break;
diff --git a/engine/src/platform.h b/engine/src/platform.h
@@ -786,6 +786,8 @@ enum MCPlatformWindowProperty
 	kMCPlatformWindowPropertyCursor,
     
     kMCPlatformWindowPropertyHideOnSuspend,
+    
+    kMCPlatformWindowPropertyIgnoreMouseEvents,
 };
 
 void MCPlatformSetWindowProperty(MCPlatformWindowRef window, MCPlatformWindowProperty property, MCPlatformPropertyType type, const void *value);
diff --git a/engine/src/srvstack.cpp b/engine/src/srvstack.cpp
@@ -175,6 +175,11 @@ void MCStack::updatemodifiedmark(void)
 {
 }
 
+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] Stub for ignoreMouseEvents.
+void MCStack::updateignoremouseevents(void)
+{
+}
+
 void MCStack::view_platform_updatewindow(MCRegionRef region)
 {
 }
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -328,7 +328,7 @@ MCStack::MCStack(const MCStack &sref) : MCObject(sref)
 	// MW-2014-03-12: [[ Bug 11914 ]] Stacks are not engine menus by default.
 	m_is_menu = false;
 	
-	view_copy(sref);
+    view_copy(sref);
 
 	mode_copy(sref);
 }
@@ -1579,6 +1579,10 @@ Exec_stat MCStack::getprop(uint4 parid, Properties which, MCExecPoint &ep, Boole
 	case P_DEFER_SCREEN_UPDATES:
 		ep . setboolean(effective ? m_defer_updates && view_getacceleratedrendering() : m_defer_updates);
 		break;
+    // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Get the ignoreMouseEvents property
+    case P_IGNORE_MOUSE_EVENTS:
+        ep.setboolean(getextendedstate(ECS_IGNORE_MOUSE_EVENTS));
+        break;
 #endif /* MCStack::getprop */
 	default:
 	{
@@ -2640,7 +2644,21 @@ Exec_stat MCStack::setprop(uint4 parid, Properties which, MCExecPoint &ep, Boole
 		m_defer_updates = (t_defer_updates == True);
 	}
 	break;
-#endif /* MCStack::setprop */	
+    
+    // MERG-2014-06-02: [[ IgnoreMouseEvents ]] Set the ignoreMouseEvents property
+    case P_IGNORE_MOUSE_EVENTS:
+    {
+        if (!MCU_matchflags(data, f_extended_state, ECS_IGNORE_MOUSE_EVENTS, dirty))
+        {
+            MCeerror->add(EE_OBJECT_NAB, 0, 0, data);
+            return ES_ERROR;
+        }
+        if (dirty && opened)
+            updateignoremouseevents();
+    }
+    break;
+   
+#endif /* MCStack::setprop */
 	default:
 	{
 		Exec_stat t_stat;
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -548,6 +548,8 @@ class MCStack : public MCObject
 	void setopacity(uint1 p_value);
 	
 	void updatemodifiedmark(void);
+    
+    void updateignoremouseevents(void);
 
     // MW-2008-10-28: [[ ParentScripts ]]
 	// This method is used to resolve any
diff --git a/engine/src/w32dcw32.cpp b/engine/src/w32dcw32.cpp
@@ -1384,6 +1384,16 @@ LRESULT CALLBACK MCWindowProc(HWND hwnd, UINT msg, WPARAM wParam,
 			}
 		}
 	break;
+    case WM_NCHITTEST:
+    {
+        MCStack *sptr = MCdispatcher->findstackd(dw);
+        if (sptr != NULL && sptr -> getextendedstate(ECS_IGNORE_MOUSE_EVENTS))
+        {
+            return HTTRANSPARENT;
+        }
+        return IsWindowUnicode(hwnd) ? DefWindowProcW(hwnd, msg, wParam, lParam) : DefWindowProcA(hwnd, msg, wParam, lParam);
+    }
+    break;
 	default:
 		return IsWindowUnicode(hwnd) ? DefWindowProcW(hwnd, msg, wParam, lParam) : DefWindowProcA(hwnd, msg, wParam, lParam);
 	}
diff --git a/engine/src/w32stack.cpp b/engine/src/w32stack.cpp
@@ -663,6 +663,11 @@ void MCStack::updatemodifiedmark(void)
 {
 }
 
+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] Stub for ignoreMouseEvents.
+void MCStack::updateignoremouseevents(void)
+{
+}
+
 void MCStack::enablewindow(bool p_enable)
 {
 	EnableWindow((HWND)getw() -> handle . window, p_enable);

Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,11 @@ void MCStack::updatemodifiedmark(void)`
`655`	`655`	`{`
`656`	`656`	`}`
`657`	`657`
	`658`	`+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] Stub for ignoreMouseEvents.`
	`659`	`+void MCStack::updateignoremouseevents(void)`
	`660`	`+{`
	`661`	`+}`
	`662`	`+`
`658`	`663`	`void MCStack::redrawicon(void)`
`659`	`664`	`{`
`660`	`665`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,11 @@ void MCStack::updatemodifiedmark(void)`
`159`	`159`	`{`
`160`	`160`	`}`
`161`	`161`
	`162`	`+// MERG-2014-06-02: [[ IgnoreMouseEvents ]] Stub for ignoreMouseEvents.`
	`163`	`+void MCStack::updateignoremouseevents(void)`
	`164`	`+{`
	`165`	`+}`
	`166`	`+`
`162`	`167`	`void MCStack::redrawicon(void)`
`163`	`168`	`{`
`164`	`169`	`}`