devdraw: fewer spurious mouse clicks in OS X multitouch
Was turning all button touches into clicks of high
buttons, causing spurious clicks even outside the
app window.
R=rsc
http://codereview.appspot.com/189084
diff --git a/src/cmd/devdraw/osx-screen-carbon.m b/src/cmd/devdraw/osx-screen-carbon.m
index 4babbf9..ee20d63 100644
--- a/src/cmd/devdraw/osx-screen-carbon.m
+++ b/src/cmd/devdraw/osx-screen-carbon.m
@@ -204,14 +204,16 @@
CGPoint p;
CGEventRef e;
+ p.x = osx.xy.x+osx.screenr.min.x;
+ p.y = osx.xy.y+osx.screenr.min.y;
+ if(!ptinrect(Pt(p.x, p.y), osx.screenr))
+ return 0;
osx.touched = 1;
buttons = 0;
for(i = 0; i < nFingers; ++i)
buttons |= classifyTouch(data+i);
delta = buttons ^ obuttons;
obuttons = buttons;
- p.x = osx.xy.x+osx.screenr.min.x;
- p.y = osx.xy.y+osx.screenr.min.y;
if(delta & 1) {
e = CGEventCreateMouseEvent(NULL,
(buttons & 1) ? kCGEventOtherMouseDown : kCGEventOtherMouseUp,
@@ -886,6 +888,7 @@
MTDeviceStart([osx.devicelist objectAtIndex:i], 0); //start sending events
}
} else {
+ osx.xy.x = -10000;
for(i = 0; i<[osx.devicelist count]; i++) { //iterate available devices
MTDeviceStop([osx.devicelist objectAtIndex:i]); //stop sending events
}
