Simplify macosx handling of mousemove events

dopplershift · dopplershift · commit 53bd4b87a3bb · 2020-04-13T13:29:51.000-06:00
We can just request these events from the tracking area rather than
manually enabling/disabling mouse move/checking inside.
diff --git a/src/_macosx.m b/src/_macosx.m
@@ -204,7 +204,6 @@ - (void)close;
 @interface View : NSView <NSWindowDelegate>
 {   PyObject* canvas;
     NSRect rubberband;
-    BOOL inside;
     NSTrackingRectTag tracking;
     @public double device_scale;
 }
@@ -338,7 +337,7 @@ static CGFloat _get_device_scale(CGContextRef cr)
     NSRect rect = NSMakeRect(0.0, 0.0, width, height);
     self->view = [self->view initWithFrame: rect];
     self->view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
-    int opts = (NSTrackingMouseEnteredAndExited |
+    int opts = (NSTrackingMouseEnteredAndExited | NSTrackingMouseMoved |
                 NSTrackingActiveInKeyWindow | NSTrackingInVisibleRect);
     [self->view addTrackingArea: [
         [NSTrackingArea alloc] initWithRect: rect
@@ -712,7 +711,6 @@ static CGFloat _get_device_scale(CGContextRef cr)
     [window setTitle: [NSString stringWithCString: title
                                          encoding: NSASCIIStringEncoding]];
 
-    [window setAcceptsMouseMovedEvents: YES];
     [window setDelegate: view];
     [window makeFirstResponder: view];
     [[window contentView] addSubview: view];
@@ -1572,7 +1570,6 @@ - (View*)initWithFrame:(NSRect)rect
 {
     self = [super initWithFrame: rect];
     rubberband = NSZeroRect;
-    inside = false;
     device_scale = 1;
     return self;
 }
@@ -1759,8 +1756,6 @@ - (void)mouseEntered:(NSEvent *)event
 {
     PyGILState_STATE gstate;
     PyObject* result;
-    NSWindow* window = [self window];
-    if ([window isKeyWindow]==false) return;
 
     int x, y;
     NSPoint location = [event locationInWindow];
@@ -1777,29 +1772,20 @@ - (void)mouseEntered:(NSEvent *)event
     else
         PyErr_Print();
     PyGILState_Release(gstate);
-
-    [window setAcceptsMouseMovedEvents: YES];
-    inside = true;
 }
 
 - (void)mouseExited:(NSEvent *)event
 {
     PyGILState_STATE gstate;
     PyObject* result;
-    NSWindow* window = [self window];
-    if ([window isKeyWindow]==false) return;
 
-    if (inside==false) return;
     gstate = PyGILState_Ensure();
     result = PyObject_CallMethod(canvas, "leave_notify_event", "");
     if(result)
         Py_DECREF(result);
     else
         PyErr_Print();
     PyGILState_Release(gstate);
-
-    [[self window] setAcceptsMouseMovedEvents: NO];
-    inside = false;
 }
 
 - (void)mouseDown:(NSEvent *)event
