diff options
Diffstat (limited to 'lib/Xconfig')
| -rw-r--r-- | lib/Xconfig/default.pm | 6 | ||||
| -rw-r--r-- | lib/Xconfig/xfree.pm | 17 |
2 files changed, 0 insertions, 23 deletions
diff --git a/lib/Xconfig/default.pm b/lib/Xconfig/default.pm index e50d9f9..722ff35 100644 --- a/lib/Xconfig/default.pm +++ b/lib/Xconfig/default.pm @@ -24,7 +24,6 @@ sub configure { $raw_X->add_load_module($_) foreach qw(dbe v4l extmod); - config_keyboard($raw_X, $keyboard); config_mouse($raw_X, $do_pkgs, $mouse); $raw_X; @@ -36,10 +35,5 @@ sub config_mouse { mouse::various_xfree_conf($do_pkgs, $mouse); } -sub config_keyboard { - my ($raw_X, $keyboard) = @_; - $raw_X->set_keyboard(keyboard::keyboard2full_xkb($keyboard)); -} - 1; diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index f03bc88..b248b7f 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -98,12 +98,6 @@ sub get_keyboard { my $raw_kbd = _raw_get_keyboard($raw_X) or die "no keyboard section"; raw_export_section($raw_kbd, \@keyboard_fields); } -sub set_keyboard { - my ($raw_X, $kbd) = @_; - my $raw_kbd = _raw_get_keyboard($raw_X) || _new_keyboard_section($raw_X); - raw_import_section($raw_kbd, $kbd); - _set_Option('keyboard', $raw_kbd, keys %$kbd); -} sub _raw_get_keyboard { my ($raw_X) = @_; first($raw_X->get_Sections('InputDevice', sub { @@ -112,17 +106,6 @@ sub _raw_get_keyboard { $Driver eq 'kbd' || $Driver eq 'evdev' && val($entry->{XkbLayout}); })); } -sub _new_keyboard_section { - my ($raw_X) = @_; - my $raw_kbd = { Identifier => { val => 'Keyboard1' }, Driver => { val => 'kbd' } }; - $raw_X->add_Section('InputDevice', $raw_kbd); - - my $layout = get_ServerLayout($raw_X)->{InputDevice} ||= []; - push @$layout, { val => '"Keyboard1" "CoreKeyboard"' }; - - $raw_kbd; -} - ################################################################################ # mouse ######################################################################## |