diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-01-24 13:11:27 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-01-24 13:11:27 +0000 |
| commit | fe0e92f4e338bd3ab690e409ff9ccde6cfe58780 (patch) | |
| tree | 90162d89089414633e30308971a9e715f1b1363c /perl-install/install_steps_gtk.pm | |
| parent | 9e683c898b6592aaac1196f76dd9321c4426c912 (diff) | |
| download | drakx-backup-do-not-use-fe0e92f4e338bd3ab690e409ff9ccde6cfe58780.tar drakx-backup-do-not-use-fe0e92f4e338bd3ab690e409ff9ccde6cfe58780.tar.gz drakx-backup-do-not-use-fe0e92f4e338bd3ab690e409ff9ccde6cfe58780.tar.bz2 drakx-backup-do-not-use-fe0e92f4e338bd3ab690e409ff9ccde6cfe58780.tar.xz drakx-backup-do-not-use-fe0e92f4e338bd3ab690e409ff9ccde6cfe58780.zip | |
first sparc release of DrakX.
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index ce374c433..4ad02d116 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -181,7 +181,7 @@ sub new($$) { my $ok = 1; local $SIG{CHLD} = sub { $ok = 0 }; unless (fork) { - exec $_[0], "-kb", "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1; + exec $_[0], (arch() =~ /^sparc/ ? () : ("-kb")), "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1; } foreach (1..15) { sleep 1; @@ -192,6 +192,7 @@ sub new($$) { }; my @servers = qw(FBDev VGA16); @servers = qw(FBDev 3DLabs TGA) if arch() eq "alpha"; + @servers = qw(Mach64) if arch() =~ /^sparc/; foreach (@servers) { log::l("Trying with server $_"); @@ -221,6 +222,8 @@ sub new($$) { install_theme($o); create_logo_window($o); +# eval { sleep 10; run_command::run('xhost+') }; #- for testing + $my_gtk::force_center = [ $width - $windowwidth, $logoheight, $windowwidth, $windowheight ]; (bless {}, ref $type || $type)->SUPER::new($o); @@ -802,7 +805,7 @@ END local *F; open F, ">$file" or die "can't create X configuration file $file"; - print F <<END; + print F <<END_KEYB; Section "Files" FontPath "/usr/X11R6/lib/X11/fonts:unscaled,/usr/X11R6/lib/X11/fonts" EndSection @@ -815,6 +818,22 @@ Section "Keyboard" RightAlt Meta ScrollLock Compose RightCtl Control +END_KEYB + + if (arch() =~ /^sparc/) { + print F <<END_KEYB_SPARC; + XkbRules "sun" + XkbModel "sun" + XkbLayout "us" + XkbCompat "compat/complete" + XkbTypes "types/complete" + XkbKeycodes "sun(type5)" + XkbGeometry "sun(type5)" + XkbSymbols "sun/us(sun5)" +END_KEYB_SPARC + } + + print F <<END; EndSection Section "Pointer" |