summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-12-02 12:47:17 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-12-02 12:47:17 +0000
commit8212f09c04859180c0e67588f0ab5912b3c08a86 (patch)
tree24f36eccb18068cdb01626fd83010f692e1b0531 /perl-install/standalone
parentfb1408984a4460dcb8c66a9ba4d2e51d2b97303f (diff)
downloaddrakx-8212f09c04859180c0e67588f0ab5912b3c08a86.tar
drakx-8212f09c04859180c0e67588f0ab5912b3c08a86.tar.gz
drakx-8212f09c04859180c0e67588f0ab5912b3c08a86.tar.bz2
drakx-8212f09c04859180c0e67588f0ab5912b3c08a86.tar.xz
drakx-8212f09c04859180c0e67588f0ab5912b3c08a86.zip
no_comment
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/keyboarddrake45
-rwxr-xr-xperl-install/standalone/mousedrake4
2 files changed, 47 insertions, 2 deletions
diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake
new file mode 100755
index 000000000..9bb77e6bb
--- /dev/null
+++ b/perl-install/standalone/keyboarddrake
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+
+
+use interactive;
+use keyboard;
+use Xconfigurator_consts;
+use common qw(:system);
+
+local $_ = join '', @ARGV;
+
+/-h/ and die "usage: keyboarddrake [--expert]\n";
+
+$::expert = /--expert/;
+$::isStandalone = 1;
+
+my $in = vnew interactive;
+
+my $keyboard = keyboard::text2keyboard(
+ $in->ask_from_list_(_("Keyboard"),
+ _("What is your keyboard layout?"),
+ [ keyboard::list() ],
+ keyboard::keyboard2text(keyboard::read(''))));
+
+my $isNotDelete = $::expert && !$in->ask_yesorno("BackSpace", "Do you want the BackSpace to return Delete in console?", 1);
+
+my $kmap = keyboard::keyboard2kmap($keyboard);
+`loadkeys $kmap`;
+
+my $xkb = keyboard::keyboard2xkb($keyboard);
+`setxkbmap $xkb`;
+
+my $f = "/etc/X11/XF86Config";
+substInFile {
+ if (/^Section "Keyboard"/ .. /^EndSection/) {
+ s|^(\s*XkbLayout\s+).*|$1"$xkb"|
+ and $_ .= join '', map { " $_\n" } @{$xkb_options{$xkb} || []};
+ s,^(\s*(XkbVariant|XkbOptions)\s+).*,,; # remove existing one
+ }
+} $f if -e $f && !$::testing;
+
+keyboard::write('', $keyboard, $isNotDelete);
+
+exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 852c5e612..daacb90e9 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -43,8 +43,8 @@ modules::write_conf("/etc/conf.modules") if $mouse->{device} eq "usbmouse" && !$
my $f = "/etc/X11/XF86Config";
substInFile {
if (/^Section "Pointer"/ .. /^EndSection/) {
- s|^(\s*Protocol\s+).*|$1 "$mouse->{XMOUSETYPE}"|;
- s|^(\s*Device\s+).*|$1 "/dev/mouse"|;
+ s|^(\s*Protocol\s+).*|$1"$mouse->{XMOUSETYPE}"|;
+ s|^(\s*Device\s+).*|$1"/dev/mouse"|;
}
} $f if -e $f && !$::testing;