move to Linux keycodes on PPC, add additional Apple modelines

3 files changed, 16 insertions, 45 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 8679800ab..77b24fbfa 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -973,7 +973,6 @@ sub write_XF86Config {
     print G $keyboardsection_part3_v4;
 
     $O->{xkb_model} ||= 
-      arch() =~ /ppc/ ? 'macintosh' :
       arch() =~ /sparc/ ? 'sun' :
       $O->{xkb_keymap} eq 'br' ? 'abnt2' : 'pc105';
     print F qq(    XkbModel        "$O->{xkb_model}"\n);
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 290be8992..29f170a16 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -511,44 +511,6 @@ $keyboardsection_part3_v4 = '
     Option "XkbGeometry" "sun(type5)"
     Option "XkbSymbols"  "sun/us(sun5)"
 ';
-} elsif (arch() =~ /ppc/) {
-$keyboardsection_part3 = '
-# To customise the XKB settings to suit your keyboard, modify the
-# lines below (which are the defaults).  For example, for a non-U.S.
-# keyboard, you will probably want to use:
-#    XkbModel    "pc102"
-# If you have a US Microsoft Natural keyboard, you can use:
-#    XkbModel    "microsoft"
-#
-# Then to change the language, change the Layout setting.
-# For example, a german layout can be obtained with:
-#    XkbLayout   "de"
-# or:
-#    XkbLayout   "de"
-#    XkbVariant  "nodeadkeys"
-#
-# If you\'d like to switch the positions of your capslock and
-# control keys, use:
-#    XkbOptions  "ctrl:swapcaps"
-
-# These are the default XKB settings for XFree86
-#    XkbRules    "xfree86"
-#    XkbModel    "pc101"
-#    XkbLayout   "us"
-#    XkbVariant  ""
-#    XkbOptions  ""
-
-    XkbKeycodes     "xfree86"
-    XkbTypes        "default"
-    XkbCompat       "default"
-    XkbSymbols      "macintosh/us"
-    XkbGeometry     "macintosh"
-    XkbRules        "xfree86"
-';
-
-$keyboardsection_part3_v4 = '
-    Option "XkbRules" "xfree86"
-';	
 } else {
 $keyboardsection_part3 = '
 # To customise the XKB settings to suit your keyboard, modify the
@@ -688,6 +650,14 @@ Section "Modes"
     Modeline "832x624"    57      832  876  940 1152   624  625  628  667 -hsync -vsync
     # Apple PowerBook G3
     Modeline "800x600"    100     800  816  824  840   600  616  624  640 -hsync -vsync
+    # Apple TI Powerbook 
+    Modeline "1152x768"   78.741 1152 1173 1269 1440   768  769  772  800 +vsync +vsync
+    # Pismo Firewire G3   
+    Modeline "1024x768"   65     1024 1032 1176 1344   768  771  777  806 -hsync -vsync
+    # iBook2
+    Modeline "1024x768"   65     1024 1048 1184 1344   768  771  777  806 -hsync -vsync
+    # HiRes Apple Studio Display
+    Modeline "1280x1024"  135    1280 1288 1392 1664  1024 1027 1030 1064
 EndSection
 ';
 $modelines_text = '
diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index e93897e63..915f2cb6a 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -151,11 +151,6 @@ arch() =~ /^sparc/ ? (
  "uk" => [ __("UK keyboard"),    "sunt5-uk",    "gb" ],
  "us" => [ __("US keyboard"),    "sunkeymap",   "us" ],
 ) : (
-arch() eq "ppc" ? (
- "de_nodeadkeys" => [ __("German"), "mac-de-latin1-nodeadkeys", "de(nodeadkeys)" ],
- "fr" => [ __("French"),         "mac-fr2-ext",   "fr" ],
- "us" => [ __("US keyboard"),    "mac-us-ext",  "us" ],
-) : (
  "al" => [ __("Albanian"), "al", "al" ],
  "am_old" => [ __("Armenian (old)"),	"am_old",	"am(old)" ],
  "am" => [ __("Armenian (typewriter)"),	"am-armscii8",	"am" ],
@@ -240,7 +235,7 @@ arch() eq "ppc" ? (
  "us_intl" => [ __("US keyboard (international)"), "us-latin1", "us_intl" ],
  "vn" => [ __("Vietnamese \"numeric row\" QWERTY"),"vn-tcvn", "vn(toggle)" ], 
  "yu" => [ __("Yugoslavian (latin)"), "yu", "hr" ],
-)),
+),
 );
 
 #-######################################################################################
@@ -394,6 +389,13 @@ sub write {
 		       });
     setVarsInSh("$prefix/etc/sysconfig/keyboard", $config);
     run_program::rooted($prefix, "dumpkeys > /etc/sysconfig/console/default.kmap") or log::l("dumpkeys failed");
+    if (arch() =~ /ppc/) {
+	my $s = "dev.mac_hid.keyboard_sends_linux_keycodes = 1";
+	substInFile { 
+            $_ = '' if /^\Qdev.mac_hid.keyboard_sends_linux_keycodes/;
+            $_ .= $s if eof;
+        } "$prefix/etc/sysctl.conf";
+    }
 }
 
 sub read_raw {