diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-22 13:43:47 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-22 13:43:47 +0000 |
| commit | 3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa (patch) | |
| tree | 5243fab83619ad3bd606bdffd10074919b6166a6 | |
| parent | 897838e2929c236f7ea7522b00d9bb96841f1b23 (diff) | |
| download | drakx-3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa.tar drakx-3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa.tar.gz drakx-3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa.tar.bz2 drakx-3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa.tar.xz drakx-3cf37a6c5c6237aa2afc34e03141eca3b7dd9caa.zip | |
(config_keyboard): drop handling of bad XkbLayout
(config_mouse): wacoms X configuration moved to mouse::set_xfree_conf
| -rw-r--r-- | perl-install/Xconfig/default.pm | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/perl-install/Xconfig/default.pm b/perl-install/Xconfig/default.pm index 2293f6a8b..54a27fc31 100644 --- a/perl-install/Xconfig/default.pm +++ b/perl-install/Xconfig/default.pm @@ -33,10 +33,6 @@ sub configure { sub config_mouse { my ($raw_X, $mouse) = @_; mouse::set_xfree_conf($mouse, $raw_X); - if (my @wacoms = @{$mouse->{wacom} || []}) { - $raw_X->set_wacoms(map { { Device => "/dev/$_", USB => m|input/event| } } @wacoms); - $raw_X->{xfree3}->add_load_module('xf86Wacom.so'); - } } sub config_keyboard { @@ -44,12 +40,6 @@ sub config_keyboard { my $XkbLayout = keyboard::keyboard2xkb($keyboard); - if (!$XkbLayout || $XkbLayout =~ /([^(]*)/ && !-e "$::prefix/usr/X11R6/lib/X11/xkb/symbols/$1") { - my $f = keyboard::xmodmap_file($keyboard); - cp_af($f, "$::prefix/etc/X11/xinit/Xmodmap"); - $XkbLayout = ''; - } - { my $f = "$::prefix/etc/sysconfig/i18n"; setVarsInSh($f, add2hash_({ XKB_IN_USE => $XkbLayout ? '': 'no' }, { getVarsFromSh($f) })) if !$::testing; |