o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

devdraw: fix support for multitouch trackpads

Browse source 
R=rsc
http://codereview.appspot.com/203059
This commit is contained in:
Russ Cox 2010-02-06 22:16:46 -08:00
parent d9e047e5d5
commit 28afa898ee
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cmd/devdraw/osx-screen-carbon.m
View file

@ -182,7 +182,7 @@ classifyTouch(Touch *t)
if((t->timestamp - tracks[i].firstThreshTime) < kTimeSensitivity) { if((t->timestamp - tracks[i].firstThreshTime) < kTimeSensitivity) {
return 0; return 0;
} }
if(p.y > kButtonLimit && t->size > kSizeSensitivity ) { if(p.y > kButtonLimit && t->size > kSizeSensitivity) {
if(p.x < 0.35) if(p.x < 0.35)
return 1; return 1;
if(p.x > 0.65) if(p.x > 0.65)
@ -604,18 +604,18 @@ mouseevent(EventRef event)
GetEventParameter(event, kEventParamKeyModifiers, GetEventParameter(event, kEventParamKeyModifiers,
typeUInt32, 0, sizeof mod, 0, &mod); typeUInt32, 0, sizeof mod, 0, &mod);
// OS X swaps button 2 and 3
but = (but & ~6) | ((but & 4)>>1) | ((but&2)<<1);
but = (but & ~((1<<10)-1)) | mouseswap(but & ((1<<10)-1));
if(osx.touched) { if(osx.touched) {
// in multitouch we use the clicks down to enable our // in multitouch we use the clicks down to enable our
// virtual buttons. // virtual buttons.
if(but & 0x3) if(but & 0x7) {
if(but>>29)
but = but >> 29; but = but >> 29;
else } else
but = 0; but = 0;
osx.touched = 0; osx.touched = 0;
} else {
// OS X swaps button 2 and 3
but = (but & ~6) | ((but & 4)>>1) | ((but&2)<<1);
but = mouseswap(but);
} }
// Apply keyboard modifiers and pretend it was a real mouse button. // Apply keyboard modifiers and pretend it was a real mouse button.