kylefang/OS-X-Voodoo-PS2-Controller
1
0
Fork 0
mirror of https://github.com/zhigang1992/OS-X-Voodoo-PS2-Controller.git synced 2026-04-29 04:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixing bugs in ClickPad right click logic, add FingerChangeIgnoreDeltas option, customize makefile for me

Browse Source
This commit is contained in:
RehabMan
2013-01-29 17:19:57 +00:00
committed by Dean McCrory
parent 031b4fef7d
commit beca7ff986
4 changed files with 53 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
VoodooPS2Trackpad/VoodooPS2SynapticsTouchPad.cpp
View File

@@ -146,6 +146,7 @@ bool ApplePS2SynapticsTouchPad::init( OSDictionary * properties )
tracksecondary=false;
#endif
ignoredeltas=0;
ignoredeltasstart=0;
scrollrest=0;
touchtime=untouchtime=0;
wastriple=wasdouble=false;
@@ -556,8 +557,6 @@ void ApplePS2SynapticsTouchPad::onScrollTimer(void)
// momentum scroll.
//
//REVIEW: need to adjust for correct "feel" (compare against real Mac)
if (!momentumscrollcurrent)
return;
@@ -724,9 +723,15 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacket(UInt8* packet, UInt32 p
int x = xraw;
int y = yraw;
if (lastf > 0 && f > 0 && lastf != f)
{
// ignore deltas for a while after finger change
ignoredeltas = ignoredeltasstart;
}
if (lastf != f)
{
ignoredeltas = 0; //4; //REVIEW: how many to ignore??
// reset averages after finger change
x_undo.reset();
y_undo.reset();
x_avg.reset();
@@ -754,6 +759,19 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacket(UInt8* packet, UInt32 p
y = y_avg.filter(y);
}
if (ignoredeltas)
{
lastx = x;
lasty = y;
if (--ignoredeltas == 0)
{
x_undo.reset();
y_undo.reset();
x_avg.reset();
y_avg.reset();
}
}
//REVIEW: this probably should be different for two button ClickPads,
// but we really don't know much about it and how/what the second button
// on such a ClickPad is used.
@@ -766,18 +784,27 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacket(UInt8* packet, UInt32 p
int clickbuttons = packet[3] & 0x3;
if (!_clickbuttons && clickbuttons)
{
DEBUG_LOG("ps2: now=%lld, touchtime=%lld, diff=%lld\n", now, touchtime, now-touchtime);
// change to right click if in right click zone, or was two finger "click"
//REVIEW: should probably have independent config for maxdbltaptime here...
if (isInRightClickZone(x, y) || (0 == w && (now-touchtime < clickpadclicktime || MODE_NOTOUCH == touchmode)))
{
DEBUG_LOG("ps2: setting clickbuttons to indicate right\n");
clickbuttons = 0x2;
}
_clickbuttons = clickbuttons;
int xx = x;
int yy = y;
#ifdef EXTENDED_WMODE
clickedprimary = (MODE_MTOUCH != touchmode);
if (!clickedprimary)
{
xx = lastx2;
yy = lasty2;
}
#endif
DEBUG_LOG("ps2: now=%lld, touchtime=%lld, diff=%lld cpct=%lld (%s) w=%d (%d,%d)\n", now, touchtime, now-touchtime, clickpadclicktime, now-touchtime < clickpadclicktime ? "true" : "false", w, isFingerTouch(z), isInRightClickZone(xx, yy));
// change to right click if in right click zone, or was two finger "click"
if (isFingerTouch(z) && (isInRightClickZone(xx, yy)
|| (0 == w && (now-touchtime < clickpadclicktime || MODE_NOTOUCH == touchmode))))
{
DEBUG_LOG("ps2p: setting clickbuttons to indicate right\n");
clickbuttons = 0x2;
}
else
DEBUG_LOG("ps2p: setting clickbuttons to indicate left\n");
_clickbuttons = clickbuttons;
}
// always clear _clickbutton state, when ClickPad is not clicked
if (!clickbuttons)
@@ -1038,12 +1065,6 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacket(UInt8* packet, UInt32 p
xrest = dx % divisorx;
yrest = dy % divisory;
}
if (ignoredeltas)
{
--ignoredeltas;
dx = dy = 0;
xrest = yrest = 0;
}
dispatchRelativePointerEventX(dx / divisorx, dy / divisory, buttons, now);
break;
@@ -1066,12 +1087,6 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacket(UInt8* packet, UInt32 p
yrest = dy % divisory;
}
}
if (ignoredeltas)
{
--ignoredeltas;
dx = dy = 0;
xrest = yrest = 0;
}
dispatchRelativePointerEventX(dx / divisorx, dy / divisory, buttons, now);
break;
}
@@ -1432,12 +1447,6 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacketEW(UInt8* packet, UInt32
dy = lasty2-y+yrest2;
xrest2 = dx % divisorx;
yrest2 = dy % divisory;
if (ignoredeltas)
{
--ignoredeltas;
dx = dy = 0;
xrest2 = yrest2 = 0;
}
dispatchRelativePointerEventX(dx / divisorx, dy / divisory, buttons|_clickbuttons, now);
}
}
@@ -1455,10 +1464,15 @@ void ApplePS2SynapticsTouchPad::dispatchEventsWithPacketEW(UInt8* packet, UInt32
int clickbuttons = packet[3] & 0x3;
if (!_clickbuttons && clickbuttons)
{
// change to right click if in right click zone, or was two finger "click"
//REVIEW: should probably have different than maxtaptime for this timer...
if (isInRightClickZone(x, y))
// change to right click if in right click zone
if (isInRightClickZone(x, y)
|| (now-touchtime < clickpadclicktime || MODE_NOTOUCH == touchmode))
{
DEBUG_LOG("ps2s: setting clickbuttons to indicate right\n");
clickbuttons = 0x2;
}
else
DEBUG_LOG("ps2s: setting clickbuttons to indicate left\n");
_clickbuttons = clickbuttons;
clickedprimary = false;
}
@@ -1825,6 +1839,7 @@ IOReturn ApplePS2SynapticsTouchPad::setParamProperties( OSDictionary * config )
{"MomentumScrollThreshY", &momentumscrollthreshy},
{"MomentumScrollMultiplier", &momentumscrollmultiplier},
{"MomentumScrollDivisor", &momentumscrolldivisor},
{"FingerChangeIgnoreDeltas", &ignoredeltasstart},
};
const struct {const char *name; int *var;} boolvars[]={
{"StickyHorizontalScrolling", &hsticky},

1
VoodooPS2Trackpad/VoodooPS2SynapticsTouchPad.h
View File

@@ -214,6 +214,7 @@ private:
int swapdoubletriple;
int draglocktempmask;
uint64_t clickpadclicktime;
int ignoredeltasstart;
// three finger state
uint8_t inSwipeLeft, inSwipeRight;

2
VoodooPS2Trackpad/VoodooPS2Trackpad-Info.plist
View File

@@ -198,6 +198,8 @@
<integer>100</integer>
<key>ClickPadClickTime</key>
<integer>300000000</integer>
<key>FingerChangeIgnoreDeltas</key>
<integer>3</integer>
</dict>
</dict>
</dict>

2
makefile
View File

@@ -20,6 +20,7 @@ install_debug:
sudo cp -R ./Build/Products/Debug/VoodooPS2Controller.kext /System/Library/Extensions
sudo cp ./VoodooPS2Keyboard/VoodooPS2Keyboard-RemapFN-Info.plist /System/Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
sudo /usr/libexec/PlistBuddy -c "Set ':IOKitPersonalities:Synaptics TouchPad:Configuration:DragLockTempMask' 262148" /System/Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
sudo /usr/libexec/PlistBuddy -c "Set ':IOKitPersonalities:Synaptics TouchPad:Configuration:FingerZ' 50" /System/Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
sudo cp ./VoodooPS2Daemon/org.rehabman.voodoo.driver.Daemon.plist /Library/LaunchDaemons
sudo cp ./Build/Products/Debug/VoodooPS2Daemon /usr/bin
make update_kernelcache
@@ -32,6 +33,7 @@ install_kext:
sudo cp -R ./Build/Products/Release/VoodooPS2Controller.kext /System/Library/Extensions
sudo cp ./VoodooPS2Keyboard/VoodooPS2Keyboard-RemapFN-Info.plist /System/Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Keyboard.kext/Contents/Info.plist
sudo /usr/libexec/PlistBuddy -c "Set ':IOKitPersonalities:Synaptics TouchPad:Configuration:DragLockTempMask' 262148" /System/Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
sudo /usr/libexec/PlistBuddy -c "Set ':IOKitPersonalities:Synaptics TouchPad:Configuration:FingerZ' 50" /System/Library/Extensions/VoodooPS2Controller.kext/Contents/PlugIns/VoodooPS2Trackpad.kext/Contents/Info.plist
make update_kernelcache
.PHONY: install_mouse