From 1052e19ffb0855a3c71ec3c1343826b6c786e700 Mon Sep 17 00:00:00 2001 From: vit9696 Date: Sun, 6 Dec 2020 04:43:16 +0300 Subject: [PATCH] Disable Command and Option swap by default closes #35 --- Changelog.md | 1 + Docs/ACPI/SSDT-Swap-CommandOption.dsl | 14 ++++++++++++++ Docs/ACPI/SSDT-Swap-LeftControlCommand.dsl | 2 +- Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl | 2 +- VoodooPS2Controller.xcodeproj/project.pbxproj | 2 ++ .../VoodooPS2Keyboard-Breakless-Info.plist | 2 +- VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist | 2 +- .../VoodooPS2Keyboard-RemapFN-Info.plist | 2 +- 8 files changed, 22 insertions(+), 5 deletions(-) create mode 100755 Docs/ACPI/SSDT-Swap-CommandOption.dsl diff --git a/Changelog.md b/Changelog.md index 73a39344..aed515af 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ VoodooPS2 Changelog #### v2.1.9 - Disabled PrntScr remap by default, see `SSDT-PrtSc-Remap.dsl` for example to re-enable it +- Disabled Command and Option remap by default, see `SSDT-Swap-CommandOption.dsl` for example to re-enable it #### v2.1.8 - Added support for receiving input form other kexts diff --git a/Docs/ACPI/SSDT-Swap-CommandOption.dsl b/Docs/ACPI/SSDT-Swap-CommandOption.dsl new file mode 100755 index 00000000..e0fb1ced --- /dev/null +++ b/Docs/ACPI/SSDT-Swap-CommandOption.dsl @@ -0,0 +1,14 @@ +// This sample shows how to remap the Command and Option. +DefinitionBlock ("", "SSDT", 2, "ACDT", "ps2", 0) +{ + External (_SB_.PCI0.LPCB.PS2K, DeviceObj) + + Name(_SB.PCI0.LPCB.PS2K.RMCF, Package() + { + "Keyboard", Package() + { + "Swap command and option", ">y", + } + }) +} +//EOF diff --git a/Docs/ACPI/SSDT-Swap-LeftControlCommand.dsl b/Docs/ACPI/SSDT-Swap-LeftControlCommand.dsl index d523721b..560c5bec 100755 --- a/Docs/ACPI/SSDT-Swap-LeftControlCommand.dsl +++ b/Docs/ACPI/SSDT-Swap-LeftControlCommand.dsl @@ -17,4 +17,4 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "ps2", 0) }, }) } -//EOF \ No newline at end of file +//EOF diff --git a/Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl b/Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl index 278ef104..8f33d66e 100644 --- a/Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl +++ b/Docs/ACPI/SSDT-Thinkpad_Trackpad.dsl @@ -55,4 +55,4 @@ DefinitionBlock ("", "SSDT", 2, "ACDT", "ps2", 0) }) } } -//EOF \ No newline at end of file +//EOF diff --git a/VoodooPS2Controller.xcodeproj/project.pbxproj b/VoodooPS2Controller.xcodeproj/project.pbxproj index 4263df54..b4b005b1 100644 --- a/VoodooPS2Controller.xcodeproj/project.pbxproj +++ b/VoodooPS2Controller.xcodeproj/project.pbxproj @@ -118,6 +118,7 @@ CE7F451522E8A8FE003F7971 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; CE7F451622E8A906003F7971 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = SOURCE_ROOT; }; CE8DA1C4251839B2008C44E8 /* libkmod.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libkmod.a; path = MacKernelSDK/Library/x86_64/libkmod.a; sourceTree = ""; }; + CEA35504257C6E3500E17556 /* SSDT-Swap-CommandOption.dsl */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SSDT-Swap-CommandOption.dsl"; sourceTree = ""; }; ED1C95C51F9B88EF00CAFCA3 /* SSDT-PrtSc-Remap.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-PrtSc-Remap.dsl"; sourceTree = ""; }; ED48777A207D94BC00D6B1E8 /* SSDT-AlternateSwipes.dsl */ = {isa = PBXFileReference; lastKnownFileType = text; path = "SSDT-AlternateSwipes.dsl"; sourceTree = ""; }; ED5759741D44FBA50069DF9F /* SSDT-KEY-DELL-WN09.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-KEY-DELL-WN09.dsl"; sourceTree = ""; }; @@ -321,6 +322,7 @@ EDD970FD1FD0B826004CCFFD /* SSDT-HP-FixLidSleep.dsl */, ED5759741D44FBA50069DF9F /* SSDT-KEY-DELL-WN09.dsl */, ED1C95C51F9B88EF00CAFCA3 /* SSDT-PrtSc-Remap.dsl */, + CEA35504257C6E3500E17556 /* SSDT-Swap-CommandOption.dsl */, EDB891282041BB12004DB536 /* SSDT-Swap-LeftControlCapsLock.dsl */, EDAD29471FE8772400A93537 /* SSDT-Swap-LeftControlCommand.dsl */, EDD95559208E2B640031D99E /* SSDT-Thinkpad_Clickpad.dsl */, diff --git a/VoodooPS2Keyboard/VoodooPS2Keyboard-Breakless-Info.plist b/VoodooPS2Keyboard/VoodooPS2Keyboard-Breakless-Info.plist index 3c32f874..9e6aaba2 100644 --- a/VoodooPS2Keyboard/VoodooPS2Keyboard-Breakless-Info.plist +++ b/VoodooPS2Keyboard/VoodooPS2Keyboard-Breakless-Info.plist @@ -43,7 +43,7 @@ Swap capslock and left control Swap command and option - + Use ISO layout keyboard alt_handler_id diff --git a/VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist b/VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist index 767b08ae..7e224756 100644 --- a/VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist +++ b/VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist @@ -278,7 +278,7 @@ Swap capslock and left control Swap command and option - + Use ISO layout keyboard alt_handler_id diff --git a/VoodooPS2Keyboard/VoodooPS2Keyboard-RemapFN-Info.plist b/VoodooPS2Keyboard/VoodooPS2Keyboard-RemapFN-Info.plist index 401a44b9..eb4a48d1 100644 --- a/VoodooPS2Keyboard/VoodooPS2Keyboard-RemapFN-Info.plist +++ b/VoodooPS2Keyboard/VoodooPS2Keyboard-RemapFN-Info.plist @@ -43,7 +43,7 @@ Swap capslock and left control Swap command and option - + Use ISO layout keyboard alt_handler_id