Merge pull request #31 from patelnav/master

Cursor defaults to center of screen
johndbritton · Sep 4, 2018 · 0c374fe · 0c374fe
2 parents 55ecaa2 + b57f9f4
commit 0c374fe
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/TPEventsController.h b/TPEventsController.h
@@ -43,6 +43,7 @@
 - (void)stopPostingEvents;
 - (void)postEventWithEventData:(NSData*)eventData;
 
+- (void)warpMouseToCenter;
 - (void)warpMouseToPosition:(NSPoint)position;
 - (void)mouseDownAtPosition:(NSPoint)position;
 - (void)mouseUpAtPosition:(NSPoint)position;

diff --git a/TPEventsController.m b/TPEventsController.m
@@ -145,6 +145,15 @@ - (void)_postEventWithEventData:(NSData*)eventData
 	// overloaded
 }
 
+- (void)warpMouseToCenter
+{
+	NSArray * screens = [[TPLocalHost localHost] screens];
+	NSRect mainScreenRect = [screens[0] frame];
+
+	NSPoint centerPoint = NSMakePoint(NSMidX(mainScreenRect), NSMidY(mainScreenRect));
+	return [self warpMouseToPosition:centerPoint];
+}
+
 - (void)warpMouseToPosition:(NSPoint)position
 {
 	_currentMouseLocation = *(CGPoint*)&position;

diff --git a/TPServerController.m b/TPServerController.m
@@ -303,7 +303,7 @@ - (void)stopControlWithDisconnect:(BOOL)disconnect
 		_state = TPServerSharedState;
 
 		if([[TPPreferencesManager sharedPreferencesManager] boolForPref:WRAP_ON_STOP_CONTROL])
-			[[self eventsController] warpMouseToPosition:NSMakePoint(16.0, 16.0)];
+			[[self eventsController] warpMouseToCenter];
 
 		[[self eventsController] stopPostingEvents];