| Message ID | 1409661804-10489-3-git-send-email-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sep 02 2014 or thereabouts, Hans de Goede wrote: > I've not done a full audit of all mouse drivers, I noticed these ones were > missing the POINTER property while working on the POINTING_STICK property. I am not sure about this one. INPUT_PROP_POINTER is the default behavior when no properties are set. The current Xorg/libinput code should already be aware of that and uses this to be able to be backward compatible. Adding the info now, will not change anything in the user-space code and we will not be able to remove the compat code before a long time. So, really, I am not in favor, nor I will opposite my vote regarding this patch. Cheers, Benjamin > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/input/mouse/alps.c | 1 + > drivers/input/mouse/elantech.c | 1 + > drivers/input/mouse/psmouse-base.c | 2 ++ > drivers/input/mouse/synaptics_usb.c | 5 +++++ > drivers/input/mouse/trackpoint.c | 1 + > 5 files changed, 10 insertions(+) > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c > index 9de3c25..d7020ad 100644 > --- a/drivers/input/mouse/alps.c > +++ b/drivers/input/mouse/alps.c > @@ -2373,6 +2373,7 @@ int alps_init(struct psmouse *psmouse) > dev2->keybit[BIT_WORD(BTN_LEFT)] = > BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); > > + __set_bit(INPUT_PROP_POINTER, dev2->propbit); > if (priv->flags & ALPS_DUALPOINT) > __set_bit(INPUT_PROP_POINTING_STICK, dev2->propbit); > > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > index c767f7e..daaf82f 100644 > --- a/drivers/input/mouse/elantech.c > +++ b/drivers/input/mouse/elantech.c > @@ -1608,6 +1608,7 @@ int elantech_init(struct psmouse *psmouse) > BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | > BIT_MASK(BTN_RIGHT); > > + __set_bit(INPUT_PROP_POINTER, tp_dev->propbit); > __set_bit(INPUT_PROP_POINTING_STICK, tp_dev->propbit); > > error = input_register_device(etd->tp_dev); > diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c > index 5c1237d..a44d655 100644 > --- a/drivers/input/mouse/psmouse-base.c > +++ b/drivers/input/mouse/psmouse-base.c > @@ -685,6 +685,8 @@ static void psmouse_apply_defaults(struct psmouse *psmouse) > __set_bit(REL_X, input_dev->relbit); > __set_bit(REL_Y, input_dev->relbit); > > + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); > + > psmouse->set_rate = psmouse_set_rate; > psmouse->set_resolution = psmouse_set_resolution; > psmouse->poll = psmouse_poll; > diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c > index db3973d..6bcc018 100644 > --- a/drivers/input/mouse/synaptics_usb.c > +++ b/drivers/input/mouse/synaptics_usb.c > @@ -402,6 +402,11 @@ static int synusb_probe(struct usb_interface *intf, > __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); > } > > + if (synusb->flags & SYNUSB_TOUCHSCREEN) > + __set_bit(INPUT_PROP_DIRECT, input_dev->propbit); > + else > + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); > + > __set_bit(BTN_LEFT, input_dev->keybit); > __set_bit(BTN_RIGHT, input_dev->keybit); > __set_bit(BTN_MIDDLE, input_dev->keybit); > diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c > index b377462..30c8b69 100644 > --- a/drivers/input/mouse/trackpoint.c > +++ b/drivers/input/mouse/trackpoint.c > @@ -393,6 +393,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) > if ((button_info & 0x0f) >= 3) > __set_bit(BTN_MIDDLE, psmouse->dev->keybit); > > + __set_bit(INPUT_PROP_POINTER, psmouse->dev->propbit); > __set_bit(INPUT_PROP_POINTING_STICK, psmouse->dev->propbit); > > trackpoint_defaults(psmouse->private); > -- > 2.1.0 > -- 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
On Tue, Sep 02, 2014 at 10:38:34AM -0400, Benjamin Tissoires wrote: > On Sep 02 2014 or thereabouts, Hans de Goede wrote: > > I've not done a full audit of all mouse drivers, I noticed these ones were > > missing the POINTER property while working on the POINTING_STICK property. > > I am not sure about this one. INPUT_PROP_POINTER is the default behavior > when no properties are set. The current Xorg/libinput code should > already be aware of that and uses this to be able to be backward > compatible. > Adding the info now, will not change anything in the user-space code and > we will not be able to remove the compat code before a long time. > > So, really, I am not in favor, nor I will opposite my vote regarding > this patch. If we could reliably use the property in userspace it would make detecting things like joysticks or accelerometers a lot easier. So setting it where we know it's a pointer device may be helpful. Cheers, Peter > > > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > --- > > drivers/input/mouse/alps.c | 1 + > > drivers/input/mouse/elantech.c | 1 + > > drivers/input/mouse/psmouse-base.c | 2 ++ > > drivers/input/mouse/synaptics_usb.c | 5 +++++ > > drivers/input/mouse/trackpoint.c | 1 + > > 5 files changed, 10 insertions(+) > > > > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c > > index 9de3c25..d7020ad 100644 > > --- a/drivers/input/mouse/alps.c > > +++ b/drivers/input/mouse/alps.c > > @@ -2373,6 +2373,7 @@ int alps_init(struct psmouse *psmouse) > > dev2->keybit[BIT_WORD(BTN_LEFT)] = > > BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); > > > > + __set_bit(INPUT_PROP_POINTER, dev2->propbit); > > if (priv->flags & ALPS_DUALPOINT) > > __set_bit(INPUT_PROP_POINTING_STICK, dev2->propbit); > > > > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > > index c767f7e..daaf82f 100644 > > --- a/drivers/input/mouse/elantech.c > > +++ b/drivers/input/mouse/elantech.c > > @@ -1608,6 +1608,7 @@ int elantech_init(struct psmouse *psmouse) > > BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | > > BIT_MASK(BTN_RIGHT); > > > > + __set_bit(INPUT_PROP_POINTER, tp_dev->propbit); > > __set_bit(INPUT_PROP_POINTING_STICK, tp_dev->propbit); > > > > error = input_register_device(etd->tp_dev); > > diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c > > index 5c1237d..a44d655 100644 > > --- a/drivers/input/mouse/psmouse-base.c > > +++ b/drivers/input/mouse/psmouse-base.c > > @@ -685,6 +685,8 @@ static void psmouse_apply_defaults(struct psmouse *psmouse) > > __set_bit(REL_X, input_dev->relbit); > > __set_bit(REL_Y, input_dev->relbit); > > > > + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); > > + > > psmouse->set_rate = psmouse_set_rate; > > psmouse->set_resolution = psmouse_set_resolution; > > psmouse->poll = psmouse_poll; > > diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c > > index db3973d..6bcc018 100644 > > --- a/drivers/input/mouse/synaptics_usb.c > > +++ b/drivers/input/mouse/synaptics_usb.c > > @@ -402,6 +402,11 @@ static int synusb_probe(struct usb_interface *intf, > > __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); > > } > > > > + if (synusb->flags & SYNUSB_TOUCHSCREEN) > > + __set_bit(INPUT_PROP_DIRECT, input_dev->propbit); > > + else > > + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); > > + > > __set_bit(BTN_LEFT, input_dev->keybit); > > __set_bit(BTN_RIGHT, input_dev->keybit); > > __set_bit(BTN_MIDDLE, input_dev->keybit); > > diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c > > index b377462..30c8b69 100644 > > --- a/drivers/input/mouse/trackpoint.c > > +++ b/drivers/input/mouse/trackpoint.c > > @@ -393,6 +393,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) > > if ((button_info & 0x0f) >= 3) > > __set_bit(BTN_MIDDLE, psmouse->dev->keybit); > > > > + __set_bit(INPUT_PROP_POINTER, psmouse->dev->propbit); > > __set_bit(INPUT_PROP_POINTING_STICK, psmouse->dev->propbit); > > > > trackpoint_defaults(psmouse->private); > > -- > > 2.1.0 > > > -- > 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 > -- 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
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 9de3c25..d7020ad 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -2373,6 +2373,7 @@ int alps_init(struct psmouse *psmouse) dev2->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); + __set_bit(INPUT_PROP_POINTER, dev2->propbit); if (priv->flags & ALPS_DUALPOINT) __set_bit(INPUT_PROP_POINTING_STICK, dev2->propbit); diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index c767f7e..daaf82f 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1608,6 +1608,7 @@ int elantech_init(struct psmouse *psmouse) BIT_MASK(BTN_LEFT) | BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); + __set_bit(INPUT_PROP_POINTER, tp_dev->propbit); __set_bit(INPUT_PROP_POINTING_STICK, tp_dev->propbit); error = input_register_device(etd->tp_dev); diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 5c1237d..a44d655 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -685,6 +685,8 @@ static void psmouse_apply_defaults(struct psmouse *psmouse) __set_bit(REL_X, input_dev->relbit); __set_bit(REL_Y, input_dev->relbit); + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); + psmouse->set_rate = psmouse_set_rate; psmouse->set_resolution = psmouse_set_resolution; psmouse->poll = psmouse_poll; diff --git a/drivers/input/mouse/synaptics_usb.c b/drivers/input/mouse/synaptics_usb.c index db3973d..6bcc018 100644 --- a/drivers/input/mouse/synaptics_usb.c +++ b/drivers/input/mouse/synaptics_usb.c @@ -402,6 +402,11 @@ static int synusb_probe(struct usb_interface *intf, __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit); } + if (synusb->flags & SYNUSB_TOUCHSCREEN) + __set_bit(INPUT_PROP_DIRECT, input_dev->propbit); + else + __set_bit(INPUT_PROP_POINTER, input_dev->propbit); + __set_bit(BTN_LEFT, input_dev->keybit); __set_bit(BTN_RIGHT, input_dev->keybit); __set_bit(BTN_MIDDLE, input_dev->keybit); diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index b377462..30c8b69 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c @@ -393,6 +393,7 @@ int trackpoint_detect(struct psmouse *psmouse, bool set_properties) if ((button_info & 0x0f) >= 3) __set_bit(BTN_MIDDLE, psmouse->dev->keybit); + __set_bit(INPUT_PROP_POINTER, psmouse->dev->propbit); __set_bit(INPUT_PROP_POINTING_STICK, psmouse->dev->propbit); trackpoint_defaults(psmouse->private);
I've not done a full audit of all mouse drivers, I noticed these ones were missing the POINTER property while working on the POINTING_STICK property. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/input/mouse/alps.c | 1 + drivers/input/mouse/elantech.c | 1 + drivers/input/mouse/psmouse-base.c | 2 ++ drivers/input/mouse/synaptics_usb.c | 5 +++++ drivers/input/mouse/trackpoint.c | 1 + 5 files changed, 10 insertions(+)