summaryrefslogtreecommitdiff
blob: 04e1a77b822f3e6527608721f05197c047ab1586 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
--- XF4text.h.old	2004-10-07 21:24:03.911097072 +0200
+++ XF4text.h	2004-10-07 21:26:29.497964504 +0200
@@ -1,4 +1,6 @@
-/* This file hold the various bits of the config file for XFree86 4.2+ */
+/* This file hold the various bits of the config file for X.org >=6.7.0 */
+
+/* Modified for Gentoo PPC Distribution by Matt Jarjoura and Lars Weiler */
 
 static char *header =
 "# File generated by Xautoconfig.\n"
@@ -20,10 +22,26 @@
 "\n"
 "       RgbPath      \"/usr/X11R6/lib/X11/rgb\"\n";
 
-static char *fontpath =
-"       FontPath     \"unix/:7100\"\n"
+static char *fontpath_gentoo = 
+"    # For XFS, uncomment this and comment the others\n"
+"    # FontPath    \"unix/:-1\"\n"
+"    FontPath    \"/usr/share/fonts/local/\"\n"
+"    FontPath    \"/usr/share/fonts/misc/\"\n"
+"    FontPath    \"/usr/share/fonts/75dpi/:unscaled\"\n"
+"    FontPath    \"/usr/share/fonts/100dpi/:unscaled\"\n"
+"    FontPath    \"/usr/share/fonts/Type1/\"\n"
+"    FontPath    \"/usr/share/fonts/TTF/\"\n"
+"    FontPath    \"/usr/share/fonts/CID/\"\n"
+"    FontPath    \"/usr/share/fonts/Speedo/\"\n"
+"    FontPath    \"/usr/share/fonts/75dpi/\"\n"
+"    FontPath    \"/usr/share/fonts/100dpi/\"\n"
 "EndSection\n\n";
 
+/* static char *fontpath =
+"       FontPath     \"unix/:7100\"\n"
+"EndSection\n\n";
+*/
+ 
 static char *fontpath_anaconda =
 "       FontPath    \"/usr/X11R6/lib/X11/fonts/misc:unscaled\"\n"
 "       FontPath    \"/usr/X11R6/lib/X11/fonts/Type1/\"\n"
@@ -57,12 +75,11 @@
 static char *inputdev_section =
 "Section \"InputDevice\"\n"
 "	Identifier	\"Keyboard0\"\n"
-"	Driver		\"keyboard\"\n";
+"	Driver		\"kbd\"\n";
 
 static char *keyboard_linux =
 "# Change \"XkbModel\" to \"macintosh_old\" if you are using\n"
 "# the deprecated adb keycodes.\n"
-"	Option		\"XkbRules\"	\"xfree86\"\n"
-"	Option		\"XkbModel\"	\"macintosh\"\n"
+"	Option		\"XkbModel\"	\"pc104\"\n"
 "	Option		\"XkbLayout\"	\"us\"\n"
 "EndSection\n\n";