linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Input: Change BTN_TOOL_FINGER falg when HOVER event trigger
@ 2016-03-30  2:02 DusonLin
  2016-03-30  2:31 ` 'Dmitry Torokhov'
  0 siblings, 1 reply; 5+ messages in thread
From: DusonLin @ 2016-03-30  2:02 UTC (permalink / raw)
  To: 'Dmitry Torokhov', Linux-kernel, linux-input
  Cc: 'Charles Mooney', 'jeff', 'Phoenix'

Only ABS_DISTANCE is not enough for upper OS  to distiguish hover event
be triggered from object form faraway to and close touchpad surface or from
object prepare to leave the touchpad surface. We add BNT_TOOL_FINGER to help
it.

                 Object_at_faraway   object_at_hover_area  object_touch_touchpad
      BTN_TOUCH         0                      0                    1
BTN_TOOL_FINGER         0                      1                    1
   ABS_DISTANCE         0                      1                    0

Signed-off by: Duson Lin <dusonlin@emc.com.tw>
---
drivers/input/mouse/elan_i2c_core.c |   14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 2f58985..9392a8c 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2013 ELAN Microelectronics Corp.
  *
  * Author: 林政維 (Duson Lin) <dusonlin@emc.com.tw>
- * Version: 1.6.0
+ * Version: 1.6.1
  *
  * Based on cyapa driver:
  * copyright (c) 2011-2012 Cypress Semiconductor, Inc.
@@ -845,23 +845,27 @@ static void elan_report_absolute(struct elan_tp_data *data, u8 *packet)
{
      struct input_dev *input = data->input;
      u8 *finger_data = &packet[ETP_FINGER_DATA_OFFSET];
-       int i;
+      int i, valid_count = 0;
      u8 tp_info = packet[ETP_TOUCH_INFO_OFFSET];
      u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];
      bool contact_valid, hover_event;

-       hover_event = hover_info & 0x40;
+      hover_event = (hover_info & 0x40);
      for (i = 0; i < ETP_MAX_FINGERS; i++) {
              contact_valid = tp_info & (1U << (3 + i));
              elan_report_contact(data, i, contact_valid, finger_data);

-               if (contact_valid)
+              if (contact_valid) {
                      finger_data += ETP_FINGER_DATA_LEN;
+                      valid_count++;
+              }
      }

       input_report_key(input, BTN_LEFT, tp_info & 0x01);
+      input_report_key(input, BTN_TOOL_FINGER,
+                      ((hover_event != 0) | (valid_count > 0)));
      input_report_abs(input, ABS_DISTANCE, hover_event != 0);
-       input_mt_report_pointer_emulation(input, true);
+      input_mt_report_pointer_emulation(input, false);
      input_sync(input);
}

-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH] Input: Change BTN_TOOL_FINGER falg when HOVER event trigger
@ 2016-03-23  5:43 duson
  0 siblings, 0 replies; 5+ messages in thread
From: duson @ 2016-03-23  5:43 UTC (permalink / raw)
  To: linux-input, linux-kernel, Dmitry Torokhov
  Cc: duson, Charles Mooney, 黃世鵬

Only ABS_DISTANCE is not enough for upper OS  to distiguish hover event
be triggered from object form faraway to and close touchpad surface or from
object prepare to leave the touchpad surface. We add BNT_TOOL_FINGER to help
it.

                                         Object_at_faraway   object_at_hover_area  object_touch_touchpad
             BTN_TOUCH              0                                0                                     1
BTN_TOOL_FINGER              0                               1                                      1
        ABS_DISTANCE              0                               1                                      0

Signed-off by: Duson Lin <dusonlin@emc.com.tw>
---
 drivers/input/mouse/elan_i2c_core.c |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
index 2f58985..9392a8c 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -4,7 +4,7 @@
  * Copyright (c) 2013 ELAN Microelectronics Corp.
  *
  * Author: 林政維 (Duson Lin) <dusonlin@emc.com.tw>
- * Version: 1.6.0
+ * Version: 1.6.1
  *
  * Based on cyapa driver:
  * copyright (c) 2011-2012 Cypress Semiconductor, Inc.
@@ -845,23 +845,27 @@ static void elan_report_absolute(struct elan_tp_data *data, u8 *packet)
 {
 	struct input_dev *input = data->input;
 	u8 *finger_data = &packet[ETP_FINGER_DATA_OFFSET];
-	int i;
+	int i, valid_count = 0;
 	u8 tp_info = packet[ETP_TOUCH_INFO_OFFSET];
 	u8 hover_info = packet[ETP_HOVER_INFO_OFFSET];
 	bool contact_valid, hover_event;
 
-	hover_event = hover_info & 0x40;
+	hover_event = (hover_info & 0x40);
 	for (i = 0; i < ETP_MAX_FINGERS; i++) {
 		contact_valid = tp_info & (1U << (3 + i));
 		elan_report_contact(data, i, contact_valid, finger_data);
 
-		if (contact_valid)
+		if (contact_valid) {
 			finger_data += ETP_FINGER_DATA_LEN;
+			valid_count++;
+		}
 	}
 
 	input_report_key(input, BTN_LEFT, tp_info & 0x01);
+	input_report_key(input, BTN_TOOL_FINGER,
+			((hover_event != 0) | (valid_count > 0)));
 	input_report_abs(input, ABS_DISTANCE, hover_event != 0);
-	input_mt_report_pointer_emulation(input, true);
+	input_mt_report_pointer_emulation(input, false);
 	input_sync(input);
 }
 
-- 
1.7.9.5


--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2016-03-31 18:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-30  2:02 [PATCH] Input: Change BTN_TOOL_FINGER falg when HOVER event trigger DusonLin
2016-03-30  2:31 ` 'Dmitry Torokhov'
2016-03-30  9:49   ` DusonLin
2016-03-31 18:17     ` 'Dmitry Torokhov'
  -- strict thread matches above, loose matches on Subject: below --
2016-03-23  5:43 duson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).