aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorBlaster4385 <[email protected]>2026-11-22 13:29:37 +0530
committerBlaster4385 <[email protected]>2026-11-22 13:56:46 +0530
commit30cd4cb3e64c81230477eb991728a82f8430c8f3 (patch)
tree800d200a88185e8071c2bf270ce38b1d067452a8 /patches
parent5fbe811338885525f553c0116f6a46b715a66b38 (diff)
cancel left click when force replaces itHEADmain
Diffstat (limited to 'patches')
-rw-r--r--patches/0001-hid-magicmouse-Add-Force-Touch-and-touch-haptics.patch151
1 files changed, 125 insertions, 26 deletions
diff --git a/patches/0001-hid-magicmouse-Add-Force-Touch-and-touch-haptics.patch b/patches/0001-hid-magicmouse-Add-Force-Touch-and-touch-haptics.patch
index 97b068d..1120492 100644
--- a/patches/0001-hid-magicmouse-Add-Force-Touch-and-touch-haptics.patch
+++ b/patches/0001-hid-magicmouse-Add-Force-Touch-and-touch-haptics.patch
@@ -30,7 +30,7 @@
static bool emulate_3button = true;
module_param(emulate_3button, bool, 0644);
MODULE_PARM_DESC(emulate_3button, "Emulate a middle button");
-@@ -62,6 +85,29 @@
+@@ -62,6 +85,30 @@
#define DOUBLE_REPORT_ID 0xf7
#define USB_BATTERY_TIMEOUT_SEC 60
@@ -46,6 +46,7 @@
+#define FORCE_STAGE2_PRESS 165
+#define FORCE_STAGE2_RELEASE 125
+#define FORCE_DEBOUNCE_MS 15
++#define FORCE_PENDING_LEFT_MOTION 30
+
+/* Feedback is 0x00SSDDHH. */
+#define FORCE_FEEDBACK_CLICK 0x060617
@@ -60,7 +61,7 @@
/* These definitions are not precise, but they're close enough. (Bits
* 0x03 seem to indicate the aspect ratio of the touch, bits 0x70 seem
* to be some kind of bit mask -- 0x20 may be a near-field reading,
-@@ -90,6 +136,17 @@
+@@ -90,6 +137,17 @@
#define MOUSE_MAX_Y 2047
#define MOUSE_RES_Y ((MOUSE_MAX_Y - MOUSE_MIN_Y) / (MOUSE_DIMENSION_Y / 100))
@@ -78,7 +79,7 @@
#define TRACKPAD_DIMENSION_X (float)13000
#define TRACKPAD_MIN_X -2909
#define TRACKPAD_MAX_X 3167
-@@ -141,6 +198,9 @@
+@@ -141,6 +199,9 @@
short scroll_x_hr;
short scroll_y_hr;
u8 size;
@@ -88,7 +89,7 @@
bool scroll_x_active;
bool scroll_y_active;
} touches[16];
-@@ -149,8 +209,36 @@
+@@ -149,8 +210,39 @@
struct hid_device *hdev;
struct delayed_work work;
struct timer_list battery_timer;
@@ -103,6 +104,9 @@
+ bool force_ready;
+ bool btn_left_forced;
+ bool force_key_down;
++ bool pending_left;
++ int pending_left_x;
++ int pending_left_y;
+ struct input_dev *force_input;
+ bool is_bt;
+ bool is_actuator;
@@ -125,7 +129,7 @@
static int magicmouse_firm_touch(struct magicmouse_sc *msc)
{
int touch = -1;
-@@ -242,6 +330,14 @@
+@@ -242,6 +334,14 @@
pressure = tdata[7];
state = tdata[3] & 0xC0;
down = state == 0x80;
@@ -140,7 +144,7 @@
} else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
id = (tdata[7] << 2 | tdata[6] >> 6) & 0xf;
x = (tdata[1] << 27 | tdata[0] << 19) >> 19;
-@@ -383,8 +479,8 @@
+@@ -383,8 +483,8 @@
}
}
@@ -151,7 +155,7 @@
{
struct magicmouse_sc *msc = hid_get_drvdata(hdev);
struct input_dev *input = msc->input;
-@@ -492,8 +588,9 @@
+@@ -492,8 +592,9 @@
break;
case DOUBLE_REPORT_ID:
/* Sometimes the trackpad sends two touch reports in one
@@ -163,7 +167,7 @@
/* Ensure that we have at least 2 elements (report type and size) */
if (size < 2)
-@@ -506,9 +603,9 @@
+@@ -506,9 +607,9 @@
return 0;
}
@@ -176,7 +180,7 @@
return 0;
default:
return 0;
-@@ -523,8 +620,10 @@
+@@ -523,8 +624,10 @@
} else if (input->id.product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD2 ||
input->id.product ==
USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC) {
@@ -188,7 +192,7 @@
} else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
input_report_key(input, BTN_MOUSE, clicks & 1);
input_mt_report_pointer_emulation(input, true);
-@@ -534,6 +633,22 @@
+@@ -534,6 +637,22 @@
return 1;
}
@@ -211,7 +215,7 @@
static int magicmouse_event(struct hid_device *hdev, struct hid_field *field,
struct hid_usage *usage, __s32 value)
{
-@@ -552,6 +667,55 @@
+@@ -552,6 +671,55 @@
return 0;
}
@@ -267,7 +271,7 @@
static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hdev)
{
int error;
-@@ -599,7 +763,6 @@
+@@ -599,7 +767,6 @@
input->name = hdev->name;
}
@@ -275,7 +279,7 @@
__clear_bit(BTN_0, input->keybit);
__clear_bit(BTN_RIGHT, input->keybit);
__clear_bit(BTN_MIDDLE, input->keybit);
-@@ -607,6 +770,11 @@
+@@ -607,6 +774,11 @@
__set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
__set_bit(BTN_TOOL_FINGER, input->keybit);
@@ -287,7 +291,7 @@
mt_flags = INPUT_MT_POINTER | INPUT_MT_DROP_UNUSED |
INPUT_MT_TRACK;
} else { /* USB_DEVICE_ID_APPLE_MAGICTRACKPAD */
-@@ -754,7 +922,11 @@
+@@ -754,7 +926,11 @@
return ret;
}
@@ -300,7 +304,7 @@
}
static int magicmouse_enable_multitouch(struct hid_device *hdev)
-@@ -828,6 +1000,434 @@
+@@ -828,6 +1004,529 @@
product == USB_DEVICE_ID_APPLE_MAGICTRACKPAD2_USBC;
}
@@ -542,6 +546,80 @@
+ input_report_key(input, code, down);
+}
+
++static bool magicmouse_force_exclusive(void)
++{
++ return force_button != FORCE_KEY;
++}
++
++static void magicmouse_primary_touch(struct magicmouse_sc *msc, int *x, int *y)
++{
++ int i;
++
++ *x = 0;
++ *y = 0;
++ for (i = 0; i < 16; i++) {
++ if (!msc->touches[i].down)
++ continue;
++ *x = msc->touches[i].x;
++ *y = msc->touches[i].y;
++ return;
++ }
++}
++
++static void magicmouse_set_left(struct magicmouse_sc *msc, bool down)
++{
++ if (!msc->input)
++ return;
++
++ magicmouse_set_button(msc->input, BTN_MOUSE, &msc->btn_left_forced,
++ down);
++}
++
++static void magicmouse_start_pending_left(struct magicmouse_sc *msc)
++{
++ msc->pending_left = true;
++ magicmouse_primary_touch(msc, &msc->pending_left_x,
++ &msc->pending_left_y);
++}
++
++static void magicmouse_commit_pending_left(struct magicmouse_sc *msc)
++{
++ if (!msc->pending_left)
++ return;
++
++ msc->pending_left = false;
++ magicmouse_set_left(msc, true);
++}
++
++static void magicmouse_cancel_pending_left(struct magicmouse_sc *msc)
++{
++ msc->pending_left = false;
++}
++
++static void magicmouse_click_pending_left(struct magicmouse_sc *msc)
++{
++ if (!msc->pending_left)
++ return;
++
++ msc->pending_left = false;
++ magicmouse_set_left(msc, true);
++ input_sync(msc->input);
++ magicmouse_set_left(msc, false);
++}
++
++static void magicmouse_update_pending_left(struct magicmouse_sc *msc)
++{
++ int x, y;
++
++ if (!msc->pending_left)
++ return;
++
++ magicmouse_primary_touch(msc, &x, &y);
++ if (abs(x - msc->pending_left_x) > FORCE_PENDING_LEFT_MOTION ||
++ abs(y - msc->pending_left_y) > FORCE_PENDING_LEFT_MOTION)
++ magicmouse_commit_pending_left(msc);
++}
++
+static void magicmouse_force_key(struct magicmouse_sc *msc, bool down)
+{
+ if (!msc->force_input) {
@@ -559,7 +637,8 @@
+ if (!msc->input || msc->force_stage == FORCE_STAGE_NONE)
+ return;
+
-+ magicmouse_set_button(msc->input, BTN_MOUSE, &msc->btn_left_forced, false);
++ magicmouse_cancel_pending_left(msc);
++ magicmouse_set_left(msc, false);
+ magicmouse_force_key(msc, false);
+ input_event(msc->input, EV_MSC, MSC_RAW, 0);
+ input_sync(msc->input);
@@ -578,18 +657,25 @@
+ return;
+
+ if (old == FORCE_STAGE_NONE && stage >= FORCE_STAGE_CLICK) {
-+ if (msc->force_ready)
-+ magicmouse_set_button(input, BTN_MOUSE,
-+ &msc->btn_left_forced, true);
++ if (msc->force_ready) {
++ if (magicmouse_force_exclusive())
++ magicmouse_start_pending_left(msc);
++ else
++ magicmouse_set_left(msc, true);
++ }
+ magicmouse_queue_haptic(msc, FORCE_FEEDBACK_CLICK);
+ input_event(input, EV_MSC, MSC_RAW, 1);
+ } else if (old >= FORCE_STAGE_CLICK && stage == FORCE_STAGE_NONE) {
-+ magicmouse_set_button(input, BTN_MOUSE, &msc->btn_left_forced, false);
++ if (magicmouse_force_exclusive() && msc->pending_left)
++ magicmouse_click_pending_left(msc);
++ else
++ magicmouse_set_left(msc, false);
+ magicmouse_queue_haptic(msc, FORCE_FEEDBACK_RELEASE);
+ input_event(input, EV_MSC, MSC_RAW, 0);
+ }
+
+ if (old < FORCE_STAGE_FORCE && stage == FORCE_STAGE_FORCE) {
++ magicmouse_cancel_pending_left(msc);
+ magicmouse_force_key(msc, true);
+ magicmouse_queue_haptic(msc, FORCE_FEEDBACK_FORCE);
+ input_event(input, EV_MSC, MSC_RAW, 2);
@@ -611,6 +697,9 @@
+ return;
+ }
+
++ if (magicmouse_force_exclusive() && msc->force_stage == FORCE_STAGE_CLICK)
++ magicmouse_update_pending_left(msc);
++
+ switch (msc->force_stage) {
+ case FORCE_STAGE_NONE:
+ cand = pressure >= FORCE_STAGE1_PRESS ?
@@ -714,6 +803,7 @@
+{
+ struct magicmouse_sc *msc;
+ unsigned int button;
++ bool exclusive;
+ int ret = kstrtouint(val, 0, &button);
+
+ if (ret)
@@ -723,9 +813,18 @@
+ if (force_button == button)
+ return 0;
+
++ exclusive = button != FORCE_KEY;
++
+ mutex_lock(&magicmouse_actuator_lock);
-+ list_for_each_entry(msc, &magicmouse_trackpads, node)
++ list_for_each_entry(msc, &magicmouse_trackpads, node) {
++ if (exclusive) {
++ magicmouse_cancel_pending_left(msc);
++ magicmouse_set_left(msc, false);
++ } else if (msc->pending_left) {
++ magicmouse_commit_pending_left(msc);
++ }
+ magicmouse_force_key(msc, false);
++ }
+ force_button = button;
+ mutex_unlock(&magicmouse_actuator_lock);
+
@@ -735,7 +834,7 @@
static int magicmouse_fetch_battery(struct hid_device *hdev)
{
#ifdef CONFIG_HID_BATTERY_STRENGTH
-@@ -883,7 +1483,12 @@
+@@ -883,7 +1582,12 @@
msc->scroll_accel = SCROLL_ACCEL_DEFAULT;
msc->hdev = hdev;
@@ -748,7 +847,7 @@
msc->quirks = id->driver_data;
hid_set_drvdata(hdev, msc);
-@@ -894,6 +1499,12 @@
+@@ -894,6 +1598,12 @@
return ret;
}
@@ -761,7 +860,7 @@
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
if (ret) {
hid_err(hdev, "magicmouse hw start failed\n");
-@@ -971,11 +1582,26 @@
+@@ -971,11 +1681,26 @@
schedule_delayed_work(&msc->work, msecs_to_jiffies(500));
}
@@ -788,7 +887,7 @@
hid_hw_stop(hdev);
return ret;
-@@ -986,7 +1612,21 @@
+@@ -986,7 +1711,21 @@
struct magicmouse_sc *msc = hid_get_drvdata(hdev);
if (msc) {
@@ -810,7 +909,7 @@
if (is_usb_magicmouse2(hdev->vendor, hdev->product) ||
is_usb_magictrackpad2(hdev->vendor, hdev->product))
timer_delete_sync(&msc->battery_timer);
-@@ -1061,5 +1701,5 @@
+@@ -1061,5 +1800,5 @@
};
module_hid_driver(magicmouse_driver);