Skip to content

Commit

Permalink
Merge pull request #15 from ther0n/mouse-acceleration
Browse files Browse the repository at this point in the history
Mouse acceleration
  • Loading branch information
ther0n authored Jan 27, 2021
2 parents ab2dcc2 + 1249e89 commit 377670b
Show file tree
Hide file tree
Showing 15 changed files with 629 additions and 190 deletions.
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## User settings
xcuserdata/
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
## Gcc Patch
/*.gcno

.DS_Store
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ The issue is described here:

https://apple.stackexchange.com/questions/116617/how-to-separate-mouse-and-trackpad-settings

Unfortunately most/all solutions no longer work reliably if at all in Catalina, or offer much more functionality/bloat than you may want. This application solves the issue and is only mere kilobytes in size.
Unfortunately most/all solutions no longer work reliably if at all in Catalina.

## Installation

Expand All @@ -33,7 +33,7 @@ brew install --cask unnaturalscrollwheels

1. Download the latest `.dmg` from the [releases page](/../../releases), mount it, and copy the `.app` to your applications folder like any other application.

2. Since the application is not notarized as I didn't want to contribute to Apple's addiction to greed, you will need to right click on the `.app` and choose Open.
2. The application is not notarized since I haven't paid the yearly $100 fee to join the Apple Developer Program, you will need to right click on the `.app` and choose Open.

![Open Application](/../master/Screenshots/OpenApplication.png?raw=true "Open Application")

Expand Down
Binary file modified Screenshots/Screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 15 additions & 3 deletions UnnaturalScrollWheels.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

/* Begin PBXBuildFile section */
91727DB224CCBDDA00432163 /* PreferencesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91727DB124CCBDDA00432163 /* PreferencesViewController.swift */; };
918546AB25C0758700B2AD21 /* MenuBarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 918546AA25C0758700B2AD21 /* MenuBarItem.swift */; };
91C7ECE424CC86B6007E2D4C /* Options.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91C7ECE324CC86B6007E2D4C /* Options.swift */; };
91C7ECE624CC8789007E2D4C /* ScrollInterceptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91C7ECE524CC8789007E2D4C /* ScrollInterceptor.swift */; };
91C8ABFB24CCA471007E85A9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 91C8ABFA24CCA471007E85A9 /* Main.storyboard */; };
Expand All @@ -16,7 +17,9 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
9138880425B0CB2700A3A633 /* UnnaturalScrollWheels-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnnaturalScrollWheels-Bridging-Header.h"; sourceTree = "<group>"; };
91727DB124CCBDDA00432163 /* PreferencesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PreferencesViewController.swift; sourceTree = "<group>"; };
918546AA25C0758700B2AD21 /* MenuBarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuBarItem.swift; sourceTree = "<group>"; };
91C7ECE324CC86B6007E2D4C /* Options.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Options.swift; sourceTree = "<group>"; };
91C7ECE524CC8789007E2D4C /* ScrollInterceptor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollInterceptor.swift; sourceTree = "<group>"; };
91C8ABFA24CCA471007E85A9 /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -59,12 +62,14 @@
children = (
91D8069D24CB37B80092C286 /* AppDelegate.swift */,
91C7ECE324CC86B6007E2D4C /* Options.swift */,
91C8ABFA24CCA471007E85A9 /* Main.storyboard */,
91727DB124CCBDDA00432163 /* PreferencesViewController.swift */,
91C7ECE524CC8789007E2D4C /* ScrollInterceptor.swift */,
9138880425B0CB2700A3A633 /* UnnaturalScrollWheels-Bridging-Header.h */,
91C8ABFA24CCA471007E85A9 /* Main.storyboard */,
91D8069F24CB37BD0092C286 /* Assets.xcassets */,
91D806A424CB37BD0092C286 /* Info.plist */,
91D806A524CB37BD0092C286 /* UnnaturalScrollWheels.entitlements */,
918546AA25C0758700B2AD21 /* MenuBarItem.swift */,
);
path = UnnaturalScrollWheels;
sourceTree = "<group>";
Expand Down Expand Up @@ -101,6 +106,7 @@
TargetAttributes = {
91D8069924CB37B80092C286 = {
CreatedOnToolsVersion = 11.6;
LastSwiftMigration = 1230;
};
};
};
Expand Down Expand Up @@ -140,6 +146,7 @@
buildActionMask = 2147483647;
files = (
91C7ECE624CC8789007E2D4C /* ScrollInterceptor.swift in Sources */,
918546AB25C0758700B2AD21 /* MenuBarItem.swift in Sources */,
91D8069E24CB37B80092C286 /* AppDelegate.swift in Sources */,
91C7ECE424CC86B6007E2D4C /* Options.swift in Sources */,
91727DB224CCBDDA00432163 /* PreferencesViewController.swift in Sources */,
Expand Down Expand Up @@ -268,6 +275,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = UnnaturalScrollWheels/UnnaturalScrollWheels.entitlements;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
Expand All @@ -280,9 +288,11 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.theron.UnnaturalScrollWheels;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "UnnaturalScrollWheels/UnnaturalScrollWheels-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
Expand All @@ -291,6 +301,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = UnnaturalScrollWheels/UnnaturalScrollWheels.entitlements;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
Expand All @@ -303,9 +314,10 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.1.1;
MARKETING_VERSION = 1.2.0;
PRODUCT_BUNDLE_IDENTIFIER = com.theron.UnnaturalScrollWheels;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "UnnaturalScrollWheels/UnnaturalScrollWheels-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
name = Release;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<PostActions>
<ExecutionAction
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Run Script"
scriptText = "# Type a script or drag a script file from your workspace to insert its path.&#10;PLIST=&quot;${PROJECT_DIR}/${INFOPLIST_FILE}&quot;&#10;PLB=/usr/libexec/PlistBuddy&#10;LAST_NUMBER=$($PLB -c &quot;Print CFBundleVersion&quot; &quot;$PLIST&quot;)&#10;NEW_VERSION=$(($LAST_NUMBER + 1))&#10;$PLB -c &quot;Set :CFBundleVersion $NEW_VERSION&quot; &quot;$PLIST&quot;&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91D8069924CB37B80092C286"
BuildableName = "UnnaturalScrollWheels.app"
BlueprintName = "UnnaturalScrollWheels"
ReferencedContainer = "container:UnnaturalScrollWheels.xcodeproj">
</BuildableReference>
</EnvironmentBuildable>
</ActionContent>
</ExecutionAction>
</PostActions>
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91D8069924CB37B80092C286"
BuildableName = "UnnaturalScrollWheels.app"
BlueprintName = "UnnaturalScrollWheels"
ReferencedContainer = "container:UnnaturalScrollWheels.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91D8069924CB37B80092C286"
BuildableName = "UnnaturalScrollWheels.app"
BlueprintName = "UnnaturalScrollWheels"
ReferencedContainer = "container:UnnaturalScrollWheels.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "91D8069924CB37B80092C286"
BuildableName = "UnnaturalScrollWheels.app"
BlueprintName = "UnnaturalScrollWheels"
ReferencedContainer = "container:UnnaturalScrollWheels.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,114 @@
uuid = "6740C2C9-4E35-4EFE-A7B3-FE4CE78B91D3"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "20"
endingLineNumber = "20"
landmarkName = "PreferencesViewController"
landmarkType = "3">
<Locations>
<Location
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738 - f2b004c759f55cf2"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "UnnaturalScrollWheels.PreferencesViewController.alternateDetectionMethod.getter : Swift.Optional&lt;__C.NSButton&gt;"
moduleName = "UnnaturalScrollWheels"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/theron/Git/UnnaturalScrollWheels/UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "104">
</Location>
<Location
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738 - f2b004c759f55cf2"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "UnnaturalScrollWheels.PreferencesViewController.alternateDetectionMethod.setter : Swift.Optional&lt;__C.NSButton&gt;"
moduleName = "UnnaturalScrollWheels"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/theron/Git/UnnaturalScrollWheels/UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "148">
</Location>
<Location
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738 - d966b4a84df3fe1a"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "UnnaturalScrollWheels.PreferencesViewController.alternateDetectionMethod.modify : Swift.Optional&lt;__C.NSButton&gt;"
moduleName = "UnnaturalScrollWheels"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/theron/Git/UnnaturalScrollWheels/UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "0"
endingLineNumber = "0"
offsetFromSymbolStart = "60">
</Location>
<Location
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738 - d1b8cbc988543ddd"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "UnnaturalScrollWheels.PreferencesViewController.alternateDetectionMethod.modify : Swift.Optional&lt;__C.NSButton&gt; with unmangled suffix &quot;.resume.0&quot;"
moduleName = "UnnaturalScrollWheels"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/theron/Git/UnnaturalScrollWheels/UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "72">
</Location>
<Location
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738 - 1cd68e65976c3924"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "UnnaturalScrollWheels.PreferencesViewController.init(nibName: Swift.Optional&lt;Swift.String&gt;, bundle: Swift.Optional&lt;__C.NSBundle&gt;) -&gt; UnnaturalScrollWheels.PreferencesViewController"
moduleName = "UnnaturalScrollWheels"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/theron/Git/UnnaturalScrollWheels/UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "636">
</Location>
<Location
uuid = "D5761B9C-4AE1-437D-9ABC-F564E84DC738 - 91f7232eabb7e5f4"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "UnnaturalScrollWheels.PreferencesViewController.init(coder: __C.NSCoder) -&gt; Swift.Optional&lt;UnnaturalScrollWheels.PreferencesViewController&gt;"
moduleName = "UnnaturalScrollWheels"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/theron/Git/UnnaturalScrollWheels/UnnaturalScrollWheels/PreferencesViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "17"
endingLineNumber = "17"
offsetFromSymbolStart = "612">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,13 @@
<integer>0</integer>
</dict>
</dict>
<key>SuppressBuildableAutocreation</key>
<dict>
<key>91D8069924CB37B80092C286</key>
<dict>
<key>primary</key>
<true/>
</dict>
</dict>
</dict>
</plist>
Loading

0 comments on commit 377670b

Please sign in to comment.