70. Merging in the TM branch (Egbert Eich).
This commit is contained in:
Egbert Eich
parent
0f8d2fd7d0
commit
9bbe288d7f
|
|
@ -10,7 +10,7 @@ XDarwin \- X window system server for Darwin operating system
|
|||
#ifdef DARWIN_WITH_QUARTZ
|
||||
.I XDarwin
|
||||
is the X window server for Mac OS X and the Darwin operating system
|
||||
provided by the XFree86 Project.
|
||||
provided by the X.Org Foundation.
|
||||
.I XDarwin
|
||||
can run in three different modes. On Mac OS X,
|
||||
.I XDarwin
|
||||
|
|
@ -51,7 +51,7 @@ handles the desktop background.
|
|||
#else
|
||||
.I XDarwin
|
||||
is the X window server for Mac OS X and the Darwin operating system
|
||||
provided by the XFree86 Project. This version of
|
||||
provided by the X.Org Foundation. This version of
|
||||
.I XDarwin
|
||||
can only be started from the Darwin text console. The Mac OS X Aqua GUI, if
|
||||
present, must be shut down.
|
||||
|
|
@ -147,7 +147,7 @@ Print out the server version and patchlevel.
|
|||
Same as \fB\-showconfig\fP.
|
||||
.SH "SEE ALSO"
|
||||
.PP
|
||||
X(__miscmansuffix__), XFree86(1), Xserver(1), xdm(1), xinit(1)
|
||||
X(__miscmansuffix__), Xorg(1), Xserver(1), xdm(1), xinit(1)
|
||||
.SH BUGS
|
||||
.I XDarwin
|
||||
and this man page still have many limitations. Some of the more obvious
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -2,4 +2,4 @@
|
|||
/* Most of these are set in the target application settings. */
|
||||
/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */
|
||||
|
||||
NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__;
|
||||
NSHumanReadableCopyright = __quote__ X_VENDOR_NAME X_VERSION __quote__;
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>XFree86 for Mac OS X</title>
|
||||
<title>XDarwin Help</title>
|
||||
</head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 on Darwin and Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Release Date: XF86_REL_DATE
|
||||
<h1>XDarwin X Server for Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Release Date: X_REL_DATE
|
||||
</center>
|
||||
<h2>Contents</h2>
|
||||
<ol>
|
||||
|
|
@ -27,8 +22,8 @@
|
|||
<h2><a NAME="notice">Important Notice</a></h2>
|
||||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
|
||||
#if X_PRE_RELEASE
|
||||
This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
|
||||
#else
|
||||
If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
|
||||
#endif
|
||||
|
|
@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
|
|||
This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Usage</a></h2>
|
||||
<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
|
||||
="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
|
||||
<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
|
||||
<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system. (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
|
||||
<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
|
||||
<h3>Multi-Button Mouse Emulation</h3>
|
||||
|
|
@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
|
|||
<h2><a NAME="path">Setting Your Path</a></h2>
|
||||
<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
|
||||
<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
|
||||
<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
|
||||
<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
|
||||
|
||||
<h2><a NAME="prefs">User Preferences</a></h2>
|
||||
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
|
||||
|
|
@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
|
|||
</ul>
|
||||
|
||||
<h2><a NAME="license">License</a></h2>
|
||||
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
|
||||
License page</A>.
|
||||
The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
|
||||
<H3><A NAME="3"></A>X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permission is hereby granted, free of charge, to any person obtaining a
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
<html>
|
||||
<head><META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
|
||||
<title>XFree86 pour Mac OS X</title>
|
||||
<title>XDarwin Help</title>
|
||||
</head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 pour Darwin et Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Date : XF86_REL_DATE
|
||||
<h1>XDarwin X Server pour Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Date : X_REL_DATE
|
||||
</center>
|
||||
<h2>Sommaire</h2>
|
||||
<ol>
|
||||
|
|
@ -28,8 +23,8 @@
|
|||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
Ceci est une pré-version de XFree86 et ne fait par conséquent l'objet d'aucun support client. Les bogues peuvent être signalés et des patches peuvent être soumis sur la
|
||||
<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la dernière version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou sur le <A HREF="http://www.XFree86.Org/cvs">répertoire CVS de XFree86</A> avant de signaler un bogue d'une pré-version.
|
||||
Ceci est une pré-version de XDarwin et ne fait par conséquent l'objet d'aucun support client. Les bogues peuvent être signalés et des patches peuvent être soumis sur la
|
||||
<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la dernière version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou le X_VENDOR_LINK avant de signaler un bogue d'une pré-version.
|
||||
#else
|
||||
Si le serveur date de plus de 6-12 mois ou si votre matériel est plus récent que la date indiquée ci-dessus, veuillez vous procurer une version plus récente avant de signaler toute anomalie. Les bogues peuvent être signalés et des patches peuvent être soumis sur la <A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge.
|
||||
#endif
|
||||
|
|
@ -39,8 +34,8 @@ Ce logiciel est distribu
|
|||
<A HREF="#license">Licence du Consortium X/X11 du MIT</A> et est fourni TEL QUEL, sans garanties. Veuillez prendre connaissance de la <A HREF="#license">Licence</A> avant toute utilisation.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Utilisation</a></h2>
|
||||
<p>XFree86 est une implémentation libre et distribuable sans contrainte du <a HREF
|
||||
="http://www.x.org/">X Window System</a> produit par <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> Le serveur X window pour Darwin et Mac OS X fourni par XFree86 se nomme XDarwin. XDarwin fonctionne sous Mac OS X en mode « rootless » ou plein écran.</p>
|
||||
<p>XDarwin est une X server libre et distribuable sans contrainte du <a HREF
|
||||
="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin fonctionne sous Mac OS X en mode « rootless » ou plein écran.</p>
|
||||
<p>Lorsque le système X window est actif en mode plein écran, il prend en charge la totalité de l'écran. Il est possible de revenir sur le bureau de Mac OS X en appuyant sur Commande-Option-A. Cette combinaison de touches peut être modifiée dans les préférences. Pour revenir dans X window, cliquer sur l'icône de XDarwin dans le Dock de Mac OS X. (Un réglage des préférences permet d'effectuer cette opération en cliquant dans une fenêtre flottante au lieu de l'icône du Dock)</p>
|
||||
<p>En mode « rootless », X window system et Aqua utilisent le même affichage. La fenêtre-mère de l'affichage X11 est de la taille de l'écran et contient toutes les autre fenêtres. En mode « rootless » cette fenêtre-mère n'est pas affichée car Aqua gère le fond d'écran.</p>
|
||||
<h3>Émulation de souris à plusieurs boutons</h3>
|
||||
|
|
@ -49,7 +44,7 @@ Ce logiciel est distribu
|
|||
<h2><a NAME="path">Réglage du chemin d'accès</a></h2>
|
||||
<p>Le chemin d'accès est une liste de répertoires utilisés pour la recherche d'exécutables. Les commandes X11 sont situées dans <code>/usr/X11R6/bin</code>, qui doit être ajouté à votre chemin d'accès. XDarwin fait cela par défaut, et peut également ajouter d'autres répertoires dans lesquels vous auriez installé d'autre commandes unix.</p>
|
||||
<p>Les utilisateurs plus expérimentés auront déjà réglé leur chemin d'accès correctement par le biais des fichiers d'initialisation de leur shell. Dans ce cas, il est possible de demander à XDarwin de ne pas modifier le chemin d'accès initial. XDarwin lance les premiers clients X11 dans le shell d'ouverture de session par défaut. (Un shell de remplacement peut être spécifié dans les préférences.) La façon de régler le chemin d'accès dépend du shell utilisé. Ceci est documenté dans les pages "man" du shell.</p>
|
||||
<p>De plus, il est possible d'ajouter les pages "man" de XFree86 à la liste des pages recherchées pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code> et la variable d'environnement <code>MANPATH</code> contient la liste des répertoires dans lesquels chercher.</p>
|
||||
<p>De plus, il est possible d'ajouter les pages "man" de X11 à la liste des pages recherchées pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code> et la variable d'environnement <code>MANPATH</code> contient la liste des répertoires dans lesquels chercher.</p>
|
||||
|
||||
|
||||
<h2><a NAME="prefs">Préférences</a></h2>
|
||||
|
|
@ -78,8 +73,7 @@ Ce logiciel est distribu
|
|||
</ul>
|
||||
|
||||
<h2><a NAME="license">Licence</a></h2>
|
||||
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
|
||||
License page</A>.
|
||||
The main license for XDarwin is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
|
||||
<H3><A NAME="3"></A>X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permission is hereby granted, free of charge, to any person obtaining a
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>XFree86 for Mac OS X</title>
|
||||
<title>XDarwin Help</title>
|
||||
</head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 on Darwin and Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Release Date: XF86_REL_DATE
|
||||
<h1>XDarwin X Server for Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Release Date: X_REL_DATE
|
||||
</center>
|
||||
<h2>Contents</h2>
|
||||
<ol>
|
||||
|
|
@ -27,43 +22,54 @@
|
|||
<h2><a NAME="notice">Important Notice</a></h2>
|
||||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
|
||||
#if X_PRE_RELEASE
|
||||
This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
|
||||
#else
|
||||
If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
|
||||
#endif
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Usage</a></h2>
|
||||
<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
|
||||
="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> XFree86 runs on Mac OS X in full screen mode. When the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, just click on the XDarwin icon in the floating switch window to switch back to the X window system. You can change this behavior in the user preferences so that clicking on the XDarwin icon in the Dock switches as well.</p>
|
||||
<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
|
||||
<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system. (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
|
||||
<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
|
||||
<h3>Multi-Button Mouse Emulation</h3>
|
||||
<p>Many X11 applications rely on the use of a 3-button mouse. To emulate a 3-button mouse with a single button, select "Enable emulation of multiple mouse buttons" in the Preferences. When emulating a 3-button mouse, holding down the left command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the left option key and clicking will simulate the third button.</p>
|
||||
<p>Notes:</p>
|
||||
<ul>
|
||||
<li>With most keyboards the left and right command and option keys are not differentiated so either will work.
|
||||
<li>Even with command and/or option keys mapped to some other key with xmodmap, you still must use the original command and option keys for multibutton mouse emulation.
|
||||
<li>The only way to simulate holding down the left command key and clicking the second mouse button is to map some other key to be the left command key. The same is true for simulating holding down the left option key and clicking the third mouse button.
|
||||
</ul>
|
||||
<p>Many X11 applications rely on the use of a 3-button mouse. You can emulate a 3-button mouse with a single button by holding down various modifier keys while you click the mouse button. This is controlled by settings in the "Multi-Button Mouse Emulation" section of the "General" preferences. By default, emulation is on and holding down the command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the option key and clicking will simulate the third button. You can change to any combination of modifiers to emulate buttons two and three in the preferences. Note, even if the modifiers keys are mapped to some other key with xmodmap, you still must use the actual keys specified in the preferences for multi-button mouse emulation.</p>
|
||||
|
||||
<h2><a NAME="path">Setting Your Path</a></h2>
|
||||
<p>The X11 binaries are located in /usr/X11R6/bin, which you may need to add to your path. Your path is the list of directories to be searched for executable commands. The way to do this depends on the shell you are using. The following directions are for tcsh, which is the default shell on Darwin and Mac OS X.</p>
|
||||
<p>You can check your path by typing "printenv PATH". You should see /usr/X11R6/bin listed as one of the directories. If not, you should add it to your default path. To do so, you can add the following line to the file ~/Library/init/tcsh/path: (You may need to create this file and directory path if it does not exist already.)</p>
|
||||
<blockquote>setenv PATH "${PATH}:/usr/X11R6/bin"</blockquote>
|
||||
<p>Note that if you have created a .cshrc or .tcshrc file, these files will override your settings in ~/Library/init/tcsh/ and you will need to change one of these files instead. These changes will not take effect until you open a new Terminal window. You may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in /usr/X11R6/man and the MANPATH environment variable contains the list of directories to search.</p>
|
||||
<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
|
||||
<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
|
||||
<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
|
||||
|
||||
<h2><a NAME="prefs">User Preferences</a></h2>
|
||||
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed under Startup Options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
|
||||
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
|
||||
<h3>General</h3>
|
||||
<ul>
|
||||
<li>Key combination button: Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
|
||||
<li>Use System beep for X11: When enabled the standard Mac OS X alert sound is used as X11 bell. When disabled (default) a simple tone is used.</li>
|
||||
<li>Click on icon in Dock switches to X11: Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
|
||||
<li>Show help on startup: This will show the introductory splash screen when XDarwin is launched.</li>
|
||||
<li>Display number: This sets what X display number XDarwin should assign to the display. Note that XDarwin always takes over the main display when showing X11.</li>
|
||||
<li>Keymapping: By default, XDarwin loads the keymapping from the Darwin kernel on startup. On portables, this keymapping is sometimes empty so that the keyboard will appear to be dead in X11. If "Load from file" is selected, XDarwin will load the keymapping from the specified file instead.</li>
|
||||
<li><b>Use System beep for X11:</b> When enabled the standard Mac OS X alert sound is used as the X11 bell. When disabled (default) a simple tone is used.</li>
|
||||
<li><b>Allow X11 to change mouse acceleration:</b> In a standard X window system implementation, the window manager can change the mouse acceleration. This can lead to confusion as the mouse acceleration may be set to different values by the Mac OS X System Preferences and the X window manager. By default, X11 is not allowed to change the mouse acceleration to avoid this problem.</li>
|
||||
<li><b>Multi-Button Mouse Emulation:</b> This is described above under <a HREF="#usage">Usage</a>. When emulation is enabled the selected modifiers must be held down when the mouse button is pushed to emulate the second or third mouse buttons.</li>
|
||||
</ul>
|
||||
<h3>Start Up</h3>
|
||||
<ul>
|
||||
<li><b>Default Mode:</b> If the user does not indicate whether to run in full screen or rootless mode, the mode specified here will be used.</li>
|
||||
<li><b>Show mode pick panel on startup:</b> By default, a panel is displayed when XDarwin is started to allow the user to choose between full screen or rootless mode. If this option is turned off, the default mode will be started automatically.</li>
|
||||
<li><b>X11 Display number:</b> X11 allows there to be multiple displays managed by separate X servers on a single computer. The user may specify an integer display number for XDarwin to use if more than one X server is going to be run simultaneously.</li>
|
||||
<li><b>Allow Xinerama multiple monitor support:</b> XDarwin supports multiple monitors with Xinerama, which treats all monitors as being part of one large rectangular screen. You can disable Xinerama with this option, but currently XDarwin does not handle multiple monitors correctly without it. If you only have a single monitor, Xinerama is automatically disabled.</li>
|
||||
<li><b>Keymapping File:</b> A keymapping file is read at startup and translated to an X11 keymap. Keymapping files, available for a wide variety of languages, are found in <code>/System/Library/Keyboards</code>.</li>
|
||||
<li><b>Starting First X11 Clients:</b> When XDarwin is started from the Finder, it will run <code>xinit</code> to launch the X window manager and other X clients. (See "<code>man xinit</code>" for more information.) Before XDarwin runs <code>xinit</code> it will add the specified directories to the user's path. By default only <code>/usr/X11R6/bin</code> is added. Additional directories may added, separated by a colon. The X clients are started in the user's default login shell so that the user's shell initialization files are read. If desired, an alternate shell may be specified.</li>
|
||||
</ul>
|
||||
<h3>Full Screen</h3>
|
||||
<ul>
|
||||
<li><b>Key combination button:</b> Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
|
||||
<li><b>Click on icon in Dock switches to X11:</b> Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
|
||||
<li><b>Show help on startup:</b> This will show an introductory splash screen when XDarwin is started in full screen mode.</li>
|
||||
<li><b>Color bit depth:</b> In full screen mode, the X11 display can use a different color bit depth than is used by Aqua. If "Current" is specified, the depth used by Aqua when XDarwin starts will be used. Otherwise 8, 15, or 24 bits may be specified.</li>
|
||||
</ul>
|
||||
|
||||
<h2><a NAME="license">License</a></h2>
|
||||
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which doesn't impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
|
||||
License page</A>.
|
||||
The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
|
||||
<H3><A NAME="3"></A>X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permission is hereby granted, free of charge, to any person obtaining a
|
||||
|
|
|
|||
|
|
@ -1,185 +1,193 @@
|
|||
{\rtf1\mac\ansicpg10000\cocoartf102
|
||||
{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
|
||||
\f3\fnil\fcharset78 HiraKakuPro-W3;}
|
||||
{\rtf1\mac\ansicpg10001\cocoartf102
|
||||
{\fonttbl\f0\fnil\fcharset78 HiraKakuPro-W3;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Bold;
|
||||
\f3\fswiss\fcharset77 Helvetica-Oblique;}
|
||||
{\colortbl;\red255\green255\blue255;}
|
||||
\vieww13980\viewh11160\viewkind0
|
||||
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
|
||||
|
||||
\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
|
||||
\f0\fs24 \cf0 \'82\'b1\'82\'cc\'90\'bb\'95\'69\'82\'cd
|
||||
\f1 XFree86
|
||||
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67
|
||||
\f1 (http://www.xfree86.org/)
|
||||
\f0 \'82\'a8\'82\'e6\'82\'d1\'82\'bb\'82\'cc\'8d\'76\'8c\'a3\'8e\'d2\'82\'c9\'82\'e6\'82\'c1\'82\'c4\'8a\'4a\'94\'ad\'82\'b3\'82\'ea\'82\'bd\'83\'5c\'83\'74\'83\'67\'83\'45\'83\'46\'83\'41\'82\'f0\'8a\'dc\'82\'f1\'82\'c5\'82\'a2\'82\'dc\'82\'b7\'81\'42\'8e\'9f\'82\'cc\'90\'6c\'81\'58\'82\'cd Darwin
|
||||
\f1 /Mac OS X
|
||||
\f0 \'82\'cc\'83\'54\'83\'7c\'81\'5b\'83\'67\'82\'c9\'8d\'76\'8c\'a3\'82\'b5\'82\'dc\'82\'b5\'82\'bd\'81\'42
|
||||
\f1 \
|
||||
\
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
|
||||
\f1\b \cf0 Contributors to Xorg Foundation Release:
|
||||
\f0\b0 \
|
||||
\f2\b \cf0 Contributors to Xorg Foundation Release:
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 Kaleb KEITHLEY\
|
||||
|
||||
\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
|
||||
\f0\i0 \
|
||||
\f0 \'8d\'b6\'89\'45\'82\'cc Ctrl,Alt(Option),Meta(Command) \'82\'a8\'82\'e6\'82\'d1 Shift \'83\'4c\'81\'5b\'82\'cc\'93\'ae\'8d\'ec
|
||||
\f1 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f1\b \cf0 \
|
||||
\f1\b \cf0 Contributors to XFree86 4.4:
|
||||
\f0\b0 \
|
||||
\f2\b \cf0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
\cf0 Contributors to XFree86 4.4:
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 John Harper
|
||||
\f2\i \
|
||||
\f3\i \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f3\i0 \cf0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
|
||||
\f0 \
|
||||
\f0\i0 \cf0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
|
||||
\f1 \
|
||||
Torrey T. Lyons\
|
||||
|
||||
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
|
||||
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f1\b \cf0 \
|
||||
\f2\b \cf0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
\cf0 Additional XonX Contributors to XFree86 4.3:
|
||||
\f0\b0 \
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 Fabr\'92cio Luis de Castro\
|
||||
|
||||
\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f0 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Michael Oland\
|
||||
|
||||
\f3 \'90\'56\'82\'b5\'82\'a2
|
||||
\f0 XDarwin
|
||||
\f3 \'83\'41\'83\'43\'83\'52\'83\'93
|
||||
\f0 \
|
||||
\f0 \'90\'56\'82\'b5\'82\'a2
|
||||
\f1 XDarwin
|
||||
\f0 \'83\'41\'83\'43\'83\'52\'83\'93
|
||||
\f1 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f1\b \cf0 \
|
||||
\f2\b \cf0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
\cf0 XonX Contributors to XFree86 4.2:
|
||||
\f0\b0 \
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 Rob Braun\
|
||||
Darwin x86
|
||||
\f2\i
|
||||
\f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f0 \
|
||||
\f3\i
|
||||
\f0\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f1 \
|
||||
Pablo Di Noto\
|
||||
|
||||
\f2\i
|
||||
\f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f3\i
|
||||
\f0\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Paul Edens\
|
||||
|
||||
\f2\i
|
||||
\f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f3\i
|
||||
\f0\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Kyunghwan Kim\
|
||||
|
||||
\f2\i
|
||||
\f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f3\i
|
||||
\f0\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Mario Klebsch\
|
||||
|
||||
\f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f0 \
|
||||
\f0 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f1 \
|
||||
Torrey T. Lyons\
|
||||
|
||||
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
|
||||
\f0 \
|
||||
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
|
||||
\f1 \
|
||||
Andreas Monitzer\
|
||||
|
||||
\f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f0 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Patrik Montgomery\
|
||||
|
||||
\f2\i
|
||||
\f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f3\i
|
||||
\f0\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Greg Parker\
|
||||
|
||||
\f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f0 \
|
||||
\f0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f1 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
|
||||
\f0 \
|
||||
\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
|
||||
\f1 \
|
||||
|
||||
\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
Olivier Verdier\
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f2\i \cf0
|
||||
\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f3\i \cf0
|
||||
\f0\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f1\b \cf0 \
|
||||
\f2\b \cf0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
\cf0 Special Thanks:
|
||||
\f0\b0 \
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 Devin Poolman and Zero G Software, Inc.\
|
||||
|
||||
\f2\i
|
||||
\f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
|
||||
\f0 \
|
||||
\f3\i
|
||||
\f0\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
|
||||
\f1 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f1\b \cf0 \
|
||||
\f2\b \cf0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
\cf0 XonX Team Members\
|
||||
Contributing to XFree86 4.1:
|
||||
\f0\b0 \
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 Rob Braun\
|
||||
Darwin x86
|
||||
\f3 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f0 \
|
||||
\f0 \'83\'54\'83\'7c\'81\'5b\'83\'67
|
||||
\f1 \
|
||||
Torrey T. Lyons\
|
||||
|
||||
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
|
||||
\f0 \
|
||||
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
|
||||
\f1 \
|
||||
Andreas Monitzer\
|
||||
Cocoa
|
||||
\f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
|
||||
\f0 \
|
||||
\f0 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
|
||||
\f1 \
|
||||
Greg Parker\
|
||||
|
||||
\f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
|
||||
\f0 \
|
||||
\f0 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
|
||||
\f1 \
|
||||
Christoph Pfisterer\
|
||||
|
||||
\f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
|
||||
\f0 \
|
||||
\f0 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
|
||||
\f1 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
|
||||
\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
|
||||
\f0 \
|
||||
\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
|
||||
\f1 \
|
||||
|
||||
\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f0 \
|
||||
\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
|
||||
\f1 \
|
||||
\
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
|
||||
\f1\b \cf0 Special Thanks:
|
||||
\f0\b0 \
|
||||
\f2\b \cf0 Special Thanks:
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 Tiago Ribeiro\
|
||||
XDarwin
|
||||
\f3 \'83\'41\'83\'43\'83\'52\'83\'93
|
||||
\f0 \
|
||||
\f0 \'83\'41\'83\'43\'83\'52\'83\'93
|
||||
\f1 \
|
||||
\
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
|
||||
|
||||
\f1\b \cf0 History:
|
||||
\f0\b0 \
|
||||
\f2\b \cf0 History:
|
||||
\f1\b0 \
|
||||
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
|
||||
\cf0 John Carmack\
|
||||
|
||||
\f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
|
||||
\f0 \
|
||||
\f0 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
|
||||
\f1 \
|
||||
Dave Zarzycki\
|
||||
XFree86 4.0
|
||||
\f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
|
||||
\f0 \
|
||||
\f0 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
|
||||
\f1 \
|
||||
Torrey T. Lyons\
|
||||
XFree86 4.0.2
|
||||
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
|
||||
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
|
||||
Binary file not shown.
|
|
@ -1,149 +1,141 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
|
||||
<title>
|
||||
XFree86 for Mac OS X</title></head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 on Darwin and Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Release Date: XF86_REL_DATE
|
||||
</center>
|
||||
<h2>目次</h2>
|
||||
<ol>
|
||||
<li><A HREF="#notice">注意事項</A></li>
|
||||
<li><A HREF="#usage">使用法</A></li>
|
||||
<li><A HREF="#path">パスの設定</A></li>
|
||||
<li><A HREF="#prefs">環境設定</A></li>
|
||||
<li><A HREF="#license">ライセンス</A></li>
|
||||
</ol>
|
||||
<center>
|
||||
<h2><a NAME="notice">注意事項</a></h2>
|
||||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
これは，XFree86 のプレリリースバージョンであり，いかなる場合においてもサポートされません。
|
||||
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
|
||||
プレリリースバージョンのバグを報告する前に，<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> プロジェクトページまたは <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS リポジトリ</A>で最新版のチェックをして下さい。
|
||||
#else
|
||||
もし，サーバーが 6 -12 ヶ月以上前のものか，またはあなたのハードウェアが上記の日付よりも新しいものならば，問題を報告する前により新しいバージョンを探してみてください。
|
||||
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
|
||||
#endif
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
本ソフトウェアは，<A HREF="#license">MIT X11/X Consortium License</A> の条件に基づき，無保証で，「そのまま」の形で供給されます。
|
||||
ご使用になる前に，<A HREF="#license">ライセンス条件</A>をお読み下さい。
|
||||
</blockquote>
|
||||
|
||||
<h2><a NAME="usage">使用法</a></h2>
|
||||
<p>XFree86 は，<a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>によって作成された，再配布可能なオープンソースの <a HREF="http://www.x.org/">X Window System</a> の実装です。
|
||||
XFree86 によって提供される Darwin と Mac OS X のための X Window サーバーを XDarwin と呼びます。
|
||||
XDarwin は，Mac OS X 上でフルスクリーンモードまたはルートレスモードで動作します。</p>
|
||||
|
||||
<p>フルスクリーンモードでは，X Window System がアクティブな時，それは全画面を占有します。
|
||||
あなたは，Command-Option-A キーを押すことによって Mac OS X デスクトップへ切り替えることができます。このキーの組み合わせは，環境設定で変更可能です。
|
||||
Mac OS X デスクトップから X Window System へ切り替える場合は，ドックに表示された XDarwin アイコンをクリックして下さい。
|
||||
（環境設定で，フローティング・ウィンドウに表示された XDarwin アイコンをクリックするように変更することができます。）</p>
|
||||
|
||||
<p>ルートレスモードでは，X Window System と Aqua は画面を共有します。
|
||||
X11 が表示するルートウィンドウは画面のサイズであり，他の全てのウィンドウを含んでいます。
|
||||
Aqua がデスクトップの背景を制御するので，X11 のルートウィンドウはルートレスモードでは表示されません。</p>
|
||||
|
||||
<h3>複数ボタンマウスのエミュレーション</h3>
|
||||
<p>多くの X11 アプリケーションは，3 ボタンマウスを必要とします。
|
||||
あなたはマウスボタンのクリックと同時にいくつかの修飾キーを押すことによって，一つのボタンで 3 ボタンマウスをエミュレーションすることができます。
|
||||
これは，環境設定の「一般設定」の「複数ボタンマウスのエミュレーション」セクションで設定します。
|
||||
デフォルトでは，エミュレーションは有効で，コマンドキーを押しながらマウスボタンをクリックすることは第 2 マウスボタンのクリックに相当します。
|
||||
オプションキーを押しながらクリックすることは第 3 マウスボタンのクリックに相当します。
|
||||
あなたは，環境設定でボタン 2 と 3 をエミュレートするために使用する修飾キーの組合せを変更することができます。
|
||||
注：修飾キーを xmodmap で他のキーに割り当てている場合でも，複数ボタンマウスのエミュレーションでは本来のコマンドキーやオプションキーを使わなければなりません。</p>
|
||||
|
||||
<h2><a NAME="path">パスの設定</a></h2>
|
||||
<p>パスは， 実行可能なコマンドを検索するディレクトリのリストです。
|
||||
X11 バイナリは，<code>/usr/X11R6/bin</code> に置かれます。あなたはそれをパスに加える必要があります。
|
||||
XDarwin は，これをデフォルトで行います。また，あなたがコマンドライン・アプリケーションをインストールした追加のディレクトリを加えることができます。</p>
|
||||
|
||||
<p>経験豊かなユーザーは，すでに自らのシェルのために初期化ファイルを使用してパスを設定しているでしょう。
|
||||
この場合，あなたは環境設定で XDarwin があなたのパスを変更しないように設定することができます。
|
||||
XDarwin は，ユーザーのデフォルトのログインシェルで最初の X11 クライアントを開始します。
|
||||
（環境設定で代わりのシェルを指定することができます。）
|
||||
パスを設定する方法は，あなたが使用しているシェルに依存します。
|
||||
これは，シェルのマニュアルページドキュメントに記載されています。
|
||||
|
||||
<p>また，あなたはドキュメントを探している時，XFree86 のマニュアルページを検索されるページのリストに追加したいと思うかもしれません。
|
||||
X11 のマニュアルページは <code>/usr/X11R6/man</code> に置かれます。そして <code>MANPATH</code> 環境変数は検索するディレクトリのリストを含んでいます。</p>
|
||||
|
||||
<h2><a NAME="prefs">環境設定</a></h2>
|
||||
<p>「XDarwin」メニューの「環境設定...」メニュー項目からアクセスできる環境設定パネルで，いくつかのオプションを設定することができます。
|
||||
「起動オプション」の内容は，XDarwin を再起動するまで有効となりません。
|
||||
他の全てのオプションの内容は，直ちに有効となります。
|
||||
以下，それぞれのオプションについて説明します:</p>
|
||||
|
||||
<h3>一般設定</h3>
|
||||
<ul>
|
||||
<li><b>X11 でシステムのビープ音を使用する:</b> オンの場合，Mac OS X のビープ音が X11 のベルとして使用されます。オフの場合（デフォルト），シンプル トーンが使われます。</li>
|
||||
<li><b>X11 のマウスアクセラレーションを有効にする:</b> 標準的な X Window System の実装では，ウィンドウマネージャーはマウスの加速度を変更することができます。
|
||||
マウスの加速度に Mac OS X のシステム環境設定と X ウィンドウマネージャーが異なる値を設定した場合，これは混乱を招きます。
|
||||
この問題を避けるため，デフォルトでは X11 のマウスアクセラレーションを有効としません。</li>
|
||||
<li><b>複数ボタンマウスのエミュレーション:</b> <a HREF="#usage">使用法</a>を参照して下さい。オンの場合，マウスボタンが第 2 または第 3 のマウスボタンをエミュレートする時に，選択した修飾キーを同時に押します。</li>
|
||||
</ul>
|
||||
|
||||
<h3>起動オプション</h3>
|
||||
<ul>
|
||||
<li><b>画面モード:</b> ユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを指定しない場合，ここで指定されたモードが使われます。</li>
|
||||
<li><b>起動時にモード選択パネルを表示する:</b> デフォルトでは，XDarwin の起動時にユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを選択するパネルを表示します。このオプションがオフの場合，画面モードで指定したモードで起動します。</li>
|
||||
<li><b>X11 ディスプレイ番号:</b> X11は，一つのコンピュータ上で別々の X サーバーが管理する複数のディスプレイが存在することを許します。複数の X サーバーが同時に実行している時，XDarwin が使用するディスプレイの番号を指定することができます。</li>
|
||||
<li><b>Xinerama マルチモニタサポートを有効にする:</b> XDarwin は，Xinerama マルチモニタをサポートします。それは全てのモニタを一つの大きな画面の一部とみなします。あなたはこのオプションで Xinerama を無効にすることができます。ただし，現在 XDarwin はそれ無しで正しく複数のモニタを扱うことができません。もし，あなたが一つのモニタを使うだけならば，Xinerama は自動的に無効となります。</li>
|
||||
<li><b>キーマッピングファイル:</b> キーマッピングファイルは起動時に読み込まれ，X11 キーマップに変換されます。他言語に対応したキーマッピングファイルは <code>/System/Library/Keyboards</code> にあります。（訳注：キーマッピングで Japanese を選択すると，一部のキーが効かない等の不具合が発生することがあります。この場合は USA を選択した上で ~/.Xmodmap を適用して下さい。）</li>
|
||||
<li><b>最初の X11 クライアントの起動:</b> XDarwin が Finderから起動する時，X ウィンドウマネージャーと X クライアントの起動は <code>xinit</code> を実行します。（詳細は "<code>man xinit</code>" を参照して下さい。）XDarwin は <code>xinit</code> を実行する前に，指定されたディレクトリをユーザーのパスに追加します。デフォルトでは <code>/usr/X11R6/bin</code> だけを追加します。他のディレクトリを追加したい場合は，コロンで区切って指定します。ユーザーのシェル初期化ファイルを読み込むために，X クライアントはユーザーのデフォルトログインシェルで起動されます。必要であれば，代わりのシェルを指定することができます。</li>
|
||||
</ul>
|
||||
|
||||
<h3>フルスクリーン</h3>
|
||||
<ul>
|
||||
<li><b>キー設定ボタン:</b> X11 と Aqua を切り替えるために使用するボタンの組み合わせを指定します。
|
||||
ボタンをクリックして，任意の数の修飾キーに続いて通常のキーを押します。</li>
|
||||
<li><b>ドックのアイコンのクリックで X11 に戻る:</b> オンの場合，ドックに表示された XDarwin アイコンのクリックで X11 への切り換えが可能となります。Mac OS X のいくつかのバージョンでは，ドックのアイコンのクリックで Aqua に戻った時，カーソルが消失することがあります。</li>
|
||||
<li><b>起動時にヘルプを表示する:</b> XDarwin がフルスクリーンモードで起動する時，スプラッシュスクリーンを表示します。</li>
|
||||
<li><b>色深度:</b> フルスクリーンモードでは，X11 ディスプレイが Aqua と異なる色深度を使うことができます。「変更なし」が指定された場合，XDarwin は Aqua によって使用される色深度を使います。これ以外に 8，15 または24 ビットを指定することができます。</li>
|
||||
</ul>
|
||||
|
||||
<h2>
|
||||
<a NAME="license">ライセンス</a>
|
||||
</h2>
|
||||
XFree86 Project は，自由に再配布可能なバイナリとソースコードを提供することにコミットしています。
|
||||
私たちが使用する主なライセンスは，伝統的な MIT X11/X Consortium License に基づくものです。
|
||||
そして，それは修正または再配布されるソースコードまたはバイナリに，その Copyright/ライセンス告示がそのまま残されることを要求する以外の条件を強制しません。
|
||||
より多くの情報と，コードの一部をカバーする追加の Copyright/ライセンス告示のために，<A HREF="http://www.xfree86.org/legal/licence.html">XFree86 の License ページ</A>を参照して下さい。
|
||||
<H3>
|
||||
<A NAME="3"></A>
|
||||
X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without
|
||||
limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to
|
||||
whom the Software is furnished to do so, subject to the following conditions:</p>
|
||||
<p>The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.</p>
|
||||
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
||||
SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
IN THE SOFTWARE.</p>
|
||||
<p>Except as contained in this notice, the name of the X Consortium shall
|
||||
not be used in advertising or otherwise to promote the sale, use or
|
||||
other dealings in this Software without prior written authorization from
|
||||
the X Consortium.</p>
|
||||
<p>X Window System is a trademark of X Consortium, Inc.</p>
|
||||
</body>
|
||||
</html>
|
||||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
|
||||
<title>
|
||||
XDarwin Help</title></head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XDarwin X Server for Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Release Date: X_REL_DATE
|
||||
</center>
|
||||
<h2>目次</h2>
|
||||
<ol>
|
||||
<li><A HREF="#notice">注意事項</A></li>
|
||||
<li><A HREF="#usage">使用法</A></li>
|
||||
<li><A HREF="#path">パスの設定</A></li>
|
||||
<li><A HREF="#prefs">環境設定</A></li>
|
||||
<li><A HREF="#license">ライセンス</A></li>
|
||||
</ol>
|
||||
<center>
|
||||
<h2><a NAME="notice">注意事項</a></h2>
|
||||
</center>
|
||||
<blockquote>
|
||||
#if X_PRE_RELEASE
|
||||
これは，XDarwin のプレリリースバージョンであり，いかなる場合においてもサポートされません。
|
||||
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
|
||||
プレリリースバージョンのバグを報告する前に，<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> プロジェクトページまたは X_VENDOR_LINKで最新版のチェックをして下さい。
|
||||
#else
|
||||
もし，サーバーが 6 -12 ヶ月以上前のものか，またはあなたのハードウェアが上記の日付よりも新しいものならば，問題を報告する前により新しいバージョンを探してみてください。
|
||||
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
|
||||
#endif
|
||||
</blockquote>
|
||||
<blockquote>
|
||||
本ソフトウェアは，<A HREF="#license">MIT X11/X Consortium License</A> の条件に基づき，無保証で，「そのまま」の形で供給されます。
|
||||
ご使用になる前に，<A HREF="#license">ライセンス条件</A>をお読み下さい。
|
||||
</blockquote>
|
||||
|
||||
<h2><a NAME="usage">使用法</a></h2>
|
||||
<p>XDarwin は，再配布可能なオープンソースの <a HREF="http://www.x.org/">X Window System</a> のための X サーバーの実装です。このバージョンの XDarwin は X_VENDOR_LINK によって作成されました。XDarwin は，Mac OS X 上でフルスクリーンモードまたはルートレスモードで動作します。</p>
|
||||
|
||||
<p>フルスクリーンモードでは，X Window System がアクティブな時，それは全画面を占有します。
|
||||
あなたは，Command-Option-A キーを押すことによって Mac OS X デスクトップへ切り替えることができます。このキーの組み合わせは，環境設定で変更可能です。
|
||||
Mac OS X デスクトップから X Window System へ切り替える場合は，ドックに表示された XDarwin アイコンをクリックして下さい。
|
||||
（環境設定で，フローティング・ウィンドウに表示された XDarwin アイコンをクリックするように変更することができます。）</p>
|
||||
|
||||
<p>ルートレスモードでは，X Window System と Aqua は画面を共有します。
|
||||
X11 が表示するルートウィンドウは画面のサイズであり，他の全てのウィンドウを含んでいます。
|
||||
Aqua がデスクトップの背景を制御するので，X11 のルートウィンドウはルートレスモードでは表示されません。</p>
|
||||
|
||||
<h3>複数ボタンマウスのエミュレーション</h3>
|
||||
<p>多くの X11 アプリケーションは，3 ボタンマウスを必要とします。
|
||||
あなたはマウスボタンのクリックと同時にいくつかの修飾キーを押すことによって，一つのボタンで 3 ボタンマウスをエミュレーションすることができます。
|
||||
これは，環境設定の「一般設定」の「複数ボタンマウスのエミュレーション」セクションで設定します。
|
||||
デフォルトでは，エミュレーションは有効で，コマンドキーを押しながらマウスボタンをクリックすることは第 2 マウスボタンのクリックに相当します。
|
||||
オプションキーを押しながらクリックすることは第 3 マウスボタンのクリックに相当します。
|
||||
あなたは，環境設定でボタン 2 と 3 をエミュレートするために使用する修飾キーの組合せを変更することができます。
|
||||
注：修飾キーを xmodmap で他のキーに割り当てている場合でも，複数ボタンマウスのエミュレーションでは本来のコマンドキーやオプションキーを使わなければなりません。</p>
|
||||
|
||||
<h2><a NAME="path">パスの設定</a></h2>
|
||||
<p>パスは， 実行可能なコマンドを検索するディレクトリのリストです。
|
||||
X11 バイナリは，<code>/usr/X11R6/bin</code> に置かれます。あなたはそれをパスに加える必要があります。
|
||||
XDarwin は，これをデフォルトで行います。また，あなたがコマンドライン・アプリケーションをインストールした追加のディレクトリを加えることができます。</p>
|
||||
|
||||
<p>経験豊かなユーザーは，すでに自らのシェルのために初期化ファイルを使用してパスを設定しているでしょう。
|
||||
この場合，あなたは環境設定で XDarwin があなたのパスを変更しないように設定することができます。
|
||||
XDarwin は，ユーザーのデフォルトのログインシェルで最初の X11 クライアントを開始します。
|
||||
（環境設定で代わりのシェルを指定することができます。）
|
||||
パスを設定する方法は，あなたが使用しているシェルに依存します。
|
||||
これは，シェルのマニュアルページドキュメントに記載されています。
|
||||
|
||||
<p>また，あなたはドキュメントを探している時，X11 のマニュアルページを検索されるページのリストに追加したいと思うかもしれません。
|
||||
X11 のマニュアルページは <code>/usr/X11R6/man</code> に置かれます。そして <code>MANPATH</code> 環境変数は検索するディレクトリのリストを含んでいます。</p>
|
||||
|
||||
<h2><a NAME="prefs">環境設定</a></h2>
|
||||
<p>「XDarwin」メニューの「環境設定...」メニュー項目からアクセスできる環境設定パネルで，いくつかのオプションを設定することができます。
|
||||
「起動オプション」の内容は，XDarwin を再起動するまで有効となりません。
|
||||
他の全てのオプションの内容は，直ちに有効となります。
|
||||
以下，それぞれのオプションについて説明します:</p>
|
||||
|
||||
<h3>一般設定</h3>
|
||||
<ul>
|
||||
<li><b>X11 でシステムのビープ音を使用する:</b> オンの場合，Mac OS X のビープ音が X11 のベルとして使用されます。オフの場合（デフォルト），シンプル トーンが使われます。</li>
|
||||
<li><b>X11 のマウスアクセラレーションを有効にする:</b> 標準的な X Window System の実装では，ウィンドウマネージャーはマウスの加速度を変更することができます。
|
||||
マウスの加速度に Mac OS X のシステム環境設定と X ウィンドウマネージャーが異なる値を設定した場合，これは混乱を招きます。
|
||||
この問題を避けるため，デフォルトでは X11 のマウスアクセラレーションを有効としません。</li>
|
||||
<li><b>複数ボタンマウスのエミュレーション:</b> <a HREF="#usage">使用法</a>を参照して下さい。オンの場合，マウスボタンが第 2 または第 3 のマウスボタンをエミュレートする時に，選択した修飾キーを同時に押します。</li>
|
||||
</ul>
|
||||
|
||||
<h3>起動オプション</h3>
|
||||
<ul>
|
||||
<li><b>画面モード:</b> ユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを指定しない場合，ここで指定されたモードが使われます。</li>
|
||||
<li><b>起動時にモード選択パネルを表示する:</b> デフォルトでは，XDarwin の起動時にユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを選択するパネルを表示します。このオプションがオフの場合，画面モードで指定したモードで起動します。</li>
|
||||
<li><b>X11 ディスプレイ番号:</b> X11は，一つのコンピュータ上で別々の X サーバーが管理する複数のディスプレイが存在することを許します。複数の X サーバーが同時に実行している時，XDarwin が使用するディスプレイの番号を指定することができます。</li>
|
||||
<li><b>Xinerama マルチモニタサポートを有効にする:</b> XDarwin は，Xinerama マルチモニタをサポートします。それは全てのモニタを一つの大きな画面の一部とみなします。あなたはこのオプションで Xinerama を無効にすることができます。ただし，現在 XDarwin はそれ無しで正しく複数のモニタを扱うことができません。もし，あなたが一つのモニタを使うだけならば，Xinerama は自動的に無効となります。</li>
|
||||
<li><b>キーマッピングファイル:</b> キーマッピングファイルは起動時に読み込まれ，X11 キーマップに変換されます。他言語に対応したキーマッピングファイルは <code>/System/Library/Keyboards</code> にあります。（訳注：キーマッピングで Japanese を選択すると，一部のキーが効かない等の不具合が発生することがあります。この場合は USA を選択した上で ~/.Xmodmap を適用して下さい。）</li>
|
||||
<li><b>最初の X11 クライアントの起動:</b> XDarwin が Finderから起動する時，X ウィンドウマネージャーと X クライアントの起動は <code>xinit</code> を実行します。（詳細は "<code>man xinit</code>" を参照して下さい。）XDarwin は <code>xinit</code> を実行する前に，指定されたディレクトリをユーザーのパスに追加します。デフォルトでは <code>/usr/X11R6/bin</code> だけを追加します。他のディレクトリを追加したい場合は，コロンで区切って指定します。ユーザーのシェル初期化ファイルを読み込むために，X クライアントはユーザーのデフォルトログインシェルで起動されます。必要であれば，代わりのシェルを指定することができます。</li>
|
||||
</ul>
|
||||
|
||||
<h3>フルスクリーン</h3>
|
||||
<ul>
|
||||
<li><b>キー設定ボタン:</b> X11 と Aqua を切り替えるために使用するボタンの組み合わせを指定します。
|
||||
ボタンをクリックして，任意の数の修飾キーに続いて通常のキーを押します。</li>
|
||||
<li><b>ドックのアイコンのクリックで X11 に戻る:</b> オンの場合，ドックに表示された XDarwin アイコンのクリックで X11 への切り換えが可能となります。Mac OS X のいくつかのバージョンでは，ドックのアイコンのクリックで Aqua に戻った時，カーソルが消失することがあります。</li>
|
||||
<li><b>起動時にヘルプを表示する:</b> XDarwin がフルスクリーンモードで起動する時，スプラッシュスクリーンを表示します。</li>
|
||||
<li><b>色深度:</b> フルスクリーンモードでは，X11 ディスプレイが Aqua と異なる色深度を使うことができます。「変更なし」が指定された場合，XDarwin は Aqua によって使用される色深度を使います。これ以外に 8，15 または24 ビットを指定することができます。</li>
|
||||
</ul>
|
||||
|
||||
<h2>
|
||||
<a NAME="license">ライセンス</a>
|
||||
</h2>
|
||||
XDarwin の主要なライセンスは伝統的な MIT X11/X Consortium License に基づきます。
|
||||
それは修正または再配布されるソースコードまたはバイナリに，その著作権/ライセンス表示がそのまま残されることを要求する以外の条件を強制しません。
|
||||
より多くの情報と，コードの一部をカバーする追加の著作権/ライセンス表示のために，ソースコードを参照して下さい。
|
||||
<H3>
|
||||
<A NAME="3"></A>
|
||||
X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without
|
||||
limitation the rights to use, copy, modify, merge, publish, distribute,
|
||||
sublicense, and/or sell copies of the Software, and to permit persons to
|
||||
whom the Software is furnished to do so, subject to the following conditions:</p>
|
||||
<p>The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.</p>
|
||||
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
||||
SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
IN THE SOFTWARE.</p>
|
||||
<p>Except as contained in this notice, the name of the X Consortium shall
|
||||
not be used in advertising or otherwise to promote the sale, use or
|
||||
other dealings in this Software without prior written authorization from
|
||||
the X Consortium.</p>
|
||||
<p>X Window System is a trademark of X Consortium, Inc.</p>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,20 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ --><html><body>
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
|
||||
<head>
|
||||
<title>XFree86 para Mac OS X</title>
|
||||
<title>XDarwin Help</title>
|
||||
</head>
|
||||
|
||||
<center>
|
||||
|
||||
<h1>XFree86 para Darwin e Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Release Date: XF86_REL_DATE
|
||||
<h1>XDarwin X Server para Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Release Date: X_REL_DATE
|
||||
</center>
|
||||
<h2>Índice</h2>
|
||||
<ol>
|
||||
|
|
@ -28,29 +22,32 @@
|
|||
<center>
|
||||
<h2><a NAME="notice">Notas importantes</a></h2>
|
||||
</center>
|
||||
<blockquote> #if PRE_RELEASE Essa é uma versão pré-lancamento
|
||||
do XFree86, e ela não é suportada de nenhuma forma. Bugs podem
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
Essa é uma versão pré-lancamento
|
||||
do XDarwin, e ela não é suportada de nenhuma forma. Bugs podem
|
||||
ser reportados e correções podem ser enviadas para <A HREF="http://sourceforge.net/projects/xonx/">Página
|
||||
do projeto XonX</A> no SourceForge. Antes de informar bugs em versões
|
||||
pré-lancamento, por favor verifique a þltima versão em <A HREF="http://sourceforge.net/projects/xonx/">XonX</A>
|
||||
or no <A HREF="http://www.XFree86.Org/cvs">Repositório CVS do XFree86</A>.
|
||||
#else Se o servidor é mais velho que 6-12 semanas, ou seu hardware é
|
||||
or X_VENDOR_LINK.
|
||||
#else
|
||||
Se o servidor é mais velho que 6-12 semanas, ou seu hardware é
|
||||
mais novo que a data acima, procure por uma nova versão antes de informar
|
||||
problemas. Bugs podem ser reportados e correções podem ser enviadas
|
||||
para a <A HREF="http://sourceforge.net/projects/xonx/">Página do projeto
|
||||
XonX</A> na SourceForge. #endif </blockquote>
|
||||
XonX</A> na SourceForge.
|
||||
#endif
|
||||
</blockquote>
|
||||
<blockquote> Este software é distribuído sob os termos da <a href="#license">licença
|
||||
MIT X11 / X Consortium</a> e é provido, sem nenhuma garantia. Por favor
|
||||
leia a <a href="#license">Licença</a> antes de começar a usar
|
||||
o programa.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Uso</a></h2>
|
||||
<p>O XFree86 é uma aplicação "open-source" livremente
|
||||
<p>O XDarwin é uma X server "open-source" livremente
|
||||
redistribuída do <a HREF
|
||||
="http://www.x.org/">Sistema X Window</a> produzido pelo <a HREF="http://www.XFree86.Org/">XFree86
|
||||
Project, Inc.</a> O servidor X window para o Darwin e Mac OS X provido pelo
|
||||
XFree86 é chamado XDarwin. XDarwin roda sobre Mac OS X no modo Tela Cheia
|
||||
ou no modo Compartilhado.</p>
|
||||
="http://www.x.org/">Sistema X Window</a>. This version of XDarwin was produced by the X_VENDOR_LINK.
|
||||
XDarwin roda sobre Mac OS X no modo Tela Cheia ou no modo Compartilhado.</p>
|
||||
<p>No modo Tela Cheia, quando o sistema X window está ativo, ele ocupa
|
||||
a tela toda. Você pode voltar ao desktop do Mac OS X clicando Command-Option-A.
|
||||
Essa combinação de teclas pode ser mudada nas preferências.
|
||||
|
|
@ -90,7 +87,7 @@
|
|||
do usuário corrente. (Um shell alternativo pode ser também expecificado
|
||||
nas preferências.) O modo para ajustar o path depende do shell que você
|
||||
está usando. Isto é descrito na man page do seu shell.</p>
|
||||
<p>Você pode também querer adicionar as man pages do XFree86 para
|
||||
<p>Você pode também querer adicionar as man pages do X11 para
|
||||
a lista de páginas a serem procuradas quando você está procurando
|
||||
por documentação. As man pages do X11 estão localizadas
|
||||
em <code>/usr/X11R6/man</code> e a variável de ambiente <code>MANPATH</code>
|
||||
|
|
@ -178,15 +175,13 @@
|
|||
</ul>
|
||||
|
||||
<h2><a NAME="license">Licença</a></h2>
|
||||
<p>O projeto XFree86 é designado a prover e a ser livremente redistribuído
|
||||
as versões binárias e souce (código-fonte). A licença
|
||||
principal nós usamos uma baseada na licença tradicional MIT X11
|
||||
<p>A licença
|
||||
principal nós por XDarwin baseada na licença tradicional MIT X11
|
||||
/ X Consortium, que não impõe nenhuma condição sobre
|
||||
modificações ou redistribuição do código-fonte
|
||||
ou dos binários desde que o copyright/licença sejam mantidos intactos.
|
||||
Para mais informações e notícias adicionais de copyright/licensing
|
||||
em algumas seção do código, por favor visite a <a href="http://www.xfree86.org/legal/licence.html">página
|
||||
de licenças do XFree86</a>.</p>
|
||||
em algumas seção do código, por favor refer to the source code.</p>
|
||||
<H3><A NAME="3"></A>Licença do X Consortium</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permissões são em virtude garantidas, livre de mudanças,
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>XFree86 para Mac OS X</title>
|
||||
<title>XDarwin Ayuda</title>
|
||||
</head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 en Darwin y Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Fecha de release: XF86_REL_DATE
|
||||
<h1>XDarwin X Server for Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Fecha de release: X_REL_DATE
|
||||
</center>
|
||||
<h2>Contenido</h2>
|
||||
<ol>
|
||||
|
|
@ -28,7 +23,7 @@
|
|||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
Esta es una versión pre-release de XFree86, y no tiene ningún soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">página del proyecto XonX</A> en SourceForge. Antes de reportar errores en versiones pre-release, por favor verifique la ultima versión en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien en el <A HREF="http://www.XFree86.Org/cvs">repositorio CVS de XFree86</A>.
|
||||
Esta es una versión pre-release de XDarwin, y no tiene ningún soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">página del proyecto XonX</A> en SourceForge. Antes de reportar errores en versiones pre-release, por favor verifique la ultima versión en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien el X_VENDOR_LINK.
|
||||
#else
|
||||
Si el server el más antiguo que 6 a 12 meses, o si su hardware es posterior a la fecha indicada más arriba, por favor verifique la última versión antes de reportar problemas. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">página del proyecto XonX</A> en SourceForge.
|
||||
#endif
|
||||
|
|
@ -37,8 +32,8 @@ Si el server el más antiguo que 6 a 12 meses, o si su hardware es posterio
|
|||
Este software es distribuido bajo los términos de la <A HREF="#license">Licencia MIT X11 / X Consortium</A> y es provisto sin garantía alguna y en el estado en que se encuentra. Por favor lea la <A HREF="#license">Licencia</A> antes de utilizarlo.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Modo de uso</a></h2>
|
||||
<p>XFree86 es una implementación open-source de distribución libre del <a HREF
|
||||
="http://www.x.org/">X Window System</a> producido por <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> El window server para Darwin y Mac OS X provisto por XFree86 se llama XDarwin. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
|
||||
<p>XDarwin es una X server open-source de distribución libre del <a HREF
|
||||
="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
|
||||
<p>En modo pantalla completa, el X window system toma control total de la pantalla mientras esta activo. Presionando Command-Option-A puede regresar al Escritorio de Mac OS X. Esta combinación de teclas puede cambiarse en las Preferencias de Usuario. Desde el Escritorio de Mac OS X, haga click en ícono de XDarwin en el Dock para volver al X window system. (Puede cambiar esta comportamiento en las Preferencias de Usuario y configurar que XDarwin vuelva al X window system haciendo click en la ventana flotante con el logo X.)</p>
|
||||
<p>En modo rootless, el X window system comparte la pantalla con Aqua. La ventana root de X11 es del tamaño de la pantalla y contiene a todas las demás ventanas. La ventana root de X11 no se muestra en este modo, ya que Aqua maneja el fondo de pantalla.</p>
|
||||
<h3>Emulación de mouse multi-botón</h3>
|
||||
|
|
@ -47,7 +42,7 @@ Este software es distribuido bajo los términos de la <A HREF="#license">Li
|
|||
<h2><a NAME="path">Configurando su Path</a></h2>
|
||||
<p>El path es la lista de directorios donde se buscarán los comandos ejecutables. Los comandos de X11 se encuentran en <code>/usr/X11R6/bin</code>, y éste necesita estar dentro de su path. XDarwin hace ésto automáticamente por defecto, y puede además agregar directorios adicionales donde tenga otros comandos de línea.</p>
|
||||
<p>Usuarios experimentados pueden tener su path correctamente configurado mediante los archivos de inicio de su interprete de comandos. En este caso, puede informarle a XDarwin en las Preferencias de Usuario para que no modifique su path. XDarwin arrancará los clientes X11 iniciales usando el intérprete de comandos del usuario, según su configuración de login. Un intérprete de comandos alternativo puede ser especificado en las Preferencias del Usuario. La manera de configurar el path de su intérprete de comandos depende de cual está usando, y es generalmente descripta en las páginas man del mismo.</p>
|
||||
<p>Además, Ud. puede agregar las páginas man de XFree86 a la lista de páginas que son consultadas. Estas están ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
|
||||
<p>Además, Ud. puede agregar las páginas man de X11 a la lista de páginas que son consultadas. Estas están ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
|
||||
|
||||
<h2><a NAME="prefs">Preferencias del Usuario</a></h2>
|
||||
<p>Ciertas opciones pueden definirse dentro de "Preferencias...", en el menú de XDarwin. Las opciones dentro de de "Inicio" no surtirán efecto hasta que la aplicación se reinicie. Las restantes opciones surten efecto inmediatamente. Las diferentes opciones se describen a continuación:</p>
|
||||
|
|
@ -75,7 +70,7 @@ Este software es distribuido bajo los términos de la <A HREF="#license">Li
|
|||
</ul>
|
||||
|
||||
<h2><a NAME="license">Licencia</a></h2>
|
||||
El XFree86 Project esta comprometido en proveer versiones binarias y en código fuente de distribución libre. La licencia principal que utilizamos es una basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificación o redistribución del código fuente o de archivos binarios más allá de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor información y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del código fuente, por favor consulte la <A HREF="http://www.xfree86.org/legal/licence.html">Página de Licencia de XFree86</A>.
|
||||
La licencia principal de XDarwin es basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificación o redistribución del código fuente o de archivos binarios más allá de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor información y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del código fuente, por favor consulte the source code.
|
||||
<H3><A NAME="3"></A>Licencia del X Consortium</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Se otorga aqui permiso, libre de costo, a toda persona que obtenga una copia de este Software y los archivos de documentación asociados (el "Software"),
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>XFree86 för Mac OS X</title>
|
||||
<title>XDarwin Help</title>
|
||||
</head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 för Darwin och Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Färdigställt: XF86_REL_DATE
|
||||
<h1>XDarwin X Server for Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Färdigställt: X_REL_DATE
|
||||
</center>
|
||||
<h2>Innehåll</h2>
|
||||
<ol>
|
||||
|
|
@ -28,7 +23,7 @@
|
|||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
Detta är en testversion av XFree86, och du kan inte garranteras någon som helst support för den. Buggar och fel kan rapporteras och förslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> på SourceForge. Innan du rapporterar buggar i testversioner, var god pröva den senaste versionen från <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS-arkiv</A>.
|
||||
Detta är en testversion av XDarwin, och du kan inte garranteras någon som helst support för den. Buggar och fel kan rapporteras och förslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> på SourceForge. Innan du rapporterar buggar i testversioner, var god pröva den senaste versionen från <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i X_VENDOR_LINK.
|
||||
#else
|
||||
Om servern är äldre än 6-12 månader, eller om din hårdvara är nyare än datumet ovan, leta efter en nyare version innan du rapporterar fel. Buggar och fel kan rapporteras och förslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> på SourceForge.
|
||||
#endif
|
||||
|
|
@ -37,8 +32,8 @@ Om servern är äldre än 6-12 månader, eller om din hår
|
|||
Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Consortium License</A> och tilhandhålls som den är, helt utan garantier. Var god läs igenom <A HREF="#license">licensdokumentet (engelska)</A> innan du använder programmet.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Användande</a></h2>
|
||||
<p>XFree86 är en fritt spridd implemenation av <a HREF
|
||||
="http://www.x.org/">X Window-systemet</a> producerad av <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc</a>, med öppen källkod. Den X Window-server för Darwin och Mac OS X som tillhandahålls av XFree86 kallas XDarwin. XDarwin kan köras på Mac OS X i fullskärmsläge eller rotlöst läge.</p>
|
||||
<p>XDarwin är en fritt spridd X server av <a HREF
|
||||
="http://www.x.org/">X Window-systemet</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin kan köras på Mac OS X i fullskärmsläge eller rotlöst läge.</p>
|
||||
<p>I fullskärmsläge kommer X window-systemet att ta över hela skärmen när det är aktivt. Du kan byta tillbaka till Mac OS Xs skrivbord genom att trycka Kommando-Alt-A. Denna tangentkombination kan ändra i inställningarna. När du är på Mac OS Xs skrivbord kan du klicka på XDarwin-ikonen i dockan för att byta tillbaka till X Window-systemet. (Du kan förändra detta beteende i inställningarna så att du istället måste klicka i det fltande bytesfönstret istället.)</p>
|
||||
<p>I rotlöstläge delar X11 och Aqua på din skärm. Rotfönstret på X11-skärmen är av samma storlek som hela skärmen och innehåller alla andra fönster - det fungerar som bakgrund. I rotlöstläge visas inte detta rotfönster, eftersom Aqua hanterar skrvbordbakgrunden.</p>
|
||||
|
||||
|
|
@ -49,7 +44,7 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
|
|||
<p>Din sökväg är en lista av kataloger som söks igenom när terminalen letar efter kommandon att exekvera. Kommandon som hör till X11 ligger i <code>/usr/X11R6/bin</code>, en katalog som inte ligger i din sökväg från början. XDarwin lägger till denna katalog åt dig, och du kan också lägga till ytterligare kataloger i vilka du lagt program som skall köras från kommandoraden.</p>
|
||||
<p>Mer erfarna användare har antagligen redan ställt in sin sökväg i skalets inställningsfiler. Om detta gäller dig kan ställa in XDarwin så att din sökväg inte modifieras. XDarwin startar de första X11-klienterna i användarens inloggningsskal (Vill du använda ett alternativt skall, kan du specificera detta i inställningarna). Hur du ställer in din sökväg beror på vilket skal du använder. Exakt hur beskrivs i skalets man-sidor.</p>
|
||||
|
||||
<p>Utöver detta kan du också vilja lägga till XFree86s man-sidor (dokumentation) till listan äver sidor som som skall sökas när du vill läsa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan äver kataloger att söka bestämms av variabeln<code>MANPATH</code>.</p>
|
||||
<p>Utöver detta kan du också vilja lägga till X11s man-sidor (dokumentation) till listan äver sidor som som skall sökas när du vill läsa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan äver kataloger att söka bestämms av variabeln<code>MANPATH</code>.</p>
|
||||
|
||||
<h2><a NAME="prefs">Inställningar</a></h2>
|
||||
<p>I inställningarna finns ett antal alternativ där du kan påverka hur XDarwin beter sig i vissa fall. Inställningarna kommer du till genom att välja "Inställningar..." i menyn "XDarwin". De alternativ som finns under fliken "Starta" träder inte i kraft förrän du startat om programmet. Alla andra alternativ träder i kraft omedelbart. De olika alternativen beskrivs nedan:</p>
|
||||
|
|
@ -77,10 +72,10 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
|
|||
</ul>
|
||||
|
||||
<h2><a NAME="license">Licens (svenska)</a></h2>
|
||||
<p>XFree86-projektet åtar sig att tillhandahålla programvara och källkod i format som fritt kan spridas vidare. Den huvudsakliga licens vi använder oss av är baserad på den traditionella MIT X11 / XConsortium-licensen, vilken inte på något sätt begränsar förändringar eller vidarespridning av vare sig källkod eller kompilerad programvara annat än genom att kräva att delarna som rör copyright och licensiering lämnas intakta. För mer information och ytterligare copyright/licensieringsinfromation rörande vissa speciella delar av koden, se <A HREF="http://www.xfree86.org/legal/licence.html">XFree86-licenssida</A> (engelska).</p>
|
||||
<p>Den huvudsakliga licens vi använder oss av är baserad på den traditionella MIT X11 / XConsortium-licensen, vilken inte på något sätt begränsar förändringar eller vidarespridning av vare sig källkod eller kompilerad programvara annat än genom att kräva att delarna som rör copyright och licensiering lämnas intakta. För mer information och ytterligare copyright/licensieringsinfromation rörande vissa speciella delar av koden, se the source code.</p>
|
||||
|
||||
<h3>Licence (english)</h3>
|
||||
<p>The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86 License page</A>.</p>
|
||||
<p>The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.</p>
|
||||
|
||||
<H3><A NAME="3"></A>X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,19 +1,14 @@
|
|||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
|
||||
|
||||
#include "xf86Version.h"
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#endif
|
||||
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
|
||||
|
||||
<html>
|
||||
<head>
|
||||
<title>XFree86 for Mac OS X</title>
|
||||
<title>XDarwin Help</title>
|
||||
</head>
|
||||
<body>
|
||||
<center>
|
||||
<h1>XFree86 on Darwin and Mac OS X</h1>
|
||||
XFree86 XF86_VERSION<br>
|
||||
Release Date: XF86_REL_DATE
|
||||
<h1>XDarwin X Server for Mac OS X</h1>
|
||||
X_VENDOR_NAME X_VERSION<br>
|
||||
Release Date: X_REL_DATE
|
||||
</center>
|
||||
<h2>Contents</h2>
|
||||
<ol>
|
||||
|
|
@ -27,8 +22,8 @@
|
|||
<h2><a NAME="notice">Important Notice</a></h2>
|
||||
</center>
|
||||
<blockquote>
|
||||
#if PRE_RELEASE
|
||||
This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
|
||||
#if X_PRE_RELEASE
|
||||
This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
|
||||
#else
|
||||
If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
|
||||
#endif
|
||||
|
|
@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
|
|||
This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
|
||||
|
||||
<h2><a NAME="usage">Usage</a></h2>
|
||||
<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
|
||||
="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
|
||||
<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
|
||||
<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system. (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
|
||||
<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
|
||||
<h3>Multi-Button Mouse Emulation</h3>
|
||||
|
|
@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
|
|||
<h2><a NAME="path">Setting Your Path</a></h2>
|
||||
<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
|
||||
<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
|
||||
<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
|
||||
<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
|
||||
|
||||
<h2><a NAME="prefs">User Preferences</a></h2>
|
||||
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
|
||||
|
|
@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
|
|||
</ul>
|
||||
|
||||
<h2><a NAME="license">License</a></h2>
|
||||
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
|
||||
License page</A>.
|
||||
The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
|
||||
<H3><A NAME="3"></A>X Consortium License</H3>
|
||||
<p>Copyright (C) 1996 X Consortium</p>
|
||||
<p>Permission is hereby granted, free of charge, to any person obtaining a
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*
|
||||
**************************************************************/
|
||||
/*
|
||||
* Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
|
||||
* Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
* holders shall not be used in advertising or otherwise to promote the sale,
|
||||
* use or other dealings in this Software without prior written authorization.
|
||||
*/
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.1.4.2.4.1 2004/03/04 17:47:29 eich Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
|
||||
|
||||
#include "X.h"
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
#include "fb.h" // fb framebuffer code
|
||||
#include "site.h"
|
||||
#include "globals.h"
|
||||
#include "xf86Version.h"
|
||||
#include "xorgVersion.h"
|
||||
#include "xf86Date.h"
|
||||
#include "dix.h"
|
||||
|
||||
|
|
@ -55,6 +55,9 @@
|
|||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define HAS_UTSNAME 1
|
||||
#include <sys/utsname.h>
|
||||
|
||||
#define NO_CFPLUGIN
|
||||
#include <IOKit/IOKitLib.h>
|
||||
#include <IOKit/hidsystem/IOHIDLib.h>
|
||||
|
|
@ -110,7 +113,7 @@ const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
|
|||
#define OSVENDOR ""
|
||||
#endif
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#define PRE_RELEASE XORG_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
void
|
||||
|
|
@ -118,37 +121,74 @@ DarwinPrintBanner()
|
|||
{
|
||||
#if PRE_RELEASE
|
||||
ErrorF("\n"
|
||||
"This is a pre-release version of XFree86, and is not supported in any\n"
|
||||
"way. Bugs may be reported to XFree86@XFree86.Org and patches submitted\n"
|
||||
"to fixes@XFree86.Org. Before reporting bugs in pre-release versions,\n"
|
||||
"please check the latest version in the XFree86 CVS repository\n"
|
||||
"(http://www.XFree86.Org/cvs)\n");
|
||||
"This is a pre-release version of the " XVENDORNAME " X11.\n"
|
||||
"Portions of this release are based on XFree86 4.4RC2 and selected\n"
|
||||
"files from XFree86 4.4RC3. It is not supported in any way.\n"
|
||||
"Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
|
||||
"Select the \"xorg\" product for bugs you find in this release.\n"
|
||||
"Before reporting bugs in pre-release versions please check the\n"
|
||||
"latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n"
|
||||
"repository hosted at http://www.freedesktop.org/Software/xorg/");
|
||||
#endif
|
||||
ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
|
||||
XF86_VERSION_PATCH);
|
||||
#if XF86_VERSION_SNAP > 0
|
||||
#if XORG_VERSION_SNAP > 0
|
||||
ErrorF(".%d", XF86_VERSION_SNAP);
|
||||
#endif
|
||||
|
||||
#if XF86_VERSION_SNAP >= 900
|
||||
ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
|
||||
XF86_VERSION_SNAP - 900);
|
||||
#if XORG_VERSION_SNAP >= 900
|
||||
ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
|
||||
XORG_VERSION_SNAP - 900);
|
||||
#endif
|
||||
|
||||
#ifdef XF86_CUSTOM_VERSION
|
||||
#ifdef XORG_CUSTOM_VERSION
|
||||
ErrorF(" (%s)", XF86_CUSTOM_VERSION);
|
||||
#endif
|
||||
ErrorF(" / X Window System\n");
|
||||
ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
|
||||
X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
|
||||
ErrorF("Release Date: %s\n", XF86_DATE);
|
||||
ErrorF("\tIf the server is older than 6-12 months, or if your hardware is\n"
|
||||
"\tnewer than the above date, look for a newer version before\n"
|
||||
"\treporting problems. (See http://www.XFree86.Org/FAQ)\n");
|
||||
ErrorF("Operating System:%s%s\n", OSNAME, OSVENDOR);
|
||||
ErrorF("\nRelease Date: %s\n", XF86_DATE);
|
||||
ErrorF("X Protocol Version %d, Revision %d, %s\n",
|
||||
X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE );
|
||||
ErrorF("Build Operating System:%s%s\n", OSNAME, OSVENDOR);
|
||||
#ifdef HAS_UTSNAME
|
||||
{
|
||||
struct utsname name;
|
||||
|
||||
if (uname(&name) == 0) {
|
||||
ErrorF("Current Operating System: %s %s %s %s %s\n",
|
||||
name.sysname, name.nodename, name.release, name.version, name.machine);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
|
||||
{
|
||||
struct tm t;
|
||||
char buf[100];
|
||||
|
||||
bzero(&t, sizeof(t));
|
||||
bzero(buf, sizeof(buf));
|
||||
t.tm_mday = BUILD_DATE % 100;
|
||||
t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
|
||||
t.tm_year = BUILD_DATE / 10000 - 1900;
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
|
||||
ErrorF("Build Date: %s\n", buf);
|
||||
}
|
||||
#endif
|
||||
#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
|
||||
{
|
||||
struct tm t;
|
||||
char buf[100];
|
||||
|
||||
bzero(&t, sizeof(t));
|
||||
bzero(buf, sizeof(buf));
|
||||
t.tm_mday = CLOG_DATE % 100;
|
||||
t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
|
||||
t.tm_year = CLOG_DATE / 10000 - 1900;
|
||||
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
|
||||
ErrorF("Changelog Date: %s\n", buf);
|
||||
}
|
||||
#endif
|
||||
#if defined(BUILDERSTRING)
|
||||
ErrorF("%s \n",BUILDERSTRING);
|
||||
#endif
|
||||
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
|
||||
"\tto make sure that you have the latest version.\n");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@
|
|||
<key>CFBundleExecutable</key>
|
||||
<string>XDarwin</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
|
||||
<string>XDarwin 1.3.0, X.Org Foundation</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>XDarwin.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ xf86AutoConfig(void)
|
|||
" -v 0x%04x -d 0x%04x -r 0x%02x -s 0x%04x"
|
||||
" -b 0x%04x -c 0x%04x",
|
||||
path,
|
||||
(unsigned int)xf86GetVersion(),
|
||||
(unsigned int)xorgGetVersion(),
|
||||
searchPath,
|
||||
info->vendor, info->chipType, info->chipRev,
|
||||
info->subsysVendor, info->subsysCard,
|
||||
|
|
|
|||
|
|
@ -1102,7 +1102,7 @@ configInputKbd(IDevPtr inputp)
|
|||
#endif
|
||||
#ifdef XKB
|
||||
if (!xf86IsPc98()) {
|
||||
xf86Info.xkbrules = "xfree86";
|
||||
xf86Info.xkbrules = __XKBDEFRULES__;
|
||||
xf86Info.xkbmodel = "pc105";
|
||||
xf86Info.xkblayout = "us";
|
||||
xf86Info.xkbvariant = NULL;
|
||||
|
|
|
|||
|
|
@ -500,7 +500,7 @@ configureLayoutSection (void)
|
|||
int scrnum = 0;
|
||||
parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
|
||||
|
||||
ptr->lay_identifier = "XFree86 Configured";
|
||||
ptr->lay_identifier = "X.org Configured";
|
||||
|
||||
{
|
||||
XF86ConfInputrefPtr iptr;
|
||||
|
|
@ -978,29 +978,33 @@ DoConfigure()
|
|||
ErrorF("\n");
|
||||
|
||||
#ifdef SCO
|
||||
ErrorF("\nXFree86 is using the kernel event driver to access the mouse.\n"
|
||||
"If you wish to use the internal XFree86 mouse drivers, please\n"
|
||||
ErrorF("\n"__XSERVERNAME__
|
||||
" is using the kernel event driver to access the mouse.\n"
|
||||
"If you wish to use the internal "__XSERVERNAME__
|
||||
"mouse drivers, please\n"
|
||||
"edit the file and correct the Device.\n");
|
||||
#else /* !SCO */
|
||||
if (!foundMouse) {
|
||||
ErrorF("\nXFree86 is not able to detect your mouse.\n"
|
||||
ErrorF("\n"__XSERVERNAME__" is not able to detect your mouse.\n"
|
||||
"Edit the file and correct the Device.\n");
|
||||
} else {
|
||||
#ifndef __UNIXOS2__ /* OS/2 definitely has a mouse */
|
||||
ErrorF("\nXFree86 detected your mouse at device %s.\n"
|
||||
ErrorF("\n"__XSERVERNAME__" detected your mouse at device %s.\n"
|
||||
"Please check your config if the mouse is still not\n"
|
||||
"operational, as by default XFree86 tries to autodetect\n"
|
||||
"operational, as by default "__XSERVERNAME__
|
||||
" tries to autodetect\n"
|
||||
"the protocol.\n",DFLT_MOUSE_DEV);
|
||||
#endif
|
||||
}
|
||||
#endif /* !SCO */
|
||||
|
||||
if (xf86NumScreens > 1) {
|
||||
ErrorF("\nXFree86 has configured a multihead system, please check your config.\n");
|
||||
ErrorF("\n"__XSERVERNAME__
|
||||
" has configured a multihead system, please check your config.\n");
|
||||
}
|
||||
|
||||
ErrorF("\nYour XF86Config file is %s\n\n", filename);
|
||||
ErrorF("To test the server, run 'XFree86 -xf86config %s'\n\n", filename);
|
||||
ErrorF("\nYour %s file is %s\n\n", XF86CONFIGFILE ,filename);
|
||||
ErrorF("To test the server, run 'X -xf86config %s'\n\n", filename);
|
||||
|
||||
bail:
|
||||
OsCleanup(TRUE);
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
#include "xf86Priv.h"
|
||||
#include "xf86Config.h"
|
||||
#include "xf86_OSlib.h"
|
||||
#include "xf86Version.h"
|
||||
#include "xorgVersion.h"
|
||||
#include "xf86Date.h"
|
||||
#include "xf86Build.h"
|
||||
#include "mipointer.h"
|
||||
|
|
@ -1262,12 +1262,17 @@ AbortDDX()
|
|||
void
|
||||
OsVendorFatalError()
|
||||
{
|
||||
ErrorF("\nWhen reporting a problem related to a server crash, please send\n"
|
||||
"the full server output, not just the last messages.\n");
|
||||
if (xf86LogFile && xf86LogFileWasOpened)
|
||||
ErrorF("This can be found in the log file \"%s\".\n", xf86LogFile);
|
||||
ErrorF("Please report problems to %s.\n", BUILDERADDR);
|
||||
ErrorF("\n");
|
||||
#ifdef VENDORSUPPORT
|
||||
ErrorF("\nPlease refer to your Operating System Vendor support pages\n"
|
||||
"at %s for support on this crash.\n",VENDORSUPPORT);
|
||||
#else
|
||||
ErrorF("\nPlease consult the "XVENDORNAME" support \n"
|
||||
"\t at "__VENDORDWEBSUPPORT__"\n for help. \n");
|
||||
#endif
|
||||
if (xf86LogFile && xf86LogFileWasOpened)
|
||||
ErrorF("Please also check the log file at \"%s\" for additional "
|
||||
"information.\n", xf86LogFile);
|
||||
ErrorF("\n");
|
||||
}
|
||||
|
||||
int
|
||||
|
|
@ -1706,7 +1711,7 @@ ddxUseMsg()
|
|||
#define OSVENDOR ""
|
||||
#endif
|
||||
#ifndef PRE_RELEASE
|
||||
#define PRE_RELEASE XF86_VERSION_SNAP
|
||||
#define PRE_RELEASE XORG_VERSION_SNAP
|
||||
#endif
|
||||
|
||||
static void
|
||||
|
|
@ -1714,24 +1719,25 @@ xf86PrintBanner()
|
|||
{
|
||||
#if PRE_RELEASE
|
||||
ErrorF("\n"
|
||||
"This is a pre-release version of XFree86, and is not supported in any\n"
|
||||
"way. Bugs may be reported to XFree86@XFree86.Org and patches submitted\n"
|
||||
"to fixes@XFree86.Org. Before reporting bugs in pre-release versions,\n"
|
||||
"please check the latest version in the XFree86 CVS repository\n"
|
||||
"(http://www.XFree86.Org/cvs).\n");
|
||||
"This is a pre-release version of the " XVENDORNAME " X11.\n"
|
||||
"Portions of this release are based on XFree86 4.4RC2 and selected\n"
|
||||
"files from XFree86 4.4RC3. It is not supported in any way.\n"
|
||||
"Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
|
||||
"Select the \"xorg\" product for bugs you find in this release.\n"
|
||||
"Before reporting bugs in pre-release versions please check the\n"
|
||||
"latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n"
|
||||
"repository hosted at http://www.freedesktop.org/Software/xorg/");
|
||||
#endif
|
||||
ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
|
||||
XF86_VERSION_PATCH);
|
||||
#if XF86_VERSION_SNAP > 0
|
||||
#if XORG_VERSION_SNAP > 0
|
||||
ErrorF(".%d", XF86_VERSION_SNAP);
|
||||
#endif
|
||||
|
||||
#if XF86_VERSION_SNAP >= 900
|
||||
ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
|
||||
XF86_VERSION_SNAP - 900);
|
||||
#if XORG_VERSION_SNAP >= 900
|
||||
ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
|
||||
XORG_VERSION_SNAP - 900);
|
||||
#endif
|
||||
|
||||
#ifdef XF86_CUSTOM_VERSION
|
||||
#ifdef XORG_CUSTOM_VERSION
|
||||
ErrorF(" (%s)", XF86_CUSTOM_VERSION);
|
||||
#endif
|
||||
ErrorF("\nRelease Date: %s\n", XF86_DATE);
|
||||
|
|
@ -1779,7 +1785,7 @@ xf86PrintBanner()
|
|||
#if defined(BUILDERSTRING)
|
||||
ErrorF("%s \n",BUILDERSTRING);
|
||||
#endif
|
||||
ErrorF("\tBefore reporting problems, check http://www.XFree86.Org/\n"
|
||||
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
|
||||
"\tto make sure that you have the latest version.\n");
|
||||
#ifdef XFree86LOADER
|
||||
ErrorF("Module Loader present\n");
|
||||
|
|
|
|||
|
|
@ -63,11 +63,11 @@ typedef enum {
|
|||
|
||||
/* Built-in ABI classes. These definitions must not be changed. */
|
||||
#define ABI_CLASS_NONE NULL
|
||||
#define ABI_CLASS_ANSIC "XFree86 ANSI C Emulation"
|
||||
#define ABI_CLASS_VIDEODRV "XFree86 Video Driver"
|
||||
#define ABI_CLASS_XINPUT "XFree86 XInput driver"
|
||||
#define ABI_CLASS_EXTENSION "XFree86 Server Extension"
|
||||
#define ABI_CLASS_FONT "XFree86 Font Renderer"
|
||||
#define ABI_CLASS_ANSIC "X.Org ANSI C Emulation"
|
||||
#define ABI_CLASS_VIDEODRV "X.Org Video Driver"
|
||||
#define ABI_CLASS_XINPUT "X.Org XInput driver"
|
||||
#define ABI_CLASS_EXTENSION "X.Org Server Extension"
|
||||
#define ABI_CLASS_FONT "X.Org Font Renderer"
|
||||
|
||||
#define ABI_MINOR_MASK 0x0000FFFF
|
||||
#define ABI_MAJOR_MASK 0xFFFF0000
|
||||
|
|
@ -95,9 +95,9 @@ typedef enum {
|
|||
|
||||
#ifndef MODULEVENDORSTRING
|
||||
#ifndef __OS2ELF__
|
||||
#define MODULEVENDORSTRING "The XFree86 Project"
|
||||
#define MODULEVENDORSTRING "X.Org Foundation"
|
||||
#else
|
||||
#define MODULEVENDORSTRING "The XFree86 Project - XFree86/OS2"
|
||||
#define MODULEVENDORSTRING "X.Org Foundation - OS2"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
@ -129,10 +129,10 @@ typedef enum {
|
|||
* the video driver ABI are themselves video drivers.
|
||||
*/
|
||||
#define MOD_CLASS_NONE NULL
|
||||
#define MOD_CLASS_VIDEODRV "XFree86 Video Driver"
|
||||
#define MOD_CLASS_XINPUT "XFree86 XInput Driver"
|
||||
#define MOD_CLASS_FONT "XFree86 Font Renderer"
|
||||
#define MOD_CLASS_EXTENSION "XFree86 Server Extension"
|
||||
#define MOD_CLASS_VIDEODRV "X.Org Video Driver"
|
||||
#define MOD_CLASS_XINPUT "X.Org XInput Driver"
|
||||
#define MOD_CLASS_FONT "X.Org Font Renderer"
|
||||
#define MOD_CLASS_EXTENSION "X.Org Server Extension"
|
||||
|
||||
/* This structure is expected to be returned by the initfunc */
|
||||
typedef struct {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
/* $XdotOrg$ */
|
||||
|
||||
#include "X.h"
|
||||
#include "os.h"
|
||||
#include "servermd.h"
|
||||
#include "pixmapstr.h"
|
||||
#include "windowstr.h"
|
||||
#include "propertyst.h"
|
||||
#include "gcstruct.h"
|
||||
#include "loaderProcs.h"
|
||||
#include "xf86.h"
|
||||
#include "xf86Priv.h"
|
||||
#include "xorgVersion.h"
|
||||
|
||||
|
||||
CARD32
|
||||
xorgGetVersion()
|
||||
{
|
||||
return XORG_VERSION_CURRENT;
|
||||
}
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2004, X.Org Foundation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
* Except as contained in this notice, the name of the copyright holder(s)
|
||||
* and author(s) shall not be used in advertising or otherwise to promote
|
||||
* the sale, use or other dealings in this Software without prior written
|
||||
* authorization from the copyright holder(s) and author(s).
|
||||
*/
|
||||
|
||||
#ifndef XORG_VERSION_H
|
||||
# define XORG_VERSION_H
|
||||
|
||||
# ifndef XORG_VERSION_CURRENT
|
||||
# error
|
||||
# endif
|
||||
|
||||
# define XORG_VERSION_NUMERIC(major,minor,patch,snap,dummy) \
|
||||
(((major) * 10000000) + ((minor) * 100000) + ((patch) * 1000) + snap)
|
||||
|
||||
# define XORG_GET_MAJOR_VERSION(vers) ((vers) / 10000000)
|
||||
# define XORG_GET_MINOR_VERSION(vers) (((vers) % 10000000) / 100000)
|
||||
# define XORG_GET_PATCH_VERSION(vers) (((vers) % 100000) / 1000)
|
||||
# define XORG_GET_SNAP_VERSION(vers) ((vers) % 1000)
|
||||
|
||||
# define XORG_VERSION_MAJOR XORG_GET_MAJOR_VERSION(XORG_VERSION_CURRENT)
|
||||
# define XORG_VERSION_MINOR XORG_GET_MINOR_VERSION(XORG_VERSION_CURRENT)
|
||||
# define XORG_VERSION_PATCH XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT)
|
||||
# define XORG_VERSION_SNAP XORG_GET_PATCH_VERSION(XORG_VERSION_CURRENT)
|
||||
|
||||
#endif
|
||||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
1.1 Copyright
|
||||
|
||||
Copyright © 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
|
||||
Copyright 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
|
||||
|
||||
Permission is granted to make and distribute verbatim copies of this document
|
||||
provided the copyright notice and this permission notice are preserved on all
|
||||
|
|
@ -1251,7 +1251,5 @@ demo programs is available from http://dri.sourceforge.net/res.phtml
|
|||
o In the future there may be IHV and Linux vendor support resources for
|
||||
the DRI.
|
||||
|
||||
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.29 dawes Exp $
|
||||
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRI.sgml,v 1.28 dawes Exp $
|
||||
|
||||
|
||||
$XFree86: $
|
||||
|
|
|
|||
|
|
@ -1,14 +1,15 @@
|
|||
Fonts in XFree86
|
||||
Fonts in X11R6.7
|
||||
|
||||
Juliusz Chroboczek, <jch@xfree86.org>
|
||||
Juliusz Chroboczek, <jch@pps.jussieu.fr>
|
||||
|
||||
17 November 2003
|
||||
25 March 2004
|
||||
|
||||
1. Introduction
|
||||
|
||||
This document describes the support for fonts in XFree86. Installing fonts
|
||||
This document describes the support for fonts in X11R6.7. Installing fonts
|
||||
(section 2., page 1) is aimed at the casual user wishing to install fonts in
|
||||
XFree86; the rest of the document describes the font support in more detail.
|
||||
X11R6.7 or XFree86; the rest of the document describes the font support in
|
||||
more detail.
|
||||
|
||||
We assume some familiarity with digital fonts. If anything is not clear to
|
||||
you, please consult Appendix: Background (section 5., page 1) at the end of
|
||||
|
|
@ -16,10 +17,10 @@ this document for background information.
|
|||
|
||||
1.1 Two font systems
|
||||
|
||||
XFree86 includes two font systems: the core X11 fonts system, which is
|
||||
present in all implementations of X11, and the Xft fonts system, which is not
|
||||
currently distributed with implementations of X11 that are not based on
|
||||
XFree86 but will hopefully be included by them in the future
|
||||
X includes two font systems: the original core X11 fonts system, which is
|
||||
present in all implementations of X11, and the Xft fonts system, which may
|
||||
not be distributed with implementations of X11 that are not based on X116.7.0
|
||||
but will hopefully be included by them in the future
|
||||
|
||||
The core X11 fonts system is directly derived from the fonts system included
|
||||
with X11R1 in 1987, which could only use monochrome bitmap fonts. Over the
|
||||
|
|
@ -36,7 +37,7 @@ ments with embedded fonts.
|
|||
|
||||
Xft is not compatible with the core fonts system: usage of Xft requires mak-
|
||||
ing fairly extensive changes to toolkits (user-interface libraries). While
|
||||
XFree86 will continue to maintain the core fonts system, toolkit authors are
|
||||
X.org will continue to maintain the core fonts system, toolkit authors are
|
||||
encouraged to switch to Xft as soon as possible.
|
||||
|
||||
2. Installing fonts
|
||||
|
|
@ -48,13 +49,13 @@ access newly-installed fonts.
|
|||
|
||||
Xft has no configuration mechanism itself, rather it relies upon the fontcon-
|
||||
fig library to configure and customize fonts. That library is not specific
|
||||
to XFree86 or indeed on any particular font output mechanism. This discus-
|
||||
to X11R6.7.0 or indeed on any particular font output mechanism. This discus-
|
||||
sion describes how fontconfig, rather than Xft, works.
|
||||
|
||||
2.1.1 Installing fonts in Xft
|
||||
|
||||
Fontconfig looks for fonts in a set of well-known directories that include
|
||||
all of XFree86's standard font directories (`/usr/X11R6/lib/X11/lib/fonts/*')
|
||||
all of X11R6.7's standard font directories (`/usr/X11R6/lib/X11/lib/fonts/*')
|
||||
by default) as well as a directory called `.fonts/' in the user's home direc-
|
||||
tory. Installing a font for use by Xft applications is as simple as copying
|
||||
a font file into one of these directories.
|
||||
|
|
@ -114,9 +115,9 @@ Anti-aliasing can be disabled for all fonts by the following incantation:
|
|||
</edit>
|
||||
</match>
|
||||
|
||||
Xft supports sub-pixel rasterisation on LCD displays. XFree86 should auto-
|
||||
matically enable this feature on laptops and when using an LCD monitor con-
|
||||
nected with a DVI cable; you can check whether this was done by typing
|
||||
Xft supports sub-pixel rasterisation on LCD displays. X11R67 should automat-
|
||||
ically enable this feature on laptops and when using an LCD monitor connected
|
||||
with a DVI cable; you can check whether this was done by typing
|
||||
|
||||
$ xdpyinfo -ext RENDER | grep sub-pixel
|
||||
|
||||
|
|
@ -167,10 +168,10 @@ disabled by your Xft configuration file.
|
|||
2.1.4 Troubleshooting
|
||||
|
||||
If some Xft-based applications don't seem to notice the changes you are mak-
|
||||
ing to your configuration files, they may be linked against the XFree86 4.2
|
||||
version of Xft. In order to fix the problem, you should relink them against
|
||||
a current version of Xft; on most systems, it is enough to install the cur-
|
||||
rent version of the Xft and Fontconfig libraries.
|
||||
ing to your configuration files, they may be linked against an old version of
|
||||
Xft. In order to fix the problem, you should relink them against a current
|
||||
version of Xft; on most systems, it is enough to install the current version
|
||||
of the Xft and Fontconfig libraries.
|
||||
|
||||
If, for some reason, you cannot upgrade the shared libraries, please check
|
||||
the Xft(3) manual page included with XFree86 4.2 for the configuration mecha-
|
||||
|
|
@ -185,8 +186,8 @@ of this new directory by including it in the font path.
|
|||
|
||||
2.2.1 Installing bitmap fonts
|
||||
|
||||
The XFree86 server can use bitmap fonts in both the cross-platform BDF format
|
||||
and the somewhat more efficient binary PCF format. (XFree86 also supports
|
||||
The X11R6.7 server can use bitmap fonts in both the cross-platform BDF format
|
||||
and the somewhat more efficient binary PCF format. (X11R6.7 also supports
|
||||
the obsolete SNF format.)
|
||||
|
||||
Bitmap fonts are normally distributed in the BDF format. Before installing
|
||||
|
|
@ -215,7 +216,7 @@ directory; see Setting the server font path (section 2.2.4, page 1) below.
|
|||
|
||||
2.2.2 Installing scalable fonts
|
||||
|
||||
The XFree86 server supports scalable fonts in four formats: Type 1, Speedo,
|
||||
The X11R6.7 server supports scalable fonts in four formats: Type 1, Speedo,
|
||||
TrueType and CIDFont. This section only applies to the former three; for
|
||||
information on CIDFonts, please see Installing CIDFonts (section 2.2.3, page
|
||||
1) later in this document.
|
||||
|
|
@ -251,7 +252,7 @@ CMap `UniKS-UCS2-H' is called
|
|||
|
||||
Munhwa-Regular--UniKS-UCS2-H
|
||||
|
||||
The CIDFont code in XFree86 requires a very rigid directory structure. The
|
||||
The CIDFont code in X11R6.7 requires a very rigid directory structure. The
|
||||
main directory must be called `CID' (its location defaults to
|
||||
`/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should
|
||||
contain a subdirectory for every CID collection. Every subdirectory must
|
||||
|
|
@ -310,7 +311,7 @@ For best results, scalable fonts should appear in the font path before the
|
|||
bitmap fonts; this way, the server will prefer bitmap fonts to scalable fonts
|
||||
when an exact match is possible, but will avoid scaling bitmap fonts when a
|
||||
scalable font can be used. (The `:unscaled' hack, while still supported,
|
||||
should no longer be necessary in XFree86 4.0 and later.)
|
||||
should no longer be necessary in X11R6.7.0.)
|
||||
|
||||
You may check the font path of the running server by typing the command
|
||||
|
||||
|
|
@ -334,15 +335,15 @@ For more information, please consult the xset(1) manual page.
|
|||
2.2.4.2 Permanent modification of the font path
|
||||
|
||||
The default font path (the one used just after server startup or after `xset
|
||||
fp default') is specified in the X server's `XF86Config' file. It is com-
|
||||
puted by appending all the directories mentioned in the `FontPath' entries of
|
||||
the `Files' section in the order in which they appear.
|
||||
fp default') is specified in the X server's `xorg.conf' file. It is computed
|
||||
by appending all the directories mentioned in the `FontPath' entries of the
|
||||
`Files' section in the order in which they appear.
|
||||
|
||||
FontPath "/usr/local/fonts/Type1"
|
||||
...
|
||||
FontPath "/usr/local/fonts/bitmap"
|
||||
|
||||
For more information, please consult the XF86Config(5) manual page.
|
||||
For more information, please consult the xorg.conf(5) manual page.
|
||||
|
||||
2.2.5 Troubleshooting
|
||||
|
||||
|
|
@ -353,19 +354,19 @@ mounted font directories). If this doesn't help, it is quite possible that
|
|||
you are trying to use a font in a format that is not supported by your
|
||||
server.
|
||||
|
||||
XFree86 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType and
|
||||
CIDFont font formats. However, not all XFree86 servers come with all the
|
||||
font backends configured in.
|
||||
X11R6.7 supports the BDF, PCF, SNF, Type 1, Speedo, TrueType, OpenType and
|
||||
CIDFont font formats. However, not all X11R6.7 or XFree86 servers come with
|
||||
all the font backends configured in.
|
||||
|
||||
On most platforms, the XFree86 servers are modular: the font backends are
|
||||
On most platforms, the X11R6.7 servers are modular: the font backends are
|
||||
included in modules that are loaded at runtime. The modules to be loaded are
|
||||
specified in the `XF86Config' file using the `Load' directive:
|
||||
specified in the `xorg.conf' file using the `Load' directive:
|
||||
|
||||
Load "type1"
|
||||
|
||||
If you have trouble installing fonts in a specific format, you may want to
|
||||
check the server's log file in order to see whether the relevant modules are
|
||||
properly loaded. The list of font modules distributed with XFree86 is as
|
||||
properly loaded. The list of font modules distributed with X11R6.7 is as
|
||||
follows:
|
||||
|
||||
o "bitmap": bitmap fonts (`*.bdf', `*.pcf' and `*.snf');
|
||||
|
|
@ -382,7 +383,7 @@ follows:
|
|||
|
||||
Please note that the argument of the `Load' directive is case-sensitive.
|
||||
|
||||
3. Fonts included with XFree86
|
||||
3. Fonts included with X11R6.7
|
||||
|
||||
3.1 Standard bitmap fonts
|
||||
|
||||
|
|
@ -391,7 +392,7 @@ fonts, including the `fixed' family, and bitmap versions of Courier, Times,
|
|||
Helvetica and some members of the Lucida family. In the SI, these fonts are
|
||||
provided in the ISO 8859-1 encoding (ISO Latin Western-European).
|
||||
|
||||
In XFree86, a number of these fonts are provided in Unicode-encoded font
|
||||
In X11R6.7, a number of these fonts are provided in Unicode-encoded font
|
||||
files instead. At build time, these fonts are split into font files encoded
|
||||
according to legacy encodings, a process which allows us to provide the stan-
|
||||
dard fonts in a number of regional encodings with no duplication of work.
|
||||
|
|
@ -469,7 +470,7 @@ for improved presentation of text.
|
|||
|
||||
3.3 Standard scalable fonts
|
||||
|
||||
XFree86 includes all the scalable fonts distributed with X11R6.
|
||||
X11R6.7 includes all the scalable fonts distributed with X11R6.
|
||||
|
||||
3.3.1 Standard Type 1 fonts
|
||||
|
||||
|
|
@ -491,7 +492,7 @@ and reside in the font files
|
|||
|
||||
/usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
|
||||
|
||||
Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and
|
||||
Finally, X11R6.7 also comes with Type 1 versions of Bitstream Courier and
|
||||
Charter. These fonts have XLFD
|
||||
|
||||
-bitstream-courier-*-*-normal--0-0-0-0-m-0-iso8859-1
|
||||
|
|
@ -503,7 +504,7 @@ and reside in the font files
|
|||
|
||||
3.3.2 Standard Speedo fonts
|
||||
|
||||
XFree86 includes Speedo versions of the Bitstream Courier and Charter fonts.
|
||||
X11R6.7 includes Speedo versions of the Bitstream Courier and Charter fonts.
|
||||
In order to use these fonts, you should ensure that your X server is loading
|
||||
the `Speedo' font backend; see Troubleshooting (section 2.2.5, page 1).
|
||||
|
||||
|
|
@ -519,7 +520,7 @@ and reside in the font files
|
|||
|
||||
3.4 The Bigelow & Holmes Luxi family
|
||||
|
||||
XFree86 includes the Luxi family of scalable fonts, in both TrueType and
|
||||
X11R6.7 includes the Luxi family of scalable fonts, in both TrueType and
|
||||
Type 1 format. This family consists of the fonts Luxi Serif, with XLFD
|
||||
|
||||
-b&h-luxi serif-medium-*-normal--*-*-*-*-p-*-*-*
|
||||
|
|
@ -565,11 +566,11 @@ For more information, please contact <design@bigelowandholmes.com> or
|
|||
|
||||
An earlier version of the Luxi fonts was made available under the name
|
||||
Lucidux. This name should no longer be used due to trademark uncertainties,
|
||||
and all traces of the Lucidux name have been removed from XFree86.
|
||||
and all traces of the Lucidux name have been removed from X11R6.7.
|
||||
|
||||
4. More about core fonts
|
||||
|
||||
This section describes XFree86-specific enhancements to the core X11 fonts
|
||||
This section describes X11R6.7-specific enhancements to the core X11 fonts
|
||||
system.
|
||||
|
||||
4.1 Core fonts and internationalisation
|
||||
|
|
@ -655,7 +656,7 @@ option followed by the name of a directory containing encoding files, can be
|
|||
used to automatically build `encodings.dir' files. Please see the mkfont-
|
||||
dir(1) manual page for more details.
|
||||
|
||||
A number of encoding files for common encodings are included with XFree86.
|
||||
A number of encoding files for common encodings are included with X11R6.7.
|
||||
Information on writing new encoding files can be found in Format of encodings
|
||||
directory files (section 4.1.3, page 1) and Format of encoding files (section
|
||||
4.1.4, page 1) later in this document.
|
||||
|
|
@ -991,7 +992,7 @@ ings, but instead uses its own database of encodings.
|
|||
|
||||
Since the functionalities for CJKV support introduced by X-TT have been
|
||||
merged into the new FreeType backend, the X-TT backend will be removed from
|
||||
XFree86's tree near the future. Therefore, the use of FreeType backend is
|
||||
X11R6.7's tree near the future. Therefore, the use of FreeType backend is
|
||||
preferred over the X-TT backend.
|
||||
|
||||
General information on X-TrueType may be found at the After X-TT Project page
|
||||
|
|
@ -1138,16 +1139,16 @@ last two fields of their XLFD set to `iso10646-1'.
|
|||
|
||||
6. References
|
||||
|
||||
XFree86 comes with extensive documentation in the form of manual pages and
|
||||
X11R6.7 comes with extensive documentation in the form of manual pages and
|
||||
typeset documents. Before installing fonts, you really should read the font-
|
||||
config(3) and mkfontdir(1) manual pages; other manual pages of interest
|
||||
include X(7), Xserver(1), xset(1), Xft(3), xlsfonts(1) and showfont(1). In
|
||||
addition, you may want to read the X Logical Font Description document, by
|
||||
Jim Flowers, which is provided in the file `xc/doc/xlfd.PS.Z'.
|
||||
|
||||
The latest released version of the XFree86 documentation (including this doc-
|
||||
ument and all manual pages) is available as current XFree86 documentation
|
||||
<URL:http://www.xfree86.org/current/>.
|
||||
The latest released version of the X11R6.7 documentation (including this doc-
|
||||
ument and all manual pages) can be found from current X11R6.7 documentation
|
||||
<URL:http://wiki.x.org/>.
|
||||
|
||||
The comp.fonts FAQ <URL:http://www.netmeg.net/faq/computers/fonts/>, which is
|
||||
unfortunately no longer being maintained, contains a wealth of information
|
||||
|
|
@ -1181,7 +1182,5 @@ The IANA RFC documents, available from a number of sites throughout the
|
|||
world, often provide interesting information about character set issues; see
|
||||
for example RFC 373.
|
||||
|
||||
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml,v 1.24 dawes Exp $
|
||||
$Id$
|
||||
|
||||
|
||||
$XFree86: $
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
1.1 Copyright
|
||||
|
||||
Copyright © 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
|
||||
Copyright 2000-2001 by VA Linux Systems, Inc. All Rights Reserved.
|
||||
|
||||
Permission is granted to make and distribute verbatim copies of this document
|
||||
provided the copyright notice and this permission notice are preserved on all
|
||||
|
|
@ -551,7 +551,5 @@ At this point your X server should be up and running with hardware-acceler-
|
|||
ated direct rendering. Please read the DRI User Guide for information about
|
||||
trouble shooting and how to use the DRI-enabled X server for 3D applications.
|
||||
|
||||
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.20 dawes Exp $
|
||||
Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DRIcomp.sgml,v 1.19 dawes Exp $
|
||||
|
||||
|
||||
$XFree86: $
|
||||
|
|
|
|||
|
|
@ -0,0 +1,691 @@
|
|||
.\" $XdotOrg: $
|
||||
.TH __xservername__ __appmansuffix__ __vendorversion__
|
||||
.SH NAME
|
||||
__xservername__ - X11R6 X server
|
||||
.SH SYNOPSIS
|
||||
.B __xservername__
|
||||
.RI [\fB:\fP display ]
|
||||
.RI [ option
|
||||
.IR ... ]
|
||||
.SH DESCRIPTION
|
||||
.B __xservername__
|
||||
is a full featured X server that was originally designed for UNIX and
|
||||
UNIX-like operating systems running on Intel x86 hardware. It now runs
|
||||
on a wider range of hardware and OS platforms.
|
||||
.PP
|
||||
This work was derived from
|
||||
.I "XFree86\ 4.4rc2"
|
||||
by the X.Org Foundation.
|
||||
The XFree86 4.4rc2 release was originally derived from
|
||||
.I "X386\ 1.2"
|
||||
by Thomas Roell which was contributed to X11R5 by Snitily Graphics
|
||||
Consulting Service. The
|
||||
.B __xservername__
|
||||
server architecture includes
|
||||
among many other things a loadable module system derived from code
|
||||
donated by Metro Link, Inc. The current __xservername__ release is compatible
|
||||
with X11R6.6.
|
||||
.SH PLATFORMS
|
||||
.PP
|
||||
.B __xservername__
|
||||
operates under a wide range of operating systems and hardware platforms.
|
||||
The Intel x86 (IA32) architecture is the most widely supported hardware
|
||||
platform. Other hardware platforms include Compaq Alpha, Intel IA64,
|
||||
SPARC and PowerPC. The most widely supported operating systems are the
|
||||
free/OpenSource UNIX-like systems such as Linux, FreeBSD, NetBSD and
|
||||
OpenBSD. Commercial UNIX operating systems such as Solaris (x86) and
|
||||
UnixWare are also supported. Other supported operating systems include
|
||||
LynxOS, and GNU Hurd. Darwin and Mac OS X are supported with the
|
||||
XDarwin(1) X server. Win32/Cygwin is supported with the XWin X server.
|
||||
.PP
|
||||
.SH "NETWORK CONNECTIONS"
|
||||
.B __xservername__
|
||||
supports connections made using the following reliable
|
||||
byte-streams:
|
||||
.TP 4
|
||||
.I "Local"
|
||||
On most platforms, the "Local" connection type is a UNIX-domain socket.
|
||||
On some System V platforms, the "local" connection types also include
|
||||
STREAMS pipes, named pipes, and some other mechanisms.
|
||||
.TP 4
|
||||
.I TCP\/IP
|
||||
.B __xservername__
|
||||
listens on port
|
||||
.RI 6000+ n ,
|
||||
where
|
||||
.I n
|
||||
is the display number. This connection type can be disabled with the
|
||||
.B \-nolisten
|
||||
option (see the Xserver(1) man page for details).
|
||||
.SH "ENVIRONMENT VARIABLES"
|
||||
For operating systems that support local connections other than Unix
|
||||
Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying
|
||||
the order in which local connections should be attempted. This list
|
||||
can be overridden by the
|
||||
.I XLOCAL
|
||||
environment variable described below. If the display name indicates a
|
||||
best-choice connection should be made (e.g.
|
||||
.BR :0.0 ),
|
||||
each connection mechanism is tried until a connection succeeds or no
|
||||
more mechanisms are available. Note: for these OSs, the Unix Domain
|
||||
socket connection is treated differently from the other local connection
|
||||
types. To use it the connection must be made to
|
||||
.BR unix:0.0 .
|
||||
.PP
|
||||
The
|
||||
.I XLOCAL
|
||||
environment variable should contain a list of one more
|
||||
more of the following:
|
||||
.PP
|
||||
.RS 8
|
||||
.nf
|
||||
NAMED
|
||||
PTS
|
||||
SCO
|
||||
ISC
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
which represent SVR4 Named Streams pipe, Old-style USL Streams pipe,
|
||||
SCO XSight Streams pipe, and ISC Streams pipe, respectively. You can
|
||||
select a single mechanism (e.g.
|
||||
.IR XLOCAL=NAMED ),
|
||||
or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP).
|
||||
his variable overrides the compiled-in defaults. For SVR4 it is
|
||||
recommended that
|
||||
.I NAMED
|
||||
be the first preference connection. The default setting is
|
||||
.IR PTS:NAMED:ISC:SCO .
|
||||
.PP
|
||||
To globally override the compiled-in defaults, you should define (and
|
||||
export if using
|
||||
.B sh
|
||||
or
|
||||
.BR ksh )
|
||||
.I XLOCAL
|
||||
globally. If you use startx(1) or xinit(1), the definition should be
|
||||
at the top of your
|
||||
.I .xinitrc
|
||||
file. If you use xdm(1), the definitions should be early on in the
|
||||
.I __projectroot__/lib/X11/xdm/Xsession
|
||||
script.
|
||||
.SH OPTIONS
|
||||
.B __xservername__
|
||||
supports several mechanisms for supplying/obtaining configuration and
|
||||
run-time parameters: command line options, environment variables, the
|
||||
__xconfigfile__(__filemansuffix__) configuration file, auto-detection, and
|
||||
fallback defaults. When the same information is supplied in more than
|
||||
one way, the highest precedence mechanism is used. The list of mechanisms
|
||||
is ordered from highest precedence to lowest. Note that not all parameters
|
||||
can be supplied via all methods. The available command line options
|
||||
and environment variables (and some defaults) are described here and in
|
||||
the Xserver(1) manual page. Most configuration file parameters, with
|
||||
their defaults, are described in the __xconfigfile__(__filemansuffix__) manual
|
||||
page. Driver and module specific configuration parameters are described
|
||||
in the relevant driver or module manual page.
|
||||
.PP
|
||||
In addition to the normal server options described in the Xserver(1)
|
||||
manual page,
|
||||
.B __xservername__
|
||||
accepts the following command line switches:
|
||||
.TP 8
|
||||
.BI vt XX
|
||||
.I XX
|
||||
specifies the Virtual Terminal device number which
|
||||
.B __xservername__
|
||||
will use. Without this option,
|
||||
.B __xservername__
|
||||
will pick the first available Virtual Terminal that it can locate. This
|
||||
option applies only to platforms such as Linux, BSD, SVR3 and SVR4, that
|
||||
have virtual terminal support.
|
||||
.TP
|
||||
.B \-allowMouseOpenFail
|
||||
Allow the server to start up even if the mouse device can't be opened
|
||||
or initialised. This is equivalent to the
|
||||
.B AllowMouseOpenFail
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B \-allowNonLocalModInDev
|
||||
Allow changes to keyboard and mouse settings from non-local clients.
|
||||
By default, connections from non-local clients are not allowed to do
|
||||
this. This is equivalent to the
|
||||
.B AllowNonLocalModInDev
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B \-allowNonLocalXvidtune
|
||||
Make the VidMode extension available to remote clients. This allows
|
||||
the xvidtune client to connect from another host. This is equivalent
|
||||
to the
|
||||
.B AllowNonLocalXvidtune
|
||||
__xconfigfile__(__filemansuffix__) file option. By default non-local
|
||||
connections are not allowed.
|
||||
.TP 8
|
||||
.BI \-bgamma " value"
|
||||
Set the blue gamma correction.
|
||||
.I value
|
||||
must be between 0.1 and 10.
|
||||
The default is 1.0. Not all drivers support this. See also the
|
||||
.BR \-gamma ,
|
||||
.BR \-rgamma ,
|
||||
and
|
||||
.B \-ggamma
|
||||
options.
|
||||
.TP 8
|
||||
.BI \-bpp " n"
|
||||
No longer supported. Use
|
||||
.B \-depth
|
||||
to set the color depth, and use
|
||||
.B \-fbbpp
|
||||
if you really need to force a non-default framebuffer (hardware) pixel
|
||||
format.
|
||||
.TP
|
||||
.B \-configure
|
||||
When this option is specified, the
|
||||
.B __xservername__
|
||||
server loads all video driver modules, probes for available hardware,
|
||||
and writes out an initial __xconfigfile__(__filemansuffix__) file based on
|
||||
what was detected. This option currently has some problems on some
|
||||
platforms, but in most cases it is a good way to bootstrap the
|
||||
configuration process. This option is only available when the server
|
||||
is run as root (i.e, with real-uid 0).
|
||||
.TP 8
|
||||
.BI "\-crt /dev/tty" XX
|
||||
SCO only. This is the same as the
|
||||
.B vt
|
||||
option, and is provided for compatibility with the native SCO X server.
|
||||
.TP 8
|
||||
.BI \-depth " n"
|
||||
Sets the default color depth. Legal values are 1, 4, 8, 15, 16, and
|
||||
24. Not all drivers support all values.
|
||||
.TP 8
|
||||
.B \-disableModInDev
|
||||
Disable dynamic modification of input device settings. This is equivalent
|
||||
to the
|
||||
.B DisableModInDev
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B \-disableVidMode
|
||||
Disable the the parts of the VidMode extension (used by the xvidtune
|
||||
client) that can be used to change the video modes. This is equivalent
|
||||
to the
|
||||
.B DisableVidModeExtension
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B \-fbbpp \fIn\fP
|
||||
Sets the number of framebuffer bits per pixel. You should only set this
|
||||
if you're sure it's necessary; normally the server can deduce the correct
|
||||
value from
|
||||
.B \-depth
|
||||
above. Useful if you want to run a depth 24 configuration with a 24
|
||||
bpp framebuffer rather than the (possibly default) 32 bpp framebuffer
|
||||
(or vice versa). Legal values are 1, 8, 16, 24, 32. Not all drivers
|
||||
support all values.
|
||||
.TP 8
|
||||
.B \-flipPixels
|
||||
Swap the default values for the black and white pixels.
|
||||
.TP 8
|
||||
.BI \-gamma " value"
|
||||
Set the gamma correction.
|
||||
.I value
|
||||
must be between 0.1 and 10. The default is 1.0. This value is applied
|
||||
equally to the R, G and B values. Those values can be set independently
|
||||
with the
|
||||
.BR \-rgamma ,
|
||||
.BR \-bgamma ,
|
||||
and
|
||||
.B \-ggamma
|
||||
options. Not all drivers support this.
|
||||
.TP 8
|
||||
.BI \-ggamma " value"
|
||||
Set the green gamma correction.
|
||||
.I value
|
||||
must be between 0.1 and 10. The default is 1.0. Not all drivers support
|
||||
this. See also the
|
||||
.BR \-gamma ,
|
||||
.BR \-rgamma ,
|
||||
and
|
||||
.B \-bgamma
|
||||
options.
|
||||
.TP 8
|
||||
.B \-ignoreABI
|
||||
The
|
||||
.B __xservername__
|
||||
server checks the ABI revision levels of each module that it loads. It
|
||||
will normally refuse to load modules with ABI revisions that are newer
|
||||
than the server's. This is because such modules might use interfaces
|
||||
that the server does not have. When this option is specified, mismatches
|
||||
like this are downgraded from fatal errors to warnings. This option
|
||||
should be used with care.
|
||||
.TP 8
|
||||
.B \-keeptty
|
||||
Prevent the server from detaching its initial controlling terminal.
|
||||
This option is only useful when debugging the server. Not all platforms
|
||||
support (or can use) this option.
|
||||
.TP 8
|
||||
.BI \-keyboard " keyboard-name"
|
||||
Use the __xconfigfile__(__filemansuffix__) file
|
||||
.B InputDevice
|
||||
section called
|
||||
.I keyboard-name
|
||||
as the core keyboard. This option is ignored when the
|
||||
.B Layout
|
||||
section specifies a core keyboard. In the absence of both a Layout
|
||||
section and this option, the first relevant
|
||||
.B InputDevice
|
||||
section is used for the core keyboard.
|
||||
.TP 8
|
||||
.BI \-layout " layout-name"
|
||||
Use the __xconfigfile__(__filemansuffix__) file
|
||||
.B Layout
|
||||
section called
|
||||
.IR layout-name .
|
||||
By default the first
|
||||
.B Layout
|
||||
section is used.
|
||||
.TP 8
|
||||
.BI \-logfile " filename"
|
||||
Use the file called
|
||||
.I filename
|
||||
as the
|
||||
.B __xservername__
|
||||
server log file. The default log file is
|
||||
.BI __logdir__/__xservername__. n .log
|
||||
on most platforms, where
|
||||
.I n
|
||||
is the display number of the
|
||||
.B __xservername__
|
||||
server. The default may be in a different directory on some platforms.
|
||||
This option is only available when the server is run as root (i.e, with
|
||||
real-uid 0).
|
||||
.TP 8
|
||||
.BR \-logverbose " [\fIn\fP]"
|
||||
Sets the verbosity level for information printed to the
|
||||
.B __xservername__
|
||||
server log file. If the
|
||||
.I n
|
||||
value isn't supplied, each occurrence of this option increments the log
|
||||
file verbosity level. When the
|
||||
.I n
|
||||
value is supplied, the log file verbosity level is set to that value.
|
||||
The default log file verbosity level is 3.
|
||||
.TP 8
|
||||
.BI \-modulepath " searchpath"
|
||||
Set the module search path to
|
||||
.IR searchpath .
|
||||
.I searchpath
|
||||
is a comma separated list of directories to search for
|
||||
.B __xservername__
|
||||
server modules. This option is only available when the server is run
|
||||
as root (i.e, with real-uid 0).
|
||||
.TP 8
|
||||
.B \-nosilk
|
||||
Disable Silken Mouse support.
|
||||
.TP 8
|
||||
.B \-pixmap24
|
||||
Set the internal pixmap format for depth 24 pixmaps to 24 bits per pixel.
|
||||
The default is usually 32 bits per pixel. There is normally little
|
||||
reason to use this option. Some client applications don't like this
|
||||
pixmap format, even though it is a perfectly legal format. This is
|
||||
equivalent to the
|
||||
.B Pixmap
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B \-pixmap32
|
||||
Set the internal pixmap format for depth 24 pixmaps to 32 bits per pixel.
|
||||
This is usually the default. This is equivalent to the
|
||||
.B Pixmap
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.BI \-pointer " pointer-name"
|
||||
Use the __xconfigfile__(__filemansuffix__) file
|
||||
.B InputDevice
|
||||
section called
|
||||
.I pointer-name
|
||||
as the core pointer. This option is ignored when the
|
||||
.B Layout
|
||||
section specifies a core pointer. In the absence of both a Layout
|
||||
section and this option, the first relevant
|
||||
.B InputDevice
|
||||
section is used for the core pointer.
|
||||
.TP 8
|
||||
.B \-probeonly
|
||||
Causes the server to exit after the device probing stage. The
|
||||
__xconfigfile__(__filemansuffix__) file is still used when this option is
|
||||
given, so information that can be auto-detected should be commented out.
|
||||
.TP 8
|
||||
.B \-quiet
|
||||
Suppress most informational messages at startup. The verbosity level
|
||||
is set to zero.
|
||||
.TP 8
|
||||
.BI \-rgamma " value"
|
||||
Set the red gamma correction.
|
||||
.I value
|
||||
must be between 0.1 and 10. The default is 1.0. Not all drivers support
|
||||
this. See also the
|
||||
.BR \-gamma ,
|
||||
.BR \-bgamma ,
|
||||
and
|
||||
.B \-ggamma
|
||||
options.
|
||||
.TP 8
|
||||
.B \-scanpci
|
||||
When this option is specified, the
|
||||
.B __xservername__
|
||||
server scans the PCI bus, and prints out some information about each
|
||||
device that was detected. See also scanpci(1) and pcitweak(1).
|
||||
.TP 8
|
||||
.BI \-screen " screen-name"
|
||||
Use the __xconfigfile__(__filemansuffix__) file
|
||||
.B Screen
|
||||
section called
|
||||
.IR screen-name .
|
||||
By default the screens referenced by the default
|
||||
.B Layout
|
||||
section are used, or the first
|
||||
.B Screen
|
||||
section when there are no
|
||||
.B Layout
|
||||
sections.
|
||||
.TP 8
|
||||
.B \-showconfig
|
||||
This is the same as the
|
||||
.B \-version
|
||||
option, and is included for compatibility reasons. It may be removed
|
||||
in a future release, so the
|
||||
.B \-version
|
||||
option should be used instead.
|
||||
.TP 8
|
||||
.BI \-weight " nnn"
|
||||
Set RGB weighting at 16 bpp. The default is 565. This applies only to
|
||||
those drivers which support 16 bpp.
|
||||
.TP 8
|
||||
.BR \-verbose " [\fIn\fP]"
|
||||
Sets the verbosity level for information printed on stderr. If the
|
||||
.I n
|
||||
value isn't supplied, each occurrence of this option increments the
|
||||
verbosity level. When the
|
||||
.I n
|
||||
value is supplied, the verbosity level is set to that value. The default
|
||||
verbosity level is 0.
|
||||
.TP 8
|
||||
.B \-version
|
||||
Print out the server version, patchlevel, release date, the operating
|
||||
system/platform it was built on, and whether it includes module loader
|
||||
support.
|
||||
.TP 8
|
||||
.BI \-config " file"
|
||||
Read the server configuration from
|
||||
.IR file .
|
||||
This option will work for any file when the server is run as root (i.e,
|
||||
with real-uid 0), or for files relative to a directory in the config
|
||||
search path for all other users.
|
||||
.SH "KEYBOARD"
|
||||
.PP
|
||||
The
|
||||
.B __xservername__
|
||||
server is normally configured to recognize various special combinations
|
||||
of key presses that instruct the server to perform some action, rather
|
||||
than just sending the key press event to a client application. The
|
||||
default XKEYBOARD keymap defines the key combinations listed below.
|
||||
The server also has these key combinations builtin to its event handler
|
||||
for cases where the XKEYBOARD extension is not being used. When using
|
||||
the XKEYBOARD extension, which key combinations perform which actions
|
||||
is completely configurable.
|
||||
.PP
|
||||
For more information about when the builtin event handler
|
||||
is used to recognize the special key combinations, see
|
||||
the documentation on the
|
||||
.B HandleSpecialKeys
|
||||
option in the __xconfigfile__(__filemansuffix__) man page.
|
||||
.PP
|
||||
The special combinations of key presses recognized directly
|
||||
by
|
||||
.B __xservername__
|
||||
are:
|
||||
.TP 8
|
||||
.B Ctrl+Alt+Backspace
|
||||
Immediately kills the server -- no questions asked. This can be disabled
|
||||
with the
|
||||
.B DontZap
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B Ctrl+Alt+Keypad-Plus
|
||||
Change video mode to next one specified in the configuration file.
|
||||
This can be disabled with the
|
||||
.B DontZoom
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B Ctrl+Alt+Keypad-Minus
|
||||
Change video mode to previous one specified in the configuration file.
|
||||
This can be disabled with the
|
||||
.B DontZoom
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.TP 8
|
||||
.B Ctrl+Alt+Keypad-Multiply
|
||||
Not treated specially by default. If the
|
||||
.B AllowClosedownGrabs
|
||||
__xconfigfile__(__filemansuffix__) file option is specified, this key sequence
|
||||
kills clients with an active keyboard or mouse grab as well as killing any
|
||||
application that may have locked the server, normally using the
|
||||
XGrabServer(__libmansuffix__) Xlib function.
|
||||
.TP 8
|
||||
.B Ctrl+Alt+Keypad-Divide
|
||||
Not treated specially by default. If the
|
||||
.B AllowDeactivateGrabs
|
||||
__xconfigfile__(__filemansuffix__) file option is specified, this key sequence
|
||||
deactivates any active keyboard and mouse grabs.
|
||||
.TP 8
|
||||
.B Ctrl+Alt+F1...F12
|
||||
For BSD and Linux systems with virtual terminal support, these keystroke
|
||||
combinations are used to switch to virtual terminals 1 through 12,
|
||||
respectively. This can be disabled with the
|
||||
.B DontVTSwitch
|
||||
__xconfigfile__(__filemansuffix__) file option.
|
||||
.SH CONFIGURATION
|
||||
.B __xservername__
|
||||
typically uses a configuration file called
|
||||
.B __xconfigfile__
|
||||
for its initial setup.
|
||||
Refer to the __xconfigfile__(__filemansuffix__) manual page for information
|
||||
about the format of this file.
|
||||
.PP
|
||||
Starting with version 4.4,
|
||||
.B __xservername__
|
||||
has a mechanism for automatically generating a built-in configuration
|
||||
at run-time when no
|
||||
.B __xconfigfile__
|
||||
file is present. The current version of this automatic configuration
|
||||
mechanism works in three ways.
|
||||
.PP
|
||||
The first is via enhancements that have made many components of the
|
||||
.B __xconfigfile__
|
||||
file optional. This means that information that can be probed or
|
||||
reasonably deduced doesn't need to be specified explicitly, greatly
|
||||
reducing the amount of built-in configuration information that needs to
|
||||
be generated at run-time.
|
||||
.PP
|
||||
The second is to use an external utility called getconfig(1), when
|
||||
available, to use meta-configuration information to generate a suitable
|
||||
configuration for the primary video device. The meta-configuration
|
||||
information can be updated to allow an existing installation to get the
|
||||
best out of new hardware or to work around bugs that are found
|
||||
post-release.
|
||||
.PP
|
||||
The third is to have "safe" fallbacks for most configuration information.
|
||||
This maximises the likelihood that the
|
||||
.B __xservername__
|
||||
server will start up in some usable configuration even when information
|
||||
about the specific hardware is not available.
|
||||
.PP
|
||||
The automatic configuration support for __xservername__ is work in progress.
|
||||
It is currently aimed at the most popular hardware and software platforms
|
||||
supported by __xservername__. Enhancements are planned for future releases.
|
||||
.SH FILES
|
||||
The
|
||||
.B __xservername__
|
||||
server config file can be found in a range of locations. These are
|
||||
documented fully in the __xconfigfile__(__filemansuffix__) manual page. The
|
||||
most commonly used locations are shown here.
|
||||
.TP 30
|
||||
.B /etc/X11/__xconfigfile__
|
||||
Server configuration file.
|
||||
.TP 30
|
||||
.B /etc/X11/__xconfigfile__-4
|
||||
Server configuration file.
|
||||
.TP 30
|
||||
.B /etc/__xconfigfile__
|
||||
Server configuration file.
|
||||
.TP 30
|
||||
.B __projectroot__/etc/__xconfigfile__
|
||||
Server configuration file.
|
||||
.TP 30
|
||||
.B __projectroot__/lib/X11/__xconfigfile__
|
||||
Server configuration file.
|
||||
.TP 30
|
||||
.BI __logdir__/__xservername__. n .log
|
||||
Server log file for display
|
||||
.IR n .
|
||||
.TP 30
|
||||
.B __projectroot__/bin/\(**
|
||||
Client binaries.
|
||||
.TP 30
|
||||
.B __projectroot__/include/\(**
|
||||
Header files.
|
||||
.TP 30
|
||||
.B __projectroot__/lib/\(**
|
||||
Libraries.
|
||||
.TP 30
|
||||
.B __projectroot__/lib/X11/fonts/\(**
|
||||
Fonts.
|
||||
.TP 30
|
||||
.B __projectroot__/lib/X11/rgb.txt
|
||||
Color names to RGB mapping.
|
||||
.TP 30
|
||||
.B __projectroot__/lib/X11/XErrorDB
|
||||
Client error message database.
|
||||
.TP 30
|
||||
.B __projectroot__/lib/X11/app-defaults/\(**
|
||||
Client resource specifications.
|
||||
.TP 30
|
||||
.B __projectroot__/man/man?/\(**
|
||||
Manual pages.
|
||||
.TP 30
|
||||
.BI /etc/X n .hosts
|
||||
Initial access control list for display
|
||||
.IR n .
|
||||
.SH "SEE ALSO"
|
||||
X(__miscmansuffix__), Xserver(__appmansuffix__), xdm(__appmansuffix__), xinit(__appmansuffix__),
|
||||
__xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), xorgcfg(__appmansuffix__), xvidtune(__appmansuffix__),
|
||||
apm(__drivermansuffix__),
|
||||
ati(__drivermansuffix__),
|
||||
chips(__drivermansuffix__),
|
||||
cirrus(__drivermansuffix__),
|
||||
cyrix(__drivermansuffix__),
|
||||
fbdev(__drivermansuffix__),
|
||||
glide(__drivermansuffix__),
|
||||
glint(__drivermansuffix__),
|
||||
i128(__drivermansuffix__),
|
||||
i740(__drivermansuffix__),
|
||||
i810(__drivermansuffix__),
|
||||
imstt(__drivermansuffix__),
|
||||
mga(__drivermansuffix__),
|
||||
neomagic(__drivermansuffix__),
|
||||
nsc(__drivermansuffix__),
|
||||
nv(__drivermansuffix__),
|
||||
r128(__drivermansuffix__),
|
||||
rendition(__drivermansuffix__),
|
||||
s3virge(__drivermansuffix__),
|
||||
siliconmotion(__drivermansuffix__),
|
||||
sis(__drivermansuffix__),
|
||||
sunbw2(__drivermansuffix__),
|
||||
suncg14(__drivermansuffix__),
|
||||
suncg3(__drivermansuffix__),
|
||||
suncg6(__drivermansuffix__),
|
||||
sunffb(__drivermansuffix__),
|
||||
sunleo(__drivermansuffix__),
|
||||
suntcx(__drivermansuffix__),
|
||||
tdfx(__drivermansuffix__),
|
||||
tga(__drivermansuffix__),
|
||||
trident(__drivermansuffix__),
|
||||
tseng(__drivermansuffix__),
|
||||
v4l(__drivermansuffix__),
|
||||
vesa(__drivermansuffix__),
|
||||
vga(__drivermansuffix__),
|
||||
vmware(__drivermansuffix__),
|
||||
.br
|
||||
Web site
|
||||
.IR <http://www.x.org> .
|
||||
|
||||
.SH AUTHORS
|
||||
__xservername__ has many contributors world wide. The names of most of them
|
||||
can be found in the documentation, CHANGELOG files in the source tree,
|
||||
and in the actual source code.
|
||||
.PP
|
||||
__xservername__ was originally based on XFree86 4.4rc2.
|
||||
That was originally based on \fIX386 1.2\fP by Thomas Roell, which
|
||||
was contributed to the then X Consortium's X11R5 distribution by SGCS.
|
||||
.PP
|
||||
__xservername__ is released by the X.org Foundation.
|
||||
.PP
|
||||
The project that became XFree86 was originally founded in 1992 by
|
||||
David Dawes, Glenn Lai, Jim Tsillas and David Wexelblat.
|
||||
.PP
|
||||
XFree86 was later integrated in the then X Consortium's X11R6 release
|
||||
by a group of dedicated XFree86 developers, including the following:
|
||||
.PP
|
||||
.RS 4
|
||||
.nf
|
||||
Stuart Anderson \fIanderson@metrolink.com\fP
|
||||
Doug Anson \fIdanson@lgc.com\fP
|
||||
Gertjan Akkerman \fIakkerman@dutiba.twi.tudelft.nl\fP
|
||||
Mike Bernson \fImike@mbsun.mlb.org\fP
|
||||
Robin Cutshaw \fIrobin@XFree86.org\fP
|
||||
David Dawes \fIdawes@XFree86.org\fP
|
||||
Marc Evans \fImarc@XFree86.org\fP
|
||||
Pascal Haible \fIhaible@izfm.uni-stuttgart.de\fP
|
||||
Matthieu Herrb \fIMatthieu.Herrb@laas.fr\fP
|
||||
Dirk Hohndel \fIhohndel@XFree86.org\fP
|
||||
David Holland \fIdavidh@use.com\fP
|
||||
Alan Hourihane \fIalanh@fairlite.demon.co.uk\fP
|
||||
Jeffrey Hsu \fIhsu@soda.berkeley.edu\fP
|
||||
Glenn Lai \fIglenn@cs.utexas.edu\fP
|
||||
Ted Lemon \fImellon@ncd.com\fP
|
||||
Rich Murphey \fIrich@XFree86.org\fP
|
||||
Hans Nasten \fInasten@everyware.se\fP
|
||||
Mark Snitily \fImark@sgcs.com\fP
|
||||
Randy Terbush \fIrandyt@cse.unl.edu\fP
|
||||
Jon Tombs \fItombs@XFree86.org\fP
|
||||
Kees Verstoep \fIversto@cs.vu.nl\fP
|
||||
Paul Vixie \fIpaul@vix.com\fP
|
||||
Mark Weaver \fIMark_Weaver@brown.edu\fP
|
||||
David Wexelblat \fIdwex@XFree86.org\fP
|
||||
Philip Wheatley \fIPhilip.Wheatley@ColumbiaSC.NCR.COM\fP
|
||||
Thomas Wolfram \fIwolf@prz.tu-berlin.de\fP
|
||||
Orest Zborowski \fIorestz@eskimo.com\fP
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
__xservername__ source is available from the FTP server
|
||||
\fI<ftp://ftp.x.org/>\fP, and from the X.org
|
||||
server \fI<http://www.freedesktop.org/cvs/>\fP. Documentation and other
|
||||
information can be found from the X.org web site
|
||||
\fI<http://www.x.org/>\fP.
|
||||
|
||||
.SH LEGAL
|
||||
.PP
|
||||
.B __xservername__
|
||||
is copyright software, provided under licenses that permit modification
|
||||
and redistribution in source and binary form without fee.
|
||||
.B __xservername__ is copyright by numerous authors and
|
||||
contributors from around the world. Licensing information can be found
|
||||
at
|
||||
.IR <http://www.x.org> .
|
||||
Refer to the source code for specific copyright notices.
|
||||
.PP
|
||||
.B XFree86(TM)
|
||||
is a trademark of The XFree86 Project, Inc.
|
||||
.PP
|
||||
.B X11(TM)
|
||||
and
|
||||
.B X Window System(TM)
|
||||
are trademarks of The Open Group.
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,5 @@
|
|||
<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
|
||||
<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
|
||||
<!ENTITY % defs SYSTEM "defs.ent"> %defs;
|
||||
<!-- config file keyword markup -->
|
||||
<!ENTITY s.key STARTTAG "bf">
|
||||
<!ENTITY e.key ENDTAG "bf">
|
||||
|
|
@ -27,6 +28,7 @@
|
|||
|
||||
<title>XFree86 server 4.x Design (DRAFT)
|
||||
<author>The XFree86 Project, Inc
|
||||
<and>Updates for X11R&relvers; by Jim Gettys
|
||||
<date>19 December 2003
|
||||
|
||||
|
||||
|
|
@ -79,10 +81,10 @@ The broad design principles are:
|
|||
Unless we find major deficiencies in the DIX layer, we should avoid
|
||||
making changes there.
|
||||
|
||||
<sect>The XF86Config File
|
||||
<sect>The xorg.conf File
|
||||
<p>
|
||||
|
||||
The XF86Config file format is similar to the old format, with the following
|
||||
The xorg.conf file format is similar to the old format, with the following
|
||||
changes:
|
||||
|
||||
<sect1>&k.device; section
|
||||
|
|
@ -315,7 +317,7 @@ the XFree86 common layer:
|
|||
|
||||
<tag>PreInit</tag>
|
||||
|
||||
Process information from the XF86Config file, determine the
|
||||
Process information from the xorg.conf file, determine the
|
||||
full characteristics of the hardware, and determine if a valid
|
||||
configuration is present.
|
||||
</descrip>
|
||||
|
|
@ -426,12 +428,12 @@ control. &s.code;InitOutput()&e.code; is expected to fill in the global
|
|||
&s.code;screenInfo.screen[]&e.code; entry for each screen present. Here
|
||||
is what &s.code;InitOutput()&e.code; does:
|
||||
|
||||
<sect1>Parse the XF86Config file
|
||||
<sect1>Parse the xorg.conf file
|
||||
<p>
|
||||
|
||||
This is done at the start of the first server generation only.
|
||||
|
||||
The XF86Config file is read in full, and the resulting information
|
||||
The xorg.conf file is read in full, and the resulting information
|
||||
stored in data structures. None of the parsed information is
|
||||
processed at this point. The parser data structures are opaque to
|
||||
the video drivers and to most of the common layer code.
|
||||
|
|
@ -595,7 +597,7 @@ is what &s.code;InitOutput()&e.code; does:
|
|||
&s.code;PROBE_DETECT&e.code; is used if "-configure" or "-probe"
|
||||
command line arguments are given and indicates to the
|
||||
&s.code;Probe()&e.code; function that it should not configure the
|
||||
bus entities and that no XF86Config information is available.
|
||||
bus entities and that no xorg.conf information is available.
|
||||
|
||||
The probe must find the active device sections that match the
|
||||
driver by calling &s.code;xf86MatchDevice()&e.code;. The number
|
||||
|
|
@ -746,7 +748,7 @@ is what &s.code;InitOutput()&e.code; does:
|
|||
|
||||
After the Probe phase is finished, there will be some number of
|
||||
&s.code;ScrnInfoRecs&e.code;. These are then matched with the active
|
||||
&k.screen; sections in the XF86Config, and those not having an active
|
||||
&k.screen; sections in the xorg.conf, and those not having an active
|
||||
&k.screen; section are deleted. If the number of remaining screens
|
||||
is 0, &s.code;InitOutput()&e.code; sets
|
||||
&s.code;screenInfo.numScreens&e.code; to &s.code;0&e.code; and
|
||||
|
|
@ -1294,10 +1296,10 @@ The function should not modify any other mode field, unless it wants to modify
|
|||
the mode timings reported to the user by &s.code;xf86PrintModes()&e.code;.
|
||||
|
||||
<p>
|
||||
The function is called once for every mode in the XF86Config Monitor section
|
||||
The function is called once for every mode in the xorg.conf Monitor section
|
||||
assigned to the screen, with &s.code;flags&e.code; set to
|
||||
&s.code;MODECHECK_INITIAL&e.code;. It is subsequently called for every mode
|
||||
in the XF86Config Display subsection assigned to the screen, with
|
||||
in the xorg.conf Display subsection assigned to the screen, with
|
||||
&s.code;flags&e.code; set to &s.code;MODECHECK_FINAL&e.code;. In the second
|
||||
case, the mode will have successfully passed all other tests. In addition,
|
||||
the &s.code;ScrnInfoRec&e.code;'s &s.code;virtualX&e.code;,
|
||||
|
|
@ -1866,7 +1868,7 @@ creates an entity record for each of them, registers non-relocatable
|
|||
resources and allocates screens and adds the resources to screens.
|
||||
|
||||
Two helper functions are provided for matching device sections in the
|
||||
XF86Config file to the devices:
|
||||
xorg.conf file to the devices:
|
||||
|
||||
<quote><p>
|
||||
&s.code;int xf86MatchPciInstances(const char *driverName, int vendorID,
|
||||
|
|
@ -5271,7 +5273,7 @@ be catered for the by the helpers.
|
|||
<quote>Allow halved clocks</quote>
|
||||
&s.code;LOOKUP_OPTIONAL_TOLERANCES&e.code;
|
||||
<quote>Allow missing horizontal sync and/or vertical refresh
|
||||
ranges in the XF86Config Monitor section</quote>
|
||||
ranges in the xorg.conf Monitor section</quote>
|
||||
|
||||
&s.code;LOOKUP_OPTIONAL_TOLERANCES&e.code; should only be
|
||||
specified when the driver can ensure all modes it generates
|
||||
|
|
@ -5291,7 +5293,7 @@ be catered for the by the helpers.
|
|||
&s.code;progClock&e.code;
|
||||
<quote>Whether the clock is programmable or not</quote>
|
||||
&s.code;monitor&e.code;
|
||||
<quote>Pointer to the applicable XF86Config monitor section</quote>
|
||||
<quote>Pointer to the applicable xorg.conf monitor section</quote>
|
||||
&s.code;fdFormat&e.code;
|
||||
<quote>Format of the screen buffer</quote>
|
||||
&s.code;videoRam&e.code;
|
||||
|
|
@ -6731,7 +6733,7 @@ ZZZProbe(DriverPtr drv, int flags)
|
|||
|
||||
Define the &s.code;AvailableOptions()&e.code; function. The purpose
|
||||
of this is to return the available driver options back to the
|
||||
-configure option, so that an XF86Config file can be built and the
|
||||
-configure option, so that an xorg.conf file can be built and the
|
||||
user can see which options are available for them to use.
|
||||
|
||||
<sect2>PreInit
|
||||
|
|
|
|||
|
|
@ -14,7 +14,8 @@ fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the
|
|||
fbdevhw module. fbdevhw can be used by other drivers too, this
|
||||
is usually activated with `Option "UseFBDev"' in the device section.
|
||||
.SH "SEE ALSO"
|
||||
XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
|
||||
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
|
||||
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
|
||||
fbdev(__drivermansuffix__)
|
||||
.SH AUTHORS
|
||||
Authors include: Gerd Knorr, based on the XF68_FBDev Server code
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
.\" $XFree86$
|
||||
.TH getconfig __filemansuffix__ __vendorversion__
|
||||
.SH NAME
|
||||
getconfig - meta configuration files for getconfig(1)
|
||||
|
|
@ -7,10 +6,10 @@ getconfig - meta configuration files for getconfig(1)
|
|||
.SH DESCRIPTION
|
||||
.B getconfig
|
||||
is a programatic interface that is used by the
|
||||
.B XFree86
|
||||
.B __xservername__
|
||||
server to get configuration information about video hardware when
|
||||
operating without an
|
||||
.B XF86Config
|
||||
.B __xconfigfile__
|
||||
file.
|
||||
.PP
|
||||
This implementation of
|
||||
|
|
@ -29,7 +28,7 @@ the file format version number. The signature string is
|
|||
.PP
|
||||
.RS 4
|
||||
.nf
|
||||
"XFree86 Project getconfig rules file.\ \ Version: "
|
||||
"Xorg getconfig rules file.\ \ Version: "
|
||||
.fi
|
||||
.RE
|
||||
.PP
|
||||
|
|
@ -44,10 +43,10 @@ continuation convention ('\e' at the end of the line). The first logical
|
|||
line of each rule is a perl expression. It may be any valid perl
|
||||
expression whose evaluated (with 'eval') result may be used as the
|
||||
argument to a perl 'if' statement. The second logical line should be
|
||||
the name of the XFree86 video driver to use when the rule is true, and
|
||||
the name of the __xservername__ video driver to use when the rule is true, and
|
||||
subsequent logical lines of each rule, if present, are additional
|
||||
configuration output for the video device's
|
||||
.B XF86Config
|
||||
.B __xconfigfile__
|
||||
.B Device
|
||||
section. The driver name and additional lines of configuration information
|
||||
are written to standard output when the rule is chosen as the successful
|
||||
|
|
@ -70,12 +69,12 @@ They include:
|
|||
.BR "$subsys " "PCI subsystem ID"
|
||||
.BR "$subsysVendor " "PCI subsystem vendor ID"
|
||||
.BR "$class " "PCI class"
|
||||
.BR "$XFree86Version " "XFree86 version, as a 'v' string"
|
||||
.BR "$XFree86VersionNumeric " "XFree86 numeric version"
|
||||
.BR "$XFree86VersionMajor " "XFree86 major version"
|
||||
.BR "$XFree86VersionMinor " "XFree86 minor version"
|
||||
.BR "$XFree86VersionPatch " "XFree86 patch version"
|
||||
.BR "$XFree86VersionSnap " "XFree86 snap version"
|
||||
.BR "$XorgVersion " "Xorg version, as a 'v' string"
|
||||
.BR "$XorgVersionNumeric " "Xorg numeric version"
|
||||
.BR "$XorgVersionMajor " "Xorg major version"
|
||||
.BR "$XorgVersionMinor " "Xorg minor version"
|
||||
.BR "$XorgVersionPatch " "Xorg patch version"
|
||||
.BR "$XorgVersionSnap " "Xorg snap version"
|
||||
.BR "$weight " "current rule weight"
|
||||
.fi
|
||||
.RE
|
||||
|
|
@ -99,7 +98,7 @@ rule that evaluates to true.
|
|||
.I .cfg
|
||||
files located in the search path. The search path typically specified
|
||||
by the
|
||||
.B XFree86
|
||||
.B __xservername__
|
||||
server is:
|
||||
.PP
|
||||
.RS 4
|
||||
|
|
@ -114,11 +113,11 @@ server is:
|
|||
where
|
||||
.I <modulepath>
|
||||
is the
|
||||
.B XFree86
|
||||
.B __xservername__
|
||||
server's module search path.
|
||||
.PP
|
||||
.TP 30
|
||||
.I __projectroot__/lib/X11/getconfig/xfree86.cfg
|
||||
.I __projectroot__/lib/X11/getconfig/xorg.cfg
|
||||
Default rules file that gets installed. This file doesn't contain any
|
||||
rules by default.
|
||||
.TP 30
|
||||
|
|
@ -128,11 +127,11 @@ appear in rules files.
|
|||
|
||||
.SH "SEE ALSO"
|
||||
getconfig(1),
|
||||
XFree86(1),
|
||||
XF86Config(__filemansuffix__).
|
||||
__xservername__(__appmansuffix__),
|
||||
__xconfigfile__(__filemansuffix__).
|
||||
|
||||
.SH AUTHORS
|
||||
The XFree86 automatic configuration support and the
|
||||
The __xservername__ automatic configuration support and the
|
||||
.B getconfig
|
||||
interface was written by David H. Dawes, with the support of X-Oz
|
||||
Technologies.
|
||||
Technologies for XFree86.
|
||||
|
|
|
|||
|
|
@ -1,14 +1,13 @@
|
|||
# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $
|
||||
# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.1 2003/10/08 14:58:29 dawes Exp $
|
||||
# $XdotOrg$
|
||||
|
||||
# Some sample XFree86 getconfig rules file.
|
||||
# Some sample Xorg getconfig rules file.
|
||||
|
||||
#
|
||||
# The line below is the getconfig rules file signature, and must be the
|
||||
# first non-blank, non-comment line.
|
||||
#
|
||||
|
||||
XFree86 Project getconfig rules file. Version: 1.0
|
||||
Xorg Project getconfig rules file. Version: 1.0
|
||||
|
||||
#
|
||||
# Set the weight for the following rules. This should be set, otherwise
|
||||
|
|
@ -38,15 +37,15 @@ $weight = 1000
|
|||
# $subsys PCI subsystem ID
|
||||
# $subsysVendor PCI subsystem vendor ID
|
||||
# $class PCI class
|
||||
# $XFree86Version XFree86 version, as a 'v' string.
|
||||
# $XorgVersion Xorg version, as a 'v' string.
|
||||
#
|
||||
# The XFree86 version information is also available as the following:
|
||||
# The Xorg version information is also available as the following:
|
||||
#
|
||||
# $XFree86VersionNumeric
|
||||
# $XFree86VersionMajor
|
||||
# $XFree86VersionMinor
|
||||
# $XFree86VersionPatch
|
||||
# $XFree86VersionSnap
|
||||
# $XorgVersionNumeric
|
||||
# $XorgVersionMajor
|
||||
# $XorgVersionMinor
|
||||
# $XorgVersionPatch
|
||||
# $XorgVersionSnap
|
||||
#
|
||||
|
||||
# Define a fake vendor ID for some sample rules.
|
||||
|
|
@ -67,10 +66,10 @@ $device == $nodevice
|
|||
Option \
|
||||
"yy"
|
||||
|
||||
# Increase the weight of the following rules if the XFree86 version is 4.3 or
|
||||
# Increase the weight of the following rules if the Xorg version is 4.3 or
|
||||
# higher.
|
||||
|
||||
$weight++ if ($XFree86Version ge v4.3)
|
||||
$weight++ if ($XorgVersion ge v4.3)
|
||||
|
||||
$vendor == $novendor
|
||||
nodriver
|
||||
|
|
@ -83,7 +82,7 @@ $vendor == $novendor
|
|||
|
||||
$weight = 100
|
||||
|
||||
$vendor == $novendor && $XFree86Version eq v4.3.2.1
|
||||
$vendor == $novendor && $XorgVersion eq v4.3.2.1
|
||||
nodriver3
|
||||
|
||||
$weight = 600
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
|
||||
# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.2 2003/09/20 01:45:57 dawes Exp $
|
||||
# $XdotOrg$
|
||||
|
||||
#
|
||||
# Copyright 2003 by David H. Dawes.
|
||||
|
|
@ -33,8 +33,6 @@
|
|||
# Author: David Dawes <dawes@XFree86.Org>.
|
||||
#
|
||||
|
||||
# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.sh,v 1.1 2003/10/08 14:58:29 dawes Exp $
|
||||
|
||||
# A simple wrapper to execute the real getconfig program. So long as perl
|
||||
# is in $PATH, we don't need to know where it is this way.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
.\" $XFree86$
|
||||
.TH getconfig 1 __vendorversion__
|
||||
.SH NAME
|
||||
getconfig - get configuration information for the XFree86 server
|
||||
getconfig - get configuration information for the __xservername__ server
|
||||
.SH SYNOPSIS
|
||||
.B getconfig
|
||||
.RI [ option
|
||||
|
|
@ -9,10 +8,10 @@ getconfig - get configuration information for the XFree86 server
|
|||
.SH DESCRIPTION
|
||||
.B getconfig
|
||||
is a programatic interface that is used by the
|
||||
.B XFree86
|
||||
.B __xservername__
|
||||
server to get configuration information about video hardware when
|
||||
operating without an
|
||||
.B XF86Config
|
||||
.B __xconfigfile__
|
||||
file.
|
||||
.PP
|
||||
This implementation of
|
||||
|
|
@ -21,7 +20,7 @@ is written in perl. It processes a prioritized and ordered list of
|
|||
rules supplied internally and from meta-configuration files. The rules
|
||||
are in the form of perl expressions.
|
||||
.B getconfig
|
||||
writes to standard output the XF86Config-style configuration data
|
||||
writes to standard output the __xconfigfile__-style configuration data
|
||||
specified by the last highest priority rule that evaluates to true.
|
||||
Information about the format of the meta-configuration files can be
|
||||
found in the getconfig(__filemansuffix__) manual page.
|
||||
|
|
@ -44,8 +43,9 @@ Enable debugging output.
|
|||
.B \-V
|
||||
Print out the version information and exit.
|
||||
.TP 8
|
||||
.BI \-X " XFree86-version"
|
||||
Specify the XFree86 version in numeric (integer) form.
|
||||
.BI \-X
|
||||
.BI __xservername__-version
|
||||
Specify the __xservername__ version in numeric (integer) form.
|
||||
.TP 8
|
||||
.BI \-b " subsys-id"
|
||||
Specify the PCI subsystem ID of the video device.
|
||||
|
|
@ -68,7 +68,7 @@ Specify the PCI vendor ID of the video device.
|
|||
.I .cfg
|
||||
files located in the search path. The search path typically specified
|
||||
by the
|
||||
.B XFree86
|
||||
.B __xservername__
|
||||
server is:
|
||||
.PP
|
||||
.RS 4
|
||||
|
|
@ -83,16 +83,16 @@ server is:
|
|||
where
|
||||
.I <modulepath>
|
||||
is the
|
||||
.B XFree86
|
||||
.B __xservername__
|
||||
server's module search path.
|
||||
|
||||
.SH "SEE ALSO"
|
||||
getconfig(__filemansuffix__),
|
||||
XFree86(1),
|
||||
XF86Config(__filemansuffix__).
|
||||
__xservername__(__appmansuffix__),
|
||||
__xconfigfile__(__filemansuffix__).
|
||||
|
||||
.SH AUTHORS
|
||||
The XFree86 automatic configuration support and the
|
||||
The __xservername__ automatic configuration support and the
|
||||
.B getconfig
|
||||
interface was written by David H. Dawes, with the support of X-Oz
|
||||
Technologies.
|
||||
Technologies for XFree86.
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@
|
|||
# Author: David Dawes <dawes@XFree86.Org>.
|
||||
#
|
||||
|
||||
# $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.1 2003/10/08 14:58:29 dawes Exp $
|
||||
|
||||
#
|
||||
# This script takes PCI id information, compares it against an ordered list
|
||||
|
|
@ -52,7 +51,7 @@ $debug = 0;
|
|||
$myname = $0;
|
||||
$myname =~ s/.*\///;
|
||||
|
||||
$signature = "XFree86 Project getconfig rules file. Version: ";
|
||||
$signature = "Xorg Foundation getconfig rules file. Version: ";
|
||||
|
||||
while (@ARGV[0] =~ /^-[A-Za-z]$/) {
|
||||
$f = shift;
|
||||
|
|
@ -70,9 +69,9 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
|
|||
exit 0;
|
||||
}
|
||||
if ($f eq "-X") {
|
||||
$XFree86VersionNumeric = shift;
|
||||
if (!defined($XFree86VersionNumeric)) {
|
||||
print STDERR "$myname: -X requires the XFree86 version.\n";
|
||||
$XorgVersionNumeric = shift;
|
||||
if (!defined($XorgVersionNumeric)) {
|
||||
print STDERR "$myname: -X requires the Xorg version.\n";
|
||||
exit 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -129,21 +128,21 @@ while (@ARGV[0] =~ /^-[A-Za-z]$/) {
|
|||
|
||||
printf STDERR "$myname: Version %vd.\n", $GetconfigVersion;
|
||||
|
||||
if (defined($XFree86VersionNumeric)) {
|
||||
$XFree86VersionMajor = $XFree86VersionNumeric / 10000000;
|
||||
$XFree86VersionMinor = ($XFree86VersionNumeric % 10000000) / 100000;
|
||||
$XFree86VersionPatch = ($XFree86VersionNumeric % 100000) / 1000;
|
||||
$XFree86VersionSnapshot = $XFree86VersionNumeric % 1000;
|
||||
$XFree86Version = chr($XFree86VersionMajor) . chr($XFree86VersionMinor) .
|
||||
chr($XFree86VersionPatch) . chr($XFree86VersionSnapshot);
|
||||
if (defined($XorgVersionNumeric)) {
|
||||
$XorgVersionMajor = $XorgVersionNumeric / 10000000;
|
||||
$XorgVersionMinor = ($XorgVersionNumeric % 10000000) / 100000;
|
||||
$XorgVersionPatch = ($XorgVersionNumeric % 100000) / 1000;
|
||||
$XorgVersionSnapshot = $XorgVersionNumeric % 1000;
|
||||
$XorgVersion = chr($XorgVersionMajor) . chr($XorgVersionMinor) .
|
||||
chr($XorgVersionPatch) . chr($XorgVersionSnapshot);
|
||||
}
|
||||
|
||||
if ($debug) {
|
||||
printf STDERR "$myname: XFree86 Version: %d, %d.%d.%d.%d, %vd.\n",
|
||||
$XFree86VersionNumeric, $XFree86VersionMajor, $XFree86VersionMinor,
|
||||
$XFree86VersionPatch, $XFree86VersionSnapshot, $XFree86Version;
|
||||
printf STDERR "$myname: Xorg Version: %d, %d.%d.%d.%d, %vd.\n",
|
||||
$XorgVersionNumeric, $XorgVersionMajor, $XorgVersionMinor,
|
||||
$XorgVersionPatch, $XorgVersionSnapshot, $XorgVersion;
|
||||
} else {
|
||||
printf STDERR "$myname: XFree86 Version: %vd.\n", $XFree86Version;
|
||||
printf STDERR "$myname: Xorg Version: %vd.\n", $XorgVersion;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
# $XdotOrg$
|
||||
|
||||
# Base Xorg getconfig rules file.
|
||||
|
||||
#
|
||||
# The line below is the getconfig rules file signature, and must be the
|
||||
# first non-blank, non-comment line.
|
||||
#
|
||||
|
||||
Xorg Project getconfig rules file. Version: 1.0
|
||||
|
||||
#
|
||||
# Set the weight for the following rules. This should be set, otherwise
|
||||
# the previously set weight will get used, and you have no idea of knowing
|
||||
# what that might be.
|
||||
#
|
||||
|
||||
$weight = 1000
|
||||
|
||||
#
|
||||
# Rules. Rules consist of a condition (in perl code) followed by
|
||||
# a driver name and optionally some additional strings. The start of a
|
||||
# rule is indicated by a line with no leading white space. subsequent
|
||||
# lines making up a rule must be indented. Logical lines may be split
|
||||
# over multiple physical lines by using the usual continuation '\'.
|
||||
#
|
||||
# Rules that are not followed by a driver name may be used to do other
|
||||
# things, like setting the weight as above.
|
||||
#
|
||||
|
||||
#
|
||||
# Pre-defined variables include:
|
||||
#
|
||||
# $vendor PCI vendor ID
|
||||
# $device PCI device ID
|
||||
# $revision PCI revision ID
|
||||
# $subsys PCI subsystem ID
|
||||
# $subsysVendor PCI subsystem vendor ID
|
||||
# $class PCI class
|
||||
# $XorgVersion Xorg version, as a 'v' string.
|
||||
#
|
||||
# The Xorg version information is also available as the following:
|
||||
#
|
||||
# $XorgVersionNumeric
|
||||
# $XorgVersionMajor
|
||||
# $XorgVersionMinor
|
||||
# $XorgVersionPatch
|
||||
# $XorgVersionSnap
|
||||
#
|
||||
|
||||
|
|
@ -440,11 +440,11 @@ xf86pathIsSafe(const char *path)
|
|||
* %A cmdline argument as an absolute path (must be absolute to match)
|
||||
* %R cmdline argument as a relative path
|
||||
* %S cmdline argument as a "safe" path (relative, and no ".." elements)
|
||||
* %X default config file name ("XF86Config")
|
||||
* %X default config file name ("xorg.conf")
|
||||
* %H hostname
|
||||
* %E config file environment ($XF86CONFIG) as an absolute path
|
||||
* %F config file environment ($XF86CONFIG) as a relative path
|
||||
* %G config file environment ($XF86CONFIG) as a safe path
|
||||
* %E config file environment ($XORGCONFIG) as an absolute path
|
||||
* %F config file environment ($XORGCONFIG) as a relative path
|
||||
* %G config file environment ($XORGCONFIG) as a safe path
|
||||
* %D $HOME
|
||||
* %P projroot
|
||||
* %M major version number
|
||||
|
|
@ -453,14 +453,15 @@ xf86pathIsSafe(const char *path)
|
|||
*/
|
||||
|
||||
#ifndef XCONFIGFILE
|
||||
#define XCONFIGFILE "XF86Config"
|
||||
#define XCONFIGFILE "xorg.conf"
|
||||
#endif
|
||||
#ifndef PROJECTROOT
|
||||
#define PROJECTROOT "/usr/X11R6"
|
||||
#endif
|
||||
#ifndef XCONFENV
|
||||
#define XCONFENV "XF86CONFIG"
|
||||
#define XCONFENV "XORGCONFIG"
|
||||
#endif
|
||||
#define XFREE86CFGFILE "XF86Config"
|
||||
#ifndef XF86_VERSION_MAJOR
|
||||
#ifdef XVERSION
|
||||
#if XVERSION > 40000000
|
||||
|
|
@ -495,7 +496,7 @@ xf86pathIsSafe(const char *path)
|
|||
|
||||
static char *
|
||||
DoSubstitution(const char *template, const char *cmdline, const char *projroot,
|
||||
int *cmdlineUsed, int *envUsed)
|
||||
int *cmdlineUsed, int *envUsed, char *XConfigFile)
|
||||
{
|
||||
char *result;
|
||||
int i, l;
|
||||
|
|
@ -547,7 +548,7 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot,
|
|||
BAIL_OUT;
|
||||
break;
|
||||
case 'X':
|
||||
APPEND_STR(XCONFIGFILE);
|
||||
APPEND_STR(XConfigFile);
|
||||
break;
|
||||
case 'H':
|
||||
if (!hostname) {
|
||||
|
|
@ -701,7 +702,8 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
|
|||
/* First, search for a config file. */
|
||||
while (template && !configFile) {
|
||||
if ((configPath = DoSubstitution(template, cmdline, projroot,
|
||||
&cmdlineUsed, NULL))) {
|
||||
&cmdlineUsed, NULL,
|
||||
XCONFIGFILE))) {
|
||||
if ((configFile = fopen(configPath, "r")) != 0) {
|
||||
if (cmdline && !cmdlineUsed) {
|
||||
fclose(configFile);
|
||||
|
|
@ -715,6 +717,31 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot)
|
|||
}
|
||||
template = strtok(NULL, ",");
|
||||
}
|
||||
|
||||
/* Then search for fallback */
|
||||
if (!configFile) {
|
||||
strcpy(pathcopy, path);
|
||||
template = strtok(pathcopy, ",");
|
||||
|
||||
while (template && !configFile) {
|
||||
if ((configPath = DoSubstitution(template, cmdline, projroot,
|
||||
&cmdlineUsed, NULL,
|
||||
XFREE86CFGFILE))) {
|
||||
if ((configFile = fopen(configPath, "r")) != 0) {
|
||||
if (cmdline && !cmdlineUsed) {
|
||||
fclose(configFile);
|
||||
configFile = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (configPath && !configFile) {
|
||||
xf86conffree(configPath);
|
||||
configPath = NULL;
|
||||
}
|
||||
template = strtok(NULL, ",");
|
||||
}
|
||||
}
|
||||
|
||||
xf86conffree(pathcopy);
|
||||
if (!configFile) {
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.1.10.1.4.1 2004/03/19 17:09:00 eich Exp $ */
|
||||
/* gtf.c Generate mode timings using the GTF Timing Standard
|
||||
*
|
||||
* gcc gtf.c -o gtf -lm -Wall
|
||||
|
|
@ -63,7 +64,7 @@
|
|||
*
|
||||
* This program takes a desired resolution and vertical refresh rate,
|
||||
* and computes mode timings according to the GTF Timing Standard.
|
||||
* These mode timings can then be formatted as an XFree86 modeline
|
||||
* These mode timings can then be formatted as an XServer modeline
|
||||
* or a mode description for use by fbset(8).
|
||||
*
|
||||
*
|
||||
|
|
@ -74,7 +75,7 @@
|
|||
* surrounding the addressable video); on most non-overscan type
|
||||
* systems, the margin period is zero. I've implemented the margin
|
||||
* computations but not enabled it because 1) I don't really have
|
||||
* any experience with this, and 2) neither XFree86 modelines nor
|
||||
* any experience with this, and 2) neither XServer modelines nor
|
||||
* fbset fb.modes provide an obvious way for margin timings to be
|
||||
* included in their mode descriptions (needs more investigation).
|
||||
*
|
||||
|
|
@ -102,7 +103,7 @@
|
|||
* o Error checking.
|
||||
*
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53 tsi Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53tsi Exp $ */
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
|
|
@ -145,7 +146,7 @@ typedef struct __mode
|
|||
typedef struct __options
|
||||
{
|
||||
int x, y;
|
||||
int xf86mode, fbmode;
|
||||
int xorgmode, fbmode;
|
||||
float v_freq;
|
||||
} options;
|
||||
|
||||
|
|
@ -180,7 +181,7 @@ void print_value(int n, char *name, float val)
|
|||
|
||||
|
||||
|
||||
/* print_xf86_mode() - print the XFree86 modeline, given mode timings. */
|
||||
/* print_xf86_mode() - print the XServer modeline, given mode timings. */
|
||||
|
||||
void print_xf86_mode (mode *m)
|
||||
{
|
||||
|
|
@ -282,7 +283,7 @@ void print_fb_mode (mode *m)
|
|||
* feel like testing it right now.
|
||||
*
|
||||
* XXX margin computations are implemented but not tested (nor used by
|
||||
* XFree86 of fbset mode descriptions, from what I can tell).
|
||||
* XServer of fbset mode descriptions, from what I can tell).
|
||||
*/
|
||||
|
||||
mode *vert_refresh (int h_pixels, int v_lines, float freq,
|
||||
|
|
@ -674,8 +675,9 @@ options *parse_command_line (int argc, char *argv[])
|
|||
(strcmp (argv[n], "--fbmode") == 0)) {
|
||||
o->fbmode = 1;
|
||||
} else if ((strcmp (argv[n], "-x") == 0) ||
|
||||
(strcmp (argv[n], "--xorgmode") == 0) ||
|
||||
(strcmp (argv[n], "--xf86mode") == 0)) {
|
||||
o->xf86mode = 1;
|
||||
o->xorgmode = 1;
|
||||
} else {
|
||||
goto bad_option;
|
||||
}
|
||||
|
|
@ -683,10 +685,10 @@ options *parse_command_line (int argc, char *argv[])
|
|||
n++;
|
||||
}
|
||||
|
||||
/* if neither xf86mode nor fbmode were requested, default to
|
||||
xf86mode */
|
||||
/* if neither xorgmode nor fbmode were requested, default to
|
||||
xorgmode */
|
||||
|
||||
if (!o->fbmode && !o->xf86mode) o->xf86mode = 1;
|
||||
if (!o->fbmode && !o->xorgmode) o->xorgmode = 1;
|
||||
|
||||
return (o);
|
||||
|
||||
|
|
@ -694,7 +696,7 @@ options *parse_command_line (int argc, char *argv[])
|
|||
|
||||
fprintf (stderr, "\n");
|
||||
fprintf (stderr, "usage: %s x y refresh [-v|--verbose] "
|
||||
"[-f|--fbmode] [-x|-xf86mode]\n", argv[0]);
|
||||
"[-f|--fbmode] [-x|--xorgmode]\n", argv[0]);
|
||||
|
||||
fprintf (stderr, "\n");
|
||||
|
||||
|
|
@ -708,7 +710,7 @@ options *parse_command_line (int argc, char *argv[])
|
|||
"(traces each step of the computation)\n");
|
||||
fprintf (stderr, " -f|--fbmode : output an fbset(8)-style mode "
|
||||
"description\n");
|
||||
fprintf (stderr, " -x|-xf86mode : output an XFree86-style mode "
|
||||
fprintf (stderr, " -x|--xorgmode : output an "__XSERVERNAME__"-style mode "
|
||||
"description (this is the default\n"
|
||||
" if no mode description is requested)\n");
|
||||
|
||||
|
|
@ -732,7 +734,7 @@ int main (int argc, char *argv[])
|
|||
m = vert_refresh (o->x, o->y, o->v_freq, 0, 0);
|
||||
if (!m) exit (1);
|
||||
|
||||
if (o->xf86mode)
|
||||
if (o->xorgmode)
|
||||
print_xf86_mode(m);
|
||||
|
||||
if (o->fbmode)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
.\" $XFree86$
|
||||
.\" $XFree86$
|
||||
.\" $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/gtf.man,v 1.1.10.1.4.2 2004/03/27 16:56:43 keithp Exp $
|
||||
.TH GTF 1 __vendorversion__
|
||||
.SH NAME
|
||||
gtf - calculate VESA GTF mode lines
|
||||
|
|
@ -9,14 +10,14 @@ gtf - calculate VESA GTF mode lines
|
|||
.I refresh
|
||||
.RB [ \-v | \-\-verbose ]
|
||||
.RB [ \-f | \-\-fbmode ]
|
||||
.RB [ \-x | \-\-xf86mode ]
|
||||
.RB [ \-x | \-\-xorgmode ]
|
||||
.SH DESCRIPTION
|
||||
.I Gtf
|
||||
is a utility for calculating VESA GTF modes. Given the desired
|
||||
horizontal and vertical resolutions and refresh rate (in Hz), the parameters
|
||||
for a matching VESA GTF mode are printed out. Two output formats are
|
||||
supported: mode lines suitable for the XFree86
|
||||
.B XF86Config(__filemansuffix__)
|
||||
supported: mode lines suitable for the __xservername__
|
||||
.B __xconfigfile__(__filemansuffix__)
|
||||
file, and mode parameters suitable for the Linux
|
||||
.B fbset(8)
|
||||
utility.
|
||||
|
|
@ -27,15 +28,15 @@ utility.
|
|||
Enable verbose printouts This shows a trace for each step of the
|
||||
computation.
|
||||
.TP 8
|
||||
.BR \-x | \-\-xf86mode
|
||||
Print the mode parameters as XFree86-style mode lines. This is the
|
||||
.BR \-x | \-\-xorgmode
|
||||
Print the mode parameters as __xservername__-style mode lines. This is the
|
||||
default format.
|
||||
.TP 8
|
||||
.BR \-f | \-\-fbset
|
||||
Print the mode parameters in a format suitable for
|
||||
.BR fbset(8) .
|
||||
.SH "SEE ALSO"
|
||||
XF86Config(__filemansuffix__)
|
||||
__xconfigfile__(__filemansuffix__)
|
||||
.SH AUTHOR
|
||||
Andy Ritger.
|
||||
.PP
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ o Have code to fetch the SymTabRec chipset list from a video driver.
|
|||
Cards file "uptodate" state can also be verified.
|
||||
Probably it is better to forgot about the Cards file, and
|
||||
either parse the output of scanpci, or link libscanpci.a
|
||||
(and whatever else be required) in xf86cfg.
|
||||
(and whatever else be required) in xorgcfg.
|
||||
|
||||
o Check if a module is "certified", there was some talk about a
|
||||
certification process in the past.
|
||||
|
|
@ -15,7 +15,7 @@ o Rewrite mouse driver to use the same code as video drivers, so that
|
|||
This would also require rewriting all existing input device modules.
|
||||
(Probably most of this can be made with cpp macros).
|
||||
|
||||
o Create a protocol to allow 3rd part xf86cfg modules.
|
||||
o Create a protocol to allow 3rd part xorgcfg modules.
|
||||
|
||||
o Write an interface for testing extensions/accel, maybe a frontend to
|
||||
xdpyinfo, x11perf, glxinfo, etc.
|
||||
|
|
@ -26,8 +26,8 @@ o Write a "wizard" mode, as several users find the graphical interface
|
|||
o Write code to use a Monitors database, either update the old Monitors
|
||||
file or use RedHat MonitorsDB.
|
||||
Chris Morgan is writting code to use MonitorsDB.
|
||||
If xf86cfg could be changed to ddcprobe (in all supported platforms),
|
||||
If xorgcfg could be changed to ddcprobe (in all supported platforms),
|
||||
it would be even be a better solution than using a database.
|
||||
|
||||
o Add interface to allow changing comments without the need of editing
|
||||
XF86Config with a text editor.
|
||||
config file with a text editor.
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -4742,7 +4742,7 @@ ExpertInitialize(void)
|
|||
XtAddCallback(panner, XtNreportCallback, PannerCallback, NULL);
|
||||
tree = XtCreateManagedWidget("tree", treeWidgetClass, expert, NULL, 0);
|
||||
|
||||
config = XtVaCreateManagedWidget("XF86Config", toggleWidgetClass, tree,
|
||||
config = XtVaCreateManagedWidget(__XCONFIGFILE__, toggleWidgetClass, tree,
|
||||
XtNstate, True, NULL, 0);
|
||||
mainNode = NewNode(NULL, config, config, NULL, NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -193,8 +193,8 @@ static char *device_names[] = {
|
|||
|
||||
static XtResource appResources[] = {
|
||||
#if 0
|
||||
{"xf86config", "XF86Config", XtRString, sizeof(char*),
|
||||
0, XtRString, "/etc/X11/XF86Config"},
|
||||
{"config", __XCONFIGFILE__, XtRString, sizeof(char*),
|
||||
0, XtRString, "/etc/X11/"__XCONFIGFILE__},
|
||||
#endif
|
||||
{"menuBitmap", "MenuBitmap", XtRString, sizeof(char*),
|
||||
0, XtRString, "menu10"},
|
||||
|
|
@ -205,11 +205,11 @@ Usage(void)
|
|||
{
|
||||
fprintf(stderr,
|
||||
"Usage:\n"
|
||||
" xf86cfg [-option ...]\n"
|
||||
" xorgcfg [-option ...]\n"
|
||||
"\n"
|
||||
"Options:\n"
|
||||
" -xf86config <XF86Config> Alternate configuration file.\n"
|
||||
" -modulepath <module-path> XFree86 modules location.\n"
|
||||
" -config <"__XCONFIGFILE__"> Alternate configuration file.\n"
|
||||
" -modulepath <module-path> "__XSERVERNAME__" modules location.\n"
|
||||
" -serverpath <server-path> X server to start (if $DISPLAY is not defined).\n"
|
||||
" -fontpath <font-path> Font path for fonts.\n"
|
||||
" -rgbpath <rgb-path> Where the rgb.txt file is located.\n"
|
||||
|
|
@ -217,7 +217,7 @@ Usage(void)
|
|||
" -textmode Use this option for the text only interface.\n"
|
||||
#endif
|
||||
#ifdef USE_MODULES
|
||||
" -nomodules Use this option if xf86cfg is slow to start.\n"
|
||||
" -nomodules Use this option if xorgcfg is slow to start.\n"
|
||||
" -verbose <number> Verbosity used in the loader (default 1).\n"
|
||||
#endif
|
||||
" -verify Verify modules/options integrity.\n"
|
||||
|
|
@ -253,7 +253,9 @@ main(int argc, char *argv[])
|
|||
noverify = True;
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
if (strcmp(argv[i], "-xf86config") == 0) {
|
||||
if (strcmp(argv[i], "-config") == 0 ||
|
||||
strcmp(argv[i], "-xorgconfig") == 0 ||
|
||||
strcmp(argv[i], "-xf86config") == 0) {
|
||||
if (i + 1 < argc) {
|
||||
XF86Config_path = argv[++i];
|
||||
config_set = True;
|
||||
|
|
@ -298,13 +300,13 @@ main(int argc, char *argv[])
|
|||
|
||||
startedx = startx();
|
||||
if (XF86Config_path == NULL)
|
||||
XF86Config_path = XtNewString("XF86Config-4");
|
||||
XF86Config_path = XtNewString(__XCONFIGFILE__"-4");
|
||||
if (XkbConfig_path == NULL) {
|
||||
XmuSnprintf(XkbConfig_path_static, sizeof(XkbConfig_path_static),
|
||||
"%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile);
|
||||
XkbConfig_path = XkbConfig_path_static;
|
||||
}
|
||||
toplevel = XtAppInitialize(&appcon, "XF86Cfg",
|
||||
toplevel = XtAppInitialize(&appcon, "XOrgCfg",
|
||||
NULL, 0,
|
||||
&argc, argv,
|
||||
NULL, NULL, 0);
|
||||
|
|
@ -534,9 +536,9 @@ main(int argc, char *argv[])
|
|||
# endif
|
||||
#else
|
||||
# ifdef XF86CONFIGDIR
|
||||
XF86Config_path = XtNewString(XF86CONFIGDIR "/XF86Config-4");
|
||||
XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__"-4");
|
||||
# else
|
||||
XF86Config_path = XtNewString("/etc/X11/XF86Config-4");
|
||||
XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__"-4");
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ static char *XkbRulesDir = "lib/X11/xkb/rules/";
|
|||
#ifdef XFREE98_XKB
|
||||
static char *XkbRulesFile = "xfree98";
|
||||
#else
|
||||
static char *XkbRulesFile = "xfree86";
|
||||
static char *XkbRulesFile = __XKBDEFRULES__;
|
||||
#endif
|
||||
static XF86ConfInputPtr current_input;
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
*
|
||||
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
|
||||
*
|
||||
* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.1.4.1.4.1 2004/03/04 17:48:16 eich Exp $
|
||||
* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.1.4.1.4.2.4.1 2004/03/23 13:54:01 eich Exp $
|
||||
* $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $
|
||||
*/
|
||||
|
||||
|
|
@ -188,8 +188,7 @@ LoaderInitializeOptions(void)
|
|||
first = 0;
|
||||
|
||||
checkerLegend[CHECKER_OPTIONS_FILE_MISSING] =
|
||||
"The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n"
|
||||
"In the sources, it is at xc/programs/Xserver/hw/xfree86/Options.";
|
||||
"The Options file, normally /usr/X11R6/lib/X11/Options was not found.\n";
|
||||
checkerLegend[CHECKER_OPTION_DESCRIPTION_MISSING] =
|
||||
"No description for the module option. The description should be in\n"
|
||||
"in the Options file, and using the sintax:\n"
|
||||
|
|
@ -207,7 +206,7 @@ LoaderInitializeOptions(void)
|
|||
checkerLegend[CHECKER_NO_OPTIONS_AVAILABLE] =
|
||||
"The driver does not have an AvailableOptions function, or that\n"
|
||||
"function is returning NULL. If the driver is returning NULL, and\n"
|
||||
"really does not need any options from XF86Config, than the message\n"
|
||||
"really does not need any options from "__XCONFIGFILE__", than the message\n"
|
||||
"can be ignored.";
|
||||
checkerLegend[CHECKER_NO_VENDOR_CHIPSET] =
|
||||
"The checker could not fetch the PCI chipset/vendor information from\n"
|
||||
|
|
|
|||
|
|
@ -64,10 +64,10 @@ startx(void)
|
|||
*/
|
||||
if (XFree86_path)
|
||||
c_pos = XmuSnprintf(commandline, sizeof(commandline),
|
||||
"%s/XFree86 :8 -configure ",XFree86_path);
|
||||
"%s/"__XSERVERNAME__" :8 -configure ",XFree86_path);
|
||||
else
|
||||
c_pos = XmuSnprintf(commandline, sizeof(commandline),
|
||||
"%s/bin/XFree86 :8 -configure ", XFree86Dir);
|
||||
"%s/bin/"__XSERVERNAME__" :8 -configure ", XFree86Dir);
|
||||
if (XF86Module_path && ((len = sizeof(commandline) - c_pos) > 0))
|
||||
c_pos += XmuSnprintf(commandline + c_pos,len,
|
||||
" -modulepath %s",XF86Module_path);
|
||||
|
|
@ -87,9 +87,9 @@ startx(void)
|
|||
home = "/";
|
||||
|
||||
#ifndef QNX4
|
||||
XmuSnprintf(filename, sizeof(filename), "%s/XF86Config.new", home);
|
||||
XmuSnprintf(filename, sizeof(filename), "%s/"__XCONFIGFILE__".new", home);
|
||||
#else
|
||||
XmuSnprintf(filename, sizeof(filename), "//%d%s/XF86Config.new",
|
||||
XmuSnprintf(filename, sizeof(filename), "//%d%s/"__XCONFIGFILE__".new",
|
||||
getnid(), home);
|
||||
#endif
|
||||
|
||||
|
|
@ -106,9 +106,9 @@ startx(void)
|
|||
char path[PATH_MAX];
|
||||
/* Don't change to X! see above */
|
||||
if (XFree86_path)
|
||||
XmuSnprintf(path, sizeof(path), "%s/XFree86", XFree86_path);
|
||||
XmuSnprintf(path, sizeof(path), "%s/"__XSERVERNAME__, XFree86_path);
|
||||
else
|
||||
XmuSnprintf(path, sizeof(path), "%s/bin/XFree86", XFree86Dir);
|
||||
XmuSnprintf(path, sizeof(path), "%s/bin/"__XSERVERNAME__, XFree86Dir);
|
||||
execl(path, "X", ":8", /*"+xinerama",*/ "+accessx","-allowMouseOpenFail",
|
||||
"-xf86config", XF86Config_path, (void *)NULL);
|
||||
exit(-127);
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ static char *main_menu[] = {
|
|||
#define CONF_LAYOUT 5
|
||||
"Configure layout",
|
||||
#define CONF_FINISH 6
|
||||
"Write XF86Config and quit",
|
||||
"Write "__XCONFIGFILE__" and quit",
|
||||
#define CONF_QUIT 7
|
||||
"Quit",
|
||||
};
|
||||
|
|
@ -200,23 +200,23 @@ TextMode(void)
|
|||
|
||||
ClearScreen();
|
||||
refresh();
|
||||
if (Dialog("XFree86 Configuration",
|
||||
"This program will create the XF86Config file, based on "
|
||||
if (Dialog( __XSERVERNAME__"Configuration",
|
||||
"This program will create the "__XCONFIGFILE__" file, based on "
|
||||
"menu selections you make.\n"
|
||||
"\n"
|
||||
#ifndef __UNIXOS2__
|
||||
"The XF86Config file usually resides in /usr/X11R6/etc/X11 "
|
||||
"The "__XCONFIGFILE__" file usually resides in /usr/X11R6/etc/X11 "
|
||||
#else
|
||||
"The XF86Config file usually resides in "XF86CONFIGDIR" "
|
||||
"The "__XCONFIGFILE__" file usually resides in "XF86CONFIGDIR" "
|
||||
#endif
|
||||
"or /etc/X11. A sample XF86Config file is supplied with "
|
||||
"XFree86; it is configured for a standard VGA card and "
|
||||
"or /etc/X11. A sample "__XCONFIGFILE__" file is supplied with "
|
||||
__XSERVERNAME__"; it is configured for a standard VGA card and "
|
||||
"monitor with 640x480 resolution. This program will ask for "
|
||||
"a pathname when it is ready to write the file.\n"
|
||||
"\n"
|
||||
"You can either take the sample XF86Config as a base and "
|
||||
"You can either take the sample "__XCONFIGFILE__" as a base and "
|
||||
"edit it for your configuration, or let this program "
|
||||
"produce a base XF86Config file for your configuration and "
|
||||
"produce a base "__XCONFIGFILE__" file for your configuration and "
|
||||
"fine-tune it.",
|
||||
20, 60, " Ok ", " Cancel ", 0) != 0)
|
||||
break;
|
||||
|
|
@ -295,12 +295,12 @@ WriteXF86Config(void)
|
|||
|
||||
ClearScreen();
|
||||
refresh();
|
||||
xf86config = DialogInput("Write XF86Config", "Write configuration to file:",
|
||||
xf86config = DialogInput("Write "__XCONFIGFILE__, "Write configuration to file:",
|
||||
10, 60, XF86Config_path ? XF86Config_path :
|
||||
#ifndef __UNIXOS2__
|
||||
"/etc/X11/XF86Config", " Ok ", " Cancel ", 0);
|
||||
"/etc/X11/"__XCONFIGFILE__, " Ok ", " Cancel ", 0);
|
||||
#else
|
||||
XF86CONFIGDIR"/XF86Config", " Ok ", " Cancel ", 0);
|
||||
XF86CONFIGDIR"/"__XCONFIGFILE__, " Ok ", " Cancel ", 0);
|
||||
#endif
|
||||
|
||||
if (xf86config == NULL)
|
||||
|
|
@ -711,7 +711,7 @@ KeyboardConfig(void)
|
|||
#ifdef XFREE98_XKB
|
||||
rulesfile = XKB_RULES_DIR "/xfree98";
|
||||
#else
|
||||
rulesfile = XKB_RULES_DIR "/xfree86";
|
||||
rulesfile = XKB_RULES_DIR "/"__XKBDEFRULES__;
|
||||
#endif
|
||||
rules = XkbRF_Load(rulesfile, "", True, False);
|
||||
if (rules == NULL) {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* dealings in this Software without prior written authorization from
|
||||
* Conectiva Linux.
|
||||
*
|
||||
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
|
||||
* Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
|
||||
*
|
||||
* $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,152 @@
|
|||
.\"
|
||||
.\" Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com)
|
||||
.\"
|
||||
.\" Permission is hereby granted, free of charge, to any person obtaining a
|
||||
.\" copy of this software and associated documentation files (the "Software"),
|
||||
.\" to deal in the Software without restriction, including without limitation
|
||||
.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
.\" and/or sell copies of the Software, and to permit persons to whom the
|
||||
.\" Software is furnished to do so, subject to the following conditions:
|
||||
.\"
|
||||
.\" The above copyright notice and this permission notice shall be included in
|
||||
.\" all copies or substantial portions of the Software.
|
||||
.\"
|
||||
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
.\" CONECTIVA LINUX BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
|
||||
.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
.\" SOFTWARE.
|
||||
.\"
|
||||
.\" Except as contained in this notice, the name of Conectiva Linux shall
|
||||
.\" not be used in advertising or otherwise to promote the sale, use or other
|
||||
.\" dealings in this Software without prior written authorization from
|
||||
.\" Conectiva Linux.
|
||||
.\"
|
||||
.\" Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
|
||||
.\"
|
||||
.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86cfg.man,v 1.9 2002/12/30 14:34:02 herrb Exp $
|
||||
.\"
|
||||
.TH xorgcfg __appmansuffix__ __vendorversion__
|
||||
.SH NAME
|
||||
xorgcfg - Graphical configuration tool for __xservername__
|
||||
.SH SYNOPSIS
|
||||
.B xorgcfg
|
||||
[-config\fI __xconfigfile__\fP] [-modulepath \fImoduledir\fP]
|
||||
[-fontpath \fIfontsdir\fP] [-toolkitoption ...]
|
||||
.SH DESCRIPTION
|
||||
.I Xorgcfg
|
||||
is a tool to configure\fI __xservername__\fP, and can be used to either write the
|
||||
initial configuration file or make customizations to the current configuration.
|
||||
.PP
|
||||
When the \fBDISPLAY\fP environment variable is not set, xorgcfg will run
|
||||
the command\fI __xservername__ -configure\fP to allow the xserver detect the
|
||||
hardware in the computer, and write an initial\fI __xconfigfile__\fP file
|
||||
in the user's home directory. Then, it will start
|
||||
__xservername__ and allow customizations.
|
||||
.br
|
||||
If the \fBDISPLAY\fP environment variable is set, xorgcfg will read the
|
||||
default\fI __xconfigfile__\fP, that may not be the same being used by the current
|
||||
server, and allow customizations.
|
||||
.PP
|
||||
To use an alternative location for modules or fonts the respective search
|
||||
paths may be specified.
|
||||
.PP
|
||||
Unless there is an \fBApply\fP button in the current xorgcfg dialog, the
|
||||
changes made will take place the next time\fI __xservername__\fP is started.
|
||||
|
||||
.PP
|
||||
Xorgcfg allows addition and configuration of new devices, such as video cards,
|
||||
monitors, keyboards and mouses.
|
||||
.PP
|
||||
Screen layout configuration for xinerama or traditional multi-head is also
|
||||
available.
|
||||
.PP
|
||||
Modelines can be configured or optimized.
|
||||
.PP
|
||||
AccessX basic configurations can be made in the xorgcfg's accessx section.
|
||||
|
||||
.SH OPTIONS
|
||||
.TP 8
|
||||
.I -config
|
||||
Specifies an alternate __xconfigfile__ file for configuration.
|
||||
.TP 8
|
||||
.I -modulepath
|
||||
Specifies where xorgcfg, and the server it may start, should look for
|
||||
__xservername__ modules.
|
||||
.TP 8
|
||||
.I -serverpath
|
||||
Specifies the complete path, not including the binary name, of the
|
||||
__xservername__ binary.
|
||||
.TP 8
|
||||
.I -fontpath
|
||||
Specifies the path to the fonts that should be used by the server started
|
||||
by xorgcfg.
|
||||
.TP 8
|
||||
.I -rgbpath
|
||||
Specifies the path to the rgb.txt file that should be used by the server
|
||||
started by xorgcfg, if any.
|
||||
.TP 8
|
||||
.I -textmode
|
||||
If xorgcfg was compiled with support to ncurses, this option makes xorgcfg
|
||||
enters a text mode interface.
|
||||
.TP 8
|
||||
.I -nomodules
|
||||
When built with support for loading modules, this options changes xorgcfg
|
||||
behaviour, so that it will not load any modules, and thus start quicker.
|
||||
|
||||
.SH ENVIRONMENT
|
||||
.TP 8
|
||||
.I DISPLAY
|
||||
Default host and display number
|
||||
.TP 8
|
||||
.I XWINHOME
|
||||
Directory where __xservername__ was installed, defaults to /usr/X11R6.
|
||||
.TP 8
|
||||
.I XENVIRONMENT
|
||||
Name of a resource file that overrides the global resources
|
||||
stored in the RESOURCE_MANAGER property
|
||||
|
||||
.SH FILES
|
||||
.TP 8
|
||||
.I /etc/__xconfigfile__
|
||||
Server configuration file
|
||||
.TP 8
|
||||
.I /etc/X11/__xconfigfile__
|
||||
Server configuration file
|
||||
.TP 8
|
||||
.I /usr/X11R6/etc/__xconfigfile__
|
||||
Server configuration file
|
||||
.TP 8
|
||||
.IR __projectroot__/lib/X11/__xconfigfile__. hostname
|
||||
Server configuration file
|
||||
.TP 8
|
||||
.I __projectroot__/lib/X11/__xconfigfile__
|
||||
Server configuration file
|
||||
.TP 8
|
||||
.I __projectroot__/lib/X11/app-default/XOrgCfg
|
||||
Specifies xorgcfg resources
|
||||
.TP 8
|
||||
.I __projectroot__/lib/X11/xkb/X0-config.keyboard
|
||||
Keyboard specific configuration
|
||||
|
||||
.SH "SEE ALSO"
|
||||
.IR __xservername__ (__appmansuffix__)
|
||||
.IR __xconfigfile__ (__filemansuffix__)
|
||||
|
||||
.SH COPYRIGHT
|
||||
.TP 8
|
||||
Copyright 2000, Conectiva Linux S.A.
|
||||
\fIhttp://www.conectiva.com\fP
|
||||
.TP 8
|
||||
Copyright 2000, The XFree86 Project
|
||||
\fIhttp://www.XFree86.org\fP
|
||||
|
||||
.SH AUTHORS
|
||||
.TP 8
|
||||
Paulo C\'esar Pereira de Andrade \fI<pcpa@conectiva.com.br>\fP
|
||||
originally for The XFree86 Project.
|
||||
|
||||
.SH BUGS
|
||||
Probably.
|
||||
|
|
@ -2979,7 +2979,7 @@ NOCLOCKPROBE
|
|||
|
||||
NAME Appian Jeronimo 2000
|
||||
CHIPSET PERMEDIA 3
|
||||
SERVER XFree86
|
||||
SERVER 3DLabs
|
||||
DRIVER glint
|
||||
NOCLOCKPROBE
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,22 @@
|
|||
.\" $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.man,v 1.5 2001/11/01 23:35:34 dawes Exp $
|
||||
.TH xorgconfig 1 __vendorversion__
|
||||
.SH NAME
|
||||
xorgconfig \- generate an __XCONFIGFILE__ file
|
||||
.SH SYNOPSIS
|
||||
.B xorgconfig
|
||||
.SH DESCRIPTION
|
||||
\fIxorgconfig\fP is an interactive program for generating an __XCONFIGFILE__ file
|
||||
for use with __XSERVERNAME__ X servers.
|
||||
.PP
|
||||
Note that the default name used by \fIxorgconfig\fP for the __XCONFIGFILE__ file
|
||||
is system-dependent. For instance, on some systems, __XCONFIGFILE__-4 is used,
|
||||
and on OS/2, XConfig is used.
|
||||
.SH FILES
|
||||
.TP
|
||||
.I __projectroot__/lib/X11/Cards
|
||||
Video cards database
|
||||
.SH "SEE ALSO"
|
||||
__XSERVERNAME__(1), __XCONFIGFILE__(__filemansuffix__), reconfig(1)
|
||||
.SH AUTHOR
|
||||
Harm Hanemaayer.
|
||||
.\" $TOG: xf86conf.man /main/9 1997/07/19 10:53:08 kaleb $
|
||||
|
|
@ -0,0 +1,626 @@
|
|||
XCOMM $XdotOrg$
|
||||
XCOMM
|
||||
XCOMM Copyright (c) 1994-1998 by The XFree86 Project, Inc.
|
||||
XCOMM
|
||||
XCOMM Permission is hereby granted, free of charge, to any person obtaining a
|
||||
XCOMM copy of this software and associated documentation files (the "Software"),
|
||||
XCOMM to deal in the Software without restriction, including without limitation
|
||||
XCOMM the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
XCOMM and/or sell copies of the Software, and to permit persons to whom the
|
||||
XCOMM Software is furnished to do so, subject to the following conditions:
|
||||
XCOMM
|
||||
XCOMM The above copyright notice and this permission notice shall be included in
|
||||
XCOMM all copies or substantial portions of the Software.
|
||||
XCOMM
|
||||
XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
XCOMM IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
XCOMM FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
XCOMM THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
XCOMM WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
|
||||
XCOMM OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
XCOMM SOFTWARE.
|
||||
XCOMM
|
||||
XCOMM Except as contained in this notice, the name of the XFree86 Project shall
|
||||
XCOMM not be used in advertising or otherwise to promote the sale, use or other
|
||||
XCOMM dealings in this Software without prior written authorization from the
|
||||
XCOMM XFree86 Project.
|
||||
XCOMM
|
||||
XCOMM $XConsortium: XF86Conf.cpp /main/22 1996/10/23 11:43:51 kaleb $
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM This is a sample configuration file only, intended to illustrate
|
||||
XCOMM what a config file might look like. Refer to the XF86Config(4/5)
|
||||
XCOMM man page for details about the format of this file. This man page
|
||||
XCOMM is installed as MANPAGE
|
||||
XCOMM **********************************************************************
|
||||
|
||||
XCOMM The ordering of sections is not important in version 4.0 and later.
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Files section. This allows default font and rgb paths to be set
|
||||
XCOMM **********************************************************************
|
||||
|
||||
Section "Files"
|
||||
|
||||
XCOMM The location of the RGB database. Note, this is the name of the
|
||||
XCOMM file minus the extension (like ".txt" or ".db"). There is normally
|
||||
XCOMM no need to change the default.
|
||||
|
||||
RgbPath RGBPATH
|
||||
|
||||
XCOMM Multiple FontPath entries are allowed (which are concatenated together),
|
||||
XCOMM as well as specifying multiple comma-separated entries in one FontPath
|
||||
XCOMM command (or a combination of both methods)
|
||||
|
||||
FontPath LOCALFONTPATH
|
||||
FontPath MISCFONTPATH
|
||||
FontPath DPI75USFONTPATH
|
||||
FontPath DPI100USFONTPATH
|
||||
FontPath T1FONTPATH
|
||||
FontPath TRUETYPEFONTPATH
|
||||
FontPath CIDFONTPATH
|
||||
FontPath SPFONTPATH
|
||||
FontPath DPI75FONTPATH
|
||||
FontPath DPI100FONTPATH
|
||||
|
||||
XCOMM ModulePath can be used to set a search path for the X server modules.
|
||||
XCOMM The default path is shown here.
|
||||
|
||||
XCOMM ModulePath MODULEPATH
|
||||
|
||||
EndSection
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Module section -- this is an optional section which is used to specify
|
||||
XCOMM which run-time loadable modules to load when the X server starts up.
|
||||
XCOMM **********************************************************************
|
||||
|
||||
Section "Module"
|
||||
|
||||
XCOMM This loads the DBE extension module.
|
||||
|
||||
Load "dbe"
|
||||
|
||||
XCOMM This loads the miscellaneous extensions module, and disables
|
||||
XCOMM initialisation of the XFree86-DGA extension within that module.
|
||||
|
||||
SubSection "extmod"
|
||||
Option "omit xfree86-dga"
|
||||
EndSubSection
|
||||
|
||||
XCOMM This loads the Type1 and FreeType font modules
|
||||
|
||||
Load "type1"
|
||||
Load "freetype"
|
||||
|
||||
EndSection
|
||||
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Server flags section. This contains various server-wide Options.
|
||||
XCOMM **********************************************************************
|
||||
|
||||
Section "ServerFlags"
|
||||
|
||||
XCOMM Uncomment this to cause a core dump at the spot where a signal is
|
||||
XCOMM received. This may leave the console in an unusable state, but may
|
||||
XCOMM provide a better stack trace in the core dump to aid in debugging
|
||||
|
||||
XCOMM Option "NoTrapSignals"
|
||||
|
||||
XCOMM Uncomment this to disable the <Crtl><Alt><Fn> VT switch sequence
|
||||
XCOMM (where n is 1 through 12). This allows clients to receive these key
|
||||
XCOMM events.
|
||||
|
||||
XCOMM Option "DontVTSwitch"
|
||||
|
||||
XCOMM Uncomment this to disable the <Crtl><Alt><BS> server abort sequence
|
||||
XCOMM This allows clients to receive this key event.
|
||||
|
||||
XCOMM Option "DontZap"
|
||||
|
||||
XCOMM Uncomment this to disable the <Crtl><Alt><KP_+>/<KP_-> mode switching
|
||||
XCOMM sequences. This allows clients to receive these key events.
|
||||
|
||||
XCOMM Option "DontZoom"
|
||||
|
||||
XCOMM Uncomment this to disable tuning with the xvidtune client. With
|
||||
XCOMM it the client can still run and fetch card and monitor attributes,
|
||||
XCOMM but it will not be allowed to change them. If it tries it will
|
||||
XCOMM receive a protocol error.
|
||||
|
||||
XCOMM Option "DisableVidModeExtension"
|
||||
|
||||
XCOMM Uncomment this to enable the use of a non-local xvidtune client.
|
||||
|
||||
XCOMM Option "AllowNonLocalXvidtune"
|
||||
|
||||
XCOMM Uncomment this to disable dynamically modifying the input device
|
||||
XCOMM (mouse and keyboard) settings.
|
||||
|
||||
XCOMM Option "DisableModInDev"
|
||||
|
||||
XCOMM Uncomment this to enable the use of a non-local client to
|
||||
XCOMM change the keyboard or mouse settings (currently only xset).
|
||||
|
||||
XCOMM Option "AllowNonLocalModInDev"
|
||||
|
||||
XCOMM Set the basic blanking screen saver timeout.
|
||||
|
||||
Option "blank time" "10" # 10 minutes
|
||||
|
||||
XCOMM Set the DPMS timeouts. These are set here because they are global
|
||||
XCOMM rather than screen-specific. These settings alone don't enable DPMS.
|
||||
XCOMM It is enabled per-screen (or per-monitor), and even then only when
|
||||
XCOMM the driver supports it.
|
||||
|
||||
Option "standby time" "20"
|
||||
Option "suspend time" "30"
|
||||
Option "off time" "60"
|
||||
|
||||
XCOMM On some platform the server needs to estimate the sizes of PCI
|
||||
XCOMM memory and pio ranges. This is done by assuming that PCI ranges
|
||||
XCOMM don't overlap. Some broken BIOSes tend to set ranges of inactive
|
||||
XCOMM devices wrong. Here one can adjust how aggressive the assumptions
|
||||
XCOMM should be. Default is 0.
|
||||
|
||||
XCOMM Option "EstimateSizesAggresively" "0"
|
||||
|
||||
EndSection
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Input devices
|
||||
XCOMM **********************************************************************
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Core keyboard's InputDevice section
|
||||
XCOMM **********************************************************************
|
||||
|
||||
Section "InputDevice"
|
||||
|
||||
Identifier "Keyboard1"
|
||||
Driver "keyboard"
|
||||
|
||||
XCOMM For most OSs the protocol can be omitted (it defaults to "Standard").
|
||||
XCOMM When using XQUEUE (only for SVR3 and SVR4, but not Solaris), comment
|
||||
XCOMM out the above line, and uncomment the following line.
|
||||
|
||||
XCOMM Option "Protocol" "Xqueue"
|
||||
|
||||
XCOMM Set the keyboard auto repeat parameters. Not all platforms implement
|
||||
XCOMM this.
|
||||
|
||||
Option "AutoRepeat" "500 5"
|
||||
|
||||
XCOMM Specifiy which keyboard LEDs can be user-controlled (eg, with xset(1)).
|
||||
|
||||
XCOMM Option "Xleds" "1 2 3"
|
||||
|
||||
XCOMM To disable the XKEYBOARD extension, uncomment XkbDisable.
|
||||
|
||||
XCOMM Option "XkbDisable"
|
||||
|
||||
XCOMM To customise the XKB settings to suit your keyboard, modify the
|
||||
XCOMM lines below (which are the defaults). For example, for a European
|
||||
XCOMM keyboard, you will probably want to use one of:
|
||||
XCOMM
|
||||
XCOMM Option "XkbModel" "pc102"
|
||||
XCOMM Option "XkbModel" "pc105"
|
||||
XCOMM
|
||||
XCOMM If you have a Microsoft Natural keyboard, you can use:
|
||||
XCOMM
|
||||
XCOMM Option "XkbModel" "microsoft"
|
||||
XCOMM
|
||||
XCOMM If you have a US "windows" keyboard you will want:
|
||||
XCOMM
|
||||
XCOMM Option "XkbModel" "pc104"
|
||||
XCOMM
|
||||
XCOMM Then to change the language, change the Layout setting.
|
||||
XCOMM For example, a german layout can be obtained with:
|
||||
XCOMM
|
||||
XCOMM Option "XkbLayout" "de"
|
||||
XCOMM
|
||||
XCOMM or:
|
||||
XCOMM
|
||||
XCOMM Option "XkbLayout" "de"
|
||||
XCOMM Option "XkbVariant" "nodeadkeys"
|
||||
XCOMM
|
||||
XCOMM If you'd like to switch the positions of your capslock and
|
||||
XCOMM control keys, use:
|
||||
XCOMM
|
||||
XCOMM Option "XkbOptions" "ctrl:swapcaps"
|
||||
|
||||
|
||||
XCOMM These are the default XKB settings for xorg
|
||||
XCOMM
|
||||
XCOMM Option "XkbRules" "xorg"
|
||||
XCOMM Option "XkbModel" "pc101"
|
||||
XCOMM Option "XkbLayout" "us"
|
||||
XCOMM Option "XkbVariant" ""
|
||||
XCOMM Option "XkbOptions" ""
|
||||
|
||||
EndSection
|
||||
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Core Pointer's InputDevice section
|
||||
XCOMM **********************************************************************
|
||||
|
||||
Section "InputDevice"
|
||||
|
||||
XCOMM Identifier and driver
|
||||
|
||||
Identifier "Mouse1"
|
||||
Driver "mouse"
|
||||
|
||||
XCOMM The mouse protocol and device. The device is normally set to /dev/mouse,
|
||||
XCOMM which is usually a symbolic link to the real device.
|
||||
|
||||
Option "Protocol" "Microsoft"
|
||||
Option "Device" "/dev/mouse"
|
||||
|
||||
XCOMM On platforms where PnP mouse detection is supported the following
|
||||
XCOMM protocol setting can be used when using a newer PnP mouse:
|
||||
|
||||
XCOMM Option "Protocol" "Auto"
|
||||
|
||||
XCOMM When using mouse connected to a PS/2 port (aka "MousePort"), set the
|
||||
XCOMM the protocol as follows. On some platforms some other settings may
|
||||
XCOMM be available.
|
||||
|
||||
XCOMM Option "Protocol" "PS/2"
|
||||
|
||||
XCOMM When using XQUEUE (only for SVR3 and SVR4, but not Solaris), use
|
||||
XCOMM the following instead of any of the lines above. The Device line
|
||||
XCOMM is not required in this case.
|
||||
|
||||
XCOMM Option "Protocol" "Xqueue"
|
||||
|
||||
XCOMM Baudrate and SampleRate are only for some older Logitech mice. In
|
||||
XCOMM almost every case these lines should be omitted.
|
||||
|
||||
XCOMM Option "BaudRate" "9600"
|
||||
XCOMM Option "SampleRate" "150"
|
||||
|
||||
XCOMM Emulate3Buttons is an option for 2-button mice
|
||||
XCOMM Emulate3Timeout is the timeout in milliseconds (default is 50ms)
|
||||
|
||||
XCOMM Option "Emulate3Buttons"
|
||||
XCOMM Option "Emulate3Timeout" "50"
|
||||
|
||||
XCOMM ChordMiddle is an option for some 3-button Logitech mice, or any
|
||||
XCOMM 3-button mouse where the middle button generates left+right button
|
||||
XCOMM events.
|
||||
|
||||
XCOMM Option "ChordMiddle"
|
||||
|
||||
EndSection
|
||||
|
||||
Section "InputDevice"
|
||||
Identifier "Mouse2"
|
||||
Driver "mouse"
|
||||
Option "Protocol" "MouseMan"
|
||||
Option "Device" "/dev/mouse2"
|
||||
EndSection
|
||||
|
||||
XCOMM Some examples of extended input devices
|
||||
|
||||
XCOMM Section "InputDevice"
|
||||
XCOMM Identifier "spaceball"
|
||||
XCOMM Driver "magellan"
|
||||
XCOMM Option "Device" "/dev/cua0"
|
||||
XCOMM EndSection
|
||||
XCOMM
|
||||
XCOMM Section "InputDevice"
|
||||
XCOMM Identifier "spaceball2"
|
||||
XCOMM Driver "spaceorb"
|
||||
XCOMM Option "Device" "/dev/cua0"
|
||||
XCOMM EndSection
|
||||
XCOMM
|
||||
XCOMM Section "InputDevice"
|
||||
XCOMM Identifier "touchscreen0"
|
||||
XCOMM Driver "microtouch"
|
||||
XCOMM Option "Device" "/dev/ttyS0"
|
||||
XCOMM Option "MinX" "1412"
|
||||
XCOMM Option "MaxX" "15184"
|
||||
XCOMM Option "MinY" "15372"
|
||||
XCOMM Option "MaxY" "1230"
|
||||
XCOMM Option "ScreenNumber" "0"
|
||||
XCOMM Option "ReportingMode" "Scaled"
|
||||
XCOMM Option "ButtonNumber" "1"
|
||||
XCOMM Option "SendCoreEvents"
|
||||
XCOMM EndSection
|
||||
XCOMM
|
||||
XCOMM Section "InputDevice"
|
||||
XCOMM Identifier "touchscreen1"
|
||||
XCOMM Driver "elo2300"
|
||||
XCOMM Option "Device" "/dev/ttyS0"
|
||||
XCOMM Option "MinX" "231"
|
||||
XCOMM Option "MaxX" "3868"
|
||||
XCOMM Option "MinY" "3858"
|
||||
XCOMM Option "MaxY" "272"
|
||||
XCOMM Option "ScreenNumber" "0"
|
||||
XCOMM Option "ReportingMode" "Scaled"
|
||||
XCOMM Option "ButtonThreshold" "17"
|
||||
XCOMM Option "ButtonNumber" "1"
|
||||
XCOMM Option "SendCoreEvents"
|
||||
XCOMM EndSection
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Monitor section
|
||||
XCOMM **********************************************************************
|
||||
|
||||
XCOMM Any number of monitor sections may be present
|
||||
|
||||
Section "Monitor"
|
||||
|
||||
XCOMM The identifier line must be present.
|
||||
|
||||
Identifier "Generic Monitor"
|
||||
|
||||
XCOMM HorizSync is in kHz unless units are specified.
|
||||
XCOMM HorizSync may be a comma separated list of discrete values, or a
|
||||
XCOMM comma separated list of ranges of values.
|
||||
XCOMM NOTE: THE VALUES HERE ARE EXAMPLES ONLY. REFER TO YOUR MONITOR'S
|
||||
XCOMM USER MANUAL FOR THE CORRECT NUMBERS.
|
||||
|
||||
XCOMM HorizSync 31.5 # typical for a single frequency fixed-sync monitor
|
||||
XCOMM HorizSync 30-64 # multisync
|
||||
XCOMM HorizSync 31.5, 35.2 # multiple fixed sync frequencies
|
||||
XCOMM HorizSync 15-25, 30-50 # multiple ranges of sync frequencies
|
||||
|
||||
XCOMM VertRefresh is in Hz unless units are specified.
|
||||
XCOMM VertRefresh may be a comma separated list of discrete values, or a
|
||||
XCOMM comma separated list of ranges of values.
|
||||
XCOMM NOTE: THE VALUES HERE ARE EXAMPLES ONLY. REFER TO YOUR MONITOR'S
|
||||
XCOMM USER MANUAL FOR THE CORRECT NUMBERS.
|
||||
|
||||
XCOMM VertRefresh 60 # typical for a single frequency fixed-sync monitor
|
||||
|
||||
XCOMM VertRefresh 50-100 # multisync
|
||||
XCOMM VertRefresh 60, 65 # multiple fixed sync frequencies
|
||||
XCOMM VertRefresh 40-50, 80-100 # multiple ranges of sync frequencies
|
||||
|
||||
XCOMM Modes can be specified in two formats. A compact one-line format, or
|
||||
XCOMM a multi-line format.
|
||||
|
||||
XCOMM A generic VGA 640x480 mode (hsync = 31.5kHz, refresh = 60Hz)
|
||||
XCOMM These two are equivalent
|
||||
|
||||
XCOMM ModeLine "640x480" 25.175 640 664 760 800 480 491 493 525
|
||||
|
||||
Mode "640x480"
|
||||
DotClock 25.175
|
||||
HTimings 640 664 760 800
|
||||
VTimings 480 491 493 525
|
||||
EndMode
|
||||
|
||||
XCOMM These two are equivalent
|
||||
|
||||
XCOMM ModeLine "1024x768i" 45 1024 1048 1208 1264 768 776 784 817 Interlace
|
||||
|
||||
XCOMM Mode "1024x768i"
|
||||
XCOMM DotClock 45
|
||||
XCOMM HTimings 1024 1048 1208 1264
|
||||
XCOMM VTimings 768 776 784 817
|
||||
XCOMM Flags "Interlace"
|
||||
XCOMM EndMode
|
||||
|
||||
XCOMM If a monitor has DPMS support, that can be indicated here. This will
|
||||
XCOMM enable DPMS when the monitor is used with drivers that support it.
|
||||
|
||||
XCOMM Option "dpms"
|
||||
|
||||
XCOMM If a monitor requires that the sync signals be superimposed on the
|
||||
XCOMM green signal, the following option will enable this when used with
|
||||
XCOMM drivers that support it. Only a relatively small range of hardware
|
||||
XCOMM (and drivers) actually support this.
|
||||
|
||||
XCOMM Option "sync on green"
|
||||
|
||||
EndSection
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Graphics device section
|
||||
XCOMM **********************************************************************
|
||||
|
||||
XCOMM Any number of graphics device sections may be present
|
||||
|
||||
Section "Device"
|
||||
|
||||
XCOMM The Identifier must be present.
|
||||
|
||||
Identifier "Generic VGA"
|
||||
|
||||
XCOMM The Driver line must be present. When using run-time loadable driver
|
||||
XCOMM modules, this line instructs the server to load the specified driver
|
||||
XCOMM module. Even when not using loadable driver modules, this line
|
||||
XCOMM indicates which driver should interpret the information in this section.
|
||||
|
||||
Driver "vga"
|
||||
|
||||
XCOMM The chipset line is optional in most cases. It can be used to override
|
||||
XCOMM the driver's chipset detection, and should not normally be specified.
|
||||
|
||||
XCOMM Chipset "generic"
|
||||
|
||||
XCOMM Various other lines can be specified to override the driver's automatic
|
||||
XCOMM detection code. In most cases they are not needed.
|
||||
|
||||
XCOMM VideoRam 256
|
||||
XCOMM Clocks 25.2 28.3
|
||||
|
||||
XCOMM The BusID line is used to specify which of possibly multiple devices
|
||||
XCOMM this section is intended for. When this line isn't present, a device
|
||||
XCOMM section can only match up with the primary video device. For PCI
|
||||
XCOMM devices a line like the following could be used. This line should not
|
||||
XCOMM normally be included unless there is more than one video device
|
||||
XCOMM intalled.
|
||||
|
||||
XCOMM BusID "PCI:0:10:0"
|
||||
|
||||
XCOMM Various option lines can be added here as required. Some options
|
||||
XCOMM are more appropriate in Screen sections, Display subsections or even
|
||||
XCOMM Monitor sections.
|
||||
|
||||
XCOMM Option "hw cursor" "off"
|
||||
|
||||
EndSection
|
||||
|
||||
Section "Device"
|
||||
Identifier "any supported Trident chip"
|
||||
Driver "trident"
|
||||
EndSection
|
||||
|
||||
Section "Device"
|
||||
Identifier "MGA Millennium I"
|
||||
Driver "mga"
|
||||
Option "hw cursor" "off"
|
||||
BusID "PCI:0:10:0"
|
||||
EndSection
|
||||
|
||||
Section "Device"
|
||||
Identifier "MGA G200 AGP"
|
||||
Driver "mga"
|
||||
BusID "PCI:1:0:0"
|
||||
Option "pci retry"
|
||||
EndSection
|
||||
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM Screen sections.
|
||||
XCOMM **********************************************************************
|
||||
|
||||
XCOMM Any number of screen sections may be present. Each describes
|
||||
XCOMM the configuration of a single screen. A single specific screen section
|
||||
XCOMM may be specified from the X server command line with the "-screen"
|
||||
XCOMM option.
|
||||
|
||||
Section "Screen"
|
||||
|
||||
XCOMM The Identifier, Device and Monitor lines must be present
|
||||
|
||||
Identifier "Screen 1"
|
||||
Device "Generic VGA"
|
||||
Monitor "Generic Monitor"
|
||||
|
||||
XCOMM The favoured Depth and/or Bpp may be specified here
|
||||
|
||||
DefaultDepth 8
|
||||
|
||||
SubSection "Display"
|
||||
Depth 8
|
||||
Modes "640x480"
|
||||
ViewPort 0 0
|
||||
Virtual 800 600
|
||||
EndSubsection
|
||||
|
||||
SubSection "Display"
|
||||
Depth 4
|
||||
Modes "640x480"
|
||||
EndSubSection
|
||||
|
||||
SubSection "Display"
|
||||
Depth 1
|
||||
Modes "640x480"
|
||||
EndSubSection
|
||||
|
||||
EndSection
|
||||
|
||||
|
||||
Section "Screen"
|
||||
Identifier "Screen MGA1"
|
||||
Device "MGA Millennium I"
|
||||
Monitor "Generic Monitor"
|
||||
Option "no accel"
|
||||
DefaultDepth 16
|
||||
XCOMM DefaultDepth 24
|
||||
|
||||
SubSection "Display"
|
||||
Depth 8
|
||||
Modes "1280x1024"
|
||||
Option "rgb bits" "8"
|
||||
Visual "StaticColor"
|
||||
EndSubSection
|
||||
SubSection "Display"
|
||||
Depth 16
|
||||
Modes "1280x1024"
|
||||
EndSubSection
|
||||
SubSection "Display"
|
||||
Depth 24
|
||||
Modes "1280x1024"
|
||||
EndSubSection
|
||||
EndSection
|
||||
|
||||
|
||||
Section "Screen"
|
||||
Identifier "Screen MGA2"
|
||||
Device "MGA G200 AGP"
|
||||
Monitor "Generic Monitor"
|
||||
DefaultDepth 8
|
||||
|
||||
SubSection "Display"
|
||||
Depth 8
|
||||
Modes "1280x1024"
|
||||
Option "rgb bits" "8"
|
||||
Visual "StaticColor"
|
||||
EndSubSection
|
||||
EndSection
|
||||
|
||||
|
||||
XCOMM **********************************************************************
|
||||
XCOMM ServerLayout sections.
|
||||
XCOMM **********************************************************************
|
||||
|
||||
XCOMM Any number of ServerLayout sections may be present. Each describes
|
||||
XCOMM the way multiple screens are organised. A specific ServerLayout
|
||||
XCOMM section may be specified from the X server command line with the
|
||||
XCOMM "-layout" option. In the absence of this, the first section is used.
|
||||
XCOMM When now ServerLayout section is present, the first Screen section
|
||||
XCOMM is used alone.
|
||||
|
||||
Section "ServerLayout"
|
||||
|
||||
XCOMM The Identifier line must be present
|
||||
|
||||
Identifier "Main Layout"
|
||||
|
||||
XCOMM Each Screen line specifies a Screen section name, and optionally
|
||||
XCOMM the relative position of other screens. The four names after
|
||||
XCOMM primary screen name are the screens to the top, bottom, left and right
|
||||
XCOMM of the primary screen. In this example, screen 2 is located to the
|
||||
XCOMM right of screen 1.
|
||||
|
||||
Screen "Screen MGA 1" "" "" "" "Screen MGA 2"
|
||||
Screen "Screen MGA 2" "" "" "Screen MGA 1" ""
|
||||
|
||||
XCOMM Each InputDevice line specifies an InputDevice section name and
|
||||
XCOMM optionally some options to specify the way the device is to be
|
||||
XCOMM used. Those options include "CorePointer", "CoreKeyboard" and
|
||||
XCOMM "SendCoreEvents". In this example, "Mouse1" is the core pointer,
|
||||
XCOMM and "Mouse2" is an extended input device that also generates core
|
||||
XCOMM pointer events (i.e., both mice will move the standard pointer).
|
||||
|
||||
InputDevice "Mouse1" "CorePointer"
|
||||
InputDevice "Mouse2" "SendCoreEvents"
|
||||
InputDevice "Keyboard1" "CoreKeyboard"
|
||||
|
||||
EndSection
|
||||
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "another layout"
|
||||
Screen "Screen 1"
|
||||
Screen "Screen MGA 1"
|
||||
InputDevice "Mouse1" "CorePointer"
|
||||
InputDevice "Keyboard1" "CoreKeyboard"
|
||||
EndSection
|
||||
|
||||
|
||||
Section "ServerLayout"
|
||||
Identifier "simple layout"
|
||||
Screen "Screen 1"
|
||||
InputDevice "Mouse1" "CorePointer"
|
||||
InputDevice "Keyboard1" "CoreKeyboard"
|
||||
EndSection
|
||||
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
/* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */
|
||||
/* $XdotOrg$ */
|
||||
/*
|
||||
|
||||
Copyright 1993 by Davor Matic
|
||||
|
|
@ -13,7 +14,6 @@ is" without express or implied warranty.
|
|||
|
||||
*/
|
||||
/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */
|
||||
|
||||
#define NEED_EVENTS
|
||||
#include "X.h"
|
||||
#include "Xproto.h"
|
||||
|
|
@ -65,7 +65,7 @@ extern Status XkbGetControls(
|
|||
#define XKB_CONFIG_FILE "X0-config.keyboard"
|
||||
#endif
|
||||
#ifndef XKB_DFLT_RULES_FILE
|
||||
#define XKB_DFLT_RULES_FILE "xfree86"
|
||||
#define XKB_DFLT_RULES_FILE __XKBDEFRULES__
|
||||
#endif
|
||||
#ifndef XKB_DFLT_KB_LAYOUT
|
||||
#define XKB_DFLT_KB_LAYOUT "us"
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ ddxUseMsg (void)
|
|||
|
||||
ErrorF ("-lesspointer\n"
|
||||
"\tHide the windows mouse pointer when it is over an inactive\n"
|
||||
"\tXFree86 window. This prevents ghost cursors appearing where\n"
|
||||
"\tX window. This prevents ghost cursors appearing where\n"
|
||||
"\tthe Windows cursor is drawn overtop of the X cursor\n");
|
||||
|
||||
ErrorF ("-nodecoration\n"
|
||||
|
|
@ -361,7 +361,7 @@ ddxUseMsg (void)
|
|||
ErrorF ("-[no]winkill\n"
|
||||
"\tAlt+F4 exits the X Server.\n");
|
||||
|
||||
ErrorF ("-xf86config\n"
|
||||
ErrorF ("-config\n"
|
||||
"\tSpecify a configuration file.\n");
|
||||
|
||||
ErrorF ("-keyboard\n"
|
||||
|
|
@ -1201,9 +1201,9 @@ ddxProcessArgument (int argc, char *argv[], int i)
|
|||
}
|
||||
|
||||
/*
|
||||
* Look for the '-xf86config' argument
|
||||
* Look for the '-config' argument. Accept -xf86config as an alias
|
||||
*/
|
||||
if (IS_OPTION ("-xf86config"))
|
||||
if (IS_OPTION ("-config") || IS_OPTION ("-xf86config"))
|
||||
{
|
||||
CHECK_ARGS (1);
|
||||
g_cmdline.configFile = argv[++i];
|
||||
|
|
@ -1270,7 +1270,7 @@ InitOutput (ScreenInfo *screenInfo, int argc, char *argv[])
|
|||
ErrorF ("InitOutput\n");
|
||||
#endif
|
||||
|
||||
/* Try to read the XF86Config-style configuration file */
|
||||
/* Try to read the xorg.conf-style configuration file */
|
||||
if (!winReadConfigfile ())
|
||||
ErrorF ("InitOutput - Error reading config file\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -48,13 +48,13 @@ Sets the display resolution for the X server to use on screen
|
|||
.I screen_number.
|
||||
.TP 8
|
||||
.B \-nodecoration
|
||||
Draw the Cygwin/XFree86 window without a border or title bar.
|
||||
Draw the Cygwin/X window without a border or title bar.
|
||||
.TP 8
|
||||
.B \-rootless
|
||||
EXPERIMENTAL: Run Cygwin/XFree86 in pseduo-rootless mode.
|
||||
EXPERIMENTAL: Run Cygwin/X in pseduo-rootless mode.
|
||||
.TP 8
|
||||
.B \-lesspointer
|
||||
Hide the Windows mouse pointer when over an inactive XFree86 window
|
||||
Hide the Windows mouse pointer when over an inactive X window
|
||||
.TP 8
|
||||
.B \-scrollbars
|
||||
In windowed mode, allow screens bigger than the Windows desktop.
|
||||
|
|
@ -96,14 +96,14 @@ ones are:
|
|||
- The display mode can not be changed once the X server has started.
|
||||
.PP
|
||||
.SH AUTHORS
|
||||
XFree86 was originally ported to Cygwin by Dakshinamurthy Karra,
|
||||
X was originally ported to Cygwin by Dakshinamurthy Karra,
|
||||
Dr. Peter Busch, John Fortin, and Suhaib Siddiqi.
|
||||
.I XWin
|
||||
is maintained by the Cygwin/XFree86 project, with hosting services
|
||||
provided by RedHat.
|
||||
is maintained by the Cygwin/X project, with hosting services
|
||||
provided by freedesktop.org.
|
||||
.PP
|
||||
The following members, in alphabetical order by last name, of the
|
||||
Cygwin/XFree86 Team contributed to the XFree86 4.1.0 release:
|
||||
Cygwin/X Team contributed to the X.Org Foundation 6.7 release:
|
||||
.PP
|
||||
Robert Collins - Cygwin developer, miscellaneous
|
||||
.br
|
||||
|
|
@ -112,7 +112,7 @@ programming guru
|
|||
.br
|
||||
Alexander Gottwald - AltGr handling for non-U.S. keyboards
|
||||
.br
|
||||
Alan Hourihane - XFree86 developer, patch reviewer, general programming guru
|
||||
Alan Hourihane - X developer, patch reviewer, general programming guru
|
||||
.br
|
||||
Pierre A Humblet - Debugging of socket-related crashes, developer
|
||||
.br
|
||||
|
|
|
|||
|
|
@ -41,12 +41,12 @@
|
|||
DEPTH_CHANGE_BOX DIALOG DISCARDABLE 32, 32, 180, 100
|
||||
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER
|
||||
FONT 8, "MS Sans Serif"
|
||||
CAPTION "Cygwin/XFree86"
|
||||
CAPTION "Cygwin/X"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "Dismiss", IDOK, 66, 80, 50, 14
|
||||
CTEXT "Cygwin/XFree86", IDC_STATIC, 40, 12, 100, 8
|
||||
CTEXT "Cygwin/X", IDC_STATIC, 40, 12, 100, 8
|
||||
CTEXT "Disruptive screen configuration change.", IDC_STATIC, 7, 40, 166, 8
|
||||
CTEXT "Restore previous resolution to use Cygwin/XFree86.", IDC_STATIC, 7, 52, 166, 8
|
||||
CTEXT "Restore previous resolution to use Cygwin/X.", IDC_STATIC, 7, 52, 166, 8
|
||||
END
|
||||
|
||||
|
||||
|
|
@ -55,7 +55,7 @@ END
|
|||
EXIT_DIALOG DIALOG DISCARDABLE 32, 32, 180, 70
|
||||
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_TABSTOP | DS_CENTER
|
||||
FONT 8, "MS Sans Serif"
|
||||
CAPTION "Cygwin/XFree86 - Exit?"
|
||||
CAPTION "Cygwin/X - Exit?"
|
||||
BEGIN
|
||||
PUSHBUTTON "E&xit", IDOK, 55, 48, 30, 14
|
||||
DEFPUSHBUTTON "&Cancel", IDCANCEL, 95, 48, 30, 14
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86$ */
|
||||
/* $Id$ */
|
||||
|
||||
#ifndef __WINE_DDRAW_H
|
||||
#define __WINE_DDRAW_H
|
||||
|
|
|
|||
|
|
@ -126,6 +126,11 @@ winReadConfigfile ()
|
|||
/* Parse config file into data structure */
|
||||
|
||||
filename = xf86openConfigFile (CONFIGPATH, xf86ConfigFile, PROJECTROOT);
|
||||
|
||||
/* Hack for backward compatibility */
|
||||
if (!filename && from == X_DEFAULT)
|
||||
filename = xf86openConfigFile (CONFIGPATH, "XF86Config", PROJECTROOT);
|
||||
|
||||
if (filename)
|
||||
{
|
||||
winMsg (from, "Using config file: \"%s\"\n", filename);
|
||||
|
|
@ -258,7 +263,7 @@ winConfigKeyboard (DeviceIntPtr pDevice)
|
|||
g_winInfo.xkb.variant = NULL;
|
||||
g_winInfo.xkb.options = NULL;
|
||||
# else
|
||||
g_winInfo.xkb.rules = "xfree86";
|
||||
g_winInfo.xkb.rules = "xorg";
|
||||
g_winInfo.xkb.model = "pc101";
|
||||
g_winInfo.xkb.layout = "us";
|
||||
g_winInfo.xkb.variant = NULL;
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
*
|
||||
* Authors: Alexander Gottwald
|
||||
*/
|
||||
/* $XFree86$ */
|
||||
/* $Id$ */
|
||||
#ifndef __WIN_CONFIG_H__
|
||||
#define __WIN_CONFIG_H__
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
|
||||
/*
|
||||
* Include the standard XFree86 ASCII keymap.
|
||||
* Include the standard ASCII keymap.
|
||||
*
|
||||
* This header declares a static KeySym array called 'map'.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ winShadowUpdateDD (ScreenPtr pScreen,
|
|||
ErrorF ("winShadowUpdateProcDD - Memory location of the shadow "
|
||||
"surface has changed, trying to update the root window "
|
||||
"pixmap header to point to the new address. If you get "
|
||||
"this message and Cygwin/XFree86 freezes or crashes "
|
||||
"this message and Cygwin/X freezes or crashes "
|
||||
"after this message then send a problem report and your "
|
||||
"/tmp/XWin.log file to cygwin-xfree@cygwin.com\n");
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ winInitNotifyIcon (winPrivScreenPtr pScreenPriv)
|
|||
/* Set display and screen-specific tooltip text */
|
||||
snprintf (nid.szTip,
|
||||
sizeof (nid.szTip),
|
||||
"Cygwin/XFree86 Server - %s:%d",
|
||||
"Cygwin/X Server - %s:%d",
|
||||
display,
|
||||
(int) pScreenInfo->dwScreen);
|
||||
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ winSetupImageVideo (ScreenPtr pScreen)
|
|||
|
||||
adapt->type = XvWindowMask | XvInputMask | XvImageMask;
|
||||
adapt->flags = VIDEO_OVERLAID_IMAGES | VIDEO_CLIP_TO_VIEWPORT;
|
||||
adapt->name = "Cygwin/XFree86 Video Overlay";
|
||||
adapt->name = "Cygwin/X Video Overlay";
|
||||
adapt->nEncodings = 1;
|
||||
adapt->pEncodings = DummyEncoding;
|
||||
adapt->nFormats = NUM_FORMATS;
|
||||
|
|
|
|||
|
|
@ -41,12 +41,12 @@
|
|||
#endif
|
||||
|
||||
/* Constant strings */
|
||||
#define WINDOW_CLASS "cygwin/xfree86"
|
||||
#define WINDOW_TITLE "Cygwin/XFree86 - %s:%d"
|
||||
#define WINDOW_TITLE_XDMCP "Cygwin/XFree86 - %s"
|
||||
#define WINDOW_CLASS "cygwin/x"
|
||||
#define WINDOW_TITLE "Cygwin/X - %s:%d"
|
||||
#define WINDOW_TITLE_XDMCP "Cygwin/X - %s"
|
||||
#define WIN_SCR_PROP "cyg_screen_prop rl"
|
||||
#define WINDOW_CLASS_X "cygwin/xfree86 X rl"
|
||||
#define WINDOW_TITLE_X "Cygwin/XFree86 X"
|
||||
#define WINDOW_CLASS_X "cygwin/x X rl"
|
||||
#define WINDOW_TITLE_X "Cygwin/X X"
|
||||
#define WIN_WINDOW_PROP "cyg_window_prop_rl"
|
||||
#define WIN_MSG_QUEUE_FNAME "/dev/windows"
|
||||
#define WIN_LOG_FNAME "/tmp/XWin.log"
|
||||
|
|
|
|||
Loading…
Reference in New Issue