NEWT/OSX: Add mouse enter/exit and pointer features (visible, confined, warp) - cleanup pos/coord translations

1 files changed, 24 insertions, 0 deletions

diff --git a/src/newt/native/NewtMacWindow.h b/src/newt/native/NewtMacWindow.h
index 911abb8aa..532eba6b4 100644
--- a/src/newt/native/NewtMacWindow.h
+++ b/src/newt/native/NewtMacWindow.h
@@ -53,8 +53,16 @@
     int jvmVersion;
 
     BOOL destroyNotifySent;
+
+    NSTrackingRectTag ptrTrackingTag;
+    NSRect ptrRect;
+    NSCursor * myCursor;
 }
 
+- (id)initWithFrame:(NSRect)frameRect;
+
+- (NSCursor *) cursor;
+
 /* Set during event dispatching cycle */
 - (void) setJVMHandle: (JavaVM*) vm;
 - (JavaVM*) getJVMHandle;
@@ -70,6 +78,7 @@
 - (BOOL) getDestroyNotifySent;
 
 - (void) rightMouseDown: (NSEvent*) theEvent;
+- (void) resetCursorRects;
 
 @end
 
@@ -79,14 +88,29 @@
 @interface NewtMacWindow : NSWindow 
 #endif
 {
+    BOOL mouseConfined;
+    BOOL mouseVisible;
+    BOOL mouseInside;
+    BOOL cursorIsHidden;
+    NSPoint lastInsideMousePosition;
 @public
     int cachedInsets[4]; // l, r, t, b
 }
 
 + (BOOL) initNatives: (JNIEnv*) env forClass: (jobject) clazz;
 
+- (NSPoint) newtScreenWinPos2OSXScreenPos: (NSPoint) p;
+
+- (NSPoint) newtClientWinPos2OSXScreenPos: (NSPoint) p;
 - (NSPoint) getLocationOnScreen: (NSPoint) p;
 
+- (NSPoint) screenPos2NewtClientWinPos: (NSPoint) p;
+
+- (void) cursorHide:(BOOL)v;
+- (void) setMouseVisible:(BOOL)v;
+- (void) setMouseConfined:(BOOL)v;
+- (void) setMousePosition:(NSPoint)p;
+
 - (void) updateInsets: (JNIEnv*) env;
 
 - (id) initWithContentRect: (NSRect) contentRect