[Linuxwacom-devel] [PATCH] Re-enable relative wheel scrolling from pad devices
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
---
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
[Linuxwacom-devel] [PATCH 01/14] Fix warning: Remove superflous casts in getScrollDelta
../src/xf86Wacom.c: In function 'wcmEventAutoDevProbe':
../src/xf86Wacom.c:527:5: warning: return discards 'const' qualifier from
pointer target type [enabled by default]
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmCommon.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 7199105..edbcd68 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -330,9 +330,9 @@ static int getScrollDelta(int current, int old, int wrap,
int flags)
if (flags AXIS_BITWISE)
{
- current = (int)log2((current 1) | 0x01);
- old = (int)log2((old 1) | 0x01);
- wrap = (int)log2((wrap 1) | 0x01);
+ current = log2((current 1) | 0x01);
+ old = log2((old 1) | 0x01);
+ wrap = log2((wrap 1) | 0x01);
}
delta = current - old;
--
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
[Linuxwacom-devel] [PATCH 00/14] Lots of compiler warning fixes
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 -- 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
[Linuxwacom-devel] [PATCH 05/14] Fix warning: Remove superflous 'event' pointer in usbParseBTNEvent
../src/wcmUSB.c: In function 'usbInitToolType':
../src/wcmUSB.c:1378:30: warning: cast discards '__attribute__((const))'
qualifier from pointer target type [-Wcast-qual]
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmUSB.c |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 76cc85d..4ec91b7 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -1375,11 +1375,10 @@ static int usbParseBTNEvent(WacomCommonPtr common,
static int usbInitToolType(const struct input_event *event_ptr, int nevents,
int last_device_type)
{
int i, device_type = 0;
- struct input_event* event = (struct input_event *)event_ptr;
for (i = 0; (i nevents) !device_type; ++i)
{
- switch (event-code)
+ switch (event_ptr-code)
{
case BTN_TOOL_PEN:
case BTN_TOOL_PENCIL:
@@ -1399,7 +1398,7 @@ static int usbInitToolType(const struct input_event
*event_ptr, int nevents, int
break;
}
- event++;
+ event_ptr++;
}
if (!device_type)
--
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
[Linuxwacom-devel] [PATCH 07/14] Fix warning: Swap empty strings for NULL in wcmCheckSource
Also cleans up variable scope.
../src/wcmValidateDevice.c: In function 'wcmCheckSource':
../src/wcmValidateDevice.c:37:2: warning: passing argument 3 of
'xf86CheckStrOption' discards 'const' qualifier from pointer target type
[enabled by default]
In file included from /usr/include/xorg/xf86str.h:43:0,
from /usr/include/xorg/xf86.h:44,
from ../src/xf86Wacom.h:33,
from ../src/wcmValidateDevice.c:23:
/usr/include/xorg/xf86Opt.h:87:24: note: expected 'char *' but argument is of
type 'const char *'
../src/wcmValidateDevice.c:52:4: warning: passing argument 3 of
'xf86CheckStrOption' discards 'const' qualifier from pointer target type
[enabled by default]
In file included from /usr/include/xorg/xf86str.h:43:0,
from /usr/include/xorg/xf86.h:44,
from ../src/xf86Wacom.h:33,
from ../src/wcmValidateDevice.c:23:
/usr/include/xorg/xf86Opt.h:87:24: note: expected 'char *' but argument is of
type 'const char *'
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmValidateDevice.c | 15 +++
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index fac813e..b4f15af 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -33,15 +33,11 @@
static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t min_maj)
{
int match = 0;
- char* device;
- char* fsource = xf86CheckStrOption(pInfo-options, _source, );
InputInfoPtr pDevices = xf86FirstLocalDevice();
- WacomCommonPtr pCommon = NULL;
- char* psource;
for (; pDevices != NULL; pDevices = pDevices-next)
{
- device = xf86CheckStrOption(pDevices-options, Device, NULL);
+ char* device = xf86CheckStrOption(pDevices-options, Device,
NULL);
/* device can be NULL on some distros */
if (!device || !strstr(pDevices-drv-driverName, wacom))
@@ -49,14 +45,17 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t
min_maj)
if (pInfo != pDevices)
{
- psource = xf86CheckStrOption(pDevices-options,
_source, );
- pCommon = ((WacomDevicePtr)pDevices-private)-common;
+ WacomCommonPtr pCommon =
((WacomDevicePtr)pDevices-private)-common;
+ char* fsource = xf86CheckStrOption(pInfo-options,
_source, NULL);
+ char* psource = xf86CheckStrOption(pDevices-options,
_source, NULL);
+
if (pCommon-min_maj
pCommon-min_maj == min_maj)
{
/* only add the new tool if the matching
major/minor
* was from the same source */
- if (strcmp(fsource, psource))
+ if ((!fsource !psource) ||
+ (fsource psource strcmp(fsource,
psource)))
{
match = 1;
break;
--
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
[Linuxwacom-devel] [PATCH 04/14] Fix warning: Constify _WacomCommonRec.device_path
../src/wcmConfig.c: In function 'wcmPreInit':
../src/wcmConfig.c:507:26: warning: assignment discards 'const' qualifier from
pointer target type [enabled by default]
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmConfig.c |2 +-
src/wcmValidateDevice.c |2 +-
src/xf86Wacom.h |2 +-
src/xf86WacomDefs.h |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index aeae119..31cc90a 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -481,7 +481,7 @@ static int wcmPreInit(InputDriverPtr drv, InputInfoPtr
pInfo, int flags)
WacomDevicePtr priv = NULL;
WacomCommonPtr common = NULL;
const char* type;
- char* device, *oldname;
+ const char* device, *oldname;
int need_hotplug = 0, is_dependent = 0;
gWacomModule.wcmDrv = drv;
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index a0247ef..fac813e 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -78,7 +78,7 @@ static Bool wcmCheckSource(InputInfoPtr pInfo, dev_t min_maj)
* the xorg.conf and is then hotplugged through the server backend (HAL,
* udev). In this case, the hotplugged one fails.
*/
-int wcmIsDuplicate(char* device, InputInfoPtr pInfo)
+int wcmIsDuplicate(const char* device, InputInfoPtr pInfo)
{
struct stat st;
int isInUse = 0;
diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h
index ca0bcf0..2e546eb 100644
--- a/src/xf86Wacom.h
+++ b/src/xf86Wacom.h
@@ -131,7 +131,7 @@ void wcmMappingFactor(InputInfoPtr pInfo);
/* validation */
extern Bool wcmIsAValidType(InputInfoPtr pInfo, const char* type);
extern Bool wcmIsWacomDevice (char* fname);
-extern int wcmIsDuplicate(char* device, InputInfoPtr pInfo);
+extern int wcmIsDuplicate(const char* device, InputInfoPtr pInfo);
extern int wcmDeviceTypeKeys(InputInfoPtr pInfo);
/* hotplug */
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index f662131..4ae6fe7 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -411,7 +411,7 @@ enum WacomProtocol {
struct _WacomCommonRec
{
/* Do not move device_path, same offset as priv-name. Used by DBG
macro */
- char* device_path; /* device file name */
+ const char* device_path;/* device file name */
dev_t min_maj; /* minor/major number */
unsigned char wcmFlags; /* various flags (handle tilt) */
int debugLevel;
--
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
[Linuxwacom-devel] [PATCH 06/14] Fix warning: Constify 'name' argument of InitWcmAtom
../src/wcmXCommand.c: In function 'InitWcmDeviceProperties': ../src/wcmXCommand.c:175:3: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:179:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:186:3: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:194:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:197:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:201:3: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:205:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:209:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:212:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:216:3: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:220:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:225:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:228:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:234:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:238:3: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:244:3: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:249:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' ../src/wcmXCommand.c:254:2: warning: passing argument 2 of 'InitWcmAtom' discards 'const' qualifier from pointer target type [enabled by default] ../src/wcmXCommand.c:121:13: note: expected 'char *' but argument is of type 'const char *' Signed-off-by: Jason Gerecke killert...@gmail.com --- src/wcmXCommand.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c index 883b3b1..724a9ac 100644 --- a/src/wcmXCommand.c +++ b/src/wcmXCommand.c @@ -118,7 +118,7 @@ Atom prop_debuglevels; * @param values Pointer to 32 bit integer array of initial property values * @return Atom handle of property name */ -static Atom InitWcmAtom(DeviceIntPtr dev, char *name, Atom type, int format, int nvalues, int *values) +static Atom InitWcmAtom(DeviceIntPtr dev, const char *name, Atom type, int format,
[Linuxwacom-devel] [PATCH 08/14] Fix warning: Swap empty string for NULL in wcmIsDuplicate
../src/wcmValidateDevice.c: In function 'wcmIsDuplicate':
../src/wcmValidateDevice.c:85:2: warning: passing argument 3 of
'xf86CheckStrOption' discards 'const' qualifier from pointer target type
[enabled by default]
In file included from /usr/include/xorg/xf86str.h:43:0,
from /usr/include/xorg/xf86.h:44,
from ../src/xf86Wacom.h:33,
from ../src/wcmValidateDevice.c:23:
/usr/include/xorg/xf86Opt.h:87:24: note: expected 'char *' but argument is of
type 'const char *'
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmValidateDevice.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index b4f15af..1b24a6f 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -81,10 +81,10 @@ int wcmIsDuplicate(const char* device, InputInfoPtr pInfo)
{
struct stat st;
int isInUse = 0;
- char* lsource = xf86CheckStrOption(pInfo-options, _source, );
+ char* lsource = xf86CheckStrOption(pInfo-options, _source, NULL);
/* always allow xorg.conf defined tools to be added */
- if (!strlen(lsource)) goto ret;
+ if (!lsource || !strlen(lsource)) goto ret;
if (stat(device, st) == -1)
{
--
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
[Linuxwacom-devel] [PATCH 09/14] Fix warning: Swap empty string for NULL in wcmNeedAutoHotplug
../src/wcmValidateDevice.c: In function 'wcmNeedAutoHotplug':
../src/wcmValidateDevice.c:574:2: warning: passing argument 3 of
'xf86CheckStrOption' discards 'const' qualifier from pointer target type
[enabled by default]
In file included from /usr/include/xorg/xf86str.h:43:0,
from /usr/include/xorg/xf86.h:44,
from ../src/xf86Wacom.h:33,
from ../src/wcmValidateDevice.c:23:
/usr/include/xorg/xf86Opt.h:87:24: note: expected 'char *' but argument is of
type 'const char *'
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmValidateDevice.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
index 1b24a6f..28321bc 100644
--- a/src/wcmValidateDevice.c
+++ b/src/wcmValidateDevice.c
@@ -570,13 +570,13 @@ void wcmHotplugOthers(InputInfoPtr pInfo, const char
*basename)
*/
int wcmNeedAutoHotplug(InputInfoPtr pInfo, const char **type)
{
- char *source = xf86CheckStrOption(pInfo-options, _source, );
+ char *source = xf86CheckStrOption(pInfo-options, _source, NULL);
int i;
if (*type) /* type specified, don't hotplug */
return 0;
- if (strcmp(source, server/hal) strcmp(source, server/udev))
+ if (source strcmp(source, server/hal) strcmp(source,
server/udev))
return 0;
/* no type specified, so we need to pick the first one applicable
--
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
[Linuxwacom-devel] [PATCH 11/14] Fix warning: Swap empty string for NULL in wcmIsHotpluggedDevice
../src/wcmConfig.c: In function 'wcmIsHotpluggedDevice':
../src/wcmConfig.c:442:2: warning: passing argument 3 of 'xf86CheckStrOption'
discards 'const' qualifier from pointer target type
[enabled by default]
In file included from /usr/include/xorg/xf86str.h:43:0,
from /usr/include/xorg/xf86.h:44,
from ../src/xf86Wacom.h:33,
from ../src/wcmConfig.c:24:
/usr/include/xorg/xf86Opt.h:87:24: note: expected 'char *' but argument is of
type 'const char *'
Signed-off-by: Jason Gerecke killert...@gmail.com
---
src/wcmConfig.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/wcmConfig.c b/src/wcmConfig.c
index 31cc90a..e7fea5b 100644
--- a/src/wcmConfig.c
+++ b/src/wcmConfig.c
@@ -439,8 +439,8 @@ static void wcmLinkTouchAndPen(InputInfoPtr pInfo)
*/
static int wcmIsHotpluggedDevice(InputInfoPtr pInfo)
{
- char *source = xf86CheckStrOption(pInfo-options, _source, );
- return !strcmp(source, _driver/wacom);
+ char *source = xf86CheckStrOption(pInfo-options, _source, NULL);
+ return (!source || !strcmp(source, _driver/wacom));
}
/* wcmPreInit - called for each input devices with the driver set to
--
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
[Linuxwacom-devel] [PATCH 14/14] Align returned type of wcmEventAutoDevProbe with expected type
There's some cognitive dissonance when reading return FALSE in a function that returns a pointer (despite FALSE and NULL being equivalent). Signed-off-by: Jason Gerecke killert...@gmail.com --- src/xf86Wacom.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c index 5011fe0..3e128f9 100644 --- a/src/xf86Wacom.c +++ b/src/xf86Wacom.c @@ -534,7 +534,7 @@ const char *wcmEventAutoDevProbe (InputInfoPtr pInfo) xf86Msg(X_ERROR, %s: no Wacom event device found (checked %d nodes, waited %d msec)\n, pInfo-name, i + 1, wait); xf86Msg(X_ERROR, %s: unable to probe device\n, pInfo-name); - return FALSE; + return NULL; } /* -- 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
[Linuxwacom-devel] RFC: Stylus naming convention
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? 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
[Linuxwacom-devel] [Patch libwacom 2/6] data: add the D6, Bamboo Pen Touch
Add the second generation Bamboo Pen Touch. Signed-off-by: David Foley favux...@gmail.com --- data/bamboopt-2fg-4x5.tablet | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 data/bamboopt-2fg-4x5.tablet diff --git a/data/bamboopt-2fg-4x5.tablet b/data/bamboopt-2fg-4x5.tablet new file mode 100644 index 000..4122bb8 --- /dev/null +++ b/data/bamboopt-2fg-4x5.tablet @@ -0,0 +1,23 @@ +# Wacom +# Bamboo Pen Touch +# CTH-460 +# +# second generation BambooPT +# +# stylus with two buttons and eraser; 2FG touch +# Pen active area: 5.8 x 3.62in +# Touch active area: 4.92 x 3.35in + +[Device] +Name=Wacom BambooPT 2FG 4x5 +DeviceMatch=usb:056a:00d6 +Class=Bamboo +Width=6 +Height=4 + +[Features] +Stylus=true +Reversible=true +Touch=true +Buttons=4 +BuiltIn=false -- 1.7.9.5 -- 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
[Linuxwacom-devel] [Patch libwacom 4/6] data: add the D8, Bamboo Comic (or Fun Medium)
Add the Bamboo Comic (or Fun Medium). Signed-off-by: David Foley favux...@gmail.com --- data/bamboo-comic-2fg.tablet | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 data/bamboo-comic-2fg.tablet diff --git a/data/bamboo-comic-2fg.tablet b/data/bamboo-comic-2fg.tablet new file mode 100644 index 000..3d95c42 --- /dev/null +++ b/data/bamboo-comic-2fg.tablet @@ -0,0 +1,23 @@ +# Wacom +# Bamboo Comic (or Fun) Medium +# CTH-661 +# +# second generation BambooPT +# +# stylus with two buttons and eraser; 2FG touch +# Pen active area: 8.53 x 5.40in +# Touch active area: 7.48 x 5.12in + +[Device] +Name=Wacom Bamboo Comic 2FG +DeviceMatch=usb:056a:00d8 +Class=Bamboo +Width=9 +Height=5 + +[Features] +Stylus=true +Reversible=true +Touch=true +Buttons=4 +BuiltIn=false -- 1.7.9.5 -- 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
[Linuxwacom-devel] [Patch libwacom 0/6] data: add 6 gen2 BambooPT tablets
Add the six second generation BambooPT tablets. Dave -- 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
[Linuxwacom-devel] [Patch libwacom 1/3] data: add the DD, Bamboo Connect (Pen)
Add the three third generation BambooPT tablets. Dave -- 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
[Linuxwacom-devel] [Patch libwacom 3/3] data: add the DF, Bamboo Create (Pen Touch Medium)
Adds the Bamboo Create (Pen Touch Medium). Reports 16 FG touches. Signed-off-by: David Foley favux...@gmail.com --- data/bamboo-16FG-6x8.tablet | 24 1 file changed, 24 insertions(+) create mode 100644 data/bamboo-16FG-6x8.tablet diff --git a/data/bamboo-16FG-6x8.tablet b/data/bamboo-16FG-6x8.tablet new file mode 100644 index 000..a7769e9 --- /dev/null +++ b/data/bamboo-16FG-6x8.tablet @@ -0,0 +1,24 @@ +# Wacom +# Bamboo Create (Pen Touch Medium) +# CTH-670 +# +# third generation BambooPT +# +# stylus with two buttons and eraser; 16FG touch +# active area: 8.5 x 5.4in +# +# wireless kit available + +[Device] +Name=Wacom Bamboo 16FG 6x8 +DeviceMatch=usb:056a:00df +Class=Bamboo +Width=9 +Height=5 + +[Features] +Stylus=true +Reversible=true +Touch=true +Buttons=4 +BuiltIn=false -- 1.7.9.5 -- 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
[Linuxwacom-devel] [Patch libwacom 2/3] data: add the DE, Bamboo Capture (Pen Touch Small)
Adds the Bamboo Capture (Pen Touch Small). Reports 16 FG touches. Signed-off-by: David Foley favux...@gmail.com --- data/bamboo-16FG-4x5.tablet | 24 1 file changed, 24 insertions(+) create mode 100644 data/bamboo-16FG-4x5.tablet diff --git a/data/bamboo-16FG-4x5.tablet b/data/bamboo-16FG-4x5.tablet new file mode 100644 index 000..e4ba4e5 --- /dev/null +++ b/data/bamboo-16FG-4x5.tablet @@ -0,0 +1,24 @@ +# Wacom +# Bamboo Capture (Pen Touch Small) +# CTH-470 +# +# third generation BambooPT +# +# stylus with two buttons and no eraser; 16FG touch +# active area: 5.8 x 3.6in +# +# wireless kit available + +[Device] +Name=Wacom Bamboo 16FG 4x5 +DeviceMatch=usb:056a:00de +Class=Bamboo +Width=6 +Height=4 + +[Features] +Stylus=true +Reversible=true +Touch=true +Buttons=4 +BuiltIn=false -- 1.7.9.5 -- 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
[Linuxwacom-devel] [Patch libwacom 0/3] data: add the DD, Bamboo Connect (Pen)
Add the three third generation BambooPT tablets. Dave -- 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
