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