author | Alan Coopersmith <Alan.Coopersmith@Sun.COM> |
Tue, 31 Jul 2007 15:09:29 -0700 | |
changeset 194 | c2b76d8a41f7 |
permissions | -rw-r--r-- |
194
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
commit 92ba435bd9aa7b6eca9aef8e5193576ef62fc9db |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
2 |
Author: Eric Anholt <[email protected]> |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
Date: Mon Mar 26 12:44:58 2007 -0700 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
5 |
Update xorg.conf manpage for new RandR 1.2 monitor options. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
6 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
7 |
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
8 |
index bbba211..cc60d07 100644 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
9 |
--- a/hw/xfree86/doc/man/xorg.conf.man.pre |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
10 |
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
11 |
@@ -1004,12 +1004,22 @@ The |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
12 |
.B Identifier |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
13 |
entry specifies the unique name for this monitor. The |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
14 |
.B Monitor |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
15 |
-section provides information about the specifications of the monitor, |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
16 |
-monitor-specific |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
17 |
+section may be used to provide information about the specifications of the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
18 |
+monitor, monitor-specific |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
19 |
.BR Options , |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
20 |
-and information about the video modes to use with the monitor. Specifying |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
21 |
-video modes is optional because the server now has a built-in list of |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
-VESA standard modes. When modes are specified explicitly in the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
+and information about the video modes to use with the monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
+.PP |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
25 |
+With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
26 |
+of the video card. Each output has a name, and the server will look for a |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
27 |
+Monitor named |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
+.B \*qMonitor-outputname\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
29 |
+for configuration of that output (for example, |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
+.B \*qMonitor-VGA\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
+for a VGA output) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
+.PP |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
33 |
+Specifying video modes is optional because the server will use the DDC or other |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
34 |
+information provided by the monitor to automatically configure the list of |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
+modes available. When modes are specified explicitly in the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
36 |
.B Monitor |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
37 |
section (with the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
38 |
.BR Modes , |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
39 |
@@ -1017,7 +1027,8 @@ section (with the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
40 |
or |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
.B UseModes |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
42 |
keywords), built-in modes with the same names are not included. Built-in |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
-modes with different names are, however, still implicitly included. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
44 |
+modes with different names are, however, still implicitly included, when they |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
+meet the requirements of the monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
.PP |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
47 |
The entries that may be used in |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
48 |
.B Monitor |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
49 |
@@ -1214,6 +1225,62 @@ monitors do not require it. The default |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
50 |
This optional entry specifies the vertical refresh rate that the server |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
51 |
should aim for when selecting video modes. Without this option, the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
52 |
default is to prefer modes with higher refresh rates. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
+.BI "Option " "\*qPreferredMode\*q " \*qstring\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
+This optional entry specifies a mode to be marked as the preferred initial mode |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
56 |
+of the monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
57 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
58 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
59 |
+.BI "Option " "\*qPosition\*q " "\*qx y\*q" |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
60 |
+This optional entry specifies the position of the monitor within the X |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
61 |
+screen. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
62 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
63 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
64 |
+.BI "Option " "\*qLeftOf\*q " \*qmonitor\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
65 |
+This optional entry specifies that the monitor should be positioned to the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
66 |
+left of the monitor of the given name. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
67 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
68 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
69 |
+.BI "Option " "\*qRightOf\*q " \*qmonitor\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
70 |
+This optional entry specifies that the monitor should be positioned to the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
71 |
+right of the monitor of the given name. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
72 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
73 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
74 |
+.BI "Option " "\*qAbove\*q " \*qmonitor\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
75 |
+This optional entry specifies that the monitor should be positioned above the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
76 |
+monitor of the given name. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
77 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
78 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
79 |
+.BI "Option " "\*qBelow\*q " \*qmonitor\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
80 |
+This optional entry specifies that the monitor should be positioned below the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
81 |
+monitor of the given name. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
82 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
83 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
84 |
+.BI "Option " "\*qEnable\*q " \*qbool\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
85 |
+This optional entry specifies whether the monitor should be turned on |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
86 |
+at startup. By default, the server will attempt to enable all connected |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
87 |
+monitors. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
88 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
89 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
90 |
+.BI "Option " "\*qMinClock\*q " \*qfrequency\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
91 |
+This optional entry specifies the minimum dot clock, in kHz, that is supported |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
92 |
+by the monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
93 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
94 |
+.BI "Option " "\*qMaxClock\*q " \*qfrequency\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
95 |
+This optional entry specifies the maximum dot clock, in kHz, that is supported |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
96 |
+by the monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
97 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
98 |
+.BI "Option " "\*qIgnore\*q " \*qbool\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
99 |
+This optional entry specifies that the monitor should be ignored entirely, |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
100 |
+and not reported through RandR. This is useful if the hardware reports the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
101 |
+presence of outputs that don't exist. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
102 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
103 |
+.TP 7 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
104 |
+.BI "Option " "\*qRotate\*q " \*qrotation\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
105 |
+This optional entry specifies the initial rotation of the given monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
106 |
+Valid values for rotation are \*qnormal\*q, \*qleft\*q, \*qright\*q, and |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
107 |
+\*qinverted\*q. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
108 |
+(RandR 1.2-supporting drivers only) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
109 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
110 |
.SH MODES SECTION |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
111 |
The config file may have multiple |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
112 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
113 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
114 |
commit 3de1f0d03b329b01856f664651db23ffefb58646 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
115 |
Author: Eric Anholt <[email protected]> |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
116 |
Date: Tue May 29 10:08:58 2007 -0700 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
117 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
118 |
Fix documentation of association of outputs to monitor sections in xorg.conf(5) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
119 |
|
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
120 |
diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
121 |
index 4103974..504e0c2 100644 |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
122 |
--- a/hw/xfree86/doc/man/xorg.conf.man.pre |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
123 |
+++ b/hw/xfree86/doc/man/xorg.conf.man.pre |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
124 |
@@ -1009,14 +1009,22 @@ monitor, monitor-specific |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
125 |
.BR Options , |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
126 |
and information about the video modes to use with the monitor. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
127 |
.PP |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
128 |
-With RandR 1.2-enabled drivers, monitor sections are tied to specific outputs |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
129 |
-of the video card. Each output has a name, and the server will look for a |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
130 |
-Monitor named |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
131 |
-.B \*qMonitor-outputname\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
132 |
-for configuration of that output (for example, |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
133 |
-.B \*qMonitor-VGA\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
134 |
+With RandR 1.2-enabled drivers, monitor sections may be tied to specific |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
135 |
+outputs of the video card. Using the name of the output defined by the video |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
136 |
+driver plus the identifier of a monitor section, one associates a monitor |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
137 |
+section with an output by adding an option to the Device section in the |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
138 |
+following format: |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
139 |
+ |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
140 |
+.B Option \*qMonitor-outputname\*q \*qmonitorsection\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
141 |
+ |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
142 |
+(for example, |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
143 |
+.B Option \*qMonitor-VGA\*q \*qVGA monitor\*q |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
144 |
for a VGA output) |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
145 |
.PP |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
146 |
+In the absence of specific association of monitor sections to outputs, if a |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
147 |
+monitor section is present the server will associate it with an output to |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
148 |
+preserve compatibility for previous single-head configurations. |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
149 |
+.PP |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
150 |
Specifying video modes is optional because the server will use the DDC or other |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
151 |
information provided by the monitor to automatically configure the list of |
c2b76d8a41f7
6580970 Xorg Server 1.3 [PSARC 2007/434]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
152 |
modes available. |