1
commit 0d7790b80ded4a33b6a81ebc0f8f11ccfbd27fa9
2
Author: Peter Hutterer <peter.hutterer@who-t.net>
3
Date: Tue Apr 19 14:05:44 2011 +1000
7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
9
commit 3081ecb428d29c639cb2874958b8f95be6978ede
10
Author: Ping Cheng <pinglinux@gmail.com>
11
Date: Wed Apr 13 15:43:49 2011 -0700
13
Fake resolution for 9F and E2
15
9F and E2 are touch only devices, for which we need to retrieve
16
the resolution from the kernel. So, the resolution defined in
17
WacomModelDesc does not count for anything. However, to avoid
18
future questions about the weird "394", align them with their
21
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
22
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
23
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
25
commit 3beefe834692048dd04d877a05bb85e0ed7c4c80
26
Author: Jason Gerecke <killertofu@gmail.com>
27
Date: Tue Apr 12 12:06:11 2011 -0700
29
man: Use __drivername__ instead of "wacom"
31
Because hardcoding things is uncool
33
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
34
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
36
commit 432f3cb434d707bc516f930bd9ee1863685e2110
37
Author: Jason Gerecke <killertofu@gmail.com>
38
Date: Tue Apr 12 12:06:10 2011 -0700
40
man: Fix __drivername__ macro
42
It seems we've been having this macro dangling in our manpage since
43
0862aa3d74378abbf9f23289ab864a4d07305d0d
45
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
46
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
48
commit e6743f3c8adc54c4a6d19e2e1fcd884091145c90
49
Author: Jason Gerecke <killertofu@gmail.com>
50
Date: Tue Apr 12 12:06:08 2011 -0700
52
man: Update usage information
54
The usage provided by '--help' is more accurate than that provided
55
in the man page, and some arguments to '--set' do not require a
58
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
59
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
61
commit 52408eac9cf497a410952284046b8fed3aa32d4b
62
Author: Peter Hutterer <peter.hutterer@who-t.net>
63
Date: Mon Apr 11 13:42:42 2011 +1000
65
isdv4-serial-debugger: return early if tcgetattr() failed.
67
Fixes compiler warning
68
isdv4-serial-debugger.c: In function ‘set_baud_rate’:
69
isdv4-serial-debugger.c:127:6: warning: variable ‘rc’ set but not used
70
[-Wunused-but-set-variable]
72
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
74
commit 8caa65efe358e12873ef3f8c17cd0d7a990a6419
75
Author: Peter Hutterer <peter.hutterer@who-t.net>
76
Date: Mon Apr 11 13:40:20 2011 +1000
78
xsetwacom: remove two unused variables
80
xsetwacom.c: In function ‘keysym_to_keycode’:
81
xsetwacom.c:964:6: warning: variable ‘group’ set but not used
82
[-Wunused-but-set-variable]
84
xsetwacom.c: In function ‘get_actions’:
85
xsetwacom.c:1747:25: warning: variable ‘last_press’ set but not used
86
[-Wunused-but-set-variable]
88
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
90
commit 161bcb48340bb9ef0b694b5bd33c7e5ed5db3ce6
91
Author: Peter Hutterer <peter.hutterer@who-t.net>
92
Date: Mon Apr 11 12:13:00 2011 +1000
94
Fix higher button events.
96
Buttons higher than sizeof(int) weren't getting sent. The mod_buttons macro
97
needs to test for the number of bits, not bytes.
99
Introduced in 880512f84c26cddbfc1a8ff495890595424466f2
101
Reported-by: Andrzej Giniewicz <gginiu@gmail.com>
102
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
103
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
105
commit 58a258600cb1138c160c6625816897ea18e34cf2
106
Author: Peter Hutterer <peter.hutterer@who-t.net>
107
Date: Fri Apr 8 11:25:01 2011 +1000
111
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
113
commit 2bbbe4546f56cd825606eff870e4817766d2e654
114
Author: Peter Hutterer <peter.hutterer@who-t.net>
115
Date: Tue Apr 5 15:37:04 2011 +1000
117
man: add hotplugging info to man page
119
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
121
commit 1390685854f7eedcb6802adaba8df274e96a4177
122
Author: Peter Hutterer <peter.hutterer@who-t.net>
123
Date: Tue Apr 5 15:21:07 2011 +1000
125
man: remove reference about different zones - unsupported
127
We ripped this out with 13a12bb852f8 Purge toolarea from device rec.
129
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
131
commit 77b9f3cafc32adad76100f293fde6599a671f22b
132
Author: Peter Hutterer <peter.hutterer@who-t.net>
133
Date: Tue Apr 5 15:17:45 2011 +1000
135
man: don't mention the core pointer, it doesn't exist
137
Obsolete since server 1.4
139
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
141
commit 4d854858ca4de352546de179e1039c43921e15bf
142
Author: Peter Hutterer <peter.hutterer@who-t.net>
143
Date: Tue Apr 5 15:16:23 2011 +1000
145
man: refer to both xorg.conf and xorg.conf.d
147
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
149
commit 2110435235c371da647a58647535cf8e268fb603
150
Author: Peter Hutterer <peter.hutterer@who-t.net>
151
Date: Wed Mar 30 09:15:34 2011 +1000
153
Don't accept invalid device types.
155
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
157
commit 6e10b33b25ac99280b387f8692e46e55d6d9ca8e
158
Author: Peter Hutterer <peter.hutterer@who-t.net>
159
Date: Fri Apr 8 11:38:28 2011 +1000
161
xsetwacom: fix --help output formatting
163
The excaping of the two quotation marks means we need extra spaces here.
165
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
167
commit b8404011790e4b06ee46b471195eefd05fa304a0
168
Author: Jason Gerecke <killertofu@gmail.com>
169
Date: Wed Mar 30 13:54:46 2011 -0700
171
Have wheel and strip properties be "actions" instead of "buttons"
173
Continuing with removing raw button code, we create the wheel and
174
strip properties ready to hold actions. Prior to this, the properties
175
would be initialized with the raw buttons; before xsetwacom could
176
set them to actions they would need to be converted.
178
This does away with the conversion step by following the mold already
179
in place for buttons. With no more need for conversion, we can also
180
nuke the conversion-related bits from xsetwacom.
182
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
183
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
185
commit f3a358796133e04dbf91e57c1bc4760002ba9b3c
186
Author: Jason Gerecke <killertofu@gmail.com>
187
Date: Wed Mar 30 13:54:45 2011 -0700
189
Decrease minimum number of args to 'set' [allow wheels/strips "reset"]
191
Since the worker functions now check that they have the appropriate
192
number of arguments, its possible to decrease the number of arguments
193
required by 'set'. Since all it really needs is a device number and
194
a property, the minimum argc is now 2.
196
A handy side-effect of this change is that its now possible to run
197
e.g. `xsetwacom --set $ID StripLeftDown` to reset the action to
198
its default. Doing the same with buttons has been supported, but
199
wheels and strips were out of luck because they would require too
200
few arguments to 'set'.
202
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
203
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
205
commit c78c2759a9b87db1078d760a0108b0f5dac5ed58
206
Author: Jason Gerecke <killertofu@gmail.com>
207
Date: Wed Mar 30 13:54:44 2011 -0700
209
More strict argument-count checking
211
Add/replace checks in functions to ensure that they have the right
212
number of arguments to do their job properly. The worst offender
213
here was the set() function -- providing too many arguments would
214
result in it walking off the end of data structures (often resulting
217
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
218
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
220
commit d7ea18239de51d84706810b555ff3b2855b8856f
221
Author: Jason Gerecke <killertofu@gmail.com>
222
Date: Fri Apr 8 11:31:23 2011 +1000
224
Change from prop_extra to arg_count
226
When setting an XInternAtom property, 'prop_extra' listed
227
the number of extra properties beyond the first that needed
228
to be set. For instance WACOM_PROP_TABLET_AREA had a total
229
of 4 properties, so prop_extra=3.
231
To provide better argument validation though, we change this
232
to 'arg_count' and list the total number of arguments
233
expected. This doesn't really do anything for normal properties
234
(since arg_count = prop_extra + 1), but does let us check
235
for the proper number of arguments in odd cases (e.g.
236
ResetArea takes 0 arguments).
238
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
240
commit c5ba63ce8e45bdecb650db78c8e2bb9dd454bfb3
241
Author: Jason Gerecke <killertofu@gmail.com>
242
Date: Wed Mar 30 13:54:41 2011 -0700
244
Fail with warnings where possible
246
For many commands, improper arguments cause a silent failure. The
247
user is often given no indication if their command succeeded or
248
failed. I've tried to find all the silent "return;" statements and
249
provide some kind of warning message where possible.
251
In some cases I've added in new checks to ensure that we have the
252
correct number of arguments. I've tried to make checks as pedantic
253
as possible, e.g. throwing errors about number of arguments even if
254
the function ignores arguments.
256
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
257
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
259
commit 19656e837c4bd3711b033992566058be790b5095
260
Author: Jason Gerecke <killertofu@gmail.com>
261
Date: Wed Mar 30 13:54:42 2011 -0700
263
More explicit input check for set_rotate
265
Because of how atoi() works, any single non-number (other than the
266
expected cw,ccw,half,none) would be interpreted as being equivlent
267
to 'none'. Since the number of valid arguments is very small, we
268
explicitly check each.
270
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
271
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
273
commit 02f5fe64df98c963c865845e79b3a20cfddb62ca
274
Author: Timo Aaltonen <tjaalton@ubuntu.com>
275
Date: Thu Apr 7 12:25:32 2011 +0300
277
Add support for Lenovo tablet ID 0xE6
279
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
280
Tested-by: Manoj Iyer <manoj.iyer@canonical.com>
281
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
282
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
284
commit 86fa0fb17e0cd34217e07671ac8f777c3fbe731f
285
Author: Peter Hutterer <peter.hutterer@who-t.net>
286
Date: Mon Apr 4 10:30:32 2011 +1000
288
Update all tools rotation property when rotating one of them.
290
All tools on the same tablet share the rotation value, so if one of them is
291
rotated, all of them must be. Since the property value is stored in the
292
server, we need to trigger it explicitly.
295
$> xsetwacom set "device name stylus" Rotate half
296
$> xsetwacom get "device name eraser" Rotate
298
Should print out the correct rotation value.
302
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
303
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
305
commit fd952b4e69bd2b2f39df36d1d489fecb47e2ae3a
306
Author: Peter Hutterer <peter.hutterer@who-t.net>
307
Date: Mon Apr 4 15:33:34 2011 +1000
309
Don't rotate hotplugged devices.
311
We only rotate on a per-tablet basis, not per-tool. Don't accept rotation
312
values on dependent devices (unless they're the same, then be quiet about
315
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
316
Acked-by: Ping Cheng <pinglinux@gmail.com>
318
commit 5cf22a3a39799cb1c50298d73c34fd397ad717b1
319
Author: Jason Gerecke <killertofu@gmail.com>
320
Date: Wed Apr 6 11:24:05 2011 -0700
322
Expand manpage documentation for "Button" parameter
324
Include list of parameters that are supported, as well as an example
325
of mixing keywords in one action.
327
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
328
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
330
commit 1c76a5942b36844b2fee80ca28b8481744f984cf
331
Author: Jason Gerecke <killertofu@gmail.com>
332
Date: Tue Apr 5 17:49:27 2011 -0700
334
Swap range of 'RawSample' and 'Suppress' in man page
336
Looks like the range of these two options was confused a while back.
337
Switch them so that the right option has the right range.
339
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
340
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
342
commit 8d57fb1693fe3a78fc6002570a9c132c067f7919
343
Author: Jason Gerecke <killertofu@gmail.com>
344
Date: Tue Apr 5 17:49:26 2011 -0700
346
Have man page reflect per-tablet nature of 'Rotate' option
348
Change documentation to indicate that rotation affects all tools
349
associated with the same tablet.
351
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
352
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
354
commit 2c30edb2b6a9542e945623fe0e215a5c04281655
355
Author: Jason Gerecke <killertofu@gmail.com>
356
Date: Tue Apr 5 17:29:20 2011 -0700
358
Cause '-V' option to xsetwacom to exit like '--version'
360
Unexpected difference in behavior between two ways of specifying
361
the same thing. '-V' no longer prints the version and continues
362
to run the rest of the program.
364
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
365
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
367
commit 35d14d75a0d06e32f3583733fcc987879c6e15f6
368
Author: Jason Gerecke <killertofu@gmail.com>
369
Date: Tue Apr 5 17:29:19 2011 -0700
371
Correct order of arguments to calloc
373
Not that there's much difference between 4*(256 bytes) and
374
256*(4 bytes) of memory...
376
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
377
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
379
commit 6424d65c613ee024795b4d529c1d2473650e01f5
380
Author: Peter Hutterer <peter.hutterer@who-t.net>
381
Date: Mon Apr 4 15:31:50 2011 +1000
383
Factor out rotation parsing and setting.
385
No functional changes, prep work only.
387
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
388
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
390
commit da6cbaf3c8b0bb9f5d993ec0291c5919b52ebdee
391
Author: Peter Hutterer <peter.hutterer@who-t.net>
392
Date: Tue Apr 5 13:27:33 2011 +1000
394
Rename hotplugged to is_primary in wcmParseOption.
396
The parameter is true for the primary device only (i.e. the one that
397
_triggers_ the hotplug). It is false for any driver-hotplugged device
398
and false for xorg.conf devices. So "hotplugged" is a rather misleading
399
name. Rename to is_primary instead.
401
Document this and while we're at it, change the function to use Bool instead
404
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
405
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
407
commit 1da14469d2cdfe68ddbe4d451a7e757ad2a4705b
408
Author: Peter Hutterer <peter.hutterer@who-t.net>
409
Date: Mon Apr 4 15:22:36 2011 +1000
411
Remove superfluous call to wcmRotateTablet().
413
This is a leftover from the times when we reconfigured the axes based on the
414
rotation. It doesn't do anything these days.
416
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
417
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
419
commit e0354b9fde1e489bd0c87aa7f34b827ce3e27778
420
Author: Peter Hutterer <peter.hutterer@who-t.net>
421
Date: Mon Apr 4 13:34:30 2011 +1000
423
xsetwacom: add PROP_FLAG_INVERTED for Hover Click/TPCButton
425
The Hover Click property is inverse to the TPCButton xsetwacom
426
option/xorg.conf option.
428
This commit restores the original behaviour for the property as before
429
f1ecd11c619f1f7eb7850dd2fb514307ca1dd1ce but fixes xsetwacom that users of
430
xsetwacom won't notice the difference.
432
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
433
Acked-by: Ping Cheng <pinglinux@gmail.com>
435
commit 5984c9aecc6f80d936f8b0f81a63f31cd23f2e19
436
Author: Peter Hutterer <peter.hutterer@who-t.net>
437
Date: Mon Apr 4 13:29:59 2011 +1000
439
Revert "Correct TPCButton property inversion"
441
"Hover Click" and "TPCButton" are not the same meaning. TPCButton behaviour
442
is that Hover Click is off and vice versa. Hence the property inversion is
444
Add some documentation to make this public.
446
This reverts commit f1ecd11c619f1f7eb7850dd2fb514307ca1dd1ce.
452
Reported-by: Michal Suchanek <hramrach@centrum.cz>
453
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
454
Acked-by: Ping Cheng <pinglinux@gmail.com>
456
commit d855766a53c005d12a56be23f9fcfce5d5922aa7
457
Author: Peter Hutterer <peter.hutterer@who-t.net>
458
Date: Mon Apr 4 14:01:46 2011 +1000
460
xsetwacom: modularise test for bool conversion.
462
No functional changes, just making it easier to test for other features in
463
the future. Some strings to test again have changed, but we really only
464
need to test for sane true/false values anyway ("oFf" is not sane enough to
467
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
468
Acked-by: Ping Cheng <pinglinux@gmail.com>
470
commit 8f2dce908d1a591c315b61fce4d66346d4f2213a
471
Author: Peter Hutterer <peter.hutterer@who-t.net>
472
Date: Mon Apr 4 13:45:00 2011 +1000
474
xsetwacom: constify convert_value_to_user
476
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
477
Acked-by: Ping Cheng <pinglinux@gmail.com>
479
commit 493e673a2e55356b1f53bd9b9229426f171f9094
480
Author: Peter Hutterer <peter.hutterer@who-t.net>
481
Date: Mon Apr 4 15:45:15 2011 +1000
483
Revert "Update all tools rotation property when rotating one of them."
485
This commit is incomplete, shouldn't have been pushed.
487
This reverts commit 570b9d06b20e3eb4e93501594d29e3b24d46d24a.
489
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
491
commit 4ed300dbb3002230c578681fd86eebef414dc272
492
Author: Peter Hutterer <peter.hutterer@who-t.net>
493
Date: Mon Apr 4 12:07:52 2011 +1000
495
Only update bottomX/bottomY if they haven't been user-configured.
497
wcmInitialToolSize() would xorg-configured overwrite BottomX/Y with the max
498
values read from the tablet. Only set the two if they are non-zero (0 is the
501
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
502
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
504
commit 1de7a780a392e363450967dfab8c3dd065fd0348
505
Author: Ping Cheng <pinglinux@gmail.com>
506
Date: Sun Apr 3 16:07:38 2011 -0700
508
Centralize pen and touch arbitration
510
With the introduction of multi-touch, the chances of getting touch
511
events while pen is in prox have been increased. One obvious use
512
case is that the touch events could be used for gestures while pen
513
is in prox. However, we do not want two cursors compete on the screen.
515
Link the pen and touch device once during the initialization stage
516
instead of every time when we receive a pen event. Then, centralize
517
pen and touch arbitration process so we can store the touch data in
518
wcmUSB.c instead of discarding them. The touch events will only be
519
ignored if it is a single touch event that causes a cursor movement
520
while pen is in prox.
522
Some cleanup in wcmUSB.c is needed. It will be considered when we
523
make MAX_CHANNEL a dynamic value based on MAX_FINGERS. The
524
MAX_FINGERS is going to be the maximum of ABS_MT_SLOT that we
525
retrieve from the kernel. That brings us to the state to support
526
XInput 2.1 and devices that have dynamic number of fingers.
528
Note: this patch is based on the assumption that all devices
529
connected to the same system have unique product IDs. That is,
530
no two or more identical devices are connected. Identical devices
531
will be properly linked when we find a decent way to distinguish
534
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
535
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
537
commit 307ad96795605fc39d2c454e4c7efde94ecbed3c
538
Author: Ping Cheng <pinglinux@gmail.com>
539
Date: Sun Apr 3 16:05:42 2011 -0700
541
Add IsPen to cover both IsStylus and IsEraser
543
It will be used more often when we need to compare touch events
546
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
547
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
549
commit 570b9d06b20e3eb4e93501594d29e3b24d46d24a
550
Author: Peter Hutterer <peter.hutterer@who-t.net>
551
Date: Mon Apr 4 10:30:32 2011 +1000
553
Update all tools rotation property when rotating one of them.
555
All tools on the same tablet share the rotation value, so if one of them is
556
rotated, all of them must be. Since the property value is stored in the
557
server, we need to trigger it explicitly.
560
$> xsetwacom set "device name stylus" Rotate half
561
$> xsetwacom get "device name eraser" Rotate
563
Should print out the correct rotation value.
567
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
569
commit bb29b90d29aa8ea25120c3db8b6ce9ca563cf202
570
Author: Chris Bagwell <chris@cnpbagwell.com>
571
Date: Sun Apr 3 08:49:13 2011 -0500
573
fix filter issue on MT bamboos
575
Init tool device type is needed for all MT devices to do correct
576
filtering; not just pen+MT tablets.
578
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
579
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
580
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
582
commit b9566151e6029f77dcf22526308dabb262400774
583
Author: Peter Hutterer <peter.hutterer@who-t.net>
584
Date: Fri Apr 1 14:54:05 2011 +1000
588
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
590
commit f72c358177a2b588c4915bf6fa5cd00f183c9486
591
Author: Peter Hutterer <peter.hutterer@who-t.net>
592
Date: Fri Apr 1 14:59:20 2011 +1000
594
test: update Makefile for include folder
596
Fixes make distcheck.
598
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
600
commit cd0738f41c875c8a2ad5444558c505b47898a7f1
601
Author: Peter Hutterer <peter.hutterer@who-t.net>
602
Date: Wed Mar 30 13:09:59 2011 +1000
604
Move npadkeys to fix comment.
606
Fixing the comment would do too, but it really doesn't matter.
608
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
609
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
611
commit 81f191d7ed9ec1187f37c1df36db0683f65bd4a3
612
Author: Peter Hutterer <peter.hutterer@who-t.net>
613
Date: Wed Mar 30 12:55:26 2011 +1000
615
Replace manual array size with ARRAY_SIZE macro.
617
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
618
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
620
commit b522fdb493cb378af3206793e0b44d6652f7427c
621
Author: Ping Cheng <pinglinux@gmail.com>
622
Date: Wed Mar 30 16:24:15 2011 -0700
624
Check predefined serial number as early as we can
626
Don't wait before we can post the events. Verify the serial number
627
as soon as the information is accessible.
629
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
630
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
632
commit 155a4b96ae8f03d3c07a93622d4f1f1da266d174
633
Author: Jason Gerecke <killertofu@gmail.com>
634
Date: Wed Mar 30 10:32:15 2011 -0700
636
Revamp button/wheel/strip getters
638
'get_map' is the new getter entrypoint and attempts to determine
639
the mapping present on buttons, wheels, and strips. It calls on
640
'get_actions' (essentially get_special_button_map) and 'get_button'
641
(an 8-bit XA_INTEGER version of the same) to determine this. If
642
both fail to find a mapping, it falls back to the method originally
643
used for non-actions: punt and ask XGetDeviceButtonMapping for
646
When raw buttons are removed from the driver, it should be possible
647
to replace 'get_map' with 'get_actions' (since everything will be
648
an action at that point).
650
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
651
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
653
commit 0f20c9b1d94bd8a53e5e9b6cf1b6f599457a1dca
654
Author: Jason Gerecke <killertofu@gmail.com>
655
Date: Wed Mar 30 10:31:25 2011 -0700
657
Merge 'map_wheels' and 'map_button' into a unified 'map_actions'
659
These two functions are very similar, and have been merged together
660
to provide a single conduit for all action mappings. Button-handling
661
code requires a little bit of special-casing (we need to be sure to
662
get a button to modify, and to change the arguments appropriately),
663
but nothing remotely worthy of breaking into its own function.
665
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
666
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
668
commit 5f0b0dd0ed106a99d356e95bb4b73fadba21194d
669
Author: Jason Gerecke <killertofu@gmail.com>
670
Date: Tue Mar 29 16:18:36 2011 -0700
672
Remove 'special_map_wheels' and 'special_map_buttons'
674
Since neither function actually do anything that couldn't just
675
be done in 'map_wheels' and 'map_button' respectively, we simply
676
squash them together.
678
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
679
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
681
commit e9e7397cd1f1bc37f27992114cebd39f4ad93e12
682
Author: Jason Gerecke <killertofu@gmail.com>
683
Date: Tue Mar 29 16:18:35 2011 -0700
685
Remove map_button_simple
687
With parse_actions now handling simple button mappings, we remove
688
this function which essentially duplicates its functionality.
690
Note that there is a small difference in how the new parse_actions
691
code and the old map_button_simple code handle things. The former
692
Translates a single numeric argument into an action (e.g. "3" is
693
turned into "button +3"). The latter cleared any existing action
694
and used XSetDeviceButtonMapping to have X remap button events.
696
To better explain the difference, consider the two following commands
699
xsetwacom --set $id button 2 3
700
xsetwacom --set $id button 3 button 2
702
Under the old map_button_simple code, both buttons 2 and 3 would
703
produce a right-click event. This is because the first command has
704
X remap all "button 2" events into "button 3" events. Since both
705
button 2 (by driver's priv->button[]) and button 3 (by the explicit
706
action) produce a "button 2" event, X remaps both events into "button 3"
709
Under the new parse_actions code, things are what you'd expect: button
710
2 produces a right click and button 3 produces a middle click. If the
711
user wants, they can use `xinput set-button-map` to remap the buttons
712
the same way that map_button_simple did.
714
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
715
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
717
commit f66bf4568c8b7005ab5611ab1b8c5c0c3819b1e3
718
Author: Jason Gerecke <killertofu@gmail.com>
719
Date: Tue Mar 29 16:18:34 2011 -0700
721
Allow parse_actions to parse simple button maps
723
If argv contains only a single numeric argument, we assume the
724
intent is to perform a button press. We add the necessary keywords
725
to make the parser happy, and then parse as normal.
727
This allows map_wheels to handle the "raw button" case that it has
728
been missing. While map_button_simple also does the same* thing,
729
that's another commit :)
731
*Actually, map_button_simple does /almost/ the same thing, but I
732
highly doubt anyone relies on the subtle difference in behavior.
734
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
735
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
737
commit e9dae780cb549f48aaf376af2b6382604c2760a5
738
Author: Jason Gerecke <killertofu@gmail.com>
739
Date: Tue Mar 29 16:18:33 2011 -0700
741
Make it clearer when actions are sent
743
When I first saw this, I thought somebody forgot to put an else
744
clause here; I completely missed that tiny return statement. This
745
makes the reality a little clearer.
747
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
748
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
750
commit 357e3c3c50d81bd57bd412d7d6bde9120d367f4b
751
Author: Jason Gerecke <killertofu@gmail.com>
752
Date: Tue Mar 29 16:18:32 2011 -0700
754
Add WACOM_PROP_WHEELBUTTONS to cursor devices
756
This enables the "Wacom Wheel Buttons" property for cursor devices,
757
allowing xsetwacom to set (rel|abs)wheel(up|down) actions. I'm not
758
sure if there are non-puck cursor devices which should *not* have
759
this enabled, but until somebody says otherwise... :)
761
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
762
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
764
commit c416728a5656748075f6671805d8da3869af2522
765
Author: Jason Gerecke <killertofu@gmail.com>
766
Date: Tue Mar 29 16:18:31 2011 -0700
768
Fix strip/wheel mapping
770
Commit 2ce1c6b4 fixed a bug where X would crash after remapping
771
strips or wheels. It made all the "keys" arrays one-indexed so that
772
wcmUpdateButtonKeys would not write beyond the end of the arrays.
774
This patch syncs the action lookup code with the use of one-indexed
775
arrays so that the proper action is returned.
777
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
778
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
780
commit c7058d85a913d2f2a494667a640d4a25e6ca0e34
781
Author: Peter Hutterer <peter.hutterer@who-t.net>
782
Date: Wed Mar 30 14:04:44 2011 +1000
784
xsetwacom: add a comment to update button actions in the right order
786
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
788
commit db66113366af1054c625940ba38c207d15bd59c1
789
Author: Jason Gerecke <killertofu@gmail.com>
790
Date: Tue Mar 29 16:18:30 2011 -0700
792
Fix "buttons must be set twice" bug from d650b139
794
*facepalm* I simply can't believe I didn't test this, but there's
795
no denying the bug exists. Looks like the change to 'btnact_prop'
796
*must* occur after the change to 'prop'. If it happens beforehand,
797
then the driver appears to be eternally one step behind xsetwacom.
799
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
800
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
802
commit 9e46d9776f6c57abc128ac12a9ef8c03ad242eac
803
Author: Peter Hutterer <peter.hutterer@who-t.net>
804
Date: Wed Mar 30 08:32:25 2011 +1000
806
Add some comments for device_id and device_type handling.
808
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
809
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
811
commit c5cbebabe796e86b94467bb7de3387e4e708f40a
812
Author: Peter Hutterer <peter.hutterer@who-t.net>
813
Date: Thu Mar 24 20:45:22 2011 +1000
815
Remove discard_first field from DeviceStateRec
817
Obsolete since the removal of old serial devices.
819
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
820
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
822
commit 2cc298863457fe9e171cb2c7494b83f2d971ccdb
823
Author: Peter Hutterer <peter.hutterer@who-t.net>
824
Date: Thu Mar 24 20:45:21 2011 +1000
826
usb: print invalid max value if we get one.
828
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
830
commit 1421082661074a201ec2bd98b826ac4154cef9f0
831
Author: Peter Hutterer <peter.hutterer@who-t.net>
832
Date: Thu Mar 24 20:45:20 2011 +1000
834
usb: swap two checks.
836
If the absbit isn't set, don't bother with the EV_ABS ioctl.
838
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
839
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
841
commit 6e21f9c6a7abc79eb89d4c742ffd0cee6bf86552
842
Author: Peter Hutterer <peter.hutterer@who-t.net>
843
Date: Thu Mar 24 20:45:19 2011 +1000
845
usb: remove to superfluous linebreaks.
847
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
848
Acked-by: Ping Cheng <pinglinux@gmail.com>
850
commit 2d55e561956dc7beb0aa6fd2d814c0540e654e34
851
Author: Jason Gerecke <killertofu@gmail.com>
852
Date: Mon Mar 28 10:06:56 2011 -0700
854
Change hardcoded string to already-defined constant
856
WACOM_PROP_BUTTON_ACTIONS is already defined in wacom-properties.h
857
Lets use it instead of all those magic constants.
859
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
860
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
862
commit 32d14dc4a9787356024020fd25e463a90a25f349
863
Author: Ping Cheng <pinglinux@gmail.com>
864
Date: Mon Mar 28 17:51:34 2011 -0700
866
Resolve the oldHwProx puzzle
868
Change oldHwProx to oldCursorHwProx to better reflect its use.
870
oldCursorHwProx keeps the hardware in/out prox state so we can
871
set the MaxCursorDist for the next round of relative cursor
872
movement when tool first comes in prox.
874
For Protocol 5 devices, distance is reported as the maximum
875
when tool is first detected. Then it is gradually reduced to 0
876
when getting closer to the tablet. Protocol 4 is the opposite:
877
distance is 0 when tool is first in prox. The value increases
878
as the tool gets closer to the tablet.
880
The maximum distance (wcmMaxDist) is model specific. They are
881
retrieved from the kernel.
883
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
884
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
885
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
886
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
888
commit 5fec376c46e3840fe2e3f838df67cefee1c0d6c6
889
Author: Peter Hutterer <peter.hutterer@who-t.net>
890
Date: Thu Mar 24 10:55:58 2011 +1000
892
ISDV4: use libudev instead of manual syspath creation.
894
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
895
Acked-by: Ping Cheng <pinglinux@gmail.com>
897
commit 4b475087b827d143df93c2acc0017a9b79ff859a
898
Author: Peter Hutterer <peter.hutterer@who-t.net>
899
Date: Thu Mar 24 11:37:39 2011 +1000
901
ISDV4: update a comment, we may return tablet id 0x90 on failure.
903
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
904
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
906
commit d650b1399d37e6f2b6f151b011d72b219a5405b8
907
Author: Jason Gerecke <killertofu@gmail.com>
908
Date: Fri Mar 25 17:32:56 2011 -0700
910
Make set/unset code easier to understand
912
Between the parsing code seperating the two halves of set/unset
913
and the code being confusing in general, I've rewritten this
914
to hopefully make its operation a little clearer for the next
917
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
918
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
919
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
921
commit 5b27df4274ae59e0e279096ac46836564d22c2ea
922
Author: Jason Gerecke <killertofu@gmail.com>
923
Date: Thu Mar 24 18:02:54 2011 -0700
925
Make parse error more helpful
927
When a set of arguments cannot be parsed, knowing the word that
928
did not make sense doesn't help if you've used it more than once.
930
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
931
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
933
commit d6ac23b79ccf65d30f07dbb1986ad9d6773ecd30
934
Author: Jason Gerecke <killertofu@gmail.com>
935
Date: Thu Mar 24 18:02:55 2011 -0700
939
We don't need to bother changing the device property if
940
we're unsetting since we're just going to be deleting it
943
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
944
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
946
commit c932e062ba894e50d2dd4c2e653e86915597ee52
947
Author: Jason Gerecke <killertofu@gmail.com>
948
Date: Thu Mar 24 18:02:53 2011 -0700
950
Return from function on parse error
952
If the arguments to this function are only parseable up to a point,
953
the function prints a warning but still makes the (partial!) requested
954
change. For example, if the user runs:
956
xsetwacom --set 10 Button 1 "key +a notakeyword -a"
958
The program prints a warning about it not recognizing "notakeyword" and
959
maps Button 1 to "key +a". Instead of making partial changes, xsetwacom
960
should instead bail at the first sign of a problem.
962
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
963
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
965
commit c690302586bf352395ca7bd1299866a97cc054da
966
Author: Ping Cheng <pinglinux@gmail.com>
967
Date: Thu Mar 24 15:36:03 2011 -0700
969
Add CursorProximity to xsetwacom.man
971
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
972
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
974
commit ed668c1b768967b3bf5a6174c16c6d3732c1b4fe
975
Author: Ping Cheng <pinglinux@gmail.com>
976
Date: Wed Mar 23 14:57:51 2011 -0700
978
PAD is always on PAD_CHANNEL
980
Don't assume the last tool was a pad, which confuses those tools
981
that never receive a serial number. Keep PAD on the PAD_CHANNEL.
983
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
984
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
986
commit 6278f4fe4afd3ae627ea676e3c655f1e3968cd8b
987
Author: Ping Cheng <pinglinux@gmail.com>
988
Date: Wed Mar 23 14:57:33 2011 -0700
990
Fix a copy/paste error in usbFindDeviceType comment
992
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
993
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
995
commit dfc8404bec1d9d4d5eb65a2d29779d7ae1a18d62
996
Author: Ping Cheng <pinglinux@gmail.com>
997
Date: Wed Mar 23 14:57:12 2011 -0700
999
Support pen and MT on the same logical port
1001
Serial ISDv4 kernel driver, wacom_w8001.ko, provides both pen and
1002
touch events on the same logical port. Filtering touch events when
1003
pen is in proximity while allowing pen events (ABS_X/Y, etc) pass.
1005
Making this action configurable would make sense when XInput 2.1 is
1006
ready. At that point, we can post MT valuators while pen events are
1007
posted. Some code refactoring is needed to add a new channel to
1008
store the pen data as well as the 2FGT data.
1010
Defering the code refactoring until we support XInput 2.1.
1012
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1013
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
1014
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
1015
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1017
commit 842f2e28f8ce90991bdb60921250c97a11101104
1018
Author: Peter Hutterer <peter.hutterer@who-t.net>
1019
Date: Thu Mar 24 12:01:34 2011 -0400
1021
Silence compiler warning.
1023
../src/wcmCommon.c: In function 'sendCommonEvents':
1024
../src/wcmCommon.c:382:2: warning: 'value' may be used uninitialized in this function [-Wuninitialized]
1025
../src/wcmCommon.c:329:22: note: 'value' was declared here
1027
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1028
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1030
commit 307f50afba024cb6558d7084f5a7d86ec76bd992
1031
Author: Peter Hutterer <peter.hutterer@who-t.net>
1032
Date: Tue Mar 22 14:02:32 2011 +1000
1034
Fix strip_keys index, copy/paste error.
1036
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1037
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1039
commit 880512f84c26cddbfc1a8ff495890595424466f2
1040
Author: Peter Hutterer <peter.hutterer@who-t.net>
1041
Date: Tue Mar 22 13:50:44 2011 +1000
1043
wcmUSB: change MOD_BUTTONS macro into a function
1045
Values in, values out. No magic state structs, keep it simple.
1047
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1048
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1050
commit aadf1e0d215e3e7dfe119c3e541d35854de2326a
1051
Author: Peter Hutterer <peter.hutterer@who-t.net>
1052
Date: Tue Mar 22 12:00:41 2011 +1000
1054
test: drop glib dependency
1056
We weren't really using any of the glib-specific stuff anyway, so just
1057
replace g_assert with normal assert and drop the dependency.
1059
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1060
Acked-by: Ping Cheng <pinglinux@gmail.com>
1062
commit 91fb559b5b760c345333ec7ac67f429d61b44f9d
1063
Author: Ping Cheng <pinglinux@gmail.com>
1064
Date: Mon Mar 21 17:56:09 2011 -0700
1066
Bring idtotype and findDeviceType to the style
1068
Make them into the usb family and follow the style guide.
1069
Consolidate tool id for the existing tools into three defines.
1070
Update findDeviceType to cover more cases so it may be called
1071
by other routines to retrieve tool types.
1073
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1074
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1076
commit b0a6637a4cf262436fb21c2b734241f376289deb
1077
Author: Ping Cheng <pinglinux@gmail.com>
1078
Date: Mon Mar 21 17:55:41 2011 -0700
1080
Move findDeviceType from wcmCommon to wcmUSB
1082
Serial model is not supported. So, findDeviceType is only used by
1085
Now it is the individual model's, wcmUSB or wcmISDV4, responsibility
1086
to set the device type locally. For wcmUSB, since kernel input filters
1087
out duplicated events, we should retrieve the device type and
1088
associated events directly from the kernel to cover the case when tool
1089
is on the tablet during driver starts.
1091
wcmCommon.c will treat packet with undefined device_type as invalid.
1093
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1094
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1096
commit 201d1c35c7de919714815be18b990e9acc570054
1097
Author: Ping Cheng <pinglinux@gmail.com>
1098
Date: Mon Mar 21 17:55:18 2011 -0700
1100
Prepare for the removal of BTN_TOOL_FINGER for pad tool in the kernel
1102
BTN_TOOL_FINGER was borrowed to group PAD events. With the support
1103
of pen and touch on the same logical port, we can not use it any more.
1105
PAD events of generic protocol has already manually routed to the pad
1106
channel, the last channel of wcmChanel.
1108
This patch groups PAD events for protocol 4 and 5 by the device_id
1109
sent through ABS_MISC event. In/out proximity event is also set by
1112
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1113
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1115
commit 09f6c0faade997da490c1cd0277eb7f2f6cc9ef3
1116
Author: Jason Gerecke <killertofu@gmail.com>
1117
Date: Fri Mar 18 18:01:17 2011 -0700
1119
Clear the correct amount of memory
1121
Though this doesn't result in any bad behavior at the moment, it
1122
could cause some serious headaches in the future.
1124
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1125
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
1126
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1128
commit 2ce1c6b47ff1596093d48b5cfccaddf17c6d2924
1129
Author: Jason Gerecke <killertofu@gmail.com>
1130
Date: Fri Mar 18 18:01:16 2011 -0700
1132
Fix X crash after remapping touchstrips and wheels
1134
Crash first appears in ab311bf20535acd6e7201e024bc311e0e15b5b6b.
1135
This commit rewrote wcmUpdateButtonKeyActions with one-indexed
1136
arrays in mind and extended the 'keys' array in _WacomDeviceRec
1137
to make room. However, the 'wheel_keys' and 'strip_keys' were
1140
Running e.g. `xsetwacom --set pad StripLeftDown button 4` results
1141
in a call to wcmUpdateButtonKeyActions. Its call to memset oversteps
1142
the array bounds and just happens to zero the 'common' pointer. The
1143
next tablet event results in a segfault as the driver tries to
1144
dereference the pointer.
1146
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1147
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1148
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1150
commit 1427db0bfea8c015ddb713f49eb0f33450266e60
1151
Author: Ping Cheng <pinglinux@gmail.com>
1152
Date: Mon Mar 21 14:10:42 2011 -0700
1154
Enable left click for MT touchscreen
1156
Tools that are in absolute mode emit left click when the tool touches
1157
the surface. However, tools in relative mode need to locate the object
1158
on the surface before it selects (left click on) the object. That is,
1159
a second event (tap/leave/touch) is needed to trigger a left click for
1160
relative mode tools.
1162
Tools on touchscreen is in absolute mode. So, send left click
1163
down/up when the first finger touches/leaves the tablet.
1165
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1166
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1167
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
1168
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1170
commit 1c0696570c78b3454a9d847e5e9fe91bf0f04e9c
1171
Author: Ping Cheng <pinglinux@gmail.com>
1172
Date: Fri Mar 18 15:07:24 2011 -0700
1176
Get the "f" out of the code as well as the root cause.
1178
A proper fix would be to use resolution to decide the distance.
1179
That can be considered when we push the resolution table to
1180
the kernel. Hopefully, at that time, we can also post MT events
1181
to XInput 2.1 and push the gesture support to the desktop.
1183
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1184
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1185
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1187
commit 1b8287e090c5d994a3f99eed227dbb08ad78c469
1188
Author: Peter Hutterer <peter.hutterer@who-t.net>
1189
Date: Wed Mar 16 10:06:01 2011 +1000
1191
xsetwacom: add pgup and pgdwn as special keys.
1193
"Prior" and "Next" aren't quite that obvious so specialcasing seems
1196
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1197
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1199
commit 1cfe05195698583e002d19eb12fc6221639283df
1200
Author: Peter Hutterer <peter.hutterer@who-t.net>
1201
Date: Thu Mar 10 16:22:33 2011 +1000
1203
xsetwacom: update the property when we have items to write
1205
Introduced in 22bc3028effbdc79d426c0b3dcf586734d4c7532, changed logic caused
1206
the property not to update in all cases.
1208
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1210
commit 7ed24d165121e167930e34a3ea8532e358c003f5
1211
Author: Peter Hutterer <peter.hutterer@who-t.net>
1212
Date: Tue Mar 15 11:54:49 2011 +1000
1214
Add fake symbols for serverClient and QueueWorkProc
1216
Broke linking of unit tests in
1217
94a8eabadd062de6ceed8563089b863d887f8770.
1219
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1221
commit 863714247c8d6020748c0cf099f1e06caf6b2b06
1222
Author: Jason Gerecke <killertofu@gmail.com>
1223
Date: Mon Mar 14 16:10:59 2011 -0700
1225
Add tests for convert_value_from_user
1227
Some basic tests to ensure booleans and non-booleans act like we
1230
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1231
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1233
commit f58feb275b51f1f9e059e668609591434021559f
1234
Author: Jason Gerecke <killertofu@gmail.com>
1235
Date: Fri Mar 11 15:13:54 2011 -0800
1237
Expand recognized boolean input for convert_value_from_user
1239
We remove the case sensitivity requirement for off/on and also
1240
allow the use of "true" and "false"
1242
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1243
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1245
commit d4f44eddeb497ecfaa99449b565f6bdf46c3b9fa
1246
Author: Jason Gerecke <killertofu@gmail.com>
1247
Date: Fri Mar 11 15:13:53 2011 -0800
1249
Use strtol instead of atoi in convert_value_from_user
1251
atoi provides only the most basic string conversion capabilities,
1252
and makes determining if conversion was successful difficult (both
1253
"abc" and "0" would return 0). We use strtol and checks to ensure
1254
that it converted the entire string sucessfully before returning True.
1256
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1257
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1259
commit 12eebced3f004a0bea2c85d2197897de28bf7781
1260
Author: Jason Gerecke <killertofu@gmail.com>
1261
Date: Fri Mar 11 15:13:52 2011 -0800
1263
Detect boolean conversion failure in convert_value_from_user
1265
Properties with PROP_FLAG_BOOLEAN set can only take on a restricted
1266
set of values. We detect if the string matches any of the allowed
1267
values and convert if possible. If not possible, the caller is notified.
1269
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1270
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1272
commit e5af4b9928b983227cad711496d258cde5d62cfd
1273
Author: Jason Gerecke <killertofu@gmail.com>
1274
Date: Mon Mar 14 16:19:24 2011 -0700
1276
Change signature of convert_value_from_user
1278
Have it return true/false to indicate conversion success/failure.
1279
Note that in its current state the function cannot tell if there
1280
was a conversion failure...
1282
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1283
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1285
commit 9ecc125c1c59b591a89e6f10b79b2e1e49c86165
1286
Author: Chris Bagwell <chris@cnpbagwell.com>
1287
Date: Sun Mar 13 22:27:44 2011 -0500
1289
Initialize USB pad device once up front
1291
Streamlines normal execution some but also resolves an issue reported
1292
for older Bamboo's since its now executed for all protocol types
1293
and not just generic protocols.
1295
Older Bamboo's and Graphire series always keep PAD device in proximity
1296
so you can pretty much count on never recieving a BTN_TOOL_FINGER
1299
This does work of that missing event.
1301
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
1302
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1304
commit 33a031cab73424a0a1ea5ded36fa6631c9a5811e
1305
Author: David Foley <favux.is@gmail.com>
1306
Date: Mon Mar 14 15:54:52 2011 +1000
1308
xsetwacom.man: Fix whitespace issues
1310
Signed-off-by: David Foley <favux.is@gmail.com>
1311
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1313
commit 3c0a16ac630603bf966e0a9fc1ee6d5be4276156
1314
Author: David Foley <favux.is@gmail.com>
1315
Date: Sun Mar 13 17:57:10 2011 -0500
1317
xsetwacom.man: add RawSample and Suppress parameters
1319
Add RawSample and Suppress to parameter description table.
1321
Signed-off-by: David Foley <favux.is@gmail.com>
1322
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1324
commit 301297d6423a3556fd94006d739a4afca82b5812
1325
Author: Peter Hutterer <peter.hutterer@who-t.net>
1326
Date: Thu Mar 10 10:12:48 2011 +1000
1328
Re-vamp source inclusion for test build suite.
1330
test/Makefile.am included src/Makefile.am for the driver sources. However,
1331
that also lead to the driver being built twice, once in src/ and once in
1332
test/. On make install, test/wacom_drv.so would overwrite the
1333
src/wacom_drv.so and thus install a driver with all static symbols compiled
1336
This caused the VCOPY bug worked around in
1337
9d227cd0bd985e7dcb7923974361145ba1d78713.
1339
Avoid this by moving the sources into a shared included Makefile and build
1340
an independent libwacom-test.la in the test directory.
1342
Reported-by: Eduard Hasenleithner <ehasenle@gmail.com>
1343
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1344
Tested-by: Eduard Hasenleithner <ehasenle@gmail.com>
1345
Acked-by: Ping Cheng <pinglinux@gmail.com>
1347
commit 36ea587badc947c027c40ee4387a2d5540a9a5b3
1348
Author: Peter Hutterer <peter.hutterer@who-t.net>
1349
Date: Fri Mar 11 09:30:45 2011 +1000
1351
xsetwacom: remove unused need_update
1353
Unused since ba77b532e6c2a0b7b05ab129009c1f614b089c37
1355
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1356
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
1358
commit a3b6e2079155c5774baabcd9e3c53b3336536e49
1359
Merge: 43c82c3 69d3e93
1360
Author: Peter Hutterer <peter.hutterer@who-t.net>
1361
Date: Mon Mar 14 15:42:00 2011 +1000
1363
Merge branch 'race-condition'
1365
commit 43c82c3139ef8b9abee7eb79a8d9055df9874329
1366
Author: Jason Gerecke <killertofu@gmail.com>
1367
Date: Fri Mar 11 08:39:50 2011 -0800
1369
Remove XWACOM_MAX_SAMPLES
1371
XWACOM_MAX_SAMPLES is a duplicate of MAX_SAMPLES, and appears to have
1372
no reason to be included in the Xwacom.h header. We remove it and
1373
retarget all references.
1375
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1376
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
1377
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1379
commit 676b25e5ec5eb70d45d3228b28bef5c8a68ab7f6
1380
Author: Peter Hutterer <peter.hutterer@who-t.net>
1381
Date: Fri Mar 11 10:53:51 2011 +1000
1383
Reset tiltx/y after converting it to rotation.
1386
"Since tilt is only used as raw value to calculate rotation for I4 mouse,
1387
i.e., they are not posted as valuators, resetting them or not does not make
1390
Let's reset it to 0 then so we don't get confusing values during debugging.
1392
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1393
Acked-by: Ping Cheng <pinglinux@gmail.com>
1395
commit abfcc2ac187a4a7131503c0aa80e166ca384034e
1396
Merge: 857ef81 90ba050
1397
Author: Peter Hutterer <peter.hutterer@who-t.net>
1398
Date: Fri Mar 11 09:31:23 2011 +1000
1400
Merge branch 'wcmTilt2R-fixes'
1402
commit 857ef8159451fe52cd999f523d9c500f6c32c0e1
1403
Author: Jason Gerecke <killertofu@gmail.com>
1404
Date: Wed Mar 9 09:52:57 2011 -0800
1406
Perform bounds checking on RawSample
1408
I made the mistake of setting this to zero and then bringing my
1409
pen into proximity. Ooops. X crashed. Looks like mathematics
1410
still can't handle getting the average of zero things ;)
1412
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1413
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1414
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1416
commit 90ba05056578405307e737620782a581b942ef62
1417
Author: Peter Hutterer <peter.hutterer@who-t.net>
1418
Date: Thu Mar 10 14:18:13 2011 +1000
1420
Change signature of wcmTilt2R to return the rotation calculated.
1422
Take an input point, calculate the rotation and return it. No need to deal
1423
with device state structures, etc.
1425
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1426
Acked-by: Ping Cheng <pinglinux@gmail.com>
1428
commit 1023572644c5f00a418043615e802484fcff6e71
1429
Author: Peter Hutterer <peter.hutterer@who-t.net>
1430
Date: Thu Mar 10 14:13:37 2011 +1000
1434
Cleaning up the code, rewriting the calculations, documentating the steps
1435
taken. It's understandable now. Whoop-dee-doo.
1437
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1438
Acked-by: Ping Cheng <pinglinux@gmail.com>
1440
commit 42dc7cb652c5cf84433aac2aa791dc9fdb39ec2b
1441
Author: Peter Hutterer <peter.hutterer@who-t.net>
1442
Date: Thu Mar 10 13:08:26 2011 +1000
1444
Add a offset paramater value to wcmTilt2R
1446
Say No To Hardcoding.
1448
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1449
Acked-by: Ping Cheng <pinglinux@gmail.com>
1451
commit 08c5fc41ef3f81dafbb50856c589fdf4e9f5f89c
1452
Author: Peter Hutterer <peter.hutterer@who-t.net>
1453
Date: Fri Mar 4 09:39:15 2011 +1000
1455
Fix wcmTilt2R so it uses defines instead of hardcoded numbers.
1457
Every time number is hardcoded deep inside the driver, god kills a kitten
1458
and a little part of me dies (unrelated to the kitten death). Use the
1461
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1462
Acked-by: Ping Cheng <pinglinux@gmail.com>
1464
commit 56c550a11b57ccdc3e0d9ebcdeb323734c7c48f7
1465
Author: Peter Hutterer <peter.hutterer@who-t.net>
1466
Date: Fri Mar 4 08:56:57 2011 +1000
1468
Document wcmTilt2R (and add a fixme)
1470
Because not everyone has hours to figure out what each function does.
1471
Come to think of it, I don't actually either...
1473
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1474
Acked-by: Ping Cheng <pinglinux@gmail.com>
1476
commit 8d61689016b961a33e6950b09f191c16741dd608
1477
Author: Peter Hutterer <peter.hutterer@who-t.net>
1478
Date: Thu Mar 10 11:15:01 2011 +1000
1480
test: write a non-test for wcmTilt2R
1482
It's non-transparent what wcmTilt2R actually does at the moment, so generate
1483
a test table from the current code and test against that. This
1484
way we at least know when we're breaking something.
1486
Exception: wraparound value generates +900 instead of -900. We must not
1487
send +900, our max range is 899, then we wrap again. This function isn't
1488
supposed to generate this value, so manually fixed up.
1490
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1491
Acked-by: Ping Cheng <pinglinux@gmail.com>
1493
commit 8e4dabd64a611dd5571aef6aff8dfb5dd258655e
1494
Author: Peter Hutterer <peter.hutterer@who-t.net>
1495
Date: Fri Mar 4 09:41:48 2011 +1000
1497
Remove superfluous function declaration
1499
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1500
Acked-by: Ping Cheng <pinglinux@gmail.com>
1502
commit 65220fa0276cbec10b51832c2bf9946c4bbfc4e8
1503
Author: Chris Bagwell <chris@cnpbagwell.com>
1504
Date: Wed Mar 9 11:27:14 2011 -0600
1506
remove per-device filter function
1508
Over time, we've merged device specific filter routines
1509
into single version. So there is no need for historic
1510
hook to register at runtime.
1512
ISDv4 devices never registered any filter which seems
1513
like it would result in jitter.
1515
Removed RawFilter() from WacomDevice structure and call
1516
wcmFilterCoord() directly from wcmCommon.c.
1518
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
1519
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1520
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1522
commit 1af65269cd22ea69b5d0920922484e0b4be3f9f6
1523
Author: Peter Hutterer <peter.hutterer@who-t.net>
1524
Date: Thu Mar 10 12:04:21 2011 +1000
1526
Use xf86ScaleAxis for pressure normalization.
1528
And copy the server's xf86ScaleAxis for the test. Not ideal, I guess but oh
1531
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1532
Acked-by: Ping Cheng <pinglinux@gmail.com>
1534
commit 0ee2a44a49ababe25dddc2b82dfa5a343fd7e893
1535
Author: Jason Gerecke <killertofu@gmail.com>
1536
Date: Tue Mar 8 17:50:44 2011 -0800
1538
Enable RawSample and Suppress
1540
The driver apparently didn't look at the RawSample option, and
1541
xsetwacom confused it's offset with Suppress. In other words:
1542
if you thought you've been tweaking Suppress, you've been tweaking
1543
RawSample. If you thought you were tewaking RawSample, you weren't
1546
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1547
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1549
commit 22fcd2305c1f7464bdf15286c2690fd307629c5d
1550
Author: Jason Gerecke <killertofu@gmail.com>
1551
Date: Tue Mar 8 17:50:43 2011 -0800
1553
Remove RawFilter from xsetwacom
1555
With support for the option completely removed from the driver,
1556
remove it from xsetwacom as well. Also modify the deprecation
1557
warning to handle cases like this where we don't want a replacement.
1559
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1560
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1562
commit ca418548e8c0114df5c7830ae6e4dc28bf38caf4
1563
Author: Jason Gerecke <killertofu@gmail.com>
1564
Date: Tue Mar 8 17:50:42 2011 -0800
1566
Remove RawFilter option from driver
1568
This option was mostly removed from the driver at some point in
1569
the past, with only these vestigal lines remaining.
1571
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1572
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1574
commit 7861dc281307d2a8727a99c31009af8ede144479
1575
Author: Jason Gerecke <killertofu@gmail.com>
1576
Date: Tue Mar 8 08:53:44 2011 -0800
1578
Fix minor doc style inconsistencies
1580
Add/move periods and whitespace, make defaults consistent, and clarify
1583
Signed-off-by: Jason Gerecke <killertofu@gmail.com>
1584
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1586
commit 3282e954f209683ee2026d72b2adfbf1d4c48cb0
1587
Author: Andrzej Pronobis <a.pronobis@gmail.com>
1588
Date: Mon Mar 7 12:42:01 2011 -0800
1590
Decide scroll direction according to tablet orientation
1592
Signed-off-by: Andrzej Pronobis <a.pronobis@gmail.com>
1593
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1594
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1596
commit fc41fb63dd883fc29236af535b22a2b347dfe326
1597
Author: David Foley <favux.is@gmail.com>
1598
Date: Mon Mar 7 12:56:35 2011 -0600
1600
xsetwacom.man: Add 5 parameters
1602
Add Mode, PressureCurve, Rotate, TabletPCButton, and Threshold. And other changes.
1604
Signed-off-by: David Foley <favux.is@gmail.com>
1605
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1607
commit acd8552d83929963d5cc70d6217c5a15da86c6c0
1608
Author: Peter Hutterer <peter.hutterer@who-t.net>
1609
Date: Mon Mar 7 14:38:31 2011 +1000
1611
Don't try to update the button mapping if we don't have anything to update.
1613
If keyword parsing failed and we have zero items to update to (but we're not
1614
trying to reset the property), don't update the button action property.
1616
Reproducer: xsetwacom set "device" Button 1 "blah"
1617
would print an error about invalid keywords but still update (erase) the
1618
button mapping property.
1620
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1621
Acked-by: Ping Cheng <pinglinux@gmail.com>
1623
commit eba6b9416148e5423c5a0c2632d88dbee5589615
1624
Author: Peter Hutterer <peter.hutterer@who-t.net>
1625
Date: Mon Mar 7 14:35:54 2011 +1000
1627
xsetwacom: fix button action unsetting
1629
xsetwacom set <devicename> Button 1
1630
should unsets the key action for button 1 (back to button mapping)
1632
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1633
Acked-by: Ping Cheng <pinglinux@gmail.com>
1635
commit 8ed4e95e8e65f569a3639959331f0a95b0917f11
1636
Author: Peter Hutterer <peter.hutterer@who-t.net>
1637
Date: Mon Mar 7 14:29:21 2011 +1000
1639
xsetwacom: update a comment for new button map arguments.
1641
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1642
Acked-by: Ping Cheng <pinglinux@gmail.com>
1644
commit 22bc3028effbdc79d426c0b3dcf586734d4c7532
1645
Author: Peter Hutterer <peter.hutterer@who-t.net>
1646
Date: Mon Mar 7 14:21:22 2011 +1000
1648
xsetwacom: don't re-use argc, add new var "unset_prop"
1650
No functional change, making the code more readable.
1652
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1653
Acked-by: Ping Cheng <pinglinux@gmail.com>
1655
commit fe07179e4976cdcc530bd2dd3cd482a65a3fd43d
1656
Author: Peter Hutterer <peter.hutterer@who-t.net>
1657
Date: Mon Mar 7 14:16:55 2011 +1000
1659
xsetwacom: print error if an unknown keyword is given.
1661
xsetwacom set "device" Button 1 "Ctrl Z" cannot be parsed by xsetwacom,
1662
leading to a nonfunctioning button without the user realising why. Print an
1663
error and complain if the keyword is unknown/invalid.
1666
https://sourceforge.net/tracker/?func=detail&atid=525124&aid=3054502&group_id=69596
1668
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1669
Acked-by: Ping Cheng <pinglinux@gmail.com>
1671
commit c4007437dcd7b24d949b80fb49e5e8e0699b4201
1672
Merge: a8c95a7 abb4144
1673
Author: Peter Hutterer <peter.hutterer@who-t.net>
1674
Date: Mon Mar 7 13:11:56 2011 +1000
1676
Merge branch 'suppress-cleanup'
1678
commit abb4144f6ec125fa37fb6cd1f3eb0c4616367359
1679
Author: Peter Hutterer <peter.hutterer@who-t.net>
1680
Date: Fri Mar 4 09:37:13 2011 +1000
1682
Don't hardcode the rotation range for cursor RZ, use defines instead.
1684
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1685
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1687
commit 379be28b51d782c18a2f8ea3b7d59b08329ebbc0
1688
Author: Peter Hutterer <peter.hutterer@who-t.net>
1689
Date: Fri Mar 4 09:13:28 2011 +1000
1691
Fix typo for max axis range on the cursor tool.
1693
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1694
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1696
commit 859d325be9fc303b78ee4b2fde7fd6ca18888b4d
1697
Author: Peter Hutterer <peter.hutterer@who-t.net>
1698
Date: Fri Mar 4 09:05:09 2011 +1000
1700
Fix indentation in wcmTilt2R.
1702
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1703
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1705
commit 5ca0e09f9058e47d2a2ff1c5474bc1b5aef92c14
1706
Author: Peter Hutterer <peter.hutterer@who-t.net>
1707
Date: Thu Mar 3 14:04:39 2011 +1000
1709
test: remove miPointer wrappers, unneded.
1711
Obsolete with a9fe6a0337183c653ede6b5724612a138b022fb9
1713
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1714
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1716
commit aa96977dc7ff0b44b7d1dcb5bf524c339d4820e5
1717
Author: Peter Hutterer <peter.hutterer@who-t.net>
1718
Date: Thu Mar 3 14:01:21 2011 +1000
1720
test: add tests for wcmCheckSuppress.
1722
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1723
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1725
commit 1982daf6b13685cc6568a53b85d62089405963a9
1726
Author: Peter Hutterer <peter.hutterer@who-t.net>
1727
Date: Thu Mar 3 13:40:08 2011 +1000
1729
Rewrite wcmCheckSuppress
1731
Instead of returning rather ambiguous 0, 1 and 2, return enums with readable
1734
No functional changes, other than that we now skip a few tests in
1735
wcmCheckSuppress if we already have the result.
1737
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1738
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1740
commit a8c95a7975ffa16779cced264062bc64b8631095
1741
Author: David Foley <favux.is@gmail.com>
1742
Date: Fri Mar 4 12:50:39 2011 -0600
1744
conf: Add Fujitsu ISDV4 device ID FUJ02e9 to matches
1746
Signed-off-by: David Foley <favux.is@gmail.com>
1747
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1748
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1750
commit 89db1ede87db655b57fb2234194f1c26993ef166
1751
Author: David Foley <favux.is@gmail.com>
1752
Date: Fri Mar 4 13:28:24 2011 -0600
1754
wcmUSB.c: Update BambooPT identifier comment
1756
Change 0xDB from CTH-661 to CTH-661/L.
1758
Reported-by: Pander <pander@users.sourceforge.net>
1759
Signed-off-by: David Foley <favux.is@gmail.com>
1760
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1761
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1763
commit e79f7a730cedee93db363c20ddddc9e90b41ef3b
1764
Author: Peter Hutterer <peter.hutterer@who-t.net>
1765
Date: Thu Mar 3 12:02:27 2011 +1000
1767
Swap an error message "likely to crash" for one not likely to do so
1769
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1770
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1772
commit 0250ecbc798b47821ed81e87ab852b6cc342efe1
1773
Author: Peter Hutterer <peter.hutterer@who-t.net>
1774
Date: Thu Mar 3 11:54:18 2011 +1000
1776
Remove now-obsolete condition.
1778
With the removal of the tool areas, this check became obsolete.
1780
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1781
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1783
commit fe46ffdd55f877e0750017285724181b3ddf4a4c
1784
Author: Peter Hutterer <peter.hutterer@who-t.net>
1785
Date: Thu Mar 3 11:53:36 2011 +1000
1789
And rename tooldef to tooldefault, I always get confused by that.
1791
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1792
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1794
commit 07964dc148767f78fee691981935f9450a1981bf
1795
Author: Peter Hutterer <peter.hutterer@who-t.net>
1796
Date: Thu Mar 3 11:50:50 2011 +1000
1798
Document is/set_absolute
1800
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1801
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1803
commit 69d3e9387105e0a92cae95f6f81a62e868506c06
1804
Author: Peter Hutterer <peter.hutterer@who-t.net>
1805
Date: Thu Mar 3 15:52:56 2011 +1000
1807
Add a fixme about tool handling.
1809
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1810
Acked-by: Ping Cheng <pinglinux@gmail.com>
1812
commit 751976d32f756197cc7254ae85956eebdf7e8e47
1813
Author: Peter Hutterer <peter.hutterer@who-t.net>
1814
Date: Thu Mar 3 14:32:38 2011 +1000
1816
Keep an enabled flag in the tool to avoid racy startup.
1818
There is a small time window where a device may try to send an event even
1819
though it is not fully setup to send events yet, causing a server crash.
1821
This window opens when the tool is added to the list of devices in
1822
wcmParseOptions() and closes with the server calling xf86ActivateDevice().
1823
If an event for a dependent device is processed during that time, the tool
1824
will be available but the device pointer is still invalid.
1826
Crash can be reproduced by putting a breakpoint after wcmParseOptions() for
1827
the eraser, then generating events with the eraser. These will cause the
1828
tool to dereference tool->device->dev, which is uninitialized.
1830
Work around this with a simple "enabled" flag that is set whenever the tool
1831
is actually enabled.
1833
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1834
Acked-by: Ping Cheng <pinglinux@gmail.com>
1836
commit 94a8eabadd062de6ceed8563089b863d887f8770
1837
Author: Peter Hutterer <peter.hutterer@who-t.net>
1838
Date: Thu Mar 3 11:29:19 2011 +1000
1840
Switch to a WorkProc for device hotplugging.
1842
The current approach to hotplugging is to call NIDR directly from the parent
1843
device's PreInit. This causes a nested device layout as the dependent
1844
devices are initialised fully before the parent device is initialised.
1846
Switch to a WorkProc instead. Copy the necessary information to create a new
1847
device later and tell the server to call the actual hotplug function when it
1850
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1851
Acked-by: Ping Cheng <pinglinux@gmail.com>
1853
commit 490e345f9d85a73263e96ba0b2918a9a2ca913ad
1854
Author: Peter Hutterer <peter.hutterer@who-t.net>
1855
Date: Thu Mar 3 15:27:20 2011 +1000
1857
Don't manually UnInit the devices for ABI 12
1859
One of the changes going into ABI 12 were that the server calls Uninit even
1860
on driver-hotplugged devices.
1862
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1863
Acked-by: Ping Cheng <pinglinux@gmail.com>
1865
commit 66466dcf8bbe4c633c006863b30d8d022c575842
1866
Author: Ping Cheng <pinglinux@gmail.com>
1867
Date: Wed Mar 2 15:16:15 2011 -0800
1869
Don't discard the first 2 USB events
1871
It was an issue with older kernels. This driver only supports
1872
kernels 2.6.26 and later. No need to do that any more.
1874
There is a special case that this code may have helped though.
1875
If tool is on the tablet while driver started, waiting for more
1876
events before processing them would fill some otherwise filtered
1877
events from the kernel. Even for this case, the solution should
1878
be added inside wcmUSB.c, instead of here.
1880
We'll work on that in wcmUSB.c later. Just for the record. The
1881
perfect solution would be to retrieve all events from the kernel
1882
if important events, such as tool type, serial number, etc, are
1883
missing. This would require quite some changes in wcmUSB.c. And,
1884
the challenge is that linux-input doesn't provide the means for
1885
us to retrieve all of the events that posted from the kernel. At
1886
least, we can not retrieve serial number and MT events yet.
1888
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1889
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
1890
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1892
commit 438da502c84e7742acb31e433e42efd5bd003581
1893
Author: Ping Cheng <pinglinux@gmail.com>
1894
Date: Wed Mar 2 15:16:49 2011 -0800
1896
Set ISDV4 to PROTOCOL_GENERIC in isdv4ProbeKeys
1898
isdv4ProbeKeys is the place we set all tool types and other keys.
1899
Reset the ProtocolLevel to PROTOCOL_GENERIC here as well.
1900
Otherwise, it would be overwrote by the default.
1902
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
1903
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1904
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1906
commit 22e4410cb3de0ac6b6e2275bd8b8bcc0f2cf7b5a
1907
Author: Peter Hutterer <peter.hutterer@who-t.net>
1908
Date: Thu Mar 3 10:05:55 2011 +1000
1910
test: fix typos and copy/paste effects.
1912
Misplaced closing parens, then copy/pasted everywhere.
1913
Introduced in 1d9a055bc8e95f20458d7da5b77967f2e53b7d6f
1915
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1917
commit 5c06d9584e1f231bea47aaf1dd33e0502dee34be
1918
Author: Peter Hutterer <peter.hutterer@who-t.net>
1919
Date: Wed Mar 2 10:40:44 2011 +1000
1921
test: add license header
1923
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1924
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1926
commit b80876c01ce62baa63c2563aeef399ffea73f588
1927
Author: Peter Hutterer <peter.hutterer@who-t.net>
1928
Date: Wed Mar 2 10:39:57 2011 +1000
1930
test: add note that we can't test static variables here.
1932
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1933
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1935
commit 1d9a055bc8e95f20458d7da5b77967f2e53b7d6f
1936
Author: Peter Hutterer <peter.hutterer@who-t.net>
1937
Date: Wed Mar 2 10:03:31 2011 +1000
1939
test: add ifdefs to allow running tests against 1.7
1941
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1942
Acked-by: Chris Bagwell <chris@cnpbagwell.com>
1944
commit 9d227cd0bd985e7dcb7923974361145ba1d78713
1945
Author: Peter Hutterer <peter.hutterer@who-t.net>
1946
Date: Wed Mar 2 10:34:36 2011 +1000
1948
Move VCOPY storage out of the function.
1950
Not 100% sure why this is needed but it looks like the returned address is
1951
invalid, causing memory corruption. Simply moving the variable into a global
1952
scope fixes this issue.
1954
Fixes crash with server 1.7.
1956
Reported-by: Vu Ngoc San <san.vu-ngoc@laposte.net>
1957
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1958
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1959
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
1961
commit a113f790fe19b0d30b672eb051a3215880df5d3e
1962
Author: Timo Aaltonen <tjaalton@ubuntu.com>
1963
Date: Wed Mar 2 19:09:27 2011 +0200
1965
xsetwacom.c: Fix a typo preventing Rotate ccw from working
1967
Introduced in ac821ba29a828fb9bb531243d0a226a7fe494504
1969
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
1970
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1972
commit 9dba8e81e132561732c3bc6c0645a6af44eab2a0
1973
Author: Peter Hutterer <peter.hutterer@who-t.net>
1974
Date: Wed Mar 2 11:47:45 2011 +1000
1978
New release versioning scheme until we settle on a stable 1.0.
1979
- 0.x.99 is the version number in-between releases
1980
- 0.x.99.901 is the first RC
1981
- 0.x.99.902 is the second RC
1982
- 0.x+1.0 is next the release
1984
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1986
commit 1f0cfe5dd48eec52c495c5777d20758563318783
1987
Author: Peter Hutterer <peter.hutterer@who-t.net>
1988
Date: Tue Mar 1 15:05:05 2011 +1000
1990
test: add basic check that the tool is initialized correctly.
1992
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1993
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
1995
commit 82e65fc52d497b57dab4bcd008ee64f9f7f08796
1996
Author: Peter Hutterer <peter.hutterer@who-t.net>
1997
Date: Fri Jan 21 14:07:55 2011 +1000
1999
Remove now unused overlap checking functions
2001
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2002
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
2004
commit 13a12bb852f845ce5588f1e7dcda18cd2c21cb59
2005
Author: Peter Hutterer <peter.hutterer@who-t.net>
2006
Date: Fri Jan 21 13:52:08 2011 +1000
2008
Purge toolarea from device rec.
2010
Having multiple areas for tool is feature that has gone untested for
2011
possibly years and it's hard to figure out how to even configure it.
2014
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
2017
commit 751065df9bce662f2e1d74746e1ce6b6cb8c73ce
2018
Author: Peter Hutterer <peter.hutterer@who-t.net>
2019
Date: Fri Jan 21 13:31:15 2011 +1000
2021
Purge KeepShape option (for now, anyway).
2023
This option is badly broken since the driver has lost the ability to check
2024
for screen coordinates.
2026
There is a need for this option, but it will have to come back as a
2027
purely client-configured option (i.e. the client feeds the tablet
2028
coordinates it should map to).
2030
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2031
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
2033
commit 24019a07a56fb73132273910d36a036d1c811bb9
2034
Author: Chris Bagwell <chris@cnpbagwell.com>
2035
Date: Sun Feb 20 22:49:33 2011 -0600
2037
Make 1 finger tap work based on finger release.
2039
Previous behavior required a double-tap to get a single finger
2040
tap to work and didn't always work for me. Its behavior was basically
2041
tap-and-drag gesture instead of tap-to-click.
2043
Converted to standard touchpad behavior of single tap based on finger
2044
release. This is arguely the more important gesture to users.
2046
Removed wcmTouchpadMode since it wasn't needed for simple tap-to-click
2047
gesture. If tap-and-drag gets added back and needs a variable, it can
2048
be added back with a name that has "drag" in it to understand its
2051
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2052
Tested-by: Andrzej Giniewicz <gginiu@gmail.com>
2053
Acked-by: Ping Cheng <pinglinux@gmail.com>
2054
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2056
commit 1b30bd68111b7e08fb9ded4302ba556f16253a8a
2057
Author: Chris Bagwell <chris@cnpbagwell.com>
2058
Date: Sun Feb 20 19:19:20 2011 -0600
2060
allow button events while touch is disabled
2062
PROTOCOL_GENERIC devices send "pad" buttons along
2063
with touchscreen/touchpad events. Since we are
2064
emulating "pad" device concept, we need to let
2065
"pad" events go through when "touch" is disabled.
2067
There seems to be a popular script floating around
2068
that toggles "touch" device on/off by using
2069
same devices "pad" buttons. This patch allows that
2072
Signed-off-by: Chris Bagwell <chris@cnpbagwell.com>
2073
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
2074
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2076
commit 85f4c8ed19f8816d0353ee302cf34f8d11e2b14b
2077
Author: Peter Hutterer <peter.hutterer@who-t.net>
2078
Date: Thu Feb 24 15:28:45 2011 +1000
2080
Disable KeepShape - it's currently unsupported.
2082
Will come back once it's hooked up properly again.
2084
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2085
Acked-by: Ping Cheng <pinglinux@gmail.com>
2087
commit 577f42d38b66fd84594a6d3f2932a559e68b5751
2088
Author: Bruno Vasselle <bruno.vasselle@laposte.net>
2089
Date: Fri Feb 25 08:31:21 2011 +1000
2091
Division by zero in wcmInitArea when KEEP_SHAPE_FLAG is on.
2093
Under some circumstances, wcmInitArea faces a division by zero when trying
2094
to deal with the "KeepShape" option. The patch disables KeepShape in the
2097
Signed-off-by: Bruno Vasselle <bruno.vasselle@laposte.net>
2098
Acked-by: Ping Cheng <pinglinux@gmail.com>
2099
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2101
commit 240e694d861fe78d516f43f315dbe2b634368131
2102
Author: Ping Cheng <pinglinux@gmail.com>
2103
Date: Tue Feb 22 17:23:42 2011 -0800
2105
Retrieve the ABS values through EVIOCGABS only when they are set
2107
We get absinfo.maximum = 0 when the ABS_ is not set in the
2108
kernel, which is invalid.
2110
This issue was found when I work on the resolution. It applies to
2111
other ABS_* as well.
2113
Signed-off-by: Ping Cheng <pinglinux@gmail.com>
2114
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2116
commit ac4f60e378150369f7de64045d80e2f2318e0f63
2117
Author: Peter Hutterer <peter.hutterer@who-t.net>
2118
Date: Wed Feb 23 09:59:15 2011 +1000
2120
Update README with a few pointers to website, etc.
2122
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2123
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
2125
commit 87d09b7addeee2d7119c81c2f5b415ceebc50931
2126
Author: Gaetan Nadon <memsize@videotron.ca>
2127
Date: Fri Feb 18 11:50:52 2011 -0500
2129
distcheck fails, xsetwacom.c needs X11_CFLAGS for UNITTESTS
2131
Otherwise it fails to pickup X11/keysym.h and friends.
2133
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2134
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2136
commit 957de9b5a32efaf891e5d4ed55207297b060e605
2137
Author: Gaetan Nadon <memsize@videotron.ca>
2138
Date: Fri Feb 18 20:02:12 2011 -0500
2140
Doxygen: add project name in footer.
2142
The footer was generated by doxygen based on doxygen.conf
2144
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2145
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2147
commit a52277e7f2864493342affb6a4fc6cda74a9d0af
2148
Author: Gaetan Nadon <memsize@videotron.ca>
2149
Date: Fri Feb 18 20:02:11 2011 -0500
2151
Doxygen: use $PACKAGE_VERSION for the release number
2153
The release number in the main page will always be in sync.
2154
This will allow archiving the API documentation for each release,
2155
enabling multiple versions to coexist on the web.
2157
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2158
Reviewed-by: Ping Cheng <pinglinux@gmail.com>
2159
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2161
commit e21033fb505734a934bd0400d9ff72e7ec32c326
2162
Author: Favux <favux.is@gmail.com>
2163
Date: Thu Feb 17 21:09:32 2011 -0600
2165
xsetwacom.c: Correct typo-spelling
2169
From 6e682f268416db29cb178f1f7f734b7687081d29 Mon Sep 17 00:00:00 2001
2170
From: David Foley <favux.is@gmail.com>
2171
Date: Thu, 17 Feb 2011 20:57:38 -0600
2172
Subject: [PATCH] xsetwacom.c: Correct typo/spelling
2174
Reported by: Vu Ngoc San <san.vu-ngoc@laposte.net>
2175
Signed-off-by: David Foley <favux.is@gmail.com>
2176
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2178
commit 01cf69515fa808c09e2ac80c29d6c638ac8191e7
2179
Author: Gaetan Nadon <memsize@videotron.ca>
2180
Date: Fri Feb 18 12:05:31 2011 -0500
2182
Doxygen: add description on the main html page
2184
Rather than staring at a blank screen.
2187
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2188
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2190
commit af58a7af91c00ef4da56c92d143d6bad1475196d
2191
Author: Gaetan Nadon <memsize@videotron.ca>
2192
Date: Fri Feb 18 12:05:30 2011 -0500
2194
Doxygen: add "getting started" support.
2196
Add Makefile.am and docygen.conf with some customization
2198
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2199
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2201
commit b667dd01313bfbc5c76326de61d7fc659076581c
2202
Merge: 244b5ad 79b3945
2203
Author: Peter Hutterer <peter.hutterer@who-t.net>
2204
Date: Fri Feb 18 10:07:06 2011 +1000
2208
commit 244b5ad8f88d3db52bdde7ade9087b096e5a12ea
2209
Author: Peter Hutterer <peter.hutterer@who-t.net>
2210
Date: Thu Feb 17 14:56:06 2011 +1000
2214
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2215
Acked-by: Ping Cheng <pinglinux@gmail.com>
2216
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2218
commit 6ca246bdbb40489490d0b9a72637f997e0629a61
2219
Author: Peter Hutterer <peter.hutterer@who-t.net>
2220
Date: Thu Feb 17 11:31:36 2011 +1000
2222
Update release script to deal with SF's shell service
2224
I get auth. failures if I log in too often.
2226
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2227
Acked-by: Ping Cheng <pinglinux@gmail.com>
1
2229
commit 8cdf444fd1f4004b5a0d237b26ebcd72900338c4
2
2230
Author: Peter Hutterer <peter.hutterer@who-t.net>
3
2231
Date: Wed Feb 16 08:45:04 2011 +1000