hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-26 21:12:25 +00:00
Code Issues Projects Releases Wiki Activity

Merging XORG-CURRENT into trunk

Browse source
This commit is contained in:
Egbert Eich 2004-04-23 19:54:30 +00:00
commit 2fb5886200
1188 changed files with 20614 additions and 3558 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hw/xfree86/common/compiler.h
View file

@ -116,6 +116,10 @@ extern int ffs(unsigned long);
;
# endif
# if defined(__SUNPRO_C)
# define DO_PROTOTYPES
# endif
# if defined(NO_INLINE) || defined(DO_PROTOTYPES)
# if !defined(__sparc__) && !defined(__arm32__) \
@ -493,7 +497,7 @@ __ustw (unsigned long r5, unsigned short * r11)
# define outw(a,b) _outw(b,a)
# define outl(a,b) _outl(b,a)
# elif defined(linux) && defined(__AMD64__)
# elif defined(linux) && defined(__amd64__)
# include <inttypes.h>
@ -1728,7 +1732,7 @@ static __inline__ void ppc_flush_icache(char *addr)
: : "r"(addr) : "memory");
}
# elif defined(__sparc__)
# elif defined(__sparc__) || defined(sparc)
/*
* Like powerpc, we provide byteswapping and no byteswapping functions
* here with byteswapping as default, drivers that don't need byteswapping

2
hw/xfree86/common/extramodes
View file

@ -1,7 +1,7 @@
//
// Extra modes to include as default modes in the X server.
//
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.6 2002/11/11 04:21:46 dawes Exp $
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $
//
# 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz

2
hw/xfree86/common/modeline2c.pl
View file

@ -34,7 +34,7 @@
# the sale, use or other dealings in this Software without prior written
# authorization from the copyright holder(s) and author(s).
#
# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $
# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.10tsi Exp $
#my %flagshash;
$flagshash{""} = "0";

2
hw/xfree86/common/vesamodes
View file

@ -3,7 +3,7 @@
// "VESA and Industry Standards and Guide for Computer Display Monitor
// Timing", version 1.0, revision 0.8, adopted September 17, 1998.
//
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.4 1999/11/18 16:52:17 tsi Exp $
// $XFree86: xc/programs/Xserver/hw/xfree86/etc/vesamodes,v 1.3 1999/11/16 03:28:03 tsi Exp $
# 640x350 @ 85Hz (VESA) hsync: 37.9kHz

2
hw/xfree86/common/xf86AutoConfig.c
View file

@ -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,

5
hw/xfree86/common/xf86Config.c
View file

@ -1,4 +1,5 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
/*
@ -1101,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;

38
hw/xfree86/common/xf86Configure.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */
/*
* Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
*
@ -499,7 +499,7 @@ configureLayoutSection (void)
int scrnum = 0;
parsePrologue (XF86ConfLayoutPtr, XF86ConfLayoutRec)
ptr->lay_identifier = "XFree86 Configured";
ptr->lay_identifier = "X.org Configured";
{
XF86ConfInputrefPtr iptr;
@ -632,8 +632,8 @@ configureModuleSection (void)
/* Add only those font backends which are referenced by fontpath */
/* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
if (defaultFontPath && (
(strcmp(*el, "xtt") == 0 &&
strstr(defaultFontPath, "/TrueType")) ||
(strcmp(*el, "freetype") == 0 &&
strstr(defaultFontPath, "/TTF")) ||
(strcmp(*el, "type1") == 0 &&
strstr(defaultFontPath, "/Type1")) ||
(strcmp(*el, "speedo") == 0 &&
@ -741,6 +741,16 @@ configureDDCMonitorSection (int screennum)
case DS_ASCII_STR:
case DS_SERIAL:
case DS_RANGES:
ptr->mon_hsync[ptr->mon_n_hsync].lo =
ConfiguredMonitor->det_mon[i].section.ranges.min_h;
ptr->mon_hsync[ptr->mon_n_hsync].hi =
ConfiguredMonitor->det_mon[i].section.ranges.max_h;
ptr->mon_n_vrefresh = 1;
ptr->mon_vrefresh[ptr->mon_n_hsync].lo =
ConfiguredMonitor->det_mon[i].section.ranges.min_v;
ptr->mon_vrefresh[ptr->mon_n_hsync].hi =
ptr->mon_n_hsync++;
ConfiguredMonitor->det_mon[i].section.ranges.max_v;
default:
break;
}
@ -967,29 +977,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);

3
hw/xfree86/common/xf86DGA.c
View file

@ -1,4 +1,5 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */
/*
* Copyright (c) 1998-2002 by The XFree86 Project, Inc.
*

1
hw/xfree86/common/xf86Date.h
View file

@ -1,3 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.1.4.2 2003/12/06 13:24:23 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */
/*
* Copyright (c) 2003 by The XFree86 Project, Inc.

2
hw/xfree86/common/xf86DefModes.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */
/* $XFree86$ */
/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at
* modeline2c.pl */

3
hw/xfree86/common/xf86Events.c
View file

@ -49,6 +49,7 @@
*/
/* $XConsortium: xf86Events.c /main/46 1996/10/25 11:36:30 kaleb $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 1.1.4.3 2003/12/06 13:24:24 kaleb Exp $ */
/* [JCH-96/01/21] Extended std reverse map to four buttons. */
@ -402,7 +403,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg)
/* */
/* otherwise fallback to sending a key event message to */
/* the current screen's driver: */
if (*pScr->HandleMessage) {
if (*pScr->HandleMessage != NULL) {
(void) (*pScr->HandleMessage)(pScr->scrnIndex,
"KeyEventMessage", message, &retstr);
}

68
hw/xfree86/common/xf86Init.c
View file

@ -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
@ -1339,15 +1344,15 @@ ddxProcessArgument(int argc, char **argv, int i)
return 2;
}
}
if (!strcmp(argv[i], "-xf86config"))
if (!strcmp(argv[i], "-config") || !strcmp(argv[i], "-xf86config"))
{
if (!argv[i + 1])
return 0;
if (getuid() != 0 && !xf86PathIsSafe(argv[i + 1])) {
FatalError("\nInvalid argument for -xf86config\n"
"\tFor non-root users, the file specified with -xf86config must be\n"
FatalError("\nInvalid argument for -config\n"
"\tFor non-root users, the file specified with -config must be\n"
"\ta relative path and must not contain any \"..\" elements.\n"
"\tUsing default XF86Config search path.\n\n");
"\tUsing default "__XCONFIGFILE__" search path.\n\n");
}
xf86ConfigFile = argv[i + 1];
return 2;
@ -1636,6 +1641,11 @@ ddxProcessArgument(int argc, char **argv, int i)
return xf86ProcessArgument(argc, argv, i);
}
/* ddxInitGlobals - called by |InitGlobals| from os/util.c */
void ddxInitGlobals(void)
{
}
/*
* ddxUseMsg --
* Print out correct use of device dependent commandline options.
@ -1650,15 +1660,14 @@ ddxUseMsg()
ErrorF("Device Dependent Usage\n");
if (getuid() == 0)
{
ErrorF("-xf86config file specify a configuration file\n");
ErrorF("-modulepath paths specify the module search path\n");
ErrorF("-logfile file specify a log file name\n");
ErrorF("-configure probe for devices and write an XF86Config\n");
ErrorF("-configure probe for devices and write an "__XCONFIGFILE__"\n");
}
else
{
ErrorF("-xf86config file specify a configuration file, relative to the\n");
ErrorF(" XF86Config search path, only root can use absolute\n");
ErrorF("-config file specify a configuration file, relative to the\n");
ErrorF(" "__XCONFIGFILE__" search path, only root can use absolute\n");
}
ErrorF("-probeonly probe for devices, then exit\n");
ErrorF("-scanpci execute the scanpci module and exit\n");
@ -1706,7 +1715,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 +1723,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 +1789,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");

2
hw/xfree86/common/xf86KbdMach.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */
/*
*****************************************************************************
* HISTORY

1
hw/xfree86/common/xf86Mode.c
View file

@ -1,3 +1,4 @@
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.

22
hw/xfree86/common/xf86Module.h
View file

@ -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 {

3
hw/xfree86/common/xf86RandR.c
View file

@ -1,5 +1,6 @@
/* $XdotOrg$ */
/*
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*

2
hw/xfree86/common/xf86Version.h
View file

@ -1,3 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */
/*
@ -58,3 +59,4 @@
#endif
/* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */

4
hw/xfree86/common/xf86cmap.c
View file

@ -1,3 +1,4 @@
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */
/*
* Copyright (c) 1998-2001 by The XFree86 Project, Inc.
@ -26,7 +27,8 @@
* authorization from the copyright holder(s) and author(s).
*/
#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__)
#if defined(_XOPEN_SOURCE) || defined(__QNXNTO__) \
|| (defined(sun) && defined(__SVR4))
#include <math.h>
#else
#define _XOPEN_SOURCE /* to get prototype for pow on some systems */

9
hw/xfree86/common/xf86pciBus.c
View file

@ -310,7 +310,7 @@ FindPCIVideoInfo(void)
(memType)PCIGETMEMORY64HIGH(pcrp->pci_base1) << 32;
#else
if (pcrp->pci_base1)
info->memBase[0] = 0;
info->memBase[0] = 0;
#endif
}
}
@ -910,10 +910,15 @@ removeOverlapsWithBridges(int busIndex, resPtr target)
{
PciBusPtr pbp;
resPtr tmp,bridgeRes = NULL;
resRange range = target->val;
resRange range;
if (!target)
return;
if (!ResCanOverlap(&target->val))
return;
range = target->val;
for (pbp=xf86PciBus; pbp; pbp = pbp->next) {
if (pbp->primary == busIndex) {

2
hw/xfree86/common/xf86sbusBus.c
View file

@ -20,7 +20,7 @@
* 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.
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */
#include <ctype.h>
#include <stdio.h>

2
hw/xfree86/common/xf86sbusBus.h
View file

@ -20,7 +20,7 @@
* 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.
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */
#ifndef _XF86_SBUSBUS_H
#define _XF86_SBUSBUS_H

2
hw/xfree86/common/xf86xv.c
View file

@ -28,7 +28,7 @@
* authorization from the copyright holder(s) and author(s).
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.38 2004/02/19 22:38:12 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */
#include "misc.h"
#include "xf86.h"

2
hw/xfree86/common/xisb.c
View file

@ -24,7 +24,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */
/*
X Input Serial Buffer routines for use in any XInput driver that accesses

2
hw/xfree86/common/xisb.h
View file

@ -24,7 +24,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */
/* $XFree86$ */
#ifndef _xisb_H_
#define _xisb_H_

20
hw/xfree86/common/xorgHelper.c Normal file
View file

@ -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;
}

51
hw/xfree86/common/xorgVersion.h Normal file
View file

@ -0,0 +1,51 @@
/* $XdotOrg$ */
/*
* 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$ */

2
hw/xfree86/ddc/DDC.HOWTO
View file

@ -94,4 +94,4 @@
$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.3 1999/09/25 14:37:16 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/ddc/DDC.HOWTO,v 1.2 1998/12/06 13:30:39 dawes Exp $

2
hw/xfree86/ddc/ddcProperty.c
View file

@ -3,7 +3,7 @@
*
* Copyright 1999 by Andrew C Aitchison <A.C.Aitchison@dpmms.cam.ac.uk>
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.10 2003/11/03 05:11:04 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */
#include "misc.h"
#include "xf86.h"

2
hw/xfree86/ddc/edid.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.4 2003/02/17 16:08:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */
/* edid.c: retrieve EDID record from raw DDC1 data stream: data
* is contained in an array of unsigned int each unsigned int

2
hw/xfree86/ddc/edid.h
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.7 2000/04/20 21:28:26 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */
/* edid.h: defines to parse an EDID block
*

2
hw/xfree86/ddc/interpret_edid.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.8 2000/07/13 21:31:37 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */
/* interpret_edid.c: interpret a primary EDID block
*

2
hw/xfree86/ddc/interpret_vdif.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.6 2000/01/21 02:30:00 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */
#include "Xarch.h"
#include "xf86DDC.h"

2
hw/xfree86/ddc/print_edid.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.16 2003/09/24 02:43:17 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */
/* print_edid.c: print out all information retrieved from display device
*

2
hw/xfree86/ddc/print_vdif.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */
#include "vdif.h"
#include "misc.h"

2
hw/xfree86/ddc/vdif.h
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.5 2003/11/06 18:37:58 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */
#ifndef _VDIF_H
#define _VDIF_H

4
hw/xfree86/ddc/xf86DDC.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.27 2003/10/30 17:48:19 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.c,v 1.26 2003/08/22 17:56:24 dawes Exp $ */
/* xf86DDC.c
*
@ -34,7 +34,7 @@ static XF86ModuleVersionInfo ddcVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_VIDEODRV, /* needs the video driver ABI */
ABI_VIDEODRV_VERSION,

2
hw/xfree86/ddc/xf86DDC.h
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.11 2003/02/17 16:08:27 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */
/* xf86DDC.h
*

2
hw/xfree86/dixmods/afbmodule.c
View file

@ -36,7 +36,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

2
hw/xfree86/dixmods/cfb16module.c
View file

@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

2
hw/xfree86/dixmods/cfb24module.c
View file

@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

2
hw/xfree86/dixmods/cfb32module.c
View file

@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

2
hw/xfree86/dixmods/cfbmodule.c
View file

@ -38,7 +38,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

4
hw/xfree86/dixmods/dbemodule.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.7 2000/01/25 18:37:37 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/dbe/dbemodule.c,v 1.6 1999/01/26 05:53:50 dawes Exp $ */
#include "xf86Module.h"
@ -20,7 +20,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,

2
hw/xfree86/dixmods/fbmodule.c
View file

@ -36,7 +36,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

4
hw/xfree86/dixmods/laymodule.c
View file

@ -1,5 +1,5 @@
/*
* $XFree86: xc/programs/Xserver/miext/layer/laymodule.c,v 1.1 2002/11/08 22:19:55 keithp Exp $
* $XFree86$
*
* Copyright © 2000 Keith Packard
*
@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

2
hw/xfree86/dixmods/mfbmodule.c
View file

@ -35,7 +35,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

4
hw/xfree86/dixmods/recordmod.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.6 2000/01/25 18:37:50 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */
#include "xf86Module.h"
@ -21,7 +21,7 @@ static XF86ModuleVersionInfo VersRec = {
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 13, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,

4
hw/xfree86/dixmods/shmodule.c
View file

@ -1,5 +1,5 @@
/*
* $XFree86: xc/programs/Xserver/miext/shadow/shmodule.c,v 1.1 2000/09/03 05:07:24 keithp Exp $
* $XFree86$
*
* Copyright © 2000 Keith Packard
*
@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_ANSIC, /* Only need the ansic layer */
ABI_ANSIC_VERSION,

5
hw/xfree86/doc/README.DRI
View file

@ -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,6 @@ 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: xc/programs/Xserver/hw/xfree86/doc/README.DRI,v 1.22 2003/07/15 02:28:28 dawes Exp $

100
hw/xfree86/doc/README.fonts
View file

@ -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,6 @@ 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 $
Generated from Id: fonts.sgml,v 1.1.4.3.2.2 eich Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.fonts,v 1.28 2003/12/20 19:47:28 dawes Exp $

2
hw/xfree86/doc/README.rapidaccess
View file

@ -45,4 +45,4 @@ Dennis Bj
$XFree86: xc/programs/Xserver/hw/xfree86/doc/README.rapidaccess,v 1.1 2001/05/18 23:35:32 dawes Exp $
$XFree86$

40
hw/xfree86/doc/changelogs/CHANGELOG
View file

@ -1,41 +1,3 @@
XFree86 4.4.99.2 (xx March 2004)
XFree86 4.4.99.1 (12 March 2004)
18. IRIX allows for a relatively low number of command arguments, so break up
font clean rules accordingly (Marc La France).
17. Change radeon driver to save/restore colour lookup tables
(Marc La France).
16. Fix ix86 pre-Solaris8 mmap() problems by deleting obsolete code
(Marc La France).
15. Fix build glitch on SunOS SPARC (Marc La France).
14. Clean up constype utility used on SPARC's (Marc La France).
13. Experimental changes to recognise parameterised macros in makedepend
(From #6003, Alexander Stohr).
12. Change scanpci utility to optionally display PCI bus linkages
(Marc La France).
11. Fixes for building on Solaris/sparc with Sun's compiler (Mark Kandianis).
10. Add support for specifying the screen origins for Xvfb, which is
useful when Xinerama is enabled (David Dawes).
9. Fix X-Resource extension server crash when the client and server hosts
have different endianness (Bugzilla #1242, Alan Coopersmith).
8. Fix an off-by-one error that can lead to malloc problems (Bugzilla #512,
Kyle Bateman).
7. Xterm patch #185 (Thomas Dickey).
6. Do the Linux KDKBDREP ioctl on the correct fd. This prevents the
fallback that tries to directly program the keyboard repeat rate,
and the related warning messages that recent Linux kernels generate
(David Dawes).
5. Turn off the DAC for Radeon DPMS modes. Without this some monitors
can be badly affected. (Bugzilla #1221, Hui Yu@ATI, reported by
Paul Shupak).
4. VeraIt.ttf wasn't getting installed (Bugzilla #1226, Matthieu Herrb).
3. Fix an attempted free of an invalid pointer in ScreenSaverSetAttributes()
(Bugzilla #1224, Matthieu Herrb, David Dawes).
2. Fix a build problem when build server side GL libraries on a system
with no installed X headers (Alan Hourihane).
1. Fix HTML man page index generation to handle recent rman changes
(David Dawes).
XFree86 4.4.0 (29 February 2004)
821. Fix Radeon secondary head register initialization (Hui Yu@ATI,
Benjamin Herrenschmidt).
@ -18721,7 +18683,7 @@ XFree86 3.0a (28 April 1994)
XFree86 3.0 (26 April 1994)
$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3173 2004/03/12 12:09:11 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.3156 2004/02/29 04:25:24 martin Exp $

2
hw/xfree86/doc/changelogs/CHANGELOG.ND
View file

@ -415,4 +415,4 @@ XFree86 3.9j (12 July 1997)
$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.3 1998/08/02 05:16:54 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG.ND,v 1.2 1998/07/31 10:41:14 dawes Exp $

2
hw/xfree86/doc/devel/Domain.note
View file

@ -156,4 +156,4 @@ Most drivers currently used on ix86 need(ed) source code changes.
multi-domain architectures, and support for Mach64 variants as
non-primary heads is not yet available.
$XFree86: xc/programs/Xserver/hw/xfree86/Domain.note,v 1.2 2002/01/25 21:55:49 tsi Exp $
$XFree86$

5
hw/xfree86/doc/devel/README.DRIcomp
View file

@ -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,6 @@ 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: xc/programs/Xserver/hw/xfree86/doc/README.DRIcomp,v 3.17 2003/07/15 02:28:28 dawes Exp $

2
hw/xfree86/doc/devel/Registry
View file

@ -407,4 +407,4 @@ and underscores removed.
$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.19 2003/02/20 04:05:12 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/Registry,v 1.18 2002/04/06 18:31:09 tsi Exp $

691
hw/xfree86/doc/man/Xorg.man.pre Normal file
View file

@ -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.

1872
hw/xfree86/doc/man/xorg.conf.man.pre Normal file
View file

File diff suppressed because it is too large Load diff

32
hw/xfree86/doc/sgml/DESIGN.sgml
View file

@ -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
@ -36,7 +38,7 @@
<ident>
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.54 2003/12/19 20:38:57 dawes Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/DESIGN.sgml,v 1.53 2003/08/23 14:10:14 dawes Exp $
</ident>
@ -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

2
hw/xfree86/dummylib/README
View file

@ -4,4 +4,4 @@ There is one symbol per source/object so that each can be overriden
individually by whatever uses this library.
$XFree86: xc/programs/Xserver/hw/xfree86/dummylib/README,v 1.1 2000/02/13 03:06:38 dawes Exp $
$XFree86$

2
hw/xfree86/dummylib/dummylib.h
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
#ifndef _DUMMY_LIB_H
#define _DUMMY_LIB_H

2
hw/xfree86/dummylib/fatalerror.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/fatalerror.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/getvalidbios.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.3 2001/05/15 10:19:41 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/logvwrite.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/logvwrite.c,v 1.1 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/pcitestmulti.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/pcitestmulti.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/verrorf.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorf.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xalloc.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.2 2002/11/09 09:00:13 herrb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86addrestolist.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.3 2002/12/24 15:50:43 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */
#include "xf86.h"

2
hw/xfree86/dummylib/xf86allocscripi.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86allocscripi.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86drvmsg.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86drvmsgverb.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86errorf.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86errorfverb.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86getpagesize.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getpagesize.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86getverb.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86getverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86info.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86info.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86msg.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86msgverb.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86opt.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.2 2001/05/04 19:05:50 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86screens.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86screens.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86servisinit.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86servisinit.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

2
hw/xfree86/dummylib/xf86verbose.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86verbose.c,v 1.1 2000/02/13 03:06:43 dawes Exp $ */
/* $XFree86$ */
#include "X.h"
#include "os.h"

4
hw/xfree86/fbdevhw/fbdevhw.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.32 2003/08/26 10:57:03 daenzer Exp $ */
/* all driver need this */
#include "xf86.h"
@ -40,7 +40,7 @@ static XF86ModuleVersionInfo fbdevHWVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
0, 0, 2,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,

2
hw/xfree86/fbdevhw/fbdevhw.h
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.12 2003/10/30 17:37:16 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */
#ifndef _FBDEVHW_H_
#define _FBDEVHW_H_

5
hw/xfree86/fbdevhw/fbdevhw.man.pre
View file

@ -1,4 +1,4 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.2 2001/01/27 18:20:56 dawes Exp $
.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $
.TH FBDEVHW __drivermansuffix__ __vendorversion__
.SH NAME
fbdevhw \- os-specific submodule for framebuffer device access
@ -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

2
hw/xfree86/fbdevhw/fbdevhwstub.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */
#include "xf86.h"
#include "xf86cmap.h"

2
hw/xfree86/fbdevhw/fbpriv.h
View file

@ -2,7 +2,7 @@
* copyed from from linux kernel 2.2.4
* removed internal stuff (#ifdef __KERNEL__)
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.3 2000/08/11 17:27:14 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */
#ifndef _LINUX_FB_H
#define _LINUX_FB_H

37
hw/xfree86/getconfig/cfg.man.pre
View file

@ -1,4 +1,3 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/cfg.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
.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.

25
hw/xfree86/getconfig/cfg.sample
View file

@ -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.2 2003/11/12 04:52:15 dawes Exp $
# 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

4
hw/xfree86/getconfig/getconfig
View file

@ -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.

26
hw/xfree86/getconfig/getconfig.man.pre
View file

@ -1,7 +1,6 @@
.\" $XFree86: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.man,v 1.1 2003/11/12 04:52:15 dawes Exp $
.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.

31
hw/xfree86/getconfig/getconfig.pl
View file

@ -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;
}

50
hw/xfree86/getconfig/xorg.cfg Normal file
View file

@ -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
#

2
hw/xfree86/i2c/xf86i2c.c
View file

@ -6,7 +6,7 @@
* (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.15 2003/08/29 21:08:06 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */
#if 1
#include "misc.h"

2
hw/xfree86/i2c/xf86i2c.h
View file

@ -2,7 +2,7 @@
* Copyright (C) 1998 Itai Nahshon, Michael Schimek
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.11 2003/08/29 21:08:06 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */
#ifndef _XF86I2C_H
#define _XF86I2C_H

4
hw/xfree86/i2c/xf86i2cmodule.c
View file

@ -5,7 +5,7 @@
* (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de>
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.7 1999/04/11 13:11:02 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2cmodule.c,v 1.6 1999/01/26 05:54:10 dawes Exp $ */
#include "xf86Module.h"
@ -17,7 +17,7 @@ static XF86ModuleVersionInfo i2cVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 2, 0,
ABI_CLASS_VIDEODRV, /* This needs the video driver ABI */
ABI_VIDEODRV_VERSION,

2
hw/xfree86/int10/INT10.HOWTO
View file

@ -341,4 +341,4 @@ XF86_AL,XF86_BL,XF86_CL,XF86_DL to access the lower byte of the
AX,BX,CX and DX register.
$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.3 2001/04/30 14:34:57 tsi Exp $
$XFree86: xc/programs/Xserver/hw/xfree86/int10/INT10.HOWTO,v 1.2 2000/02/08 13:13:22 eich Exp $

2
hw/xfree86/int10/generic.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.29 2003/09/24 02:43:33 dawes Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.28 2003/09/08 14:25:30 eich Exp $ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment

2
hw/xfree86/int10/helper_exec.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.27 2003/12/23 22:32:38 tsi Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.26 2003/11/06 18:38:12 tsi Exp $ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment

2
hw/xfree86/int10/helper_mem.c
View file

@ -1,4 +1,4 @@
/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.26 2002/11/25 14:05:01 eich Exp $ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.25 2002/09/16 18:06:08 eich Exp $ */
/*
* XFree86 int10 module
* execute BIOS int 10h calls in x86 real mode environment

Some files were not shown because too many files have changed in this diff Show more