Skip to content

Commit c0bc53c

Browse files
committed
0008-revert-touchpad-detect
0.5.14 "fixed" touchpad detection, which breaks touchpad detection. Revert that changeset (52e039f3b0a5749f706b97491087b9632d30512f)
1 parent c7656a9 commit c0bc53c

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN hal-0.5.14.orig/hald/linux/device.c hal-0.5.14/hald/linux/device.c
2+
--- hal-0.5.14.orig/hald/linux/device.c 2009-11-30 17:01:10.000000000 -0500
3+
+++ hal-0.5.14/hald/linux/device.c 2009-12-02 09:14:32.134120558 -0500
4+
@@ -1157,12 +1157,12 @@ input_test_abs (HalDevice *d, const char
5+
{
6+
num_bits_key = input_str_to_bitmask (s, bitmask_key, sizeof (bitmask_key));
7+
8+
- if (test_bit (BTN_STYLUS, bitmask_key) || test_bit (BTN_TOOL_PEN, bitmask_key)) {
9+
+ if (test_bit (BTN_STYLUS, bitmask_key)) {
10+
hal_device_add_capability (d, "input.tablet");
11+
goto out;
12+
}
13+
14+
- if (test_bit (BTN_TOOL_FINGER, bitmask_key) && !test_bit (BTN_TOOL_PEN, bitmask_key)) {
15+
+ if (test_bit (BTN_TOUCH, bitmask_key)) {
16+
hal_device_add_capability (d, "input.touchpad");
17+
goto out;
18+
}
19+
@@ -1181,6 +1181,11 @@ input_test_abs (HalDevice *d, const char
20+
goto out;
21+
}
22+
}
23+
+
24+
+ if (test_bit (ABS_PRESSURE, bitmask_abs)) {
25+
+ hal_device_add_capability (d, "input.touchpad");
26+
+ goto out;
27+
+ }
28+
}
29+
out:
30+
;

0 commit comments

Comments
 (0)