summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-07-09 17:11:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-07-09 17:11:14 +0000
commit9134af7ac0b3e6962f55d27dcb149b7259b94033 (patch)
treee7f1ebbda9e2d1aa4b7adef5ad4975b3d34658b2
parentbe406d428fdcdf0c7a746c6e862f87168bec6ebc (diff)
downloaddrakx-kbd-mouse-x11-9134af7ac0b3e6962f55d27dcb149b7259b94033.tar
drakx-kbd-mouse-x11-9134af7ac0b3e6962f55d27dcb149b7259b94033.tar.gz
drakx-kbd-mouse-x11-9134af7ac0b3e6962f55d27dcb149b7259b94033.tar.bz2
drakx-kbd-mouse-x11-9134af7ac0b3e6962f55d27dcb149b7259b94033.tar.xz
drakx-kbd-mouse-x11-9134af7ac0b3e6962f55d27dcb149b7259b94033.zip
- wacom configuration: add "pad" InputDevice section
-rw-r--r--NEWS1
-rw-r--r--lib/Xconfig/xfree.pm9
2 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index b137693..ee88555 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- wacom configuration: add "pad" InputDevice section
- fix displaying "3D hardware acceleration: no" for nvidia proprietary driver
(#31326)
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index a3dda06..8248fe9 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -275,21 +275,20 @@ sub set_wacoms {
$raw_X->remove_InputDevices('wacom');
my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= [];
- @$layout = grep { $_->{val} !~ /^"(Stylus|Eraser|Cursor)/ } @$layout;
+ @$layout = grep { $_->{val} !~ /^"(Stylus|Eraser|Cursor|Pad)/ } @$layout;
@wacoms or return;
- my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative');
-
+ my @Modes = ('Stylus', 'Eraser', 'Cursor', 'Pad');
+
each_index {
my $wacom = $_;
- foreach (keys %Modes) {
+ foreach (@Modes) {
my $identifier = $_ . ($::i + 1);
my $h = { Identifier => { val => $identifier },
Driver => { val => 'wacom' },
Type => { val => lc $_, Option => 1 },
Device => { val => $wacom->{Device}, Option => 1 },
- Mode => { val => $Modes{$_}, Option => 1 },
if_($wacom->{USB}, USB => { Option => 1 })
};
$raw_X->add_Section('InputDevice', $h);