Merge pull request livecode#5981 from livecodeian/bugfix-16709

livecodepanos · web-flow · commit 159966d8eb1e · 2017-09-29T10:11:34.000+01:00
[[ Bug 16709 ]] Implement 'the mouse' in HTML5
diff --git a/docs/notes/bugfix-16709.md b/docs/notes/bugfix-16709.md
@@ -0,0 +1 @@
+# Fix the mouse function always returning false
diff --git a/engine/src/em-dc.cpp b/engine/src/em-dc.cpp
@@ -51,8 +51,20 @@ MCEmscriptenGetCurrentStack()
 	return t_dc->GetCurrentStack();
 }
 
+MC_DLLEXPORT_DEF
+bool MCEmscriptenHandleMousePress(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, MCMousePressState p_state, int32_t p_button)
+{
+	if (MCnoui) return false;
+	
+	MCScreenDC *t_dc = static_cast<MCScreenDC *>(MCscreen);
+	
+	t_dc->handle_mouse_press(p_stack, p_time, p_modifiers, p_state, p_button);
+	
+	return true;
+}
+
 MCScreenDC::MCScreenDC()
-	: m_main_window(nil)
+	: m_main_window(nil), m_mouse_button_state(0)
 {
 }
 
@@ -335,6 +347,32 @@ MCScreenDC::popupaskdialog(uint32_t p_type, MCStringRef p_title, MCStringRef p_m
 }
 
 
+void
+MCScreenDC::handle_mouse_press(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, MCMousePressState p_state, int32_t p_button)
+{
+	// track mouse button pressed state
+	/* NOTE - assumes there are no more than 32 mouse buttons */
+	if (p_button < 32)
+	{
+		if (p_state == kMCMousePressStateDown)
+			m_mouse_button_state |= 1UL << p_button;
+		else if (p_state == kMCMousePressStateUp)
+			m_mouse_button_state &= ~(1UL << p_button);
+	}
+	
+	MCEventQueuePostMousePress(p_stack, p_time, p_modifiers, p_state, p_button);
+}
+
+Boolean
+MCScreenDC::getmouse(uint2 p_button, Boolean& r_abort)
+{
+	// return recorded mouse button state
+	if (p_button < 32)
+		return (m_mouse_button_state & (1 << p_button)) != 0;
+		
+	return false;
+}
+
 void
 MCScreenDC::platform_querymouse(int16_t& r_x, int16_t& r_y)
 {
diff --git a/engine/src/em-dc.h b/engine/src/em-dc.h
@@ -27,10 +27,12 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "sysdefs.h"
 #include "stack.h"
 #include "uidc.h"
+#include "eventqueue.h"
 
 MCUIDC *MCCreateScreenDC(void);
 
 extern "C" MCStack *MCEmscriptenGetCurrentStack(void);
+extern "C" bool MCEmscriptenHandleMousePress(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, MCMousePressState p_state, int32_t p_button);
 
 /* ---------------------------------------------------------------- */
 
@@ -65,6 +67,8 @@ class MCScreenDC: public MCUIDC
     virtual bool popupaskdialog(uint32_t p_type, MCStringRef p_title, MCStringRef p_message, MCStringRef p_initial, bool p_hint, MCStringRef& r_result);
 
     /* Mouse management */
+	void handle_mouse_press(MCStack *p_stack, uint32_t p_time, uint32_t p_modifiers, MCMousePressState p_state, int32_t p_button);
+	virtual Boolean getmouse(uint2 button, Boolean& r_abort);
     virtual void platform_querymouse(int16_t& r_x, int16_t& r_y);
     
 protected:
@@ -73,6 +77,7 @@ class MCScreenDC: public MCUIDC
 
 private:
 	Window m_main_window;
+	uint32_t m_mouse_button_state;
 };
 
 #endif /* ! __MC_EMSCRIPTEN_DC_H__ */
diff --git a/engine/src/em-event.js b/engine/src/em-event.js
@@ -634,7 +634,7 @@ mergeInto(LibraryManager.library, {
 		// Wrapper for MCEventQueuePostMousePress
 		_postMousePress: function(stack, time, modifiers, state, button)
 		{
-			Module.ccall('MCEventQueuePostMousePress',
+			Module.ccall('MCEmscriptenHandleMousePress',
 						 'number', /* bool */
 						 ['number', /* MCStack *stack */
 						  'number', /* uint32_t time */

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Fix the mouse function always returning false`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ mergeInto(LibraryManager.library, {`
`634`	`634`	`// Wrapper for MCEventQueuePostMousePress`
`635`	`635`	`_postMousePress: function(stack, time, modifiers, state, button)`
`636`	`636`	`{`
`637`		`- Module.ccall('MCEventQueuePostMousePress',`
	`637`	`+ Module.ccall('MCEmscriptenHandleMousePress',`
`638`	`638`	`'number', /* bool */`
`639`	`639`	`['number', /* MCStack stack /`
`640`	`640`	`'number', /* uint32_t time */`