Re: [Linuxwacom-devel] RFC: Stylus naming convention

2012-05-29 Thread Peter Hutterer
On Fri, May 25, 2012 at 03:10:44PM -0700, Jason Gerecke wrote:
 I was just made aware of an interesting naming issue for libwacom /
 gnome-control-center that I wanted people's opinion on.
 
 Looking at the Intuos5 configuration page, g-c-c claims that I can
 configure its Intuos4 Grip Pen. On seeing this, some users (e.g.
 those who've never used an Intuos4) may be confused by the
 contradictory information in front of them. We could remove the tablet
 name from the pen and leave just Grip Pen, but then you may confuse
 other users (e.g. those who've upgraded from Intuos3 to Intuos5) into
 thinking that their old pens are compatible with their new tablet. We
 could dynamically generate the name on the fly so that they see
 Intuos5 Grip Pen, but that may confuse other users (e.g. those
 who've upgraded from Intuos4 to Intuos5) into thinking that old pens
 are *not* compatible.
 
 Thoughts? Opinions?

lame, but possibly less confusing is Intuos4-compatible? we also have that
problem with the I4-compatible pens and the Cintiqs, isn't it?

we could also rename the current series to simply Wacom Grip Pen (as on
the website) and the models for older series with the tablet name (Wacom
Intuos3 blah). Of course, then you'd have to pinky-swear that you're not
going to release a newer, different, model :)

Cheers,
  Peter

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [Patch libwacom 1/3] data: add the DD, Bamboo Connect (Pen)

2012-05-29 Thread Peter Hutterer
On Fri, May 25, 2012 at 11:39:25PM -0500, David Foley wrote:
 Add the three third generation BambooPT tablets.

Thanks for the patches. I'm going to hold them back though until we've
figured out a good solution for the Bamboo button numbering because we need
to add the button position to all the files. Same goes for the other series,
they're not forgotten though.

Cheers,
  Peter

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [PATCH] Re-enable relative wheel scrolling from pad devices

2012-05-29 Thread Peter Hutterer
On Fri, May 25, 2012 at 10:30:27AM -0700, Jason Gerecke wrote:
 Commit 477a261e does not handle the case where relative wheel events
 come from a pad device. The Graphire4 produces such events, with the
 result that scrolling with one has been broken ever since.
 
 Signed-off-by: Jason Gerecke killert...@gmail.com

Reviewed-by: Peter Hutterer peter.hutte...@who-t.net

Cheers,
  Peter

 ---
  src/wcmCommon.c |2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/wcmCommon.c b/src/wcmCommon.c
 index 7199105..09e5ccd 100644
 --- a/src/wcmCommon.c
 +++ b/src/wcmCommon.c
 @@ -449,7 +449,7 @@ static void sendWheelStripEvents(InputInfoPtr pInfo, 
 const WacomDeviceState* ds,
  
   /* emulate events for relative wheel */
   delta = getScrollDelta(ds-relwheel, 0, 0, 0);
 - if (delta  IsCursor(priv)  priv-oldProximity == ds-proximity)
 + if (delta  (IsCursor(priv) || IsPad(priv))  priv-oldProximity == 
 ds-proximity)
   {
   DBG(10, priv, Relative wheel scroll delta = %d\n, delta);
   fakeButton = getWheelButton(delta, priv-relup, priv-reldn,
 -- 
 1.7.10.2
 
 
 --
 Live Security Virtual Conference
 Exclusive live event will cover all the ways today's security and 
 threat landscape has changed and how IT managers can respond. Discussions 
 will include endpoint security, mobile security and the latest in malware 
 threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
 ___
 Linuxwacom-devel mailing list
 Linuxwacom-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
 

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [PATCH 00/14] Lots of compiler warning fixes

2012-05-29 Thread Jason Gerecke
On Fri, May 25, 2012 at 12:49 PM, Jason Gerecke killert...@gmail.com wrote:
 The compiler is spitting out too many warnings for me to easily
 find concerns about new changes, so I've gone ahead and addressed
 a number of the ones I'm getting. There are still a handful of
 warnings left, but they're a little harder to fix.

 Jason Gerecke (14):
  Fix warning: Remove superflous casts in getScrollDelta
  Fix warning: Have wcmEventAutoDevProbe return const
  Fix warning: Change default_options to be const
  Fix warning: Constify _WacomCommonRec.device_path
  Fix warning: Remove superflous 'event' pointer in usbParseBTNEvent
  Fix warning: Constify 'name' argument of InitWcmAtom
  Fix warning: Swap empty strings for NULL in wcmCheckSource
  Fix warning: Swap empty string for NULL in wcmIsDuplicate
  Fix warning: Swap empty string for NULL in wcmNeedAutoHotplug
  Fix warning: Swap empty string for NULL in wcmIsAValidType
  Fix warning: Swap empty string for NULL in wcmIsHotpluggedDevice
  Fix warning: Remove variable re-definition in wcmSerialValidate
  Fix warning: Re-scope variable in wcmPreInitParseOptions
  Align returned type of wcmEventAutoDevProbe with expected type

  src/wcmCommon.c         |    6 +++---
  src/wcmConfig.c         |    8 
  src/wcmISDV4.c          |    2 +-
  src/wcmUSB.c            |    5 ++---
  src/wcmValidateDevice.c |   32 
  src/wcmXCommand.c       |    2 +-
  src/xf86Wacom.c         |    4 ++--
  src/xf86Wacom.h         |    4 ++--
  src/xf86WacomDefs.h     |    2 +-
  9 files changed, 32 insertions(+), 33 deletions(-)

 --
 1.7.10.2


Pushed with fixes.

Jason

---
Day xee-nee-svsh duu-'ushtlh-ts'it;
nuu-wee-ya' duu-xan' 'vm-nvshtlh-ts'it.
Huu-chan xuu naa~-gha.

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [PATCH] Re-enable relative wheel scrolling from pad devices

2012-05-29 Thread Jason Gerecke
On Mon, May 28, 2012 at 11:12 PM, Peter Hutterer
peter.hutte...@who-t.net wrote:
 On Fri, May 25, 2012 at 10:30:27AM -0700, Jason Gerecke wrote:
 Commit 477a261e does not handle the case where relative wheel events
 come from a pad device. The Graphire4 produces such events, with the
 result that scrolling with one has been broken ever since.

 Signed-off-by: Jason Gerecke killert...@gmail.com

 Reviewed-by: Peter Hutterer peter.hutte...@who-t.net

 Cheers,
  Peter

 ---
  src/wcmCommon.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/wcmCommon.c b/src/wcmCommon.c
 index 7199105..09e5ccd 100644
 --- a/src/wcmCommon.c
 +++ b/src/wcmCommon.c
 @@ -449,7 +449,7 @@ static void sendWheelStripEvents(InputInfoPtr pInfo, 
 const WacomDeviceState* ds,

       /* emulate events for relative wheel */
       delta = getScrollDelta(ds-relwheel, 0, 0, 0);
 -     if (delta  IsCursor(priv)  priv-oldProximity == ds-proximity)
 +     if (delta  (IsCursor(priv) || IsPad(priv))  priv-oldProximity == 
 ds-proximity)
       {
               DBG(10, priv, Relative wheel scroll delta = %d\n, delta);
               fakeButton = getWheelButton(delta, priv-relup, priv-reldn,
 --
 1.7.10.2


 --
 Live Security Virtual Conference
 Exclusive live event will cover all the ways today's security and
 threat landscape has changed and how IT managers can respond. Discussions
 will include endpoint security, mobile security and the latest in malware
 threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
 ___
 Linuxwacom-devel mailing list
 Linuxwacom-devel@lists.sourceforge.net
 https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Patch pushed to Sourceforge.

Jason

---
Day xee-nee-svsh duu-'ushtlh-ts'it;
nuu-wee-ya' duu-xan' 'vm-nvshtlh-ts'it.
Huu-chan xuu naa~-gha.

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] RFC: Stylus naming convention

2012-05-29 Thread Ping Cheng
On Mon, May 28, 2012 at 11:04 PM, Peter Hutterer
peter.hutte...@who-t.net wrote:
 On Fri, May 25, 2012 at 03:10:44PM -0700, Jason Gerecke wrote:
 I was just made aware of an interesting naming issue for libwacom /
 gnome-control-center that I wanted people's opinion on.

 Looking at the Intuos5 configuration page, g-c-c claims that I can
 configure its Intuos4 Grip Pen. On seeing this, some users (e.g.
 those who've never used an Intuos4) may be confused by the
 contradictory information in front of them. We could remove the tablet
 name from the pen and leave just Grip Pen, but then you may confuse
 other users (e.g. those who've upgraded from Intuos3 to Intuos5) into
 thinking that their old pens are compatible with their new tablet. We
 could dynamically generate the name on the fly so that they see
 Intuos5 Grip Pen, but that may confuse other users (e.g. those
 who've upgraded from Intuos4 to Intuos5) into thinking that old pens
 are *not* compatible.

 Thoughts? Opinions?

 lame, but possibly less confusing is Intuos4-compatible? we also have that
 problem with the I4-compatible pens and the Cintiqs, isn't it?

Intuos 3 and Cintiq 21UX1 share tools.

Intuos 4, 5, and Cintiq 21UX2, 24HD share tools

 we could also rename the current series to simply Wacom Grip Pen (as on
 the website) and the models for older series with the tablet name (Wacom
 Intuos3 blah). Of course, then you'd have to pinky-swear that you're not
 going to release a newer, different, model :)

We can not tell future :). But we know what we have now.

So, how about we classify them with tool version/generations?

Wacom Grip Pen1 = for Intuos 1;
Wacom Grip Pen2 = for Intuos2;
Wacom Grip Pen3 = I3 and Cintiq 21UX1;
Wacom Grip Pen4 = I4, I5, and Cintiq 21UX2, Cintiq 24HD.

Although they are not consistent with tablet names, they are
consistent with tool specs/versions.

Ping

--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel


Re: [Linuxwacom-devel] [PATCH libwacom] Add LED0 and LED1 options for led-controlling buttons

2012-05-29 Thread Ping Cheng
On Wed, May 23, 2012 at 7:17 PM, Peter Hutterer
peter.hutte...@who-t.net wrote:
 These two button options specify which button controls which LED bank
 exposed by the kernel.

 Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
 ---
 Notably on the Cintiq, the layout of the banks is inverse to what one
 expects (0 is right, 1 is left). That can be fixed in the kernel but
 long-term it's better to rely on a specific flag to tell us.

We may not want to fix it in the kernel. People should not assume 0 is
for left. All Cintiqs have 0 for right, so far ;). You may mention
Intuos4. But I4 only has one set of LEDs.

 Not sure about the 24HD here - three buttons that control the leds? is this
 correct?

Every LED has its own button.

Ping


  data/cintiq-21ux2.tablet     |    3 ++
  data/cintiq-24hd.tablet      |    3 ++
  data/intuos4-12x19.tablet    |    2 ++
  data/intuos4-4x6.tablet      |    2 ++
  data/intuos4-6x9-wl.tablet   |    2 ++
  data/intuos4-6x9.tablet      |    2 ++
  data/intuos4-8x13.tablet     |    2 ++
  data/intuos5-m.tablet        |    2 ++
  data/intuos5-s.tablet        |    2 ++
  data/intuos5-touch-l.tablet  |    2 ++
  data/intuos5-touch-m.tablet  |    2 ++
  data/intuos5-touch-s.tablet  |    2 ++
  data/wacom.example           |    5 
  libwacom/libwacom-database.c |    4 ++-
  libwacom/libwacom.c          |    2 ++
  libwacom/libwacom.h          |    2 ++
  test/tablet-validity.c       |   63 
 ++
  17 files changed, 101 insertions(+), 1 deletion(-)

 diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet
 index 6a0b242..a623f27 100644
 --- a/data/cintiq-21ux2.tablet
 +++ b/data/cintiq-21ux2.tablet
 @@ -64,3 +64,6 @@ Right=K;L;M;N;J;O;P;Q;R
  Touchstrip=A
  Touchstrip2=J
  StripsNumModes=4
 +
 +LED0=J
 +LED1=A
 diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet
 index 004ef22..8c5e715 100644
 --- a/data/cintiq-24hd.tablet
 +++ b/data/cintiq-24hd.tablet
 @@ -64,3 +64,6 @@ Right=I;J;K;L;M;N;O;P

  Ring=A;B;C
  Ring2=I;J;K
 +
 +LED0=I;J;K
 +LED1=A;B;C
 diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet
 index 4f066b6..c947ef2 100644
 --- a/data/intuos4-12x19.tablet
 +++ b/data/intuos4-12x19.tablet
 @@ -54,3 +54,5 @@ OLEDs=B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet
 index 36e45d6..e06f08a 100644
 --- a/data/intuos4-4x6.tablet
 +++ b/data/intuos4-4x6.tablet
 @@ -53,3 +53,5 @@ Left=A;B;C;D;E;F;G

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet
 index 90839de..8468f70 100644
 --- a/data/intuos4-6x9-wl.tablet
 +++ b/data/intuos4-6x9-wl.tablet
 @@ -54,3 +54,5 @@ OLEDs=B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet
 index 0d20933..3153a81 100644
 --- a/data/intuos4-6x9.tablet
 +++ b/data/intuos4-6x9.tablet
 @@ -54,3 +54,5 @@ OLEDs=B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet
 index e46e9b4..113a893 100644
 --- a/data/intuos4-8x13.tablet
 +++ b/data/intuos4-8x13.tablet
 @@ -54,3 +54,5 @@ OLEDs=B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet
 index ee3b6bb..79cc636 100644
 --- a/data/intuos5-m.tablet
 +++ b/data/intuos5-m.tablet
 @@ -63,3 +63,5 @@ Left=A;B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet
 index 665159d..f6ba62e 100644
 --- a/data/intuos5-s.tablet
 +++ b/data/intuos5-s.tablet
 @@ -61,3 +61,5 @@ Left=A;B;C;D;E;F;G

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet
 index cbd2685..5c52ecd 100644
 --- a/data/intuos5-touch-l.tablet
 +++ b/data/intuos5-touch-l.tablet
 @@ -63,3 +63,5 @@ Left=A;B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet
 index 4cd57a8..3f627e8 100644
 --- a/data/intuos5-touch-m.tablet
 +++ b/data/intuos5-touch-m.tablet
 @@ -63,3 +63,5 @@ Left=A;B;C;D;E;F;G;H;I

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet
 index 6e3812e..261ec74 100644
 --- a/data/intuos5-touch-s.tablet
 +++ b/data/intuos5-touch-s.tablet
 @@ -61,3 +61,5 @@ Left=A;B;C;D;E;F;G

  Ring=A
  RingNumModes=4
 +
 +LED0=A
 diff --git a/data/wacom.example b/data/wacom.example
 index 762c360..50ac843 100644
 --- a/data/wacom.example
 +++ b/data/wacom.example
 @@ -144,3 +144,8 @@ Touchstrip2=J
  # We assume the same number of modes for each of the touchstrips
  # if there is more than one
  StripsNumModes=4
 +
 +# Button associated with LED bank 0 or 1, i.e. the that should toggle that
 +# LED bank
 +LED0=A
 +LED1=J
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
 index 5468975..e5569c9 100644