input-raw: set 0 pressure if ABS_MT_TOUCH_MAJOR is 0

see https://www.kernel.org/doc/Documentation/input/multi-touch-protocol.txt for details and #140 for an example.
libts · Oct 15, 2018 · e73b6d1 · e73b6d1
1 parent 5ce512d
commit e73b6d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/plugins/input-evdev-raw.c b/plugins/input-evdev-raw.c
@@ -517,6 +517,10 @@ static int ts_input_read(struct tslib_module_info *inf,
 				case ABS_MT_PRESSURE:
 					i->current_p = ev.value;
 					break;
+				case ABS_MT_TOUCH_MAJOR:
+					if (ev.value == 0)
+						i->current_p = 0;
+					break;
 				case ABS_MT_TRACKING_ID:
 					if (ev.value == -1)
 						i->current_p = 0;
@@ -795,6 +799,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
 				i->buf[total][i->slot].touch_major = ev.value;
 				i->buf[total][i->slot].tv = ev.time;
 				i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+				if (i->ev[it].value == 0)
+					i->buf[total][i->slot].pressure = 0;
 				break;
 			case ABS_MT_WIDTH_MAJOR:
 				i->buf[total][i->slot].width_major = ev.value;

diff --git a/plugins/input-raw.c b/plugins/input-raw.c
@@ -444,6 +444,10 @@ static int ts_input_read(struct tslib_module_info *inf,
 					case ABS_MT_PRESSURE:
 						i->current_p = ev.value;
 						break;
+					case ABS_MT_TOUCH_MAJOR:
+						if (ev.value == 0)
+							i->current_p = 0;
+						break;
 					case ABS_MT_TRACKING_ID:
 						if (ev.value == -1)
 							i->current_p = 0;
@@ -794,6 +798,8 @@ static int ts_input_read_mt(struct tslib_module_info *inf,
 					i->buf[total][i->slot].touch_major = i->ev[it].value;
 					i->buf[total][i->slot].tv = i->ev[it].time;
 					i->buf[total][i->slot].valid |= TSLIB_MT_VALID;
+					if (i->ev[it].value == 0)
+						i->buf[total][i->slot].pressure = 0;
 					break;
 				case ABS_MT_WIDTH_MAJOR:
 					i->buf[total][i->slot].width_major = i->ev[it].value;