diff options
| -rw-r--r-- | perl-install/Xconfig/parse.pm | 3 | ||||
| -rw-r--r-- | perl-install/Xconfig/xfree3.pm | 2 | ||||
| -rw-r--r-- | perl-install/Xconfig/xfree4.pm | 11 | ||||
| -rw-r--r-- | perl-install/Xconfig/xfreeX.pm | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/perl-install/Xconfig/parse.pm b/perl-install/Xconfig/parse.pm index dbd8851ea..9f4b40bd5 100644 --- a/perl-install/Xconfig/parse.pm +++ b/perl-install/Xconfig/parse.pm @@ -137,6 +137,9 @@ my %kind_names = ( Display => [ qw(Depth Modes) ], # Subsection in Device Screen => [ qw(Identifier Driver Device Monitor DefaultColorDepth) ], InputDevice => [ qw(Identifier Driver Protocol Device Type Mode XkbModel XkbLayout XkbDisable Emulate3Buttons Emulate3Timeout) ], + WacomCursor => [ qw(Port) ], #-\ + WacomStylus => [ qw(Port) ], #--> Port must be first + WacomEraser => [ qw(Port) ], #-/ ServerLayout => [ qw(Identifier) ], ); my @want_string = qw(Identifier DeviceName VendorName ModelName BoardName Driver Device Chipset Monitor Protocol XkbModel XkbLayout XkbOptions Load BusID); diff --git a/perl-install/Xconfig/xfree3.pm b/perl-install/Xconfig/xfree3.pm index 106f14ed8..d3a258138 100644 --- a/perl-install/Xconfig/xfree3.pm +++ b/perl-install/Xconfig/xfree3.pm @@ -54,7 +54,7 @@ sub new_mouse_sections { sub set_wacoms { my ($raw_X, @wacoms) = @_; - my %Modes = (Stylus => 'Absolute', Erasor => 'Absolute', Cursor => 'Relative'); + my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative'); my $XInput = $raw_X->get_Section('XInput'); if ($XInput) { diff --git a/perl-install/Xconfig/xfree4.pm b/perl-install/Xconfig/xfree4.pm index 58c6cdad0..8ffa411e0 100644 --- a/perl-install/Xconfig/xfree4.pm +++ b/perl-install/Xconfig/xfree4.pm @@ -63,20 +63,21 @@ sub set_wacoms { @wacoms or return; - my %Modes = (Stylus => 'Absolute', Erasor => 'Absolute', Cursor => 'Relative'); + my %Modes = (Stylus => 'Absolute', Eraser => 'Absolute', Cursor => 'Relative'); each_index { - my ($wacom) = @_; + my $wacom = $_; foreach (keys %Modes) { - my $h = { Identifier => { val => $_ . ($::i + 1) }, + my $identifier = $_ . ($::i + 1); + my $h = { Identifier => { val => $identifier }, Driver => { val => 'wacom' }, - Style => { val => lc $_, Option => 1 }, + 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); - push @$layout, { val => qq("$_$::i" "AlwaysCore") }; + push @$layout, { val => qq("$identifier" "AlwaysCore") }; } } @wacoms; } diff --git a/perl-install/Xconfig/xfreeX.pm b/perl-install/Xconfig/xfreeX.pm index 6154cb547..0b593d939 100644 --- a/perl-install/Xconfig/xfreeX.pm +++ b/perl-install/Xconfig/xfreeX.pm @@ -258,7 +258,7 @@ sub raw_import_section { sub add_Section { my ($raw_X, $Section, $h) = @_; - my @suggested_ordering = qw(Files ServerFlags Keyboard Pointer XInput InputDevice Module DRI Monitor Device Screen ServerLayout); + my @suggested_ordering = qw(Files ServerFlags Module DRI Keyboard Pointer XInput InputDevice Monitor Device Screen ServerLayout); my %order = map_index { { lc($_) => $::i } } @suggested_ordering; my $e = { name => $Section, l => $h }; my $added; |