| Message ID | 1468616445-6158-1-git-send-email-pingc@wacom.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
Hi Ping, On Fri, Jul 15, 2016 at 02:00:45PM -0700, Ping Cheng wrote: > input_mt_sync_frame is used by other wacom devices in wacom_wac.c > to close the frame and emulate pointer events. Let's follow them. > > Touch resolution was missing during touch setup. Newer apps won't > be happy without that info. > > Signed-off-by: Ping Cheng <pingc@wacom.com> > Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> > --- > drivers/input/touchscreen/wacom_w8001.c | 19 +++++-------------- > 1 file changed, 5 insertions(+), 14 deletions(-) > > diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c > index fe983e7..a09dc65 100644 > --- a/drivers/input/touchscreen/wacom_w8001.c > +++ b/drivers/input/touchscreen/wacom_w8001.c > @@ -170,16 +170,8 @@ static void parse_multi_touch(struct w8001 *w8001) > } > } > > - /* emulate single touch events when stylus is out of proximity. > - * This is to make single touch backward support consistent > - * across all Wacom single touch devices. > - */ > - if (w8001->type != BTN_TOOL_PEN && > - w8001->type != BTN_TOOL_RUBBER) { > - w8001->type = count == 1 ? BTN_TOOL_FINGER : KEY_RESERVED; > - input_mt_report_pointer_emulation(dev, true); > - } > - > + w8001->type = KEY_RESERVED; > + input_mt_sync_frame(dev); > input_sync(dev); > } > > @@ -508,14 +500,13 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename, > case 5: > w8001->pktlen = W8001_PKTLEN_TOUCH2FG; > > - __set_bit(BTN_TOOL_DOUBLETAP, dev->keybit); > - input_mt_init_slots(dev, 2, 0); > input_set_abs_params(dev, ABS_MT_POSITION_X, > 0, touch.x, 0, 0); > input_set_abs_params(dev, ABS_MT_POSITION_Y, > 0, touch.y, 0, 0); > - input_set_abs_params(dev, ABS_MT_TOOL_TYPE, > - 0, MT_TOOL_MAX, 0, 0); There seem a few issues combined into 1 patch. Why are we dropping tool type? And the chunk below deserves a separate commit (which we might consider for stable). Thanks. > + input_abs_set_res(dev, ABS_MT_POSITION_X, touch.panel_res); > + input_abs_set_res(dev, ABS_MT_POSITION_Y, touch.panel_res); > + input_mt_init_slots(dev, 2, 0); > > strlcat(basename, " 2FG", basename_sz); > if (w8001->max_pen_x && w8001->max_pen_y) > -- > 1.8.3.1 >
On Fri, Jul 15, 2016 at 02:10:28PM -0700, Dmitry Torokhov wrote: > Hi Ping, > > On Fri, Jul 15, 2016 at 02:00:45PM -0700, Ping Cheng wrote: > > input_mt_sync_frame is used by other wacom devices in wacom_wac.c > > to close the frame and emulate pointer events. Let's follow them. > > > > Touch resolution was missing during touch setup. Newer apps won't > > be happy without that info. > > > > Signed-off-by: Ping Cheng <pingc@wacom.com> > > Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> > > --- > > drivers/input/touchscreen/wacom_w8001.c | 19 +++++-------------- > > 1 file changed, 5 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c > > index fe983e7..a09dc65 100644 > > --- a/drivers/input/touchscreen/wacom_w8001.c > > +++ b/drivers/input/touchscreen/wacom_w8001.c > > @@ -170,16 +170,8 @@ static void parse_multi_touch(struct w8001 *w8001) > > } > > } > > > > - /* emulate single touch events when stylus is out of proximity. > > - * This is to make single touch backward support consistent > > - * across all Wacom single touch devices. > > - */ > > - if (w8001->type != BTN_TOOL_PEN && > > - w8001->type != BTN_TOOL_RUBBER) { > > - w8001->type = count == 1 ? BTN_TOOL_FINGER : KEY_RESERVED; > > - input_mt_report_pointer_emulation(dev, true); > > - } > > - > > + w8001->type = KEY_RESERVED; > > + input_mt_sync_frame(dev); > > input_sync(dev); > > } > > > > @@ -508,14 +500,13 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename, > > case 5: > > w8001->pktlen = W8001_PKTLEN_TOUCH2FG; > > > > - __set_bit(BTN_TOOL_DOUBLETAP, dev->keybit); > > - input_mt_init_slots(dev, 2, 0); > > input_set_abs_params(dev, ABS_MT_POSITION_X, > > 0, touch.x, 0, 0); > > input_set_abs_params(dev, ABS_MT_POSITION_Y, > > 0, touch.y, 0, 0); > > - input_set_abs_params(dev, ABS_MT_TOOL_TYPE, > > - 0, MT_TOOL_MAX, 0, 0); > > There seem a few issues combined into 1 patch. Why are we dropping tool > type? And the chunk below deserves a separate commit (which we might > consider for stable). > > Thanks. > > > + input_abs_set_res(dev, ABS_MT_POSITION_X, touch.panel_res); > > + input_abs_set_res(dev, ABS_MT_POSITION_Y, touch.panel_res); > > + input_mt_init_slots(dev, 2, 0); By the way, error handling here would be nice. Thanks. > > > > strlcat(basename, " 2FG", basename_sz); > > if (w8001->max_pen_x && w8001->max_pen_y) > > -- > > 1.8.3.1 > > > > -- > Dmitry
diff --git a/drivers/input/touchscreen/wacom_w8001.c b/drivers/input/touchscreen/wacom_w8001.c index fe983e7..a09dc65 100644 --- a/drivers/input/touchscreen/wacom_w8001.c +++ b/drivers/input/touchscreen/wacom_w8001.c @@ -170,16 +170,8 @@ static void parse_multi_touch(struct w8001 *w8001) } } - /* emulate single touch events when stylus is out of proximity. - * This is to make single touch backward support consistent - * across all Wacom single touch devices. - */ - if (w8001->type != BTN_TOOL_PEN && - w8001->type != BTN_TOOL_RUBBER) { - w8001->type = count == 1 ? BTN_TOOL_FINGER : KEY_RESERVED; - input_mt_report_pointer_emulation(dev, true); - } - + w8001->type = KEY_RESERVED; + input_mt_sync_frame(dev); input_sync(dev); } @@ -508,14 +500,13 @@ static int w8001_setup_touch(struct w8001 *w8001, char *basename, case 5: w8001->pktlen = W8001_PKTLEN_TOUCH2FG; - __set_bit(BTN_TOOL_DOUBLETAP, dev->keybit); - input_mt_init_slots(dev, 2, 0); input_set_abs_params(dev, ABS_MT_POSITION_X, 0, touch.x, 0, 0); input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, touch.y, 0, 0); - input_set_abs_params(dev, ABS_MT_TOOL_TYPE, - 0, MT_TOOL_MAX, 0, 0); + input_abs_set_res(dev, ABS_MT_POSITION_X, touch.panel_res); + input_abs_set_res(dev, ABS_MT_POSITION_Y, touch.panel_res); + input_mt_init_slots(dev, 2, 0); strlcat(basename, " 2FG", basename_sz); if (w8001->max_pen_x && w8001->max_pen_y)