0.5.1

Author: Simon Hofmann

src/keypress.c

@@ -206,14 +206,14 @@ void toggleUnicodeKey(unsigned long ch, const bool down)
 
 	if (ch > 0xFFFF) {
 		// encode to utf-16 if necessary
-		UniChar surrogates[2] = {
+		unsigned short surrogates[] = {
 			0xD800 + ((ch - 0x10000) >> 10),
 			0xDC00 + (ch & 0x3FF)
 		};
 
-		CGEventKeyboardSetUnicodeString(keyEvent, 2, (UniChar*) &surrogates);
+		CGEventKeyboardSetUnicodeString(keyEvent, 2, &surrogates);
 	} else {
-		CGEventKeyboardSetUnicodeString(keyEvent, 1, (UniChar*) &ch);
+		CGEventKeyboardSetUnicodeString(keyEvent, 1, &ch);
 	}
 
 	CGEventPost(kCGSessionEventTap, keyEvent);

src/mouse.c

@@ -118,6 +118,7 @@ void moveMouse(MMPoint point)
 	mouseInput.mi.dwExtraInfo = 0;
 	mouseInput.mi.mouseData = 0;
 	SendInput(1, &mouseInput, sizeof(mouseInput));
+
 #endif
 }
 
@@ -185,15 +186,7 @@ void toggleMouse(bool down, MMMouseButton button)
 	XTestFakeButtonEvent(display, button, down ? True : False, CurrentTime);
 	XSync(display, false);
 #elif defined(IS_WINDOWS)
-	INPUT mouseInput;
-	mouseInput.type = INPUT_MOUSE;
-	mouseInput.mi.dx = 0;
-	mouseInput.mi.dy = 0;
-	mouseInput.mi.dwFlags = MMMouseToMEventF(down, button);
-	mouseInput.mi.time = 0; //System will provide the timestamp
-	mouseInput.mi.dwExtraInfo = 0;
-	mouseInput.mi.mouseData = 0;
-	SendInput(1, &mouseInput, sizeof(mouseInput));
+	mouse_event(MMMouseToMEventF(down, button), 0, 0, 0, 0);
 #endif
 }
 
@@ -244,7 +237,8 @@ void scrollMouse(int x, int y)
 #if defined(IS_WINDOWS)
 	// Fix for #97 https://github.com/octalmage/robotjs/issues/97,
 	// C89 needs variables declared on top of functions (mouseScrollInput)
-	INPUT mouseScrollInputs[2];
+	INPUT mouseScrollInputH;
+	INPUT mouseScrollInputV;
 #endif
 
   /* Direction should only be considered based on the scrollDirection. This
@@ -300,24 +294,25 @@ void scrollMouse(int x, int y)
 
 #elif defined(IS_WINDOWS)
 
-	mouseScrollInputs[0].type = INPUT_MOUSE;
-	mouseScrollInputs[0].mi.dx = 0;
-	mouseScrollInputs[0].mi.dy = 0;
-	mouseScrollInputs[0].mi.dwFlags = MOUSEEVENTF_HWHEEL;
-	mouseScrollInputs[0].mi.time = 0;
-	mouseScrollInputs[0].mi.dwExtraInfo = 0;
+	mouseScrollInputH.type = INPUT_MOUSE;
+	mouseScrollInputH.mi.dx = 0;
+	mouseScrollInputH.mi.dy = 0;
+	mouseScrollInputH.mi.dwFlags = MOUSEEVENTF_HWHEEL;
+	mouseScrollInputH.mi.time = 0;
+	mouseScrollInputH.mi.dwExtraInfo = 0;
 	// Flip x to match other platforms.
-	mouseScrollInputs[0].mi.mouseData = -x;
-
-	mouseScrollInputs[1].type = INPUT_MOUSE;
-	mouseScrollInputs[1].mi.dx = 0;
-	mouseScrollInputs[1].mi.dy = 0;
-	mouseScrollInputs[1].mi.dwFlags = MOUSEEVENTF_WHEEL;
-	mouseScrollInputs[1].mi.time = 0;
-	mouseScrollInputs[1].mi.dwExtraInfo = 0;
-	mouseScrollInputs[1].mi.mouseData = y;
-
-	SendInput(2, mouseScrollInputs, sizeof(mouseScrollInputs));
+	mouseScrollInputH.mi.mouseData = -x;
+
+	mouseScrollInputV.type = INPUT_MOUSE;
+	mouseScrollInputV.mi.dx = 0;
+	mouseScrollInputV.mi.dy = 0;
+	mouseScrollInputV.mi.dwFlags = MOUSEEVENTF_WHEEL;
+	mouseScrollInputV.mi.time = 0;
+	mouseScrollInputV.mi.dwExtraInfo = 0;
+	mouseScrollInputV.mi.mouseData = y;
+
+	SendInput(1, &mouseScrollInputH, sizeof(mouseScrollInputH));
+	SendInput(1, &mouseScrollInputV, sizeof(mouseScrollInputV));
 #endif
 }
 

src/robotjs.cc

@@ -415,23 +415,23 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags)
 	return 0;
 }
 
-int GetFlagsFromString(v8::Local<v8::Value> value, MMKeyFlags* flags)
+int GetFlagsFromString(v8::Handle<v8::Value> value, MMKeyFlags* flags)
 {
 	v8::String::Utf8Value fstr(value->ToString());
 	return CheckKeyFlags(*fstr, flags);
 }
 
-int GetFlagsFromValue(v8::Local<v8::Value> value, MMKeyFlags* flags)
+int GetFlagsFromValue(v8::Handle<v8::Value> value, MMKeyFlags* flags)
 {
 	if (!flags) return -1;
 
 	//Optionally allow an array of flag strings to be passed.
 	if (value->IsArray())
 	{
-		v8::Local<v8::Array> a = v8::Local<v8::Array>::Cast(value);
+		v8::Handle<v8::Array> a = v8::Handle<v8::Array>::Cast(value);
 		for (uint32_t i = 0; i < a->Length(); i++)
 		{
-			v8::Local<v8::Value> v(a->Get(i));
+			v8::Handle<v8::Value> v(a->Get(i));
 			if (!v->IsString()) return -2;
 
 			MMKeyFlags f = MOD_NONE;

test/integration/mouse.js

@@ -8,11 +8,7 @@ robot.setMouseDelay(100);
 var target, elements;
 
 describe('Integration/Mouse', () => {
-	let defaultTimeout;
 	beforeEach(done => {
-		defaultTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-		jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;
-
 		target = targetpractice.start();
 		target.once('elements', message => {
 			elements = message;
@@ -21,7 +17,6 @@ describe('Integration/Mouse', () => {
 	});
 
 	afterEach(() => {
-		jasmine.DEFAULT_TIMEOUT_INTERVAL = defaultTimeout;
 		targetpractice.stop();
 		target = null;
 	});
@@ -40,7 +35,7 @@ describe('Integration/Mouse', () => {
 		// Click it!
 		robot.moveMouse(button_1.x, button_1.y);
 		robot.mouseClick();
-	})
+	});
 
 	it('scrolls vertically', done => {
 		target.once('scroll', element => {