Input: wacom - allow both MT and pen data to be reported
Subsystems (2)
PATCH v2 1/1 Input: wacom - allow both MT and pen data to be reported
As discussed at linux-input and xorg-devel mailing lists, MT events are sent even a stylus is in proximity. Clients have the opportunity to use or ignore them later. To support backward compatibility, single touch events are still ignored when pen is in proximity.
Signed-off-by Ping Cheng <[email protected]>
--- drivers/input/tablet/wacom_wac.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-)
drivers/input/tablet/wacom_wac.c +17 -13
@@ -868,13 +868,11 @@ static int wacom_bpt_touch(struct wacom_wac *wacom)for (i =0 ; i <2 ; i++) {int p = data[9 * i +2 ];input_mt_slot (input, i); -/* -* Touch events need to be disabled while stylus is -* in proximity because user's hand is resting on touchpad -* and sending unwanted events. User expects tablet buttons -* to continue working though. + +/* MT events are sent even a stylus is in proximity. Clients +* have the opportunity to use or ignore them later. */ -if (p && !wacom->shared->stylus_in_proximity) { +if (p) {int x =get_unaligned_be16 (&data[9 * i +3 ]) &0x7ff ;int y =get_unaligned_be16 (&data[9 * i +5 ]) &0x7ff ;if (features->quirks &WACOM_QUIRK_BBTOUCH_LOWRES ) {
@@ -894,13 +892,19 @@ static int wacom_bpt_touch(struct wacom_wac *wacom)input_report_abs (input,ABS_MT_TRACKING_ID , wacom->id[i]); } -input_report_key (input,BTN_TOUCH , count >0 ); -input_report_key (input,BTN_TOOL_FINGER , count ==1 ); -input_report_key (input,BTN_TOOL_DOUBLETAP , count ==2 ); - -input_report_abs (input,ABS_PRESSURE , sp); -input_report_abs (input,ABS_X , sx); -input_report_abs (input,ABS_Y , sy); +/* As discussed at linux-input and xorg-devel mailing lists, single +* touch events are ignored when pen is in prox to support backward +* compatibility +*/ +if (!wacom->shared->stylus_in_proximity) { +input_report_key (input,BTN_TOUCH , count >0 ); +input_report_key (input,BTN_TOOL_FINGER , count ==1 ); +input_report_key (input,BTN_TOOL_DOUBLETAP , count ==2 ); + +input_report_abs (input,ABS_PRESSURE , sp); +input_report_abs (input,ABS_X , sx); +input_report_abs (input,ABS_Y , sy); + }input_report_key (input,BTN_LEFT , (data[1 ] &0x08 ) !=0 );input_report_key (input,BTN_FORWARD , (data[1 ] &0x04 ) !=0 );
Signature · 1 line
1.7.2.3