1 diff -urp -x '*~' -x '*.orig' man/general/X.man man/general/X.man |
1 diff -urp -x '*~' -x '*.orig' man/general/X.man man/general/X.man |
2 --- man/general/X.man 2008-07-30 19:30:11.355466000 -0700 |
2 --- man/general/X.man 2009-10-16 14:37:57.000000000 -0700 |
3 +++ man/general/X.man 2008-07-30 19:30:15.046399000 -0700 |
3 +++ man/general/X.man 2009-10-30 21:54:28.900018991 -0700 |
4 @@ -117,6 +117,8 @@ web browser plug-ins, \fIlibxrx.so\fP an |
4 @@ -114,6 +114,8 @@ web browser plug-ins, \fIlibxrx.so\fP an |
5 an RX MIME-type helper program, \fIxrx\fP; |
5 an RX MIME-type helper program, \fIxrx\fP; |
6 and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP. |
6 and a utility to cause part or all of the screen to be redrawn, \fIxrefresh\fP. |
7 .PP |
7 .PP |
8 +Many, but not all, of these programs are included in this release of Solaris. |
8 +Many, but not all, of these programs are included in Solaris and OpenSolaris. |
9 +.PP |
9 +.PP |
10 Many other utilities, window managers, games, toolkits, etc. are included |
10 Many other utilities, window managers, games, toolkits, etc. are included |
11 as user-contributed software in the X.Org Foundation distribution, or are |
11 as user-contributed software in the X.Org Foundation distribution, or are |
12 available on the Internet. |
12 available on the Internet. |
13 @@ -129,22 +131,16 @@ operating system you are running and whe |
13 @@ -126,11 +128,10 @@ operating system you are running and whe |
14 systems in addition to X. |
14 systems in addition to X. |
15 .TP 8 |
15 .TP 8 |
16 .B "Display Manager" |
16 .B "Display Manager" |
17 -If you want to always have X running on your display, your site administrator |
17 -If you want to always have X running on your display, your site administrator |
18 -can set your machine up to use a Display Manager such as \fIxdm\fP, \fIgdm\fP, |
18 -can set your machine up to use a Display Manager such as \fIxdm\fP, \fIgdm\fP, |
19 -or \fIkdm\fP. This program |
19 -or \fIkdm\fP. This program |
20 -is typically started by the system at boot time and takes care of keeping the |
20 -is typically started by the system at boot time and takes care of keeping the |
21 -server running and getting users logged in. If you are running |
21 -server running and getting users logged in. If you are running one of these |
22 -\fIxdm\fP, you will see a window on the screen welcoming you to the system and |
22 +The default configuration of Solaris and OpenSolaris start X at boot time via |
23 +The default configuration of Solaris starts X at boot time via a display |
23 +the \fIgdm\fP(1m) display manager. The \fIxdm\fP(1) display manager is also |
24 +manager. Solaris includes 3 display managers, \fIgdm\fP(1), |
24 +provided as an option the system administrator can configure. |
25 +\fIdtlogin\fP(1), and \fIxdm\fP(1). If you are running a display manager, |
25 +If you are running one of these |
26 +you will see a window on the screen welcoming you to the system and |
26 display managers, you will normally see a window on the screen welcoming you |
27 asking for your username and password. Simply type them in as you would at |
27 to the system and asking for your login information. Simply type them in as |
28 a normal terminal, pressing the Return key after each. If you make a mistake, |
28 you would at a normal terminal. If you make a mistake, the display manager |
29 -\fIxdm\fP will display an error message and ask you to try again. After you |
29 @@ -239,6 +240,7 @@ addresses, and IPv6 addresses are all al |
30 -have successfully logged in, \fIxdm\fP will start up your X environment. By |
30 The hostname part of the display name should be the server machine's |
31 -default, if you have an executable file named \fI.xsession\fP in your |
|
32 -home directory, |
|
33 -\fIxdm\fP will treat it as a program (or shell script) to run to start up |
|
34 -your initial clients (such as terminal emulators, clocks, a window manager, |
|
35 -user settings for things like the background, the speed of the pointer, etc.). |
|
36 -Your site administrator can provide details. |
|
37 +the display manager will display an error message and ask you to try again. |
|
38 +After you have successfully logged in, the display manager will start up your |
|
39 +X environment. The documentation for the display manager you use can provide |
|
40 +more details. |
|
41 .TP 8 |
|
42 .B "\fIxinit\fP (run manually from the shell)" |
|
43 Sites that support more than one window system might choose to use the |
|
44 @@ -247,6 +243,7 @@ addresses, and IPv6 addresses are all al |
|
45 The hostname part of the display name should be the server machine's |
|
46 nodename, followed by two colons instead of one. |
31 nodename, followed by two colons instead of one. |
47 For example: \fImyws::0\fP, \fIbig::1\fP, and \fIhydra::0.1\fP. |
32 For example: \fImyws::0\fP, \fIbig::1\fP, and \fIhydra::0.1\fP. |
48 +Note that DECnet connections are not supported on this release of Solaris. |
33 +Note that DECnet connections are not supported on Solaris or OpenSolaris. |
49 .PP |
34 .PP |
50 .SH "ACCESS CONTROL" |
35 .SH "ACCESS CONTROL" |
51 An X server can use several types of access control. Mechanisms provided |
36 An X server can use several types of access control. Mechanisms provided |
52 @@ -377,10 +374,12 @@ to explicitly draw the window's region o |
37 @@ -369,10 +371,14 @@ to explicitly draw the window's region o |
53 example). |
38 example). |
54 .PP |
39 .PP |
55 Since window managers are regular (albeit complex) client programs, |
40 Since window managers are regular (albeit complex) client programs, |
56 -a variety of different user interfaces can be built. The X.Org Foundation distribution |
41 -a variety of different user interfaces can be built. The X.Org Foundation distribution |
57 -comes with a window manager named \fItwm\fP which supports overlapping windows, |
42 -comes with a window manager named \fItwm\fP which supports overlapping windows, |
58 -popup menus, point-and-click or click-to-type input models, title bars, nice |
43 -popup menus, point-and-click or click-to-type input models, title bars, nice |
59 -icons (and an icon manager for those who don't like separate icon windows). |
44 -icons (and an icon manager for those who don't like separate icon windows). |
60 +a variety of different user interfaces can be built. |
45 +a variety of different user interfaces can be built. |
61 +Solaris includes two window managers, the GNOME window manager |
46 +Solaris and OpenSolaris include several window managers, including the |
|
47 +GNOME window manager |
62 +.IR metacity (1), |
48 +.IR metacity (1), |
|
49 +the compositing effects manager |
|
50 +.IR compiz (1), |
63 +and the X.Org Foundation distributed |
51 +and the X.Org Foundation distributed |
64 +.IR twm (1). |
52 +.IR twm (1). |
65 +Both support overlapping windows, popup menus, and many other features. |
|
66 .PP |
53 .PP |
67 See the user-contributed software in the X.Org Foundation distribution for other |
54 See the user-contributed software in the X.Org Foundation distribution for other |
68 popular window managers. |
55 popular window managers. |
69 @@ -1115,11 +1114,6 @@ This must point to a color name database |
56 @@ -1305,6 +1311,13 @@ the appropriate instance name can be pla |
70 \fI __projectroot__/lib/X11/Xcms.txt\fP. |
|
71 .TP |
|
72 .SM |
|
73 -.B XFT_CONFIG |
|
74 -This must point to a configuration file for the Xft library. The default |
|
75 -value is\fI __projectroot__/lib/X11/XftConfig\fP. |
|
76 -.TP |
|
77 -.SM |
|
78 .B RESOURCE_NAME |
|
79 This serves as main identifier for resources belonging to the program |
|
80 being executed. It defaults to the basename of pathname of the program. |
|
81 @@ -1192,7 +1186,6 @@ please refer to that command's manual pa |
|
82 % bitmap companylogo.bm 32x32 |
|
83 % xcalc -bg blue -fg magenta |
|
84 % xterm -geometry 80x66-0-0 -name myxterm $* |
|
85 - % xon filesysmachine xload |
|
86 .fi |
|
87 .SH DIAGNOSTICS |
|
88 A wide variety of error messages are generated from various programs. |
|
89 @@ -1301,12 +1294,19 @@ the appropriate instance name can be pla |
|
90 .BR xwud (__appmansuffix__). |
|
91 .\" servers |
|
92 .BR Xserver (__appmansuffix__), |
|
93 +.BR Xorg (__appmansuffix__), |
|
94 +.BR Xsun (__appmansuffix__), |
|
95 .BR Xdmx (__appmansuffix__), |
|
96 .BR Xnest (__appmansuffix__), |
|
97 .BR Xvfb (__appmansuffix__), |
57 .BR Xvfb (__appmansuffix__), |
98 -.BR Xorg (__appmansuffix__), |
58 .BR Xvnc (__appmansuffix__), |
99 -.BR XDarwin (__appmansuffix__), |
59 .BR XWin (__appmansuffix__). |
100 .BR Xprt (__appmansuffix__). |
|
101 + |
60 + |
102 +.\" related software |
61 +.\" related software |
103 +.BR gdm (1), |
62 +.BR gdm (1m), |
104 +.BR dtlogin (1), |
|
105 +.BR gnome-session (1), |
63 +.BR gnome-session (1), |
106 +.BR metacity (1). |
64 +.BR metacity (1), |
|
65 +.BR compiz (1). |
107 + |
66 + |
108 .\" specifications |
67 .\" specifications |
109 .I "Xlib \- C Language X Interface\fR,\fP" |
68 .I "Xlib \- C Language X Interface\fR,\fP" |
110 and |
69 and |