frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged changes from RELEASE-1 branch

This commit is contained in:
Egbert Eich 2004-04-15 10:17:35 +00:00
parent 629c379222
commit c6c6d0de23
169 changed files with 15608 additions and 1507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GL/glx/single2.c
View File

@ -344,7 +344,7 @@ int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap)
if ( atof( string ) > atof( GLServerVersion ) ) {
buf = __glXMalloc( __glXStrlen( string )
+ __glXStrlen( GLServerVersion )
+ 3 );
+ 4 );
if ( buf == NULL ) {
string = GLServerVersion;
}

6
XTrap/xtrapdi.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.6tsi Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
@ -77,7 +77,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/xtrapddmi.h>
#include <X11/extensions/xtrapproto.h>
#include "colormapst.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#include "cursor.h"
@ -1559,7 +1559,7 @@ void XETrapStampAndMail(xEvent *x_event)
/* Copy the event information into our local memory */
(void)memcpy(&(data.u.event),x_event,sizeof(xEvent));
#ifdef XINERAMA
#ifdef PANORAMIX
if (!noPanoramiXExtension &&
(data.u.event.u.u.type == MotionNotify ||
data.u.event.u.u.type == ButtonPress ||

1
Xext/panoramiX.h
View File

@ -27,6 +27,7 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */
/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */

10
Xext/saver.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/*
* $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
*
@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium.
#include "gcstruct.h"
#include "cursorstr.h"
#include "colormapst.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -677,7 +677,7 @@ ScreenSaverHandle (pScreen, xstate, force)
ret = TRUE;
}
#ifdef XINERAMA
#ifdef PANORAMIX
if(noPanoramiXExtension || !pScreen->myNum)
#endif
SendScreenSaverNotify (pScreen, state, force);
@ -1195,7 +1195,7 @@ ScreenSaverUnsetAttributes (ClientPtr client)
static int
ProcScreenSaverSetAttributes (ClientPtr client)
{
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
REQUEST(xScreenSaverSetAttributesReq);
PanoramiXRes *draw;
@ -1274,7 +1274,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
static int
ProcScreenSaverUnsetAttributes (ClientPtr client)
{
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
REQUEST(xScreenSaverUnsetAttributesReq);
PanoramiXRes *draw;

36
Xext/shape.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
/************************************************************
@ -113,7 +113,7 @@ static DISPATCH_PROC(SProcShapeQueryVersion);
static DISPATCH_PROC(SProcShapeRectangles);
static DISPATCH_PROC(SProcShapeSelectInput);
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -376,9 +376,9 @@ ProcShapeRectangles (client)
stuff->xOff, stuff->yOff, createDefault);
}
#ifdef XINERAMA
#ifdef PANORAMIX
static int
ProcXineramaShapeRectangles(
ProcPanoramiXShapeRectangles(
register ClientPtr client)
{
REQUEST(xShapeRectanglesReq);
@ -465,9 +465,9 @@ ProcShapeMask (client)
stuff->xOff, stuff->yOff, createDefault);
}
#ifdef XINERAMA
#ifdef PANORAMIX
static int
ProcXineramaShapeMask(
ProcPanoramiXShapeMask(
register ClientPtr client)
{
REQUEST(xShapeMaskReq);
@ -580,9 +580,9 @@ ProcShapeCombine (client)
}
#ifdef XINERAMA
#ifdef PANORAMIX
static int
ProcXineramaShapeCombine(
ProcPanoramiXShapeCombine(
register ClientPtr client)
{
REQUEST(xShapeCombineReq);
@ -649,9 +649,9 @@ ProcShapeOffset (client)
}
#ifdef XINERAMA
#ifdef PANORAMIX
static int
ProcXineramaShapeOffset(
ProcPanoramiXShapeOffset(
register ClientPtr client)
{
REQUEST(xShapeOffsetReq);
@ -1065,30 +1065,30 @@ ProcShapeDispatch (client)
case X_ShapeQueryVersion:
return ProcShapeQueryVersion (client);
case X_ShapeRectangles:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShapeRectangles (client);
return ProcPanoramiXShapeRectangles (client);
else
#endif
return ProcShapeRectangles (client);
case X_ShapeMask:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShapeMask (client);
return ProcPanoramiXShapeMask (client);
else
#endif
return ProcShapeMask (client);
case X_ShapeCombine:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShapeCombine (client);
return ProcPanoramiXShapeCombine (client);
else
#endif
return ProcShapeCombine (client);
case X_ShapeOffset:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShapeOffset (client);
return ProcPanoramiXShapeOffset (client);
else
#endif
return ProcShapeOffset (client);

24
Xext/shm.c
View File

@ -62,7 +62,7 @@ in this Software without prior written authorization from The Open Group.
#include "xf86_ansic.h"
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -560,9 +560,9 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
}
#ifdef XINERAMA
#ifdef PANORAMIX
static int
ProcXineramaShmPutImage(register ClientPtr client)
ProcPanoramiXShmPutImage(register ClientPtr client)
{
int j, result = 0, orig_x, orig_y;
PanoramiXRes *draw, *gc;
@ -600,7 +600,7 @@ ProcXineramaShmPutImage(register ClientPtr client)
}
static int
ProcXineramaShmGetImage(ClientPtr client)
ProcPanoramiXShmGetImage(ClientPtr client)
{
PanoramiXRes *draw;
DrawablePtr drawables[MAXSCREENS];
@ -714,7 +714,7 @@ ProcXineramaShmGetImage(ClientPtr client)
}
static int
ProcXineramaShmCreatePixmap(
ProcPanoramiXShmCreatePixmap(
register ClientPtr client)
{
ScreenPtr pScreen = NULL;
@ -1080,10 +1080,8 @@ CreatePmap:
shmdesc->addr + stuff->offset);
if (pMap)
{
#ifdef NO_XINERAMA_PORT
#ifdef PIXPRIV
pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
#endif
#endif
shmdesc->refcnt++;
pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
@ -1110,21 +1108,21 @@ ProcShmDispatch (client)
case X_ShmDetach:
return ProcShmDetach(client);
case X_ShmPutImage:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShmPutImage(client);
return ProcPanoramiXShmPutImage(client);
#endif
return ProcShmPutImage(client);
case X_ShmGetImage:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShmGetImage(client);
return ProcPanoramiXShmGetImage(client);
#endif
return ProcShmGetImage(client);
case X_ShmCreatePixmap:
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
return ProcXineramaShmCreatePixmap(client);
return ProcPanoramiXShmCreatePixmap(client);
#endif
return ProcShmCreatePixmap(client);
default:

8
Xext/xtest.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
/*
@ -64,7 +64,7 @@ static unsigned char XTestReqCode;
extern int DeviceValuator;
#endif /* XINPUT */
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -391,7 +391,7 @@ ProcXTestFakeInput(client)
return BadValue;
}
#ifdef XINERAMA
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
ScreenPtr pScreen = root->drawable.pScreen;
BoxRec box;
@ -426,7 +426,7 @@ ProcXTestFakeInput(client)
else if (ev->u.keyButtonPointer.rootY >= root->drawable.height)
ev->u.keyButtonPointer.rootY = root->drawable.height - 1;
#ifdef XINERAMA
#ifdef PANORAMIX
if ((!noPanoramiXExtension
&& root->drawable.pScreen->myNum != XineramaGetCursorScreen())
|| (noPanoramiXExtension && root != GetCurrentRootWindow()))

21
Xext/xvdisp.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */
/* $XdotOrg$ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@ -73,7 +73,7 @@ SOFTWARE.
#include "xvdisp.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
@ -233,14 +233,14 @@ ProcXvDispatch(ClientPtr client)
case xv_QueryAdaptors: return(ProcXvQueryAdaptors(client));
case xv_QueryEncodings: return(ProcXvQueryEncodings(client));
case xv_PutVideo:
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return(XineramaXvPutVideo(client));
else
#endif
return(ProcXvPutVideo(client));
case xv_PutStill:
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return(XineramaXvPutStill(client));
else
@ -253,14 +253,14 @@ ProcXvDispatch(ClientPtr client)
case xv_SelectVideoNotify: return(ProcXvSelectVideoNotify(client));
case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client));
case xv_StopVideo:
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return(XineramaXvStopVideo(client));
else
#endif
return(ProcXvStopVideo(client));
case xv_SetPortAttribute:
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return(XineramaXvSetPortAttribute(client));
else
@ -270,7 +270,7 @@ ProcXvDispatch(ClientPtr client)
case xv_QueryBestSize: return(ProcXvQueryBestSize(client));
case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client));
case xv_PutImage:
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return(XineramaXvPutImage(client));
else
@ -278,7 +278,7 @@ ProcXvDispatch(ClientPtr client)
return(ProcXvPutImage(client));
#ifdef MITSHM
case xv_ShmPutImage:
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return(XineramaXvShmPutImage(client));
else
@ -1863,7 +1863,7 @@ SWriteListImageFormatsReply(
}
#ifdef XINERAMA
#ifdef PANORAMIX
@ -2079,8 +2079,7 @@ XineramaXvPutStill(ClientPtr client)
client, stuff->port, XvXRTPort, SecurityReadAccess)))
return _XvBadPort;
isRoot = (draw->type == XRT_WINDOW) &&
(stuff->drawable == WindowTable[0]->drawable.id);
isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
x = stuff->drw_x;
y = stuff->drw_y;

8
Xext/xvmain.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/***********************************************************
Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@ -99,7 +99,7 @@ SOFTWARE.
#include "xf86_ansic.h"
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#include "xvdisp.h"
@ -172,7 +172,7 @@ XvExtensionInit()
ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
return;
}
#ifdef XINERAMA
#ifdef PANORAMIX
XineramaRegisterConnectionBlockCallback(XineramifyXv);
#endif
XvScreenGeneration = serverGeneration;
@ -271,7 +271,7 @@ XvScreenInit(ScreenPtr pScreen)
ErrorF("XvScreenInit: Unable to allocate screen private index\n");
return BadAlloc;
}
#ifdef XINERAMA
#ifdef PANORAMIX
XineramaRegisterConnectionBlockCallback(XineramifyXv);
#endif
XvScreenGeneration = serverGeneration;

25
cfb/cfbpntwin.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/cfb/cfbpntwin.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
/***********************************************************
@ -59,11 +59,9 @@ SOFTWARE.
#include "cfbmskbits.h"
#include "mi.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
extern Bool noPanoramiXExtension;
extern WindowPtr *WindowTable;
#endif
void
@ -100,11 +98,9 @@ cfbPaintWindow(pWin, pRegion, what)
}
else
{
#ifndef NO_XINERAMA_PORT
int xorg = pWin->drawable.x;
int yorg = pWin->drawable.y;
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
int index = pWin->drawable.pScreen->myNum;
if(WindowTable[index] == pWin) {
@ -117,11 +113,7 @@ cfbPaintWindow(pWin, pRegion, what)
(int)REGION_NUM_RECTS(pRegion),
REGION_RECTS(pRegion),
pWin->background.pixmap,
#ifndef NO_XINERAMA_PORT
xorg, yorg);
#else
(int)pWin->drawable.x, (int)pWin->drawable.y);
#endif
}
break;
case BackgroundPixel:
@ -149,20 +141,16 @@ cfbPaintWindow(pWin, pRegion, what)
}
else
{
#ifndef NO_XINERAMA_PORT
int xorg, yorg;
#endif
for (pBgWin = pWin;
pBgWin->backgroundState == ParentRelative;
pBgWin = pBgWin->parent);
#ifndef NO_XINERAMA_PORT
xorg = pBgWin->drawable.x;
yorg = pBgWin->drawable.y;
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
int index = pWin->drawable.pScreen->myNum;
if(WindowTable[index] == pBgWin) {
@ -176,12 +164,7 @@ cfbPaintWindow(pWin, pRegion, what)
(int)REGION_NUM_RECTS(pRegion),
REGION_RECTS(pRegion),
pWin->border.pixmap,
#ifndef NO_XINERAMA_PORT
xorg, yorg);
#else
(int) pBgWin->drawable.x,
(int) pBgWin->drawable.y);
#endif
}
break;
}

5
dbe/dbe.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dbe/dbe.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/* $Xorg: dbe.c,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ */
/******************************************************************************
*
@ -1821,8 +1821,7 @@ DbeExtensionInit()
int nStubbedScreens = 0;
Bool ddxInitSuccess;
#ifdef XINERAMA
extern Bool noPanoramiXExtension;
#ifdef PANORAMIX
if(!noPanoramiXExtension) return;
#endif

38
dix/colormap.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/colormap.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.11 2003/11/03 05:10:59 tsi Exp $ */
/***********************************************************
@ -62,11 +62,6 @@ SOFTWARE.
#ifdef LBX
#include "lbxserve.h"
#endif
#ifdef XINERAMA
#include "panoramiX.h"
#include "panoramiXsrv.h"
extern Bool noPanoramiXExtension;
#endif
extern XID clientErrorValue;
extern int colormapPrivateCount;
@ -480,23 +475,16 @@ TellNoMap (pwin, pmid)
if (wColormap(pwin) == *pmid)
{
#ifdef XINERAMA
/*
* Only deliver event for Screen 0 when Xinerama enabled
*/
if (noPanoramiXExtension ||
(!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum))) {
#endif
/* This should be call to DeliverEvent */
xE.u.u.type = ColormapNotify;
xE.u.colormap.window = pwin->drawable.id;
xE.u.colormap.colormap = None;
xE.u.colormap.new = TRUE;
xE.u.colormap.state = ColormapUninstalled;
DeliverEvents(pwin, &xE, 1, (WindowPtr)NULL);
#ifdef XINERAMA
}
#ifdef PANORAMIX
if(noPanoramiXExtension || !pwin->drawable.pScreen->myNum)
#endif
DeliverEvents(pwin, &xE, 1, (WindowPtr)NULL);
if (pwin->optional) {
pwin->optional->colormap = None;
CheckWindowOptionalNeed (pwin);
@ -515,12 +503,9 @@ TellLostMap (pwin, value)
Colormap *pmid = (Colormap *)value;
xEvent xE;
#ifdef XINERAMA
/*
* Only deliver event for Screen 0 when Xinerama enabled
*/
if (noPanoramiXExtension ||
(!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum)))
#ifdef PANORAMIX
if(!noPanoramiXExtension && pwin->drawable.pScreen->myNum)
return WT_STOPWALKING;
#endif
if (wColormap(pwin) == *pmid)
{
@ -545,12 +530,9 @@ TellGainedMap (pwin, value)
Colormap *pmid = (Colormap *)value;
xEvent xE;
#ifdef XINERAMA
/*
* Only deliver event for Screen 0 when Xinerama enabled
*/
if (noPanoramiXExtension ||
(!noPanoramiXExtension && !(pwin->drawable.pScreen->myNum)))
#ifdef PANORAMIX
if(!noPanoramiXExtension && pwin->drawable.pScreen->myNum)
return WT_STOPWALKING;
#endif
if (wColormap (pwin) == *pmid)
{

19
dix/dispatch.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/dispatch.c,v 1.1.4.5 2004/03/05 13:39:57 eich Exp $ */
/* $XdotOrg$ */
/* $Xorg: dispatch.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
/************************************************************
@ -47,7 +47,7 @@ SOFTWARE.
********************************************************/
/* The Xinerama components contained the following notice */
/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@ -75,9 +75,10 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.32 2003/11/10 18:21:45 tsi Exp $ */
#ifdef XINERAMA_DEBUG
#ifdef PANORAMIX_DEBUG
#include <stdio.h>
int ProcInitialConnection();
#endif
@ -98,7 +99,7 @@ int ProcInitialConnection();
#include "dispatch.h"
#include "swaprep.h"
#include "swapreq.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -2648,7 +2649,7 @@ ProcAllocColor(client)
else
return (retval);
}
#ifdef XINERAMA
#ifdef PANORAMIX
if (noPanoramiXExtension || !pmap->pScreen->myNum)
#endif
WriteReplyToClient(client, sizeof(xAllocColorReply), &acr);
@ -2707,7 +2708,7 @@ ProcAllocNamedColor (client)
else
return(retval);
}
#ifdef XINERAMA
#ifdef PANORAMIX
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
#endif
WriteReplyToClient(client, sizeof (xAllocNamedColorReply), &ancr);
@ -2777,7 +2778,7 @@ ProcAllocColorCells (client)
else
return(retval);
}
#ifdef XINERAMA
#ifdef PANORAMIX
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
#endif
{
@ -2856,7 +2857,7 @@ ProcAllocColorPlanes(client)
return(retval);
}
acpr.length = length >> 2;
#ifdef XINERAMA
#ifdef PANORAMIX
if (noPanoramiXExtension || !pcmp->pScreen->myNum)
#endif
{
@ -3939,7 +3940,7 @@ SendConnSetup(client, reason)
#endif
/* fill in the "currentInputMask" */
root = (xWindowRoot *)(lConnectionInfo + connBlockScreenStart);
#ifdef XINERAMA
#ifdef PANORAMIX
if (noPanoramiXExtension)
numScreens = screenInfo.numScreens;
else

10
dix/dixfonts.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/dixfonts.c,v 1.1.4.5 2004/03/05 13:39:57 eich Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.28 2003/11/08 02:02:03 dawes Exp $ */
/************************************************************************
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@ -22,8 +22,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
************************************************************************/
/*****************************************************************
/* The panoramix components contained the following notice */
/*
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
Permission is hereby granted, free of charge, to any person obtaining a copy
@ -68,7 +68,7 @@ Equipment Corporation.
#include <stdio.h>
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#endif
@ -1425,7 +1425,7 @@ bail:
if (c->err != Success) err = c->err;
if (err != Success && c->client != serverClient) {
#ifdef XINERAMA
#ifdef PANORAMIX
if (noPanoramiXExtension || !c->pGC->pScreen->myNum)
#endif
SendErrorToClient(c->client, c->reqType, 0, 0, err);

94
dix/events.c
View File

@ -47,7 +47,7 @@ SOFTWARE.
********************************************************/
/* The Xinerama components contained the following notice */
/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@ -90,7 +90,7 @@ Equipment Corporation.
#include "cursorstr.h"
#include "dixstruct.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -148,6 +148,7 @@ extern Bool XkbFilterEvents(ClientPtr, int, xEvent *);
#define XE_KBPTR (xE->u.keyButtonPointer)
#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
CallbackListPtr EventCallback;
@ -190,14 +191,14 @@ static struct {
CursorPtr current;
BoxRec hotLimits; /* logical constraints of hot spot */
Bool confined; /* confined to screen */
#if defined(SHAPE) || defined(XINERAMA)
#if defined(SHAPE) || defined(PANORAMIX)
RegionPtr hotShape; /* additional logical shape constraint */
#endif
BoxRec physLimits; /* physical constraints of hot spot */
WindowPtr win; /* window of logical position */
HotSpot hot; /* logical pointer position */
HotSpot hotPhys; /* physical pointer position */
#ifdef XINERAMA
#ifdef PANORAMIX
ScreenPtr screen; /* all others are in Screen 0 coordinates */
RegionRec Reg1; /* Region 1 for confining motion */
RegionRec Reg2; /* Region 2 for confining virtual motion */
@ -270,8 +271,9 @@ static CARD8 criticalEvents[32] =
0x7c /* key and button events */
};
#ifdef XINERAMA
#ifdef PANORAMIX
static void ConfineToShape(RegionPtr shape, int *px, int *py);
static void SyntheticMotion(int x, int y);
static void PostNewCursor(void);
@ -334,11 +336,6 @@ XineramaConstrainCursor(void)
(* pScreen->ConstrainCursor)(pScreen, &newBox);
}
#ifdef SHAPE
static void
ConfineToShape(RegionPtr, int *, int *);
#endif
static void
XineramaCheckPhysLimits(
CursorPtr cursor,
@ -594,7 +591,7 @@ XineramaChangeToCursor(CursorPtr cursor)
}
#endif /* XINERAMA */
#endif /* PANORAMIX */
void
SetMaskForEvent(mask, event)
@ -620,7 +617,7 @@ SyntheticMotion(int x, int y)
{
xEvent xE;
#ifdef XINERAMA
#ifdef PANORAMIX
/* Translate back to the sprite screen since processInputProc
will translate from sprite screen to screen 0 upon reentry
to the DIX layer */
@ -727,8 +724,7 @@ CheckVirtualMotion(
register QdEventPtr qe,
register WindowPtr pWin)
{
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaCheckVirtualMotion(qe, pWin);
return;
@ -779,7 +775,7 @@ ConfineCursorToWindow(WindowPtr pWin, Bool generateEvents, Bool confineToScreen)
{
ScreenPtr pScreen = pWin->drawable.pScreen;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaConfineCursorToWindow(pWin, generateEvents);
return;
@ -812,7 +808,7 @@ PointerConfinedToScreen()
static void
ChangeToCursor(CursorPtr cursor)
{
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XineramaChangeToCursor(cursor);
return;
@ -897,7 +893,7 @@ GetSpritePosition(px, py)
*py = sprite.hotPhys.y;
}
#ifdef XINERAMA
#ifdef PANORAMIX
int
XineramaGetCursorScreen()
{
@ -907,7 +903,7 @@ XineramaGetCursorScreen()
return 0;
}
}
#endif /* XINERAMA */
#endif /* PANORAMIX */
#define TIMESLOP (5 * 60 * 1000) /* 5 minutes */
@ -982,7 +978,7 @@ EnqueueEvent(xE, device, count)
}
if (xE->u.u.type == MotionNotify)
{
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
XE_KBPTR.rootX += panoramiXdataPtr[sprite.screen->myNum].x -
panoramiXdataPtr[0].x;
@ -1038,7 +1034,7 @@ PlayReleasedEvents(void)
CheckVirtualMotion(qe, NullWindow);
syncEvents.time.months = qe->months;
syncEvents.time.milliseconds = qe->event->u.keyButtonPointer.time;
#ifdef XINERAMA
#ifdef PANORAMIX
/* Translate back to the sprite screen since processInputProc
will translate from sprite screen to screen 0 upon reentry
to the DIX layer */
@ -1680,7 +1676,7 @@ DeliverEventsToWindow(pWin, pEvents, count, filter, grab, mskidx)
Only works for core events.
*/
#ifdef XINERAMA
#ifdef PANORAMIX
static int
XineramaTryClientEventsResult(
ClientPtr client,
@ -1713,7 +1709,7 @@ MaybeDeliverEventsToClient(pWin, pEvents, count, filter, dontClient)
{
if (wClient(pWin) == dontClient)
return 0;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
return XineramaTryClientEventsResult(
wClient(pWin), NullGrab, pWin->eventMask, filter);
@ -1727,7 +1723,7 @@ MaybeDeliverEventsToClient(pWin, pEvents, count, filter, dontClient)
{
if (SameClient(other, dontClient))
return 0;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
return XineramaTryClientEventsResult(
rClient(other), NullGrab, other->mask, filter);
@ -1870,7 +1866,7 @@ DeliverEvents(pWin, xE, count, otherParent)
Mask filter;
int deliveries;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum)
return count;
#endif
@ -1901,7 +1897,7 @@ DeliverEvents(pWin, xE, count, otherParent)
return deliveries;
}
#ifndef NO_XINERAMA_PORT
static Bool
PointInBorderSize(WindowPtr pWin, int x, int y)
{
@ -1910,7 +1906,7 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
if(POINT_IN_REGION(pWin->drawable.pScreen, &pWin->borderSize, x, y, &box))
return TRUE;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) {
int i;
@ -1926,7 +1922,6 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
#endif
return FALSE;
}
#endif /* NO_XINERAMA_PORT */
static WindowPtr
XYToWindow(int x, int y)
@ -1949,13 +1944,7 @@ XYToWindow(int x, int y)
* is made to see if the point is inside
* borderSize
*/
#ifndef NO_XINERAMA_PORT
&& (!wBoundingShape(pWin) || PointInBorderSize(pWin, x, y))
#else
&& (!wBoundingShape(pWin) ||
POINT_IN_REGION(pWin->drawable.pScreen,
&pWin->borderSize, x, y, &box))
#endif
#endif
)
{
@ -1981,7 +1970,7 @@ CheckMotion(xEvent *xE)
{
WindowPtr prevSpriteWin = sprite.win;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return XineramaCheckMotion(xE);
#endif
@ -2070,7 +2059,7 @@ DefineInitialRootWindow(win)
(*pScreen->SetCursorPosition) (pScreen, sprite.hot.x, sprite.hot.y, FALSE);
(*pScreen->DisplayCursor) (pScreen, sprite.current);
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
sprite.hotLimits.x1 = -panoramiXdataPtr[0].x;
sprite.hotLimits.y1 = -panoramiXdataPtr[0].y;
@ -2111,7 +2100,7 @@ NewCurrentScreen(newScreen, x, y)
{
sprite.hotPhys.x = x;
sprite.hotPhys.y = y;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
sprite.hotPhys.x += panoramiXdataPtr[newScreen->myNum].x -
panoramiXdataPtr[0].x;
@ -2139,7 +2128,7 @@ NewCurrentScreen(newScreen, x, y)
ConfineCursorToWindow(WindowTable[newScreen->myNum], TRUE, FALSE);
}
#ifdef XINERAMA
#ifdef PANORAMIX
static Bool
XineramaPointInWindowIsVisible(
@ -2246,7 +2235,7 @@ XineramaWarpPointer(ClientPtr client)
return Success;
}
#endif /* XINERAMA */
#endif
int
@ -2261,7 +2250,7 @@ ProcWarpPointer(client)
REQUEST_SIZE_MATCH(xWarpPointerReq);
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
return XineramaWarpPointer(client);
#endif
@ -2339,14 +2328,13 @@ ProcWarpPointer(client)
return Success;
}
#ifndef NO_XINERAMA_PORT
static Bool
BorderSizeNotEmpty(WindowPtr pWin)
{
if(REGION_NOTEMPTY(sprite.hotPhys.pScreen, &pWin->borderSize))
return TRUE;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && XineramaSetWindowPntrs(pWin)) {
int i;
@ -2358,7 +2346,6 @@ BorderSizeNotEmpty(WindowPtr pWin)
#endif
return FALSE;
}
#endif /* NO_XINERAMA_PORT */
/* "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a
passive grab set on the window to be activated. */
@ -2414,12 +2401,7 @@ CheckPassiveGrabsOnWindow(
if (GrabMatchesSecond(&tempGrab, grab) &&
(!grab->confineTo ||
(grab->confineTo->realized &&
#ifndef NO_XINERAMA_PORT
BorderSizeNotEmpty(grab->confineTo))))
#else
REGION_NOTEMPTY( grab->confineTo->drawable.pScreen,
&grab->confineTo->borderSize))))
#endif
BorderSizeNotEmpty(grab->confineTo))))
{
#ifdef XCSECURITY
if (!SecurityCheckDeviceAccess(wClient(pWin), device, FALSE))
@ -3361,7 +3343,7 @@ DoFocusEvents(dev, fromWin, toWin, mode)
FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer,
TRUE);
/* Notify all the roots */
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
else
@ -3380,7 +3362,7 @@ DoFocusEvents(dev, fromWin, toWin, mode)
NotifyNonlinearVirtual, FALSE);
}
/* Notify all the roots */
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
FocusEvent(dev, FocusIn, mode, in, WindowTable[0]);
else
@ -3398,7 +3380,7 @@ DoFocusEvents(dev, fromWin, toWin, mode)
if (fromWin == PointerRootWin)
FocusOutEvents(dev, sprite.win, ROOT, mode, NotifyPointer,
TRUE);
#ifdef XINERAMA
#ifdef PANORAMIX
if ( !noPanoramiXExtension )
FocusEvent(dev, FocusOut, mode, out, WindowTable[0]);
else
@ -3912,7 +3894,7 @@ ProcQueryPointer(client)
rep.winY = 0;
}
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension) {
rep.rootX += panoramiXdataPtr[0].x;
rep.rootY += panoramiXdataPtr[0].y;
@ -4380,7 +4362,7 @@ CheckCursorConfinement(pWin)
GrabPtr grab = inputInfo.pointer->grab;
WindowPtr confineTo;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && pWin->drawable.pScreen->myNum) return;
#endif
@ -4440,7 +4422,7 @@ ProcRecolorCursor(client)
for (nscr = 0; nscr < screenInfo.numScreens; nscr++)
{
pscr = screenInfo.screens[nscr];
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
displayed = (pscr == sprite.screen);
else
@ -4458,7 +4440,7 @@ WriteEventsToClient(pClient, count, events)
int count;
xEvent *events;
{
#ifdef XINERAMA
#ifdef PANORAMIX
xEvent eventCopy;
#endif
xEvent eventTo, *eventFrom;
@ -4469,7 +4451,7 @@ WriteEventsToClient(pClient, count, events)
return;
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension &&
(panoramiXdataPtr[0].x || panoramiXdataPtr[0].y))
{

18
dix/main.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.1.4.6 2004/03/05 13:39:57 eich Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
/***********************************************************
@ -48,7 +48,7 @@ SOFTWARE.
******************************************************************/
/* $Xorg: main.c,v 1.4 2001/02/09 02:04:40 xorgcvs Exp $ */
/* The Xinerama components contained the following notice */
/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@ -100,8 +100,8 @@ Equipment Corporation.
#include "site.h"
#include "dixfont.h"
#include "extnsionst.h"
#ifdef XINERAMA
extern Bool noPanoramiXExtension;
#ifdef PANORAMIX
#include "panoramiXsrv.h"
#else
#include "dixevents.h" /* InitEvents() */
#include "dispatch.h" /* InitProcVectors() */
@ -130,7 +130,7 @@ extern int screenPrivateCount;
extern void InitProcVectors(void);
extern Bool CreateGCperDepthArray(void);
#ifndef XINERAMA
#ifndef PANORAMIX
static
#endif
Bool CreateConnectionBlock(void);
@ -410,7 +410,7 @@ main(int argc, char *argv[], char *envp[])
DPMSEnabled = FALSE;
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
/*
* Consolidate window and colourmap information for each screen
*/
@ -426,7 +426,7 @@ main(int argc, char *argv[], char *envp[])
SetDPMSTimers();
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
if (!noPanoramiXExtension) {
if (!PanoramiXCreateConnectionBlock())
FatalError("could not create connection block info");
@ -445,7 +445,7 @@ main(int argc, char *argv[], char *envp[])
FreeScreenSaverTimer();
CloseDownExtensions();
#ifdef XINERAMA
#ifdef PANORAMIX
{
Bool remember_it = noPanoramiXExtension;
noPanoramiXExtension = TRUE;
@ -500,7 +500,7 @@ main(int argc, char *argv[], char *envp[])
static int padlength[4] = {0, 3, 2, 1};
#ifndef XINERAMA
#ifndef PANORAMIX
static
#endif
Bool

15
dix/resource.c
View File

@ -44,6 +44,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@ -71,9 +72,9 @@ dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $Xorg: resource.c,v 1.5 2001/02/09 02:04:40 xorgcvs Exp $ */
/* $XdotOrg$ */
/* $TOG: resource.c /main/41 1998/02/09 14:20:31 kaleb $ */
/* Routines to manage various kinds of resources:
@ -114,7 +115,7 @@ Equipment Corporation.
#include "dixevents.h"
#include "dixgrabs.h"
#include "cursor.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -698,7 +699,7 @@ FindAllClientResources(
}
}
#ifndef NO_XINERAMA_PORT
pointer
LookupClientResourceComplex(
ClientPtr client,
@ -724,7 +725,7 @@ LookupClientResourceComplex(
}
return NULL;
}
#endif /* NO_XINERAMA_PORT */
void
FreeClientNeverRetainResources(ClientPtr client)
@ -823,7 +824,7 @@ LegalNewID(id, client)
register ClientPtr client;
{
#ifdef XINERAMA
#ifdef PANORAMIX
XID minid, maxid;
if (!noPanoramiXExtension) {
@ -833,7 +834,7 @@ LegalNewID(id, client)
if ((id >= minid) && (id <= maxid))
return TRUE;
}
#endif /* XINERAMA */
#endif /* PANORAMIX */
return ((client->clientAsMask == (id & ~RESOURCE_ID_MASK)) &&
((clientTable[client->index].expectID <= id) ||
!LookupIDByClass(id, RC_ANY)));

20
dix/window.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/dix/window.c,v 1.1.4.5 2004/03/05 13:39:57 eich Exp $ */
/* $XdotOrg$ */
/* $Xorg: window.c,v 1.4 2001/02/09 02:04:41 xorgcvs Exp $ */
/*
@ -49,7 +49,7 @@ SOFTWARE.
*/
/* The Xinerama components contained the following notice */
/* The panoramix components contained the following notice */
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
@ -93,7 +93,7 @@ Equipment Corporation.
#include "dixstruct.h"
#include "gcstruct.h"
#include "servermd.h"
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -2328,7 +2328,7 @@ ConfigureWindow(pWin, mask, vlist, client)
event.u.u.detail = Above;
event.u.configureRequest.x = x;
event.u.configureRequest.y = y;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && (!pParent || !pParent->parent)) {
event.u.configureRequest.x += panoramiXdataPtr[0].x;
event.u.configureRequest.y += panoramiXdataPtr[0].y;
@ -2414,7 +2414,7 @@ ActuallyDoSomething:
event.u.configureNotify.aboveSibling = None;
event.u.configureNotify.x = x;
event.u.configureNotify.y = y;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && (!pParent || !pParent->parent)) {
event.u.configureNotify.x += panoramiXdataPtr[0].x;
event.u.configureNotify.y += panoramiXdataPtr[0].y;
@ -2572,7 +2572,7 @@ ReparentWindow(pWin, pParent, x, y, client)
event.u.reparent.parent = pParent->drawable.id;
event.u.reparent.x = x;
event.u.reparent.y = y;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && !pParent->parent) {
event.u.reparent.x += panoramiXdataPtr[0].x;
event.u.reparent.y += panoramiXdataPtr[0].y;
@ -2945,7 +2945,7 @@ UnrealizeTree(
{
pChild->realized = FALSE;
pChild->visibility = VisibilityNotViewable;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension && !pChild->drawable.pScreen->myNum) {
PanoramiXRes *win;
win = (PanoramiXRes*)LookupIDByType(pChild->drawable.id,
@ -3227,10 +3227,9 @@ SendVisibilityNotify(pWin)
WindowPtr pWin;
{
xEvent event;
#ifndef NO_XINERAMA_PORT
unsigned int visibility = pWin->visibility;
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
/* This is not quite correct yet, but it's close */
if(!noPanoramiXExtension) {
PanoramiXRes *win;
@ -3284,6 +3283,7 @@ SendVisibilityNotify(pWin)
win->u.win.visibility = visibility;
}
#endif
event.u.u.type = VisibilityNotify;
event.u.visibility.window = pWin->drawable.id;
event.u.visibility.state = visibility;

6
fb/fbwindow.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/fb/fbwindow.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/*
* Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
*
@ -224,7 +224,7 @@ fbFillRegionSolid (DrawablePtr pDrawable,
}
}
#ifdef XINERAMA
#ifdef PANORAMIX
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif
@ -248,7 +248,7 @@ fbFillRegionTiled (DrawablePtr pDrawable,
int xRot = pDrawable->x;
int yRot = pDrawable->y;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
{
int index = pDrawable->pScreen->myNum;

6
hw/darwin/XDarwin.man
View File

@ -10,7 +10,7 @@ XDarwin \- X window system server for Darwin operating system
#ifdef DARWIN_WITH_QUARTZ
.I XDarwin
is the X window server for Mac OS X and the Darwin operating system
provided by the XFree86 Project.
provided by the X.Org Foundation.
.I XDarwin
can run in three different modes. On Mac OS X,
.I XDarwin
@ -51,7 +51,7 @@ handles the desktop background.
#else
.I XDarwin
is the X window server for Mac OS X and the Darwin operating system
provided by the XFree86 Project. This version of
provided by the X.Org Foundation. This version of
.I XDarwin
can only be started from the Darwin text console. The Mac OS X Aqua GUI, if
present, must be shut down.
@ -147,7 +147,7 @@ Print out the server version and patchlevel.
Same as \fB\-showconfig\fP.
.SH "SEE ALSO"
.PP
X(__miscmansuffix__), XFree86(1), Xserver(1), xdm(1), xinit(1)
X(__miscmansuffix__), Xorg(1), Xserver(1), xdm(1), xinit(1)
.SH BUGS
.I XDarwin
and this man page still have many limitations. Some of the more obvious

BIN
hw/darwin/bundle/Dutch.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

104
hw/darwin/bundle/Dutch.lproj/XDarwinHelp.html.cpp
View File

File diff suppressed because one or more lines are too long

2
hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp
View File

@ -2,4 +2,4 @@
/* Most of these are set in the target application settings. */
/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/InfoPlist.strings.cpp,v 1.3 2002/07/17 01:24:55 torrey Exp $ */
NSHumanReadableCopyright = __quote__XFree86 XF86_VERSION\nCopyright 2003 XFree86 Project, Inc.__quote__;
NSHumanReadableCopyright = __quote__ X_VENDOR_NAME X_VERSION __quote__;

BIN
hw/darwin/bundle/English.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

25
hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp
View File

@ -1,19 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<html>
<head>
<title>XFree86 for Mac OS X</title>
<title>XDarwin Help</title>
</head>
<body>
<center>
<h1>XFree86 on Darwin and Mac OS X</h1>
XFree86 XF86_VERSION<br>
Release Date: XF86_REL_DATE
<h1>XDarwin X Server for Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Release Date: X_REL_DATE
</center>
<h2>Contents</h2>
<ol>
@ -27,8 +22,8 @@
<h2><a NAME="notice">Important Notice</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
#if X_PRE_RELEASE
This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
#else
If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
#endif
@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
<h2><a NAME="usage">Usage</a></h2>
<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system. (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
<h3>Multi-Button Mouse Emulation</h3>
@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
<h2><a NAME="path">Setting Your Path</a></h2>
<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
<h2><a NAME="prefs">User Preferences</a></h2>
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
</ul>
<h2><a NAME="license">License</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a

BIN
hw/darwin/bundle/French.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

26
hw/darwin/bundle/French.lproj/XDarwinHelp.html.cpp
View File

@ -1,19 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<html>
<head><META HTTP-EQUIV="content-type" CONTENT="text/html; charset=iso-8859-1">
<title>XFree86 pour Mac OS X</title>
<title>XDarwin Help</title>
</head>
<body>
<center>
<h1>XFree86 pour Darwin et Mac OS X</h1>
XFree86 XF86_VERSION<br>
Date : XF86_REL_DATE
<h1>XDarwin X Server pour Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Date : X_REL_DATE
</center>
<h2>Sommaire</h2>
<ol>
@ -28,8 +23,8 @@
</center>
<blockquote>
#if PRE_RELEASE
Ceci est une pré-version de XFree86 et ne fait par conséquent l'objet d'aucun support client. Les bogues peuvent être signalés et des patches peuvent être soumis sur la
<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la dernière version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou sur le <A HREF="http://www.XFree86.Org/cvs">répertoire CVS de XFree86</A> avant de signaler un bogue d'une pré-version.
Ceci est une pré-version de XDarwin et ne fait par conséquent l'objet d'aucun support client. Les bogues peuvent être signalés et des patches peuvent être soumis sur la
<A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge. Veuillez prendre connaissance de la dernière version sur <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> ou le X_VENDOR_LINK avant de signaler un bogue d'une pré-version.
#else
Si le serveur date de plus de 6-12 mois ou si votre matériel est plus récent que la date indiquée ci-dessus, veuillez vous procurer une version plus récente avant de signaler toute anomalie. Les bogues peuvent être signalés et des patches peuvent être soumis sur la <A HREF="http://sourceforge.net/projects/xonx/">page du projet XonX</A> chez SourceForge.
#endif
@ -39,8 +34,8 @@ Ce logiciel est distribu
<A HREF="#license">Licence du Consortium X/X11 du MIT</A> et est fourni TEL QUEL, sans garanties. Veuillez prendre connaissance de la <A HREF="#license">Licence</A> avant toute utilisation.</blockquote>
<h2><a NAME="usage">Utilisation</a></h2>
<p>XFree86 est une implémentation libre et distribuable sans contrainte du <a HREF
="http://www.x.org/">X Window System</a> produit par <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> Le serveur X window pour Darwin et Mac OS X fourni par XFree86 se nomme XDarwin. XDarwin fonctionne sous Mac OS X en mode « rootless » ou plein écran.</p>
<p>XDarwin est une X server libre et distribuable sans contrainte du <a HREF
="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin fonctionne sous Mac OS X en mode « rootless » ou plein écran.</p>
<p>Lorsque le système X window est actif en mode plein écran, il prend en charge la totalité de l'écran. Il est possible de revenir sur le bureau de Mac OS X en appuyant sur Commande-Option-A. Cette combinaison de touches peut être modifiée dans les préférences. Pour revenir dans X window, cliquer sur l'icône de XDarwin dans le Dock de Mac OS X. (Un réglage des préférences permet d'effectuer cette opération en cliquant dans une fenêtre flottante au lieu de l'icône du Dock)</p>
<p>En mode « rootless », X window system et Aqua utilisent le même affichage. La fenêtre-mère de l'affichage X11 est de la taille de l'écran et contient toutes les autre fenêtres. En mode « rootless » cette fenêtre-mère n'est pas affichée car Aqua gère le fond d'écran.</p>
<h3>Émulation de souris à plusieurs boutons</h3>
@ -49,7 +44,7 @@ Ce logiciel est distribu
<h2><a NAME="path">Réglage du chemin d'accès</a></h2>
<p>Le chemin d'accès est une liste de répertoires utilisés pour la recherche d'exécutables. Les commandes X11 sont situées dans <code>/usr/X11R6/bin</code>, qui doit être ajouté à votre chemin d'accès. XDarwin fait cela par défaut, et peut également ajouter d'autres répertoires dans lesquels vous auriez installé d'autre commandes unix.</p>
<p>Les utilisateurs plus expérimentés auront déjà réglé leur chemin d'accès correctement par le biais des fichiers d'initialisation de leur shell. Dans ce cas, il est possible de demander à XDarwin de ne pas modifier le chemin d'accès initial. XDarwin lance les premiers clients X11 dans le shell d'ouverture de session par défaut. (Un shell de remplacement peut être spécifié dans les préférences.) La façon de régler le chemin d'accès dépend du shell utilisé. Ceci est documenté dans les pages "man" du shell.</p>
<p>De plus, il est possible d'ajouter les pages "man" de XFree86 à la liste des pages recherchées pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code> et la variable d'environnement <code>MANPATH</code> contient la liste des répertoires dans lesquels chercher.</p>
<p>De plus, il est possible d'ajouter les pages "man" de X11 à la liste des pages recherchées pour la documentation "man". Les pages "man" X11 se trouvent dans <code>/usr/X11R6/man</code> et la variable d'environnement <code>MANPATH</code> contient la liste des répertoires dans lesquels chercher.</p>
<h2><a NAME="prefs">Préférences</a></h2>
@ -78,8 +73,7 @@ Ce logiciel est distribu
</ul>
<h2><a NAME="license">Licence</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
The main license for XDarwin is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a

BIN
hw/darwin/bundle/German.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

72
hw/darwin/bundle/German.lproj/XDarwinHelp.html.cpp
View File

@ -1,19 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<html>
<head>
<title>XFree86 for Mac OS X</title>
<title>XDarwin Help</title>
</head>
<body>
<center>
<h1>XFree86 on Darwin and Mac OS X</h1>
XFree86 XF86_VERSION<br>
Release Date: XF86_REL_DATE
<h1>XDarwin X Server for Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Release Date: X_REL_DATE
</center>
<h2>Contents</h2>
<ol>
@ -27,43 +22,54 @@
<h2><a NAME="notice">Important Notice</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
#if X_PRE_RELEASE
This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
#else
If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
#endif
</blockquote>
<blockquote>
This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
<h2><a NAME="usage">Usage</a></h2>
<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> XFree86 runs on Mac OS X in full screen mode. When the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, just click on the XDarwin icon in the floating switch window to switch back to the X window system. You can change this behavior in the user preferences so that clicking on the XDarwin icon in the Dock switches as well.</p>
<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system. (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
<h3>Multi-Button Mouse Emulation</h3>
<p>Many X11 applications rely on the use of a 3-button mouse. To emulate a 3-button mouse with a single button, select "Enable emulation of multiple mouse buttons" in the Preferences. When emulating a 3-button mouse, holding down the left command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the left option key and clicking will simulate the third button.</p>
<p>Notes:</p>
<ul>
<li>With most keyboards the left and right command and option keys are not differentiated so either will work.
<li>Even with command and/or option keys mapped to some other key with xmodmap, you still must use the original command and option keys for multibutton mouse emulation.
<li>The only way to simulate holding down the left command key and clicking the second mouse button is to map some other key to be the left command key. The same is true for simulating holding down the left option key and clicking the third mouse button.
</ul>
<p>Many X11 applications rely on the use of a 3-button mouse. You can emulate a 3-button mouse with a single button by holding down various modifier keys while you click the mouse button. This is controlled by settings in the "Multi-Button Mouse Emulation" section of the "General" preferences. By default, emulation is on and holding down the command key and clicking the mouse button will simulate clicking the second mouse button. Holding down the option key and clicking will simulate the third button. You can change to any combination of modifiers to emulate buttons two and three in the preferences. Note, even if the modifiers keys are mapped to some other key with xmodmap, you still must use the actual keys specified in the preferences for multi-button mouse emulation.</p>
<h2><a NAME="path">Setting Your Path</a></h2>
<p>The X11 binaries are located in /usr/X11R6/bin, which you may need to add to your path. Your path is the list of directories to be searched for executable commands. The way to do this depends on the shell you are using. The following directions are for tcsh, which is the default shell on Darwin and Mac OS X.</p>
<p>You can check your path by typing "printenv PATH". You should see /usr/X11R6/bin listed as one of the directories. If not, you should add it to your default path. To do so, you can add the following line to the file ~/Library/init/tcsh/path: (You may need to create this file and directory path if it does not exist already.)</p>
<blockquote>setenv PATH "${PATH}:/usr/X11R6/bin"</blockquote>
<p>Note that if you have created a .cshrc or .tcshrc file, these files will override your settings in ~/Library/init/tcsh/ and you will need to change one of these files instead. These changes will not take effect until you open a new Terminal window. You may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in /usr/X11R6/man and the MANPATH environment variable contains the list of directories to search.</p>
<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
<h2><a NAME="prefs">User Preferences</a></h2>
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed under Startup Options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
<h3>General</h3>
<ul>
<li>Key combination button: Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
<li>Use System beep for X11: When enabled the standard Mac OS X alert sound is used as X11 bell. When disabled (default) a simple tone is used.</li>
<li>Click on icon in Dock switches to X11: Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
<li>Show help on startup: This will show the introductory splash screen when XDarwin is launched.</li>
<li>Display number: This sets what X display number XDarwin should assign to the display. Note that XDarwin always takes over the main display when showing X11.</li>
<li>Keymapping: By default, XDarwin loads the keymapping from the Darwin kernel on startup. On portables, this keymapping is sometimes empty so that the keyboard will appear to be dead in X11. If "Load from file" is selected, XDarwin will load the keymapping from the specified file instead.</li>
<li><b>Use System beep for X11:</b> When enabled the standard Mac OS X alert sound is used as the X11 bell. When disabled (default) a simple tone is used.</li>
<li><b>Allow X11 to change mouse acceleration:</b> In a standard X window system implementation, the window manager can change the mouse acceleration. This can lead to confusion as the mouse acceleration may be set to different values by the Mac OS X System Preferences and the X window manager. By default, X11 is not allowed to change the mouse acceleration to avoid this problem.</li>
<li><b>Multi-Button Mouse Emulation:</b> This is described above under <a HREF="#usage">Usage</a>. When emulation is enabled the selected modifiers must be held down when the mouse button is pushed to emulate the second or third mouse buttons.</li>
</ul>
<h3>Start Up</h3>
<ul>
<li><b>Default Mode:</b> If the user does not indicate whether to run in full screen or rootless mode, the mode specified here will be used.</li>
<li><b>Show mode pick panel on startup:</b> By default, a panel is displayed when XDarwin is started to allow the user to choose between full screen or rootless mode. If this option is turned off, the default mode will be started automatically.</li>
<li><b>X11 Display number:</b> X11 allows there to be multiple displays managed by separate X servers on a single computer. The user may specify an integer display number for XDarwin to use if more than one X server is going to be run simultaneously.</li>
<li><b>Allow Xinerama multiple monitor support:</b> XDarwin supports multiple monitors with Xinerama, which treats all monitors as being part of one large rectangular screen. You can disable Xinerama with this option, but currently XDarwin does not handle multiple monitors correctly without it. If you only have a single monitor, Xinerama is automatically disabled.</li>
<li><b>Keymapping File:</b> A keymapping file is read at startup and translated to an X11 keymap. Keymapping files, available for a wide variety of languages, are found in <code>/System/Library/Keyboards</code>.</li>
<li><b>Starting First X11 Clients:</b> When XDarwin is started from the Finder, it will run <code>xinit</code> to launch the X window manager and other X clients. (See "<code>man xinit</code>" for more information.) Before XDarwin runs <code>xinit</code> it will add the specified directories to the user's path. By default only <code>/usr/X11R6/bin</code> is added. Additional directories may added, separated by a colon. The X clients are started in the user's default login shell so that the user's shell initialization files are read. If desired, an alternate shell may be specified.</li>
</ul>
<h3>Full Screen</h3>
<ul>
<li><b>Key combination button:</b> Click this button and then press any number of modifiers followed by a standard key to change the key combination to switch between Aqua and X11.</li>
<li><b>Click on icon in Dock switches to X11:</b> Enable this to activate switching to X11 by clicking on the XDarwin icon in the Dock. On some versions of Mac OS X, switching by clicking in the Dock can cause the cursor to disappear on returning to Aqua.</li>
<li><b>Show help on startup:</b> This will show an introductory splash screen when XDarwin is started in full screen mode.</li>
<li><b>Color bit depth:</b> In full screen mode, the X11 display can use a different color bit depth than is used by Aqua. If "Current" is specified, the depth used by Aqua when XDarwin starts will be used. Otherwise 8, 15, or 24 bits may be specified.</li>
</ul>
<h2><a NAME="license">License</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which doesn't impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a

182
hw/darwin/bundle/Japanese.lproj/Credits.rtf
View File

@ -1,185 +1,193 @@
{\rtf1\mac\ansicpg10000\cocoartf102
{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\fswiss\fcharset77 Helvetica-Oblique;
\f3\fnil\fcharset78 HiraKakuPro-W3;}
{\rtf1\mac\ansicpg10001\cocoartf102
{\fonttbl\f0\fnil\fcharset78 HiraKakuPro-W3;\f1\fswiss\fcharset77 Helvetica;\f2\fswiss\fcharset77 Helvetica-Bold;
\f3\fswiss\fcharset77 Helvetica-Oblique;}
{\colortbl;\red255\green255\blue255;}
\vieww13980\viewh11160\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
\f0\fs24 \cf0 This product includes software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and its contributors. The following people contributed to Darwin/Mac OS X support.\
\f0\fs24 \cf0 \'82\'b1\'82\'cc\'90\'bb\'95\'69\'82\'cd
\f1 XFree86
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67
\f1 (http://www.xfree86.org/)
\f0 \'82\'a8\'82\'e6\'82\'d1\'82\'bb\'82\'cc\'8d\'76\'8c\'a3\'8e\'d2\'82\'c9\'82\'e6\'82\'c1\'82\'c4\'8a\'4a\'94\'ad\'82\'b3\'82\'ea\'82\'bd\'83\'5c\'83\'74\'83\'67\'83\'45\'83\'46\'83\'41\'82\'f0\'8a\'dc\'82\'f1\'82\'c5\'82\'a2\'82\'dc\'82\'b7\'81\'42\'8e\'9f\'82\'cc\'90\'6c\'81\'58\'82\'cd Darwin
\f1 /Mac OS X
\f0 \'82\'cc\'83\'54\'83\'7c\'81\'5b\'83\'67\'82\'c9\'8d\'76\'8c\'a3\'82\'b5\'82\'dc\'82\'b5\'82\'bd\'81\'42
\f1 \
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\f1\b \cf0 Contributors to Xorg Foundation Release:
\f0\b0 \
\f2\b \cf0 Contributors to Xorg Foundation Release:
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Kaleb KEITHLEY\
\f2\i Working left and right Ctrl, Alt (Option), Meta (Command) and Shift keys.
\f0\i0 \
\f0 \'8d\'b6\'89\'45\'82\'cc Ctrl,Alt(Option),Meta(Command) \'82\'a8\'82\'e6\'82\'d1 Shift \'83\'4c\'81\'5b\'82\'cc\'93\'ae\'8d\'ec
\f1 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\b \cf0 \
\f1\b \cf0 Contributors to XFree86 4.4:
\f0\b0 \
\f2\b \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\cf0 Contributors to XFree86 4.4:
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 John Harper
\f2\i \
\f3\i \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3\i0 \cf0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
\f0 \
\f0\i0 \cf0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'41\'83\'4e\'83\'5a\'83\'89\'83\'8c\'81\'5b\'83\'56\'83\'87\'83\'93 \'82\'a8\'82\'e6\'82\'d1 Apple-WM \'8a\'67\'92\'a3
\f1 \
Torrey T. Lyons\
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\b \cf0 \
\f2\b \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\cf0 Additional XonX Contributors to XFree86 4.3:
\f0\b0 \
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Fabr\'92cio Luis de Castro\
\f3 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f0 \'83\'7c\'83\'8b\'83\'67\'83\'4b\'83\'8b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Michael Oland\
\f3 \'90\'56\'82\'b5\'82\'a2
\f0 XDarwin
\f3 \'83\'41\'83\'43\'83\'52\'83\'93
\f0 \
\f0 \'90\'56\'82\'b5\'82\'a2
\f1 XDarwin
\f0 \'83\'41\'83\'43\'83\'52\'83\'93
\f1 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\b \cf0 \
\f2\b \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\cf0 XonX Contributors to XFree86 4.2:
\f0\b0 \
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Rob Braun\
Darwin x86
\f2\i
\f3\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f0 \
\f3\i
\f0\i0 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f1 \
Pablo Di Noto\
\f2\i
\f3\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f3\i
\f0\i0 \'83\'58\'83\'79\'83\'43\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Paul Edens\
\f2\i
\f3\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f3\i
\f0\i0 \'83\'49\'83\'89\'83\'93\'83\'5f\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Kyunghwan Kim\
\f2\i
\f3\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f3\i
\f0\i0 \'8a\'d8\'8d\'91\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Mario Klebsch\
\f3 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f0 \
\f0 \'94\'f1US\'83\'4c\'81\'5b\'83\'7b\'81\'5b\'83\'68 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f1 \
Torrey T. Lyons\
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
\f0 \
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
\f1 \
Andreas Monitzer\
\f3 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f0 \'83\'68\'83\'43\'83\'63\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Patrik Montgomery\
\f2\i
\f3\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f3\i
\f0\i0 \'83\'58\'83\'45\'83\'46\'81\'5b\'83\'66\'83\'93\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Greg Parker\
\f3 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f0 \
\f0 \'83\'8b\'81\'5b\'83\'67\'83\'8c\'83\'58 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f1 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
\f0 \
\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
\f1 \
\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
Olivier Verdier\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f2\i \cf0
\f3\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f3\i \cf0
\f0\i0 \'83\'74\'83\'89\'83\'93\'83\'58\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\b \cf0 \
\f2\b \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\cf0 Special Thanks:
\f0\b0 \
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Devin Poolman and Zero G Software, Inc.\
\f2\i
\f3\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
\f0 \
\f3\i
\f0\i0 \'83\'43\'83\'93\'83\'58\'83\'67\'81\'5b\'83\'89
\f1 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f1\b \cf0 \
\f2\b \cf0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\cf0 XonX Team Members\
Contributing to XFree86 4.1:
\f0\b0 \
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Rob Braun\
Darwin x86
\f3 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f0 \
\f0 \'83\'54\'83\'7c\'81\'5b\'83\'67
\f1 \
Torrey T. Lyons\
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
\f0 \
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67 \'83\'8a\'81\'5b\'83\'5f\'81\'5b
\f1 \
Andreas Monitzer\
Cocoa
\f3 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
\f0 \
\f0 \'94\'c5 XDarwin \'83\'74\'83\'8d\'83\'93\'83\'67\'83\'47\'83\'93\'83\'68
\f1 \
Greg Parker\
\f3 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
\f0 \
\f0 \'8d\'c5\'8f\'89\'82\'cc Quartz \'83\'43\'83\'93\'83\'76\'83\'8a\'83\'81\'83\'93\'83\'67
\f1 \
Christoph Pfisterer\
\f3 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
\f0 \
\f0 \'8b\'a4\'97\'4c\'83\'89\'83\'43\'83\'75\'83\'89\'83\'8a
\f1 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f3 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
\f0 \
\f0 \cf0 \'93\'63\'92\'86 \'8f\'72\'8c\'f5
\f1 \
\f3 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f0 \
\f0 \'93\'fa\'96\'7b\'8c\'ea\'83\'8d\'81\'5b\'83\'4a\'83\'89\'83\'43\'83\'59
\f1 \
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\f1\b \cf0 Special Thanks:
\f0\b0 \
\f2\b \cf0 Special Thanks:
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 Tiago Ribeiro\
XDarwin
\f3 \'83\'41\'83\'43\'83\'52\'83\'93
\f0 \
\f0 \'83\'41\'83\'43\'83\'52\'83\'93
\f1 \
\
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\qc
\f1\b \cf0 History:
\f0\b0 \
\f2\b \cf0 History:
\f1\b0 \
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\cf0 John Carmack\
\f3 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
\f0 \
\f0 XFree86 \'82\'cc Mac OS X Server \'82\'d6\'82\'cc\'8d\'c5\'8f\'89\'82\'cc\'88\'da\'90\'41
\f1 \
Dave Zarzycki\
XFree86 4.0
\f3 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
\f0 \
\f0 \'82\'f0 Darwin 1.0 \'82\'c9\'88\'da\'90\'41
\f1 \
Torrey T. Lyons\
XFree86 4.0.2
\f3 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}
\f0 \'83\'76\'83\'8d\'83\'57\'83\'46\'83\'4e\'83\'67\'82\'d6\'82\'cc\'93\'9d\'8d\'87}

BIN
hw/darwin/bundle/Japanese.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

290
hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp
View File

@ -1,149 +1,141 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
<title>
XFree86 for Mac OS X</title></head>
<body>
<center>
<h1>XFree86 on Darwin and Mac OS X</h1>
XFree86 XF86_VERSION<br>
Release Date: XF86_REL_DATE
</center>
<h2>目次</h2>
<ol>
<li><A HREF="#notice">注意事項</A></li>
<li><A HREF="#usage">使用法</A></li>
<li><A HREF="#path">パスの設定</A></li>
<li><A HREF="#prefs">環境設定</A></li>
<li><A HREF="#license">ライセンス</A></li>
</ol>
<center>
<h2><a NAME="notice">注意事項</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
これは，XFree86 のプレリリースバージョンであり，いかなる場合においてもサポートされません。
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
プレリリースバージョンのバグを報告する前に，<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> プロジェクトページまたは <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS リポジトリ</A>で最新版のチェックをして下さい。
#else
もし，サーバーが 6 -12 ヶ月以上前のものか，またはあなたのハードウェアが上記の日付よりも新しいものならば，問題を報告する前により新しいバージョンを探してみてください。
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
#endif
</blockquote>
<blockquote>
本ソフトウェアは，<A HREF="#license">MIT X11/X Consortium License</A> の条件に基づき，無保証で，「そのまま」の形で供給されます。
ご使用になる前に，<A HREF="#license">ライセンス条件</A>をお読み下さい。
</blockquote>
<h2><a NAME="usage">使用法</a></h2>
<p>XFree86 は，<a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a>によって作成された，再配布可能なオープンソースの <a HREF="http://www.x.org/">X Window System</a> の実装です。
XFree86 によって提供される Darwin と Mac OS X のための X Window サーバーを XDarwin と呼びます。
XDarwin は，Mac OS X 上でフルスクリーンモードまたはルートレスモードで動作します。</p>
<p>フルスクリーンモードでは，X Window System がアクティブな時，それは全画面を占有します。
あなたは，Command-Option-A キーを押すことによって Mac OS X デスクトップへ切り替えることができます。このキーの組み合わせは，環境設定で変更可能です。
Mac OS X デスクトップから X Window System へ切り替える場合は，ドックに表示された XDarwin アイコンをクリックして下さい。
（環境設定で，フローティング・ウィンドウに表示された XDarwin アイコンをクリックするように変更することができます。）</p>
<p>ルートレスモードでは，X Window System と Aqua は画面を共有します。
X11 が表示するルートウィンドウは画面のサイズであり，他の全てのウィンドウを含んでいます。
Aqua がデスクトップの背景を制御するので，X11 のルートウィンドウはルートレスモードでは表示されません。</p>
<h3>複数ボタンマウスのエミュレーション</h3>
<p>多くの X11 アプリケーションは，3 ボタンマウスを必要とします。
あなたはマウスボタンのクリックと同時にいくつかの修飾キーを押すことによって，一つのボタンで 3 ボタンマウスをエミュレーションすることができます。
これは，環境設定の「一般設定」の「複数ボタンマウスのエミュレーション」セクションで設定します。
デフォルトでは，エミュレーションは有効で，コマンドキーを押しながらマウスボタンをクリックすることは第 2 マウスボタンのクリックに相当します。
オプションキーを押しながらクリックすることは第 3 マウスボタンのクリックに相当します。
あなたは，環境設定でボタン 2 と 3 をエミュレートするために使用する修飾キーの組合せを変更することができます。
注：修飾キーを xmodmap で他のキーに割り当てている場合でも，複数ボタンマウスのエミュレーションでは本来のコマンドキーやオプションキーを使わなければなりません。</p>
<h2><a NAME="path">パスの設定</a></h2>
<p>パスは， 実行可能なコマンドを検索するディレクトリのリストです。
X11 バイナリは，<code>/usr/X11R6/bin</code> に置かれます。あなたはそれをパスに加える必要があります。
XDarwin は，これをデフォルトで行います。また，あなたがコマンドライン・アプリケーションをインストールした追加のディレクトリを加えることができます。</p>
<p>経験豊かなユーザーは，すでに自らのシェルのために初期化ファイルを使用してパスを設定しているでしょう。
この場合，あなたは環境設定で XDarwin があなたのパスを変更しないように設定することができます。
XDarwin は，ユーザーのデフォルトのログインシェルで最初の X11 クライアントを開始します。
（環境設定で代わりのシェルを指定することができます。）
パスを設定する方法は，あなたが使用しているシェルに依存します。
これは，シェルのマニュアルページドキュメントに記載されています。
<p>また，あなたはドキュメントを探している時，XFree86 のマニュアルページを検索されるページのリストに追加したいと思うかもしれません。
X11 のマニュアルページは <code>/usr/X11R6/man</code> に置かれます。そして <code>MANPATH</code> 環境変数は検索するディレクトリのリストを含んでいます。</p>
<h2><a NAME="prefs">環境設定</a></h2>
<p>「XDarwin」メニューの「環境設定...」メニュー項目からアクセスできる環境設定パネルで，いくつかのオプションを設定することができます。
「起動オプション」の内容は，XDarwin を再起動するまで有効となりません。
他の全てのオプションの内容は，直ちに有効となります。
以下，それぞれのオプションについて説明します:</p>
<h3>一般設定</h3>
<ul>
<li><b>X11 でシステムのビープ音を使用する:</b> オンの場合，Mac OS X のビープ音が X11 のベルとして使用されます。オフの場合（デフォルト），シンプル トーンが使われます。</li>
<li><b>X11 のマウスアクセラレーションを有効にする:</b> 標準的な X Window System の実装では，ウィンドウマネージャーはマウスの加速度を変更することができます。
マウスの加速度に Mac OS X のシステム環境設定と X ウィンドウマネージャーが異なる値を設定した場合，これは混乱を招きます。
この問題を避けるため，デフォルトでは X11 のマウスアクセラレーションを有効としません。</li>
<li><b>複数ボタンマウスのエミュレーション:</b> <a HREF="#usage">使用法</a>を参照して下さい。オンの場合，マウスボタンが第 2 または第 3 のマウスボタンをエミュレートする時に，選択した修飾キーを同時に押します。</li>
</ul>
<h3>起動オプション</h3>
<ul>
<li><b>画面モード:</b> ユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを指定しない場合，ここで指定されたモードが使われます。</li>
<li><b>起動時にモード選択パネルを表示する:</b> デフォルトでは，XDarwin の起動時にユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを選択するパネルを表示します。このオプションがオフの場合，画面モードで指定したモードで起動します。</li>
<li><b>X11 ディスプレイ番号:</b> X11は，一つのコンピュータ上で別々の X サーバーが管理する複数のディスプレイが存在することを許します。複数の X サーバーが同時に実行している時，XDarwin が使用するディスプレイの番号を指定することができます。</li>
<li><b>Xinerama マルチモニタサポートを有効にする:</b> XDarwin は，Xinerama マルチモニタをサポートします。それは全てのモニタを一つの大きな画面の一部とみなします。あなたはこのオプションで Xinerama を無効にすることができます。ただし，現在 XDarwin はそれ無しで正しく複数のモニタを扱うことができません。もし，あなたが一つのモニタを使うだけならば，Xinerama は自動的に無効となります。</li>
<li><b>キーマッピングファイル:</b> キーマッピングファイルは起動時に読み込まれ，X11 キーマップに変換されます。他言語に対応したキーマッピングファイルは <code>/System/Library/Keyboards</code> にあります。（訳注：キーマッピングで Japanese を選択すると，一部のキーが効かない等の不具合が発生することがあります。この場合は USA を選択した上で ~/.Xmodmap を適用して下さい。）</li>
<li><b>最初の X11 クライアントの起動:</b> XDarwin が Finderから起動する時，X ウィンドウマネージャーと X クライアントの起動は <code>xinit</code> を実行します。（詳細は "<code>man xinit</code>" を参照して下さい。）XDarwin は <code>xinit</code> を実行する前に，指定されたディレクトリをユーザーのパスに追加します。デフォルトでは <code>/usr/X11R6/bin</code> だけを追加します。他のディレクトリを追加したい場合は，コロンで区切って指定します。ユーザーのシェル初期化ファイルを読み込むために，X クライアントはユーザーのデフォルトログインシェルで起動されます。必要であれば，代わりのシェルを指定することができます。</li>
</ul>
<h3>フルスクリーン</h3>
<ul>
<li><b>キー設定ボタン:</b> X11 と Aqua を切り替えるために使用するボタンの組み合わせを指定します。
ボタンをクリックして，任意の数の修飾キーに続いて通常のキーを押します。</li>
<li><b>ドックのアイコンのクリックで X11 に戻る:</b> オンの場合，ドックに表示された XDarwin アイコンのクリックで X11 への切り換えが可能となります。Mac OS X のいくつかのバージョンでは，ドックのアイコンのクリックで Aqua に戻った時，カーソルが消失することがあります。</li>
<li><b>起動時にヘルプを表示する:</b> XDarwin がフルスクリーンモードで起動する時，スプラッシュスクリーンを表示します。</li>
<li><b>色深度:</b> フルスクリーンモードでは，X11 ディスプレイが Aqua と異なる色深度を使うことができます。「変更なし」が指定された場合，XDarwin は Aqua によって使用される色深度を使います。これ以外に 8，15 または24 ビットを指定することができます。</li>
</ul>
<h2>
<a NAME="license">ライセンス</a>
</h2>
XFree86 Project は，自由に再配布可能なバイナリとソースコードを提供することにコミットしています。
私たちが使用する主なライセンスは，伝統的な MIT X11/X Consortium License に基づくものです。
そして，それは修正または再配布されるソースコードまたはバイナリに，その Copyright/ライセンス告示がそのまま残されることを要求する以外の条件を強制しません。
より多くの情報と，コードの一部をカバーする追加の Copyright/ライセンス告示のために，<A HREF="http://www.xfree86.org/legal/licence.html">XFree86 の License ページ</A>を参照して下さい。
<H3>
<A NAME="3"></A>
X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to
whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.</p>
<p>Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization from
the X Consortium.</p>
<p>X Window System is a trademark of X Consortium, Inc.</p>
</body>
</html>
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/Japanese.lproj/XDarwinHelp.html.cpp,v 1.4 2001/11/27 07:27:46 torrey Exp $ -->
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=EUC-JP">
<title>
XDarwin Help</title></head>
<body>
<center>
<h1>XDarwin X Server for Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Release Date: X_REL_DATE
</center>
<h2>目次</h2>
<ol>
<li><A HREF="#notice">注意事項</A></li>
<li><A HREF="#usage">使用法</A></li>
<li><A HREF="#path">パスの設定</A></li>
<li><A HREF="#prefs">環境設定</A></li>
<li><A HREF="#license">ライセンス</A></li>
</ol>
<center>
<h2><a NAME="notice">注意事項</a></h2>
</center>
<blockquote>
#if X_PRE_RELEASE
これは，XDarwin のプレリリースバージョンであり，いかなる場合においてもサポートされません。
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
プレリリースバージョンのバグを報告する前に，<A HREF="http://sourceforge.net/projects/xonx/">XonX</A> プロジェクトページまたは X_VENDOR_LINKで最新版のチェックをして下さい。
#else
もし，サーバーが 6 -12 ヶ月以上前のものか，またはあなたのハードウェアが上記の日付よりも新しいものならば，問題を報告する前により新しいバージョンを探してみてください。
バグの報告やパッチが SourceForge の <A HREF="http://sourceforge.net/projects/xonx/">XonX プロジェクトページ</A>に提出されているかもしれません。
#endif
</blockquote>
<blockquote>
本ソフトウェアは，<A HREF="#license">MIT X11/X Consortium License</A> の条件に基づき，無保証で，「そのまま」の形で供給されます。
ご使用になる前に，<A HREF="#license">ライセンス条件</A>をお読み下さい。
</blockquote>
<h2><a NAME="usage">使用法</a></h2>
<p>XDarwin は，再配布可能なオープンソースの <a HREF="http://www.x.org/">X Window System</a> のための X サーバーの実装です。このバージョンの XDarwin は X_VENDOR_LINK によって作成されました。XDarwin は，Mac OS X 上でフルスクリーンモードまたはルートレスモードで動作します。</p>
<p>フルスクリーンモードでは，X Window System がアクティブな時，それは全画面を占有します。
あなたは，Command-Option-A キーを押すことによって Mac OS X デスクトップへ切り替えることができます。このキーの組み合わせは，環境設定で変更可能です。
Mac OS X デスクトップから X Window System へ切り替える場合は，ドックに表示された XDarwin アイコンをクリックして下さい。
（環境設定で，フローティング・ウィンドウに表示された XDarwin アイコンをクリックするように変更することができます。）</p>
<p>ルートレスモードでは，X Window System と Aqua は画面を共有します。
X11 が表示するルートウィンドウは画面のサイズであり，他の全てのウィンドウを含んでいます。
Aqua がデスクトップの背景を制御するので，X11 のルートウィンドウはルートレスモードでは表示されません。</p>
<h3>複数ボタンマウスのエミュレーション</h3>
<p>多くの X11 アプリケーションは，3 ボタンマウスを必要とします。
あなたはマウスボタンのクリックと同時にいくつかの修飾キーを押すことによって，一つのボタンで 3 ボタンマウスをエミュレーションすることができます。
これは，環境設定の「一般設定」の「複数ボタンマウスのエミュレーション」セクションで設定します。
デフォルトでは，エミュレーションは有効で，コマンドキーを押しながらマウスボタンをクリックすることは第 2 マウスボタンのクリックに相当します。
オプションキーを押しながらクリックすることは第 3 マウスボタンのクリックに相当します。
あなたは，環境設定でボタン 2 と 3 をエミュレートするために使用する修飾キーの組合せを変更することができます。
注：修飾キーを xmodmap で他のキーに割り当てている場合でも，複数ボタンマウスのエミュレーションでは本来のコマンドキーやオプションキーを使わなければなりません。</p>
<h2><a NAME="path">パスの設定</a></h2>
<p>パスは， 実行可能なコマンドを検索するディレクトリのリストです。
X11 バイナリは，<code>/usr/X11R6/bin</code> に置かれます。あなたはそれをパスに加える必要があります。
XDarwin は，これをデフォルトで行います。また，あなたがコマンドライン・アプリケーションをインストールした追加のディレクトリを加えることができます。</p>
<p>経験豊かなユーザーは，すでに自らのシェルのために初期化ファイルを使用してパスを設定しているでしょう。
この場合，あなたは環境設定で XDarwin があなたのパスを変更しないように設定することができます。
XDarwin は，ユーザーのデフォルトのログインシェルで最初の X11 クライアントを開始します。
（環境設定で代わりのシェルを指定することができます。）
パスを設定する方法は，あなたが使用しているシェルに依存します。
これは，シェルのマニュアルページドキュメントに記載されています。
<p>また，あなたはドキュメントを探している時，X11 のマニュアルページを検索されるページのリストに追加したいと思うかもしれません。
X11 のマニュアルページは <code>/usr/X11R6/man</code> に置かれます。そして <code>MANPATH</code> 環境変数は検索するディレクトリのリストを含んでいます。</p>
<h2><a NAME="prefs">環境設定</a></h2>
<p>「XDarwin」メニューの「環境設定...」メニュー項目からアクセスできる環境設定パネルで，いくつかのオプションを設定することができます。
「起動オプション」の内容は，XDarwin を再起動するまで有効となりません。
他の全てのオプションの内容は，直ちに有効となります。
以下，それぞれのオプションについて説明します:</p>
<h3>一般設定</h3>
<ul>
<li><b>X11 でシステムのビープ音を使用する:</b> オンの場合，Mac OS X のビープ音が X11 のベルとして使用されます。オフの場合（デフォルト），シンプル トーンが使われます。</li>
<li><b>X11 のマウスアクセラレーションを有効にする:</b> 標準的な X Window System の実装では，ウィンドウマネージャーはマウスの加速度を変更することができます。
マウスの加速度に Mac OS X のシステム環境設定と X ウィンドウマネージャーが異なる値を設定した場合，これは混乱を招きます。
この問題を避けるため，デフォルトでは X11 のマウスアクセラレーションを有効としません。</li>
<li><b>複数ボタンマウスのエミュレーション:</b> <a HREF="#usage">使用法</a>を参照して下さい。オンの場合，マウスボタンが第 2 または第 3 のマウスボタンをエミュレートする時に，選択した修飾キーを同時に押します。</li>
</ul>
<h3>起動オプション</h3>
<ul>
<li><b>画面モード:</b> ユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを指定しない場合，ここで指定されたモードが使われます。</li>
<li><b>起動時にモード選択パネルを表示する:</b> デフォルトでは，XDarwin の起動時にユーザーがフルスクリーンモードまたはルートレスモードのどちらを使用するかを選択するパネルを表示します。このオプションがオフの場合，画面モードで指定したモードで起動します。</li>
<li><b>X11 ディスプレイ番号:</b> X11は，一つのコンピュータ上で別々の X サーバーが管理する複数のディスプレイが存在することを許します。複数の X サーバーが同時に実行している時，XDarwin が使用するディスプレイの番号を指定することができます。</li>
<li><b>Xinerama マルチモニタサポートを有効にする:</b> XDarwin は，Xinerama マルチモニタをサポートします。それは全てのモニタを一つの大きな画面の一部とみなします。あなたはこのオプションで Xinerama を無効にすることができます。ただし，現在 XDarwin はそれ無しで正しく複数のモニタを扱うことができません。もし，あなたが一つのモニタを使うだけならば，Xinerama は自動的に無効となります。</li>
<li><b>キーマッピングファイル:</b> キーマッピングファイルは起動時に読み込まれ，X11 キーマップに変換されます。他言語に対応したキーマッピングファイルは <code>/System/Library/Keyboards</code> にあります。（訳注：キーマッピングで Japanese を選択すると，一部のキーが効かない等の不具合が発生することがあります。この場合は USA を選択した上で ~/.Xmodmap を適用して下さい。）</li>
<li><b>最初の X11 クライアントの起動:</b> XDarwin が Finderから起動する時，X ウィンドウマネージャーと X クライアントの起動は <code>xinit</code> を実行します。（詳細は "<code>man xinit</code>" を参照して下さい。）XDarwin は <code>xinit</code> を実行する前に，指定されたディレクトリをユーザーのパスに追加します。デフォルトでは <code>/usr/X11R6/bin</code> だけを追加します。他のディレクトリを追加したい場合は，コロンで区切って指定します。ユーザーのシェル初期化ファイルを読み込むために，X クライアントはユーザーのデフォルトログインシェルで起動されます。必要であれば，代わりのシェルを指定することができます。</li>
</ul>
<h3>フルスクリーン</h3>
<ul>
<li><b>キー設定ボタン:</b> X11 と Aqua を切り替えるために使用するボタンの組み合わせを指定します。
ボタンをクリックして，任意の数の修飾キーに続いて通常のキーを押します。</li>
<li><b>ドックのアイコンのクリックで X11 に戻る:</b> オンの場合，ドックに表示された XDarwin アイコンのクリックで X11 への切り換えが可能となります。Mac OS X のいくつかのバージョンでは，ドックのアイコンのクリックで Aqua に戻った時，カーソルが消失することがあります。</li>
<li><b>起動時にヘルプを表示する:</b> XDarwin がフルスクリーンモードで起動する時，スプラッシュスクリーンを表示します。</li>
<li><b>色深度:</b> フルスクリーンモードでは，X11 ディスプレイが Aqua と異なる色深度を使うことができます。「変更なし」が指定された場合，XDarwin は Aqua によって使用される色深度を使います。これ以外に 8，15 または24 ビットを指定することができます。</li>
</ul>
<h2>
<a NAME="license">ライセンス</a>
</h2>
XDarwin の主要なライセンスは伝統的な MIT X11/X Consortium License に基づきます。
それは修正または再配布されるソースコードまたはバイナリに，その著作権/ライセンス表示がそのまま残されることを要求する以外の条件を強制しません。
より多くの情報と，コードの一部をカバーする追加の著作権/ライセンス表示のために，ソースコードを参照して下さい。
<H3>
<A NAME="3"></A>
X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without
limitation the rights to use, copy, modify, merge, publish, distribute,
sublicense, and/or sell copies of the Software, and to permit persons to
whom the Software is furnished to do so, subject to the following conditions:</p>
<p>The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.</p>
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.</p>
<p>Except as contained in this notice, the name of the X Consortium shall
not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization from
the X Consortium.</p>
<p>X Window System is a trademark of X Consortium, Inc.</p>
</body>
</html>

BIN
hw/darwin/bundle/Portuguese.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

47
hw/darwin/bundle/Portuguese.lproj/XDarwinHelp.html.cpp
View File

@ -1,20 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ --><html><body>
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<head>
<title>XFree86 para Mac OS X</title>
<title>XDarwin Help</title>
</head>
<center>
<h1>XFree86 para Darwin e Mac OS X</h1>
XFree86 XF86_VERSION<br>
Release Date: XF86_REL_DATE
<h1>XDarwin X Server para Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Release Date: X_REL_DATE
</center>
<h2>&Iacute;ndice</h2>
<ol>
@ -28,29 +22,32 @@
<center>
<h2><a NAME="notice">Notas importantes</a></h2>
</center>
<blockquote> #if PRE_RELEASE Essa &eacute; uma vers&atilde;o pr&eacute;-lancamento
do XFree86, e ela n&atilde;o &eacute; suportada de nenhuma forma. Bugs podem
<blockquote>
#if PRE_RELEASE
Essa &eacute; uma vers&atilde;o pr&eacute;-lancamento
do XDarwin, e ela n&atilde;o &eacute; suportada de nenhuma forma. Bugs podem
ser reportados e corre&ccedil;&otilde;es podem ser enviadas para <A HREF="http://sourceforge.net/projects/xonx/">P&aacute;gina
do projeto XonX</A> no SourceForge. Antes de informar bugs em vers&otilde;es
pr&eacute;-lancamento, por favor verifique a þltima vers&atilde;o em <A HREF="http://sourceforge.net/projects/xonx/">XonX</A>
or no <A HREF="http://www.XFree86.Org/cvs">Reposit&oacute;rio CVS do XFree86</A>.
#else Se o servidor &eacute; mais velho que 6-12 semanas, ou seu hardware &eacute;
or X_VENDOR_LINK.
#else
Se o servidor &eacute; mais velho que 6-12 semanas, ou seu hardware &eacute;
mais novo que a data acima, procure por uma nova vers&atilde;o antes de informar
problemas. Bugs podem ser reportados e corre&ccedil;&otilde;es podem ser enviadas
para a <A HREF="http://sourceforge.net/projects/xonx/">P&aacute;gina do projeto
XonX</A> na SourceForge. #endif </blockquote>
XonX</A> na SourceForge.
#endif
</blockquote>
<blockquote> Este software &eacute; distribu&iacute;do sob os termos da <a href="#license">licen&ccedil;a
MIT X11 / X Consortium</a> e &eacute; provido, sem nenhuma garantia. Por favor
leia a <a href="#license">Licen&ccedil;a</a> antes de come&ccedil;ar a usar
o programa.</blockquote>
<h2><a NAME="usage">Uso</a></h2>
<p>O XFree86 &eacute; uma aplica&ccedil;&atilde;o &quot;open-source&quot; livremente
<p>O XDarwin &eacute; uma X server &quot;open-source&quot; livremente
redistribu&iacute;da do <a HREF
="http://www.x.org/">Sistema X Window</a> produzido pelo <a HREF="http://www.XFree86.Org/">XFree86
Project, Inc.</a> O servidor X window para o Darwin e Mac OS X provido pelo
XFree86 &eacute; chamado XDarwin. XDarwin roda sobre Mac OS X no modo Tela Cheia
ou no modo Compartilhado.</p>
="http://www.x.org/">Sistema X Window</a>. This version of XDarwin was produced by the X_VENDOR_LINK.
XDarwin roda sobre Mac OS X no modo Tela Cheia ou no modo Compartilhado.</p>
<p>No modo Tela Cheia, quando o sistema X window est&aacute; ativo, ele ocupa
a tela toda. Voc&ecirc; pode voltar ao desktop do Mac OS X clicando Command-Option-A.
Essa combina&ccedil;&atilde;o de teclas pode ser mudada nas prefer&ecirc;ncias.
@ -90,7 +87,7 @@
do usu&aacute;rio corrente. (Um shell alternativo pode ser tamb&eacute;m expecificado
nas prefer&ecirc;ncias.) O modo para ajustar o path depende do shell que voc&ecirc;
est&aacute; usando. Isto &eacute; descrito na man page do seu shell.</p>
<p>Voc&ecirc; pode tamb&eacute;m querer adicionar as man pages do XFree86 para
<p>Voc&ecirc; pode tamb&eacute;m querer adicionar as man pages do X11 para
a lista de p&aacute;ginas a serem procuradas quando voc&ecirc; est&aacute; procurando
por documenta&ccedil;&atilde;o. As man pages do X11 est&atilde;o localizadas
em <code>/usr/X11R6/man</code> e a vari&aacute;vel de ambiente <code>MANPATH</code>
@ -178,15 +175,13 @@
</ul>
<h2><a NAME="license">Licen&ccedil;a</a></h2>
<p>O projeto XFree86 &eacute; designado a prover e a ser livremente redistribu&iacute;do
as vers&otilde;es bin&aacute;rias e souce (c&oacute;digo-fonte). A licen&ccedil;a
principal n&oacute;s usamos uma baseada na licen&ccedil;a tradicional MIT X11
<p>A licen&ccedil;a
principal n&oacute;s por XDarwin baseada na licen&ccedil;a tradicional MIT X11
/ X Consortium, que n&atilde;o imp&otilde;e nenhuma condi&ccedil;&atilde;o sobre
modifica&ccedil;&otilde;es ou redistribui&ccedil;&atilde;o do c&oacute;digo-fonte
ou dos bin&aacute;rios desde que o copyright/licen&ccedil;a sejam mantidos intactos.
Para mais informa&ccedil;&otilde;es e not&iacute;cias adicionais de copyright/licensing
em algumas se&ccedil;&atilde;o do c&oacute;digo, por favor visite a <a href="http://www.xfree86.org/legal/licence.html">p&aacute;gina
de licen&ccedil;as do XFree86</a>.</p>
em algumas se&ccedil;&atilde;o do c&oacute;digo, por favor refer to the source code.</p>
<H3><A NAME="3"></A>Licen&ccedil;a do X Consortium</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permiss&otilde;es s&atilde;o em virtude garantidas, livre de mudan&ccedil;as,

BIN
hw/darwin/bundle/Spanish.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

23
hw/darwin/bundle/Spanish.lproj/XDarwinHelp.html.cpp
View File

@ -1,19 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<html>
<head>
<title>XFree86 para Mac OS X</title>
<title>XDarwin Ayuda</title>
</head>
<body>
<center>
<h1>XFree86 en Darwin y Mac OS X</h1>
XFree86 XF86_VERSION<br>
Fecha de release: XF86_REL_DATE
<h1>XDarwin X Server for Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Fecha de release: X_REL_DATE
</center>
<h2>Contenido</h2>
<ol>
@ -28,7 +23,7 @@
</center>
<blockquote>
#if PRE_RELEASE
Esta es una versi&oacuten pre-release de XFree86, y no tiene ning&uacuten soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge. Antes de reportar errores en versiones pre-release, por favor verifique la ultima versi&oacuten en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien en el <A HREF="http://www.XFree86.Org/cvs">repositorio CVS de XFree86</A>.
Esta es una versi&oacuten pre-release de XDarwin, y no tiene ning&uacuten soporte. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge. Antes de reportar errores en versiones pre-release, por favor verifique la ultima versi&oacuten en <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> o bien el X_VENDOR_LINK.
#else
Si el server el m&aacutes antiguo que 6 a 12 meses, o si su hardware es posterior a la fecha indicada m&aacutes arriba, por favor verifique la &uacuteltima versi&oacuten antes de reportar problemas. Patches y reportes de error pueden ser enviados a la <A HREF="http://sourceforge.net/projects/xonx/">p&aacutegina del proyecto XonX</A> en SourceForge.
#endif
@ -37,8 +32,8 @@ Si el server el m&aacutes antiguo que 6 a 12 meses, o si su hardware es posterio
Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Licencia MIT X11 / X Consortium</A> y es provisto sin garant&iacutea alguna y en el estado en que se encuentra. Por favor lea la <A HREF="#license">Licencia</A> antes de utilizarlo.</blockquote>
<h2><a NAME="usage">Modo de uso</a></h2>
<p>XFree86 es una implementaci&oacuten open-source de distribuci&oacuten libre del <a HREF
="http://www.x.org/">X Window System</a> producido por <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> El window server para Darwin y Mac OS X provisto por XFree86 se llama XDarwin. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
<p>XDarwin es una X server open-source de distribuci&oacuten libre del <a HREF
="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin funciona en Mac OS X en modo pantalla completa o en modo rootless (integrado al escritorio).</p>
<p>En modo pantalla completa, el X window system toma control total de la pantalla mientras esta activo. Presionando Command-Option-A puede regresar al Escritorio de Mac OS X. Esta combinaci&oacuten de teclas puede cambiarse en las Preferencias de Usuario. Desde el Escritorio de Mac OS X, haga click en &iacutecono de XDarwin en el Dock para volver al X window system. (Puede cambiar esta comportamiento en las Preferencias de Usuario y configurar que XDarwin vuelva al X window system haciendo click en la ventana flotante con el logo X.)</p>
<p>En modo rootless, el X window system comparte la pantalla con Aqua. La ventana root de X11 es del tama&ntildeo de la pantalla y contiene a todas las dem&aacutes ventanas. La ventana root de X11 no se muestra en este modo, ya que Aqua maneja el fondo de pantalla.</p>
<h3>Emulaci&oacuten de mouse multi-bot&oacuten</h3>
@ -47,7 +42,7 @@ Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Li
<h2><a NAME="path">Configurando su Path</a></h2>
<p>El path es la lista de directorios donde se buscar&aacuten los comandos ejecutables. Los comandos de X11 se encuentran en <code>/usr/X11R6/bin</code>, y &eacuteste necesita estar dentro de su path. XDarwin hace &eacutesto autom&aacuteticamente por defecto, y puede adem&aacutes agregar directorios adicionales donde tenga otros comandos de l&iacutenea.</p>
<p>Usuarios experimentados pueden tener su path correctamente configurado mediante los archivos de inicio de su interprete de comandos. En este caso, puede informarle a XDarwin en las Preferencias de Usuario para que no modifique su path. XDarwin arrancar&aacute los clientes X11 iniciales usando el int&eacuterprete de comandos del usuario, seg&uacuten su configuraci&oacuten de login. Un int&eacuterprete de comandos alternativo puede ser especificado en las Preferencias del Usuario. La manera de configurar el path de su int&eacuterprete de comandos depende de cual est&aacute usando, y es generalmente descripta en las p&aacuteginas man del mismo.</p>
<p>Adem&aacutes, Ud. puede agregar las p&aacuteginas man de XFree86 a la lista de p&aacuteginas que son consultadas. Estas est&aacuten ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
<p>Adem&aacutes, Ud. puede agregar las p&aacuteginas man de X11 a la lista de p&aacuteginas que son consultadas. Estas est&aacuten ubicadas en <code>/usr/X11R6/man</code> y <code>MANPATH</code> es la variable de entorno que contiene los directorios que son consultados.</p>
<h2><a NAME="prefs">Preferencias del Usuario</a></h2>
<p>Ciertas opciones pueden definirse dentro de "Preferencias...", en el men&uacute de XDarwin. Las opciones dentro de de "Inicio" no surtir&aacuten efecto hasta que la aplicaci&oacuten se reinicie. Las restantes opciones surten efecto inmediatamente. Las diferentes opciones se describen a continuaci&oacuten:</p>
@ -75,7 +70,7 @@ Este software es distribuido bajo los t&eacuterminos de la <A HREF="#license">Li
</ul>
<h2><a NAME="license">Licencia</a></h2>
El XFree86 Project esta comprometido en proveer versiones binarias y en c&oacutedigo fuente de distribuci&oacuten libre. La licencia principal que utilizamos es una basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificaci&oacuten o redistribuci&oacuten del c&oacutedigo fuente o de archivos binarios m&aacutes all&aacute de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor informaci&oacuten y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del c&oacutedigo fuente, por favor consulte la <A HREF="http://www.xfree86.org/legal/licence.html">P&aacutegina de Licencia de XFree86</A>.
La licencia principal de XDarwin es basada en la Licencia MIT X11 tradicional, que no impone condiciones a la modificaci&oacuten o redistribuci&oacuten del c&oacutedigo fuente o de archivos binarios m&aacutes all&aacute de requerir que los mensajes de Licencia y Copyright se mantengan intactos. Para mayor informaci&oacuten y para mensajes adicionales de Licencia y Copyright que cubren algunas secciones del c&oacutedigo fuente, por favor consulte the source code.
<H3><A NAME="3"></A>Licencia del X Consortium</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Se otorga aqui permiso, libre de costo, a toda persona que obtenga una copia de este Software y los archivos de documentaci&oacuten asociados (el "Software"),

BIN
hw/darwin/bundle/Swedish.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

25
hw/darwin/bundle/Swedish.lproj/XDarwinHelp.html.cpp
View File

@ -1,19 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<html>
<head>
<title>XFree86 f&ouml;r Mac OS X</title>
<title>XDarwin Help</title>
</head>
<body>
<center>
<h1>XFree86 f&ouml;r Darwin och Mac OS X</h1>
XFree86 XF86_VERSION<br>
F&auml;rdigst&auml;llt: XF86_REL_DATE
<h1>XDarwin X Server for Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
F&auml;rdigst&auml;llt: X_REL_DATE
</center>
<h2>Inneh&aring;ll</h2>
<ol>
@ -28,7 +23,7 @@
</center>
<blockquote>
#if PRE_RELEASE
Detta &auml;r en testversion av XFree86, och du kan inte garranteras n&aring;gon som helst support f&ouml;r den. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge. Innan du rapporterar buggar i testversioner, var god pr&ouml;va den senaste versionen fr&aring;n <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS-arkiv</A>.
Detta &auml;r en testversion av XDarwin, och du kan inte garranteras n&aring;gon som helst support f&ouml;r den. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge. Innan du rapporterar buggar i testversioner, var god pr&ouml;va den senaste versionen fr&aring;n <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> eller i X_VENDOR_LINK.
#else
Om servern &auml;r &auml;ldre &auml;n 6-12 m&aring;nader, eller om din h&aring;rdvara &auml;r nyare &auml;n datumet ovan, leta efter en nyare version innan du rapporterar fel. Buggar och fel kan rapporteras och f&ouml;rslag till fixar kan skickas till <A HREF="http://sourceforge.net/projects/xonx/">XonX-projektets sida</A> p&aring; SourceForge.
#endif
@ -37,8 +32,8 @@ Om servern &auml;r &auml;ldre &auml;n 6-12 m&aring;nader, eller om din h&aring;r
Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Consortium License</A> och tilhandh&aring;lls som den &auml;r, helt utan garantier. Var god l&auml;s igenom <A HREF="#license">licensdokumentet (engelska)</A> innan du anv&auml;nder programmet.</blockquote>
<h2><a NAME="usage">Anv&auml;ndande</a></h2>
<p>XFree86 &auml;r en fritt spridd implemenation av <a HREF
="http://www.x.org/">X Window-systemet</a> producerad av <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc</a>, med &ouml;ppen k&auml;llkod. Den X Window-server f&ouml;r Darwin och Mac OS X som tillhandah&aring;lls av XFree86 kallas XDarwin. XDarwin kan k&ouml;ras p&aring; Mac OS X i fullsk&auml;rmsl&auml;ge eller rotl&ouml;st l&auml;ge.</p>
<p>XDarwin &auml;r en fritt spridd X server av <a HREF
="http://www.x.org/">X Window-systemet</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin kan k&ouml;ras p&aring; Mac OS X i fullsk&auml;rmsl&auml;ge eller rotl&ouml;st l&auml;ge.</p>
<p>I fullsk&auml;rmsl&auml;ge kommer X window-systemet att ta &ouml;ver hela sk&auml;rmen n&auml;r det &auml;r aktivt. Du kan byta tillbaka till Mac OS Xs skrivbord genom att trycka Kommando-Alt-A. Denna tangentkombination kan &auml;ndra i inst&auml;llningarna. N&auml;r du &auml;r p&aring; Mac OS Xs skrivbord kan du klicka p&aring; XDarwin-ikonen i dockan f&ouml;r att byta tillbaka till X Window-systemet. (Du kan f&ouml;r&auml;ndra detta beteende i inst&auml;llningarna s&aring; att du ist&auml;llet m&aring;ste klicka i det fltande bytesf&ouml;nstret ist&auml;llet.)</p>
<p>I rotl&ouml;stl&auml;ge delar X11 och Aqua p&aring; din sk&auml;rm. Rotf&ouml;nstret p&aring; X11-sk&auml;rmen &auml;r av samma storlek som hela sk&auml;rmen och inneh&aring;ller alla andra f&ouml;nster - det fungerar som bakgrund. I rotl&ouml;stl&auml;ge visas inte detta rotf&ouml;nster, eftersom Aqua hanterar skrvbordbakgrunden.</p>
@ -49,7 +44,7 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
<p>Din s&ouml;kv&auml;g &auml;r en lista av kataloger som s&ouml;ks igenom n&auml;r terminalen letar efter kommandon att exekvera. Kommandon som h&ouml;r till X11 ligger i <code>/usr/X11R6/bin</code>, en katalog som inte ligger i din s&ouml;kv&auml;g fr&aring;n b&ouml;rjan. XDarwin l&auml;gger till denna katalog &aring;t dig, och du kan ocks&aring; l&auml;gga till ytterligare kataloger i vilka du lagt program som skall k&ouml;ras fr&aring;n kommandoraden.</p>
<p>Mer erfarna anv&auml;ndare har antagligen redan st&auml;llt in sin s&ouml;kv&auml;g i skalets inst&auml;llningsfiler. Om detta g&auml;ller dig kan st&auml;lla in XDarwin s&aring; att din s&ouml;kv&auml;g inte modifieras. XDarwin startar de f&ouml;rsta X11-klienterna i anv&auml;ndarens inloggningsskal (Vill du anv&auml;nda ett alternativt skall, kan du specificera detta i inst&auml;llningarna). Hur du st&auml;ller in din s&ouml;kv&auml;g beror p&aring; vilket skal du anv&auml;nder. Exakt hur beskrivs i skalets man-sidor.</p>
<p>Ut&ouml;ver detta kan du ocks&aring; vilja l&auml;gga till XFree86s man-sidor (dokumentation) till listan &auml;ver sidor som som skall s&ouml;kas n&auml;r du vill l&auml;sa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan &auml;ver kataloger att s&ouml;ka best&auml;mms av variabeln<code>MANPATH</code>.</p>
<p>Ut&ouml;ver detta kan du ocks&aring; vilja l&auml;gga till X11s man-sidor (dokumentation) till listan &auml;ver sidor som som skall s&ouml;kas n&auml;r du vill l&auml;sa efter dokumentationen. X11s man-sidor ligger i <code>/usr/X11R6/man</code> och listan &auml;ver kataloger att s&ouml;ka best&auml;mms av variabeln<code>MANPATH</code>.</p>
<h2><a NAME="prefs">Inst&auml;llningar</a></h2>
<p>I inst&auml;llningarna finns ett antal alternativ d&auml;r du kan p&aring;verka hur XDarwin beter sig i vissa fall. Inst&auml;llningarna kommer du till genom att v&auml;lja "Inst&auml;llningar..." i menyn "XDarwin". De alternativ som finns under fliken "Starta" tr&auml;der inte i kraft f&ouml;rr&auml;n du startat om programmet. Alla andra alternativ tr&auml;der i kraft omedelbart. De olika alternativen beskrivs nedan:</p>
@ -77,10 +72,10 @@ Denna programvara distrubueras i enlighet med <A HREF="#license">MIT X11 / X Con
</ul>
<h2><a NAME="license">Licens (svenska)</a></h2>
<p>XFree86-projektet &aring;tar sig att tillhandah&aring;lla programvara och k&auml;llkod i format som fritt kan spridas vidare. Den huvudsakliga licens vi anv&auml;nder oss av &auml;r baserad p&aring; den traditionella MIT X11 / XConsortium-licensen, vilken inte p&aring; n&aring;got s&auml;tt begr&auml;nsar f&ouml;r&auml;ndringar eller vidarespridning av vare sig k&auml;llkod eller kompilerad programvara annat &auml;n genom att kr&auml;va att delarna som r&ouml;r copyright och licensiering l&auml;mnas intakta. F&ouml;r mer information och ytterligare copyright/licensieringsinfromation r&ouml;rande vissa speciella delar av koden, se <A HREF="http://www.xfree86.org/legal/licence.html">XFree86-licenssida</A> (engelska).</p>
<p>Den huvudsakliga licens vi anv&auml;nder oss av &auml;r baserad p&aring; den traditionella MIT X11 / XConsortium-licensen, vilken inte p&aring; n&aring;got s&auml;tt begr&auml;nsar f&ouml;r&auml;ndringar eller vidarespridning av vare sig k&auml;llkod eller kompilerad programvara annat &auml;n genom att kr&auml;va att delarna som r&ouml;r copyright och licensiering l&auml;mnas intakta. F&ouml;r mer information och ytterligare copyright/licensieringsinfromation r&ouml;rande vissa speciella delar av koden, se the source code.</p>
<h3>Licence (english)</h3>
<p>The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86 License page</A>.</p>
<p>The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.</p>
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>

BIN
hw/darwin/bundle/ko.lproj/MainMenu.nib/objects.nib generated
View File

Binary file not shown.

27
hw/darwin/bundle/ko.lproj/XDarwinHelp.html.cpp
View File

@ -1,19 +1,14 @@
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.2 2001/11/04 07:02:28 torrey Exp $ -->
#include "xf86Version.h"
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#endif
<!-- $XFree86: xc/programs/Xserver/hw/darwin/bundle/English.lproj/XDarwinHelp.html.cpp,v 1.1 2001/05/21 01:42:17 torrey Exp $ -->
<html>
<head>
<title>XFree86 for Mac OS X</title>
<title>XDarwin Help</title>
</head>
<body>
<center>
<h1>XFree86 on Darwin and Mac OS X</h1>
XFree86 XF86_VERSION<br>
Release Date: XF86_REL_DATE
<h1>XDarwin X Server for Mac OS X</h1>
X_VENDOR_NAME X_VERSION<br>
Release Date: X_REL_DATE
</center>
<h2>Contents</h2>
<ol>
@ -27,8 +22,8 @@
<h2><a NAME="notice">Important Notice</a></h2>
</center>
<blockquote>
#if PRE_RELEASE
This is a pre-release version of XFree86, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or in the <A HREF="http://www.XFree86.Org/cvs">XFree86 CVS repository</A>.
#if X_PRE_RELEASE
This is a pre-release version of XDarwin, and is not supported in any way. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge. Before reporting bugs in pre-release versions, please check the latest version from <A HREF="http://sourceforge.net/projects/xonx/">XonX</A> or the X_VENDOR_LINK.
#else
If the server is older than 6-12 months, or if your hardware is newer than the above date, look for a newer version before reporting problems. Bugs may be reported and patches may be submitted to the <A HREF="http://sourceforge.net/projects/xonx/">XonX project page</A> at SourceForge.
#endif
@ -37,8 +32,7 @@ If the server is older than 6-12 months, or if your hardware is newer than the a
This software is distributed under the terms of the <A HREF="#license">MIT X11 / X Consortium License</A> and is provided AS IS, with no warranty. Please read the <A HREF="#license">License</A> before using.</blockquote>
<h2><a NAME="usage">Usage</a></h2>
<p>XFree86 is a freely redistributable open-source implementation of the <a HREF
="http://www.x.org/">X Window System</a> produced by the <a HREF="http://www.XFree86.Org/">XFree86 Project, Inc.</a> The X window server for Darwin and Mac OS X provided by XFree86 is called XDarwin. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
<p>XDarwin is a freely redistributable open-source X server for the <a HREF="http://www.x.org/">X Window System</a>. This version of XDarwin was produced by the X_VENDOR_LINK. XDarwin runs on Mac OS X in full screen or rootless modes.</p>
<p>In full screen mode, when the X window system is active, it takes over the entire screen. You can switch back to the Mac OS X desktop by holding down Command-Option-A. This key combination can be changed in the user preferences. From the Mac OS X desktop, click on the XDarwin icon in the Dock to switch back to the X window system. (You can change this behavior in the user preferences so that you must click the XDarwin icon in the floating switch window instead.)</p>
<p>In rootless mode, the X window system and Aqua share your display. The root window of the X11 display is the size of the screen and contains all the other windows. The X11 root window is not displayed in rootless mode as Aqua handles the desktop background.</p>
<h3>Multi-Button Mouse Emulation</h3>
@ -47,7 +41,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
<h2><a NAME="path">Setting Your Path</a></h2>
<p>Your path is the list of directories to be searched for executable commands. The X11 commands are located in <code>/usr/X11R6/bin</code>, which needs to be added to your path. XDarwin does this for you by default and can also add additional directories where you have installed command line applications.</p>
<p>More experienced users will have already set their path correctly using the initialization files for their shell. In this case, you can inform XDarwin not to modify your path in the preferences. XDarwin launches the initial X11 clients in the user's default login shell. (An alternate shell can also be specified in the preferences.) The way to set the path depends on the shell you are using. This is described in the man page documentation for the shell.</p>
<p>In addition you may also want to add the man pages from XFree86 to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
<p>In addition you may also want to add the X11 man pages to the list of pages to be searched when you are looking for documentation. The X11 man pages are located in <code>/usr/X11R6/man</code> and the <code>MANPATH</code> environment variable contains the list of directories to search.</p>
<h2><a NAME="prefs">User Preferences</a></h2>
<p>A number of options may be set from the user preferences, accessible from the "Preferences..." menu item in the "XDarwin" menu. The options listed as start up options will not take effect until you have restarted XDarwin. All other options take effect immediately. The various options are described below:</p>
@ -75,8 +69,7 @@ This software is distributed under the terms of the <A HREF="#license">MIT X11 /
</ul>
<h2><a NAME="license">License</a></h2>
The XFree86 Project is committed to providing freely redistributable binary and source releases. The main license we use is one based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please see the <A HREF="http://www.xfree86.org/legal/licence.html">XFree86
License page</A>.
The main license for XDarwin is based on the traditional MIT X11 / X Consortium License, which does not impose any conditions on modification or redistribution of source code or binaries other than requiring that copyright/license notices are left intact. For more information and additional copyright/licensing notices covering some sections of the code, please refer to the source code.
<H3><A NAME="3"></A>X Consortium License</H3>
<p>Copyright (C) 1996 X Consortium</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a

88
hw/darwin/darwin.c
View File

@ -5,7 +5,7 @@
*
**************************************************************/
/*
* Copyright (c) 2001-2003 Torrey T. Lyons. All Rights Reserved.
* Copyright (c) 2001-2004 Torrey T. Lyons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -29,7 +29,7 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
/* $XdotOrg: xc/programs/Xserver/hw/darwin/darwin.c,v 1.56 2003/11/24 05:39:01 torrey Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */
#include "X.h"
@ -44,7 +44,7 @@
#include "fb.h" // fb framebuffer code
#include "site.h"
#include "globals.h"
#include "xf86Version.h"
#include "xorgVersion.h"
#include "xf86Date.h"
#include "dix.h"
@ -55,6 +55,9 @@
#include <fcntl.h>
#include <unistd.h>
#define HAS_UTSNAME 1
#include <sys/utsname.h>
#define NO_CFPLUGIN
#include <IOKit/IOKitLib.h>
#include <IOKit/hidsystem/IOHIDLib.h>
@ -110,7 +113,7 @@ const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
#define OSVENDOR ""
#endif
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#define PRE_RELEASE XORG_VERSION_SNAP
#endif
void
@ -118,37 +121,74 @@ DarwinPrintBanner()
{
#if PRE_RELEASE
ErrorF("\n"
"This is a pre-release version of XFree86, and is not supported in any\n"
"way. Bugs may be reported to XFree86@XFree86.Org and patches submitted\n"
"to fixes@XFree86.Org. Before reporting bugs in pre-release versions,\n"
"please check the latest version in the XFree86 CVS repository\n"
"(http://www.XFree86.Org/cvs)\n");
"This is a pre-release version of the " XVENDORNAME " X11.\n"
"Portions of this release are based on XFree86 4.4RC2 and selected\n"
"files from XFree86 4.4RC3. It is not supported in any way.\n"
"Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.\n"
"Select the \"xorg\" product for bugs you find in this release.\n"
"Before reporting bugs in pre-release versions please check the\n"
"latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n"
"repository hosted at http://www.freedesktop.org/Software/xorg/");
#endif
ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
XF86_VERSION_PATCH);
#if XF86_VERSION_SNAP > 0
#if XORG_VERSION_SNAP > 0
ErrorF(".%d", XF86_VERSION_SNAP);
#endif
#if XF86_VERSION_SNAP >= 900
ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
XF86_VERSION_SNAP - 900);
#if XORG_VERSION_SNAP >= 900
ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
XORG_VERSION_SNAP - 900);
#endif
#ifdef XF86_CUSTOM_VERSION
#ifdef XORG_CUSTOM_VERSION
ErrorF(" (%s)", XF86_CUSTOM_VERSION);
#endif
ErrorF(" / X Window System\n");
ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
ErrorF("Release Date: %s\n", XF86_DATE);
ErrorF("\tIf the server is older than 6-12 months, or if your hardware is\n"
"\tnewer than the above date, look for a newer version before\n"
"\treporting problems. (See http://www.XFree86.Org/FAQ)\n");
ErrorF("Operating System:%s%s\n", OSNAME, OSVENDOR);
ErrorF("\nRelease Date: %s\n", XF86_DATE);
ErrorF("X Protocol Version %d, Revision %d, %s\n",
X_PROTOCOL, X_PROTOCOL_REVISION, XORG_RELEASE );
ErrorF("Build Operating System:%s%s\n", OSNAME, OSVENDOR);
#ifdef HAS_UTSNAME
{
struct utsname name;
if (uname(&name) == 0) {
ErrorF("Current Operating System: %s %s %s %s %s\n",
name.sysname, name.nodename, name.release, name.version, name.machine);
}
}
#endif
#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
{
struct tm t;
char buf[100];
bzero(&t, sizeof(t));
bzero(buf, sizeof(buf));
t.tm_mday = BUILD_DATE % 100;
t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
t.tm_year = BUILD_DATE / 10000 - 1900;
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
ErrorF("Build Date: %s\n", buf);
}
#endif
#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
{
struct tm t;
char buf[100];
bzero(&t, sizeof(t));
bzero(buf, sizeof(buf));
t.tm_mday = CLOG_DATE % 100;
t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
t.tm_year = CLOG_DATE / 10000 - 1900;
if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
ErrorF("Changelog Date: %s\n", buf);
}
#endif
#if defined(BUILDERSTRING)
ErrorF("%s \n",BUILDERSTRING);
#endif
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
"\tto make sure that you have the latest version.\n");
}

6
hw/darwin/quartz/XDarwin.pbproj/project.pbxproj
View File

@ -334,7 +334,7 @@
<key>CFBundleExecutable</key>
<string>XDarwin</string>
<key>CFBundleGetInfoString</key>
<string>XDarwin 1.3.0, ©2001-2003 XFree86 Project, Inc.</string>
<string>XDarwin 1.3.0, X.Org Foundation</string>
<key>CFBundleIconFile</key>
<string>XDarwin.icns</string>
<key>CFBundleIdentifier</key>
@ -1792,13 +1792,13 @@
F5269C2D01D5BC3501000001 = {
fileEncoding = 30;
isa = PBXFileReference;
path = pseudorama.c;
path = pseudoramiX.c;
refType = 4;
};
F5269C2E01D5BC3501000001 = {
fileEncoding = 30;
isa = PBXFileReference;
path = pseudorama.h;
path = pseudoramiX.h;
refType = 4;
};
F53321390193CB6A01000001 = {

25
hw/darwin/quartz/cr/crFrame.m
View File

@ -27,8 +27,8 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.1.4.1 2003/12/06 13:24:23 kaleb Exp $ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.7 2003/11/27 01:53:39 torrey Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/cr/crFrame.m,v 1.9 2004/03/19 02:05:29 torrey Exp $ */
#include "quartzCommon.h"
#include "cr.h"
@ -36,6 +36,7 @@
#undef BOOL
#define BOOL xBOOL
#include "rootless.h"
#include "windowstr.h"
#undef BOOL
WindowPtr nextWindowToFrame = NULL;
@ -79,7 +80,12 @@ CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
theWindow = [[NSWindow alloc] initWithContentRect:bounds
styleMask:theStyleMask
backing:NSBackingStoreBuffered
#ifdef DEFER_NSWINDOW
defer:YES];
#else
defer:NO];
#endif
if (!theWindow) return FALSE;
[theWindow setBackgroundColor:[NSColor clearColor]]; // erase transparent
@ -96,6 +102,21 @@ CRCreateFrame(RootlessWindowPtr pFrame, ScreenPtr pScreen,
[theWindow setContentView:theView];
[theWindow setInitialFirstResponder:theView];
#ifdef DEFER_NSWINDOW
// We need the NSWindow to actually be created now.
// If we had to defer creating it, we have to order it
// onto the screen to force it to be created.
if (pFrame->win->prevSib) {
CRWindowPtr crWinPtr = (CRWindowPtr) RootlessFrameForWindow(
pFrame->win->prevSib, FALSE);
int upperNum = [crWinPtr->window windowNumber];
[theWindow orderWindow:NSWindowBelow relativeTo:upperNum];
} else {
[theWindow orderFront:nil];
}
#endif
[theWindow setAcceptsMouseMovedEvents:YES];
crWinPtr->window = theWindow;

20
hw/darwin/quartz/cr/crScreen.m
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/cr/crScreen.m,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
/* $XdotOrg$ */
/*
* Cocoa rootless implementation initialization
*/
@ -40,7 +40,7 @@
#include "quartzCursor.h"
#include "rootless.h"
#include "safeAlpha.h"
#include "pseudorama.h"
#include "pseudoramiX.h"
#include "applewmExt.h"
#include "regionstr.h"
@ -59,8 +59,8 @@ static Class classXView = nil;
* CRDisplayInit
* Find all screens.
*
* Multihead note: When rootless mode uses Pseudorama, the
* X server only sees one screen; only Pseudorama itself knows
* Multihead note: When rootless mode uses PseudoramiX, the
* X server only sees one screen; only PseudoramiX itself knows
* about all of the screens.
*/
static void
@ -71,7 +71,7 @@ CRDisplayInit(void)
if (noPseudoramiXExtension) {
darwinScreensFound = [[NSScreen screens] count];
} else {
darwinScreensFound = 1; // only Pseudorama knows about the rest
darwinScreensFound = 1; // only PseudoramiX knows about the rest
}
CRAppleWMInit();
@ -133,7 +133,7 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb)
dfb->height = unionRect.size.height;
dfb->pitch = (dfb->width) * (dfb->bitsPerPixel) / 8;
// Tell Pseudorama about the real screens.
// Tell PseudoramiX about the real screens.
// InitOutput() will move the big screen to (0,0),
// so compensate for that here.
for (i = 0; i < [screens count]; i++) {
@ -144,7 +144,7 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb)
// Skip this screen if it's a mirrored copy of an earlier screen.
for (j = 0; j < i; j++) {
if (NSEqualRects(frame, [[screens objectAtIndex:j] frame])) {
ErrorF("Pseudorama screen %d is a mirror of screen %d.\n",
ErrorF("PseudoramiX screen %d is a mirror of screen %d.\n",
i, j);
break;
}
@ -159,14 +159,14 @@ CRScreenParams(int index, DarwinFramebufferPtr dfb)
frame.size.height -= aquaMenuBarHeight;
}
ErrorF("Pseudorama screen %d added: %dx%d @ (%d,%d).\n", i,
ErrorF("PseudoramiX screen %d added: %dx%d @ (%d,%d).\n", i,
(int)frame.size.width, (int)frame.size.height,
(int)frame.origin.x, (int)frame.origin.y);
frame.origin.x -= unionRect.origin.x;
frame.origin.y -= unionRect.origin.y;
ErrorF("Pseudorama screen %d placed at X11 coordinate (%d,%d).\n",
ErrorF("PseudoramiX screen %d placed at X11 coordinate (%d,%d).\n",
i, (int)frame.origin.x, (int)frame.origin.y);
PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
@ -219,7 +219,7 @@ CRAddScreen(int index, ScreenPtr pScreen)
// This X11 screen covers all CoreGraphics displays we just found.
// If there's more than one CG display, then video mirroring is on
// or Pseudorama is on.
// or PseudoramiX is on.
displayInfo->displayCount = allocatedDisplays;
displayInfo->displayIDs = displays;

420
hw/darwin/quartz/pseudoramiX.c Normal file
View File

@ -0,0 +1,420 @@
/*
* Minimal implementation of PanoramiX/Xinerama
*
* This is used in rootless mode where the underlying window server
* already provides an abstracted view of multiple screens as one
* large screen area.
*
* This code is largely based on panoramiX.c, which contains the
* following copyright notice:
*/
/*****************************************************************
Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
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.
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
DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
shall not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.2 2002/10/16 21:13:33 dawes Exp $ */
#include "pseudoramiX.h"
#include "extnsionst.h"
#include "dixstruct.h"
#include "window.h"
#include "panoramiXproto.h"
#include "globals.h"
extern int ProcPanoramiXQueryVersion (ClientPtr client);
static void PseudoramiXResetProc(ExtensionEntry *extEntry);
static int ProcPseudoramiXQueryVersion(ClientPtr client);
static int ProcPseudoramiXGetState(ClientPtr client);
static int ProcPseudoramiXGetScreenCount(ClientPtr client);
static int ProcPseudoramiXGetScreenSize(ClientPtr client);
static int ProcPseudoramiXIsActive(ClientPtr client);
static int ProcPseudoramiXQueryScreens(ClientPtr client);
static int ProcPseudoramiXDispatch(ClientPtr client);
static int SProcPseudoramiXQueryVersion(ClientPtr client);
static int SProcPseudoramiXGetState(ClientPtr client);
static int SProcPseudoramiXGetScreenCount(ClientPtr client);
static int SProcPseudoramiXGetScreenSize(ClientPtr client);
static int SProcPseudoramiXIsActive(ClientPtr client);
static int SProcPseudoramiXQueryScreens(ClientPtr client);
static int SProcPseudoramiXDispatch(ClientPtr client);
typedef struct {
int x;
int y;
int w;
int h;
} PseudoramiXScreenRec;
static PseudoramiXScreenRec *pseudoramiXScreens = NULL;
static int pseudoramiXScreensAllocated = 0;
static int pseudoramiXNumScreens = 0;
static unsigned long pseudoramiXGeneration = 0;
// Add a PseudoramiX screen.
// The rest of the X server will know nothing about this screen.
// Can be called before or after extension init.
// Screens must be re-added once per generation.
void
PseudoramiXAddScreen(int x, int y, int w, int h)
{
PseudoramiXScreenRec *s;
if (noPseudoramiXExtension) return;
if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {
pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;
pseudoramiXScreens = xrealloc(pseudoramiXScreens,
pseudoramiXScreensAllocated *
sizeof(PseudoramiXScreenRec));
}
s = &pseudoramiXScreens[pseudoramiXNumScreens++];
s->x = x;
s->y = y;
s->w = w;
s->h = h;
}
// Initialize PseudoramiX.
// Copied from PanoramiXExtensionInit
void PseudoramiXExtensionInit(int argc, char *argv[])
{
Bool success = FALSE;
ExtensionEntry *extEntry;
if (noPseudoramiXExtension) return;
if (pseudoramiXNumScreens == 1) {
// Only one screen - disable Xinerama extension.
noPseudoramiXExtension = TRUE;
return;
}
// The server must not run the PanoramiX operations.
noPanoramiXExtension = TRUE;
if (pseudoramiXGeneration != serverGeneration) {
extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
ProcPseudoramiXDispatch,
SProcPseudoramiXDispatch,
PseudoramiXResetProc,
StandardMinorOpcode);
if (!extEntry) {
ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");
} else {
pseudoramiXGeneration = serverGeneration;
success = TRUE;
}
}
if (!success) {
ErrorF("%s Extension (PseudoramiX) failed to initialize\n",
PANORAMIX_PROTOCOL_NAME);
return;
}
}
static void PseudoramiXResetProc(ExtensionEntry *extEntry)
{
pseudoramiXNumScreens = 0;
}
// was PanoramiX
static int ProcPseudoramiXQueryVersion(ClientPtr client)
{
return ProcPanoramiXQueryVersion(client);
}
// was PanoramiX
static int ProcPseudoramiXGetState(ClientPtr client)
{
REQUEST(xPanoramiXGetStateReq);
WindowPtr pWin;
xPanoramiXGetStateReply rep;
register int n;
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
pWin = LookupWindow (stuff->window, client);
if (!pWin)
return BadWindow;
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.state = !noPseudoramiXExtension;
if (client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swaps (&rep.state, n);
}
WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
return client->noClientException;
}
// was PanoramiX
static int ProcPseudoramiXGetScreenCount(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenCountReq);
WindowPtr pWin;
xPanoramiXGetScreenCountReply rep;
register int n;
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
pWin = LookupWindow (stuff->window, client);
if (!pWin)
return BadWindow;
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.ScreenCount = pseudoramiXNumScreens;
if (client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swaps (&rep.ScreenCount, n);
}
WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
return client->noClientException;
}
// was PanoramiX
static int ProcPseudoramiXGetScreenSize(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenSizeReq);
WindowPtr pWin;
xPanoramiXGetScreenSizeReply rep;
register int n;
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
pWin = LookupWindow (stuff->window, client);
if (!pWin)
return BadWindow;
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
/* screen dimensions */
rep.width = pseudoramiXScreens[stuff->screen].w;
// was panoramiXdataPtr[stuff->screen].width;
rep.height = pseudoramiXScreens[stuff->screen].h;
// was panoramiXdataPtr[stuff->screen].height;
if (client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swaps (&rep.width, n);
swaps (&rep.height, n);
}
WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
return client->noClientException;
}
// was Xinerama
static int ProcPseudoramiXIsActive(ClientPtr client)
{
/* REQUEST(xXineramaIsActiveReq); */
xXineramaIsActiveReply rep;
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.state = !noPseudoramiXExtension;
if (client->swapped) {
register int n;
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swapl (&rep.state, n);
}
WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
return client->noClientException;
}
// was Xinerama
static int ProcPseudoramiXQueryScreens(ClientPtr client)
{
/* REQUEST(xXineramaQueryScreensReq); */
xXineramaQueryScreensReply rep;
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
rep.type = X_Reply;
rep.sequenceNumber = client->sequence;
rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens;
rep.length = rep.number * sz_XineramaScreenInfo >> 2;
if (client->swapped) {
register int n;
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
swapl (&rep.number, n);
}
WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
if (!noPseudoramiXExtension) {
xXineramaScreenInfo scratch;
int i;
for(i = 0; i < pseudoramiXNumScreens; i++) {
scratch.x_org = pseudoramiXScreens[i].x;
scratch.y_org = pseudoramiXScreens[i].y;
scratch.width = pseudoramiXScreens[i].w;
scratch.height = pseudoramiXScreens[i].h;
if(client->swapped) {
register int n;
swaps (&scratch.x_org, n);
swaps (&scratch.y_org, n);
swaps (&scratch.width, n);
swaps (&scratch.height, n);
}
WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
}
}
return client->noClientException;
}
// was PanoramiX
static int ProcPseudoramiXDispatch (ClientPtr client)
{ REQUEST(xReq);
switch (stuff->data)
{
case X_PanoramiXQueryVersion:
return ProcPseudoramiXQueryVersion(client);
case X_PanoramiXGetState:
return ProcPseudoramiXGetState(client);
case X_PanoramiXGetScreenCount:
return ProcPseudoramiXGetScreenCount(client);
case X_PanoramiXGetScreenSize:
return ProcPseudoramiXGetScreenSize(client);
case X_XineramaIsActive:
return ProcPseudoramiXIsActive(client);
case X_XineramaQueryScreens:
return ProcPseudoramiXQueryScreens(client);
}
return BadRequest;
}
static int
SProcPseudoramiXQueryVersion (ClientPtr client)
{
REQUEST(xPanoramiXQueryVersionReq);
register int n;
swaps(&stuff->length,n);
REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
return ProcPseudoramiXQueryVersion(client);
}
static int
SProcPseudoramiXGetState(ClientPtr client)
{
REQUEST(xPanoramiXGetStateReq);
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
return ProcPseudoramiXGetState(client);
}
static int
SProcPseudoramiXGetScreenCount(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenCountReq);
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
return ProcPseudoramiXGetScreenCount(client);
}
static int
SProcPseudoramiXGetScreenSize(ClientPtr client)
{
REQUEST(xPanoramiXGetScreenSizeReq);
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
return ProcPseudoramiXGetScreenSize(client);
}
static int
SProcPseudoramiXIsActive(ClientPtr client)
{
REQUEST(xXineramaIsActiveReq);
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
return ProcPseudoramiXIsActive(client);
}
static int
SProcPseudoramiXQueryScreens(ClientPtr client)
{
REQUEST(xXineramaQueryScreensReq);
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
return ProcPseudoramiXQueryScreens(client);
}
static int
SProcPseudoramiXDispatch (ClientPtr client)
{ REQUEST(xReq);
switch (stuff->data)
{
case X_PanoramiXQueryVersion:
return SProcPseudoramiXQueryVersion(client);
case X_PanoramiXGetState:
return SProcPseudoramiXGetState(client);
case X_PanoramiXGetScreenCount:
return SProcPseudoramiXGetScreenCount(client);
case X_PanoramiXGetScreenSize:
return SProcPseudoramiXGetScreenSize(client);
case X_XineramaIsActive:
return SProcPseudoramiXIsActive(client);
case X_XineramaQueryScreens:
return SProcPseudoramiXQueryScreens(client);
}
return BadRequest;
}

9
hw/darwin/quartz/pseudoramiX.h Normal file
View File

@ -0,0 +1,9 @@
/*
* Minimal implementation of PanoramiX/Xinerama
*/
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
extern int noPseudoramiXExtension;
void PseudoramiXAddScreen(int x, int y, int w, int h);
void PseudoramiXExtensionInit(int argc, char *argv[]);

8
hw/darwin/quartz/quartz.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
/* $XdotOrg$ */
/**************************************************************
*
* Quartz-specific support for the Darwin X Server
@ -36,7 +36,7 @@
#include "quartz.h"
#include "darwin.h"
#include "quartzAudio.h"
#include "pseudorama.h"
#include "pseudoramiX.h"
#define _APPLEWM_SERVER_
#include "applewm.h"
#include "applewmExt.h"
@ -140,9 +140,9 @@ void DarwinModeInitOutput(
// Do display mode specific initialization
quartzProcs->DisplayInit();
// Init Pseudorama implementation of Xinerama.
// Init PseudoramiX implementation of Xinerama.
// This should be in InitExtensions, but that causes link errors
// for servers that don't link in pseudorama.c.
// for servers that don't link in pseudoramiX.c.
if (!noPseudoramiXExtension) {
PseudoramiXExtensionInit(argc, argv);
}

6
hw/darwin/quartz/quartzCocoa.m
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v 1.1.4.3 2004/02/25 21:46:45 kaleb Exp $ */
/* $XdotOrg$ */
/**************************************************************
*
* Quartz-specific support for the Darwin X Server
@ -45,7 +45,7 @@
#include <Cocoa/Cocoa.h>
#import "Preferences.h"
#include "pseudorama.h"
#include "pseudoramiX.h"
extern void FatalError(const char *, ...);
extern char *display;
@ -68,7 +68,7 @@ void QuartzReadPreferences(void)
// quartzRootless has already been set
if (quartzRootless) {
// Use Pseudorama instead of Xinerama
// Use PseudoramiX instead of Xinerama
noPanoramiXExtension = TRUE;
noPseudoramiXExtension = ![Preferences xinerama];

2
hw/darwin/quartz/quartzCommon.h
View File

@ -53,7 +53,7 @@
typedef struct {
// List of CoreGraphics displays that this X11 screen covers.
// This is more than one CG display for video mirroring and
// rootless Pseudorama mode.
// rootless PseudoramiX mode.
// No CG display will be covered by more than one X11 screen.
int displayCount;
CGDirectDisplayID *displayIDs;

16
hw/darwin/quartz/xpr/xprScreen.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
/* $XdotOrg$ */
/*
* Xplugin rootless implementation screen functions
*/
@ -33,7 +33,7 @@
#include "quartzCommon.h"
#include "quartz.h"
#include "xpr.h"
#include "pseudorama.h"
#include "pseudoramiX.h"
#include "darwin.h"
#include "rootless.h"
#include "safeAlpha.h"
@ -139,8 +139,8 @@ displayScreenBounds(CGDirectDisplayID id)
/*
* addPseudoramaScreens
* Add a physical screen with Pseudorama.
* addPseudoramiXScreens
* Add a physical screen with PseudoramiX.
*/
static void
addPseudoramiXScreens(int *x, int *y, int *width, int *height)
@ -168,21 +168,21 @@ addPseudoramiXScreens(int *x, int *y, int *width, int *height)
*width = unionRect.size.width;
*height = unionRect.size.height;
/* Tell Pseudorama about the real screens. */
/* Tell PseudoramiX about the real screens. */
for (i = 0; i < displayCount; i++)
{
CGDirectDisplayID dpy = displayList[i];
frame = displayScreenBounds(dpy);
ErrorF("Pseudorama screen %d added: %dx%d @ (%d,%d).\n", i,
ErrorF("PseudoramiX screen %d added: %dx%d @ (%d,%d).\n", i,
(int)frame.size.width, (int)frame.size.height,
(int)frame.origin.x, (int)frame.origin.y);
frame.origin.x -= unionRect.origin.x;
frame.origin.y -= unionRect.origin.y;
ErrorF("Pseudorama screen %d placed at X11 coordinate (%d,%d).\n",
ErrorF("PseudoramiX screen %d placed at X11 coordinate (%d,%d).\n",
i, (int)frame.origin.x, (int)frame.origin.y);
PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
@ -206,7 +206,7 @@ xprDisplayInit(void)
CGGetActiveDisplayList(0, NULL, &displayCount);
/* With Pseudorama, the X server only sees one screen; only Pseudorama
/* With PseudoramiX, the X server only sees one screen; only PseudoramiX
itself knows about all of the screens. */
if (noPseudoramiXExtension)

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,

6
hw/xfree86/common/xf86Config.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.3 2003/12/18 19:29:13 kaleb Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
@ -1058,7 +1058,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
}
#endif
#ifdef XINERAMA
#ifdef PANORAMIX
from = X_DEFAULT;
if (!noPanoramiXExtension)
from = X_CMDLINE;
@ -1102,7 +1102,7 @@ configInputKbd(IDevPtr inputp)
#endif
#ifdef XKB
if (!xf86IsPc98()) {
xf86Info.xkbrules = "xfree86";
xf86Info.xkbrules = __XKBDEFRULES__;
xf86Info.xkbmodel = "pc105";
xf86Info.xkblayout = "us";
xf86Info.xkbvariant = NULL;

36
hw/xfree86/common/xf86Configure.c
View File

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

4
hw/xfree86/common/xf86DGA.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb 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.
@ -140,7 +140,7 @@ DGAInit(
for(i = 0; i < num; i++)
modes[i].num = i + 1;
#ifdef XINERAMA
#ifdef PANORAMIX
if(!noPanoramiXExtension)
for(i = 0; i < num; i++)
modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;

52
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\n"
"send 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;
@ -1650,15 +1655,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 +1710,7 @@ ddxUseMsg()
#define OSVENDOR ""
#endif
#ifndef PRE_RELEASE
#define PRE_RELEASE XF86_VERSION_SNAP
#define PRE_RELEASE XORG_VERSION_SNAP
#endif
static void
@ -1714,25 +1718,25 @@ xf86PrintBanner()
{
#if PRE_RELEASE
ErrorF("\n"
"This is a pre-release version of the X.org Foundation's X11.\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 X.org Foundation \"monolithic tree\" CVS\n"
"latest version in the " XVENDORNAME " \"monolithic tree\" CVS\n"
"repository hosted at http://www.freedesktop.org/Software/xorg/");
#endif
#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);
@ -1780,7 +1784,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");

4
hw/xfree86/common/xf86Mode.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
/* $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.
@ -1682,7 +1682,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
/* Lookup each mode */
#ifdef RANDR
if (!xf86Info.disableRandR
#ifdef XINERAMA
#ifdef PANORAMIX
&& noPanoramiXExtension
#endif
)

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 {

4
hw/xfree86/common/xf86RandR.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */
/* $XdotOrg$ */
/*
* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $
*
@ -244,7 +244,7 @@ xf86RandRInit (ScreenPtr pScreen)
XF86RandRInfoPtr randrp;
ScrnInfoPtr scrp = XF86SCRNINFO(pScreen);
#ifdef XINERAMA
#ifdef PANORAMIX
/* XXX disable RandR when using Xinerama */
if (!noPanoramiXExtension)
return TRUE;

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

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/xf86DDC.c
View File

@ -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/dixmods/GLcoremodule.c
View File

@ -42,7 +42,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/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/bitmapmod.c
View File

@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_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,

2
hw/xfree86/dixmods/dbemodule.c
View File

@ -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/extmod/modinit.c
View File

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

2
hw/xfree86/dixmods/ftmodule.c
View File

@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING " & the After X-TT Project",
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
2, 1, 0,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,

2
hw/xfree86/dixmods/glxmodule.c
View File

@ -1222,7 +1222,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/laymodule.c
View File

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

2
hw/xfree86/dixmods/recordmod.c
View File

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

2
hw/xfree86/dixmods/shmodule.c
View File

@ -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/type1mod.c
View File

@ -43,7 +43,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 2,
ABI_CLASS_FONT, /* Font module */
ABI_FONT_VERSION,

2
hw/xfree86/dixmods/xf86XTrapModule.c
View File

@ -27,7 +27,7 @@ static XF86ModuleVersionInfo xtrapVersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION, /* needs the server extension ABI */
ABI_EXTENSION_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: $

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: $

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: $

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

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

6
hw/xfree86/dri/dri.c
View File

@ -66,7 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "mi.h"
#include "mipointer.h"
#if defined(XFree86LOADER) && !defined(XINERAMA)
#if defined(XFree86LOADER) && !defined(PANORAMIX)
extern Bool noPanoramiXExtension;
#endif
@ -129,14 +129,14 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
* If Xinerama is on, don't allow DRI to initialise. It won't be usable
* anyway.
*/
#if defined(XINERAMA) && !defined(XFree86LOADER)
#if defined(PANORAMIX) && !defined(XFree86LOADER)
xineramaInCore = TRUE;
#elif defined(XFree86LOADER)
if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
xineramaInCore = TRUE;
#endif
#if defined(XINERAMA) || defined(XFree86LOADER)
#if defined(PANORAMIX) || defined(XFree86LOADER)
if (xineramaInCore) {
if (!noPanoramiXExtension) {
DRIDrvMsg(pScreen->myNum, X_WARNING,

4
hw/xfree86/dri/drimodule.c
View File

@ -44,7 +44,7 @@ static XF86ModuleVersionInfo VersRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_EXTENSION,
ABI_EXTENSION_VERSION,
@ -110,7 +110,7 @@ driSetup(pointer module, pointer opts, int *errmaj, int *errmin)
}
else {
LoaderReqSymLists(drmSymbols, NULL);
LoaderRefSymbols("noXineramaExtension", NULL);
LoaderRefSymbols("noPanoramiXExtension", NULL);
LoadExtension(&XF86DRIExt, FALSE);
}
} else {

2
hw/xfree86/fbdevhw/fbdevhw.c
View File

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

3
hw/xfree86/fbdevhw/fbdevhw.man.pre
View File

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

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

@ -1,4 +1,3 @@
.\" $XFree86$
.TH getconfig __filemansuffix__ __vendorversion__
.SH NAME
getconfig - meta configuration files for getconfig(1)
@ -7,10 +6,10 @@ getconfig - meta configuration files for getconfig(1)
.SH DESCRIPTION
.B getconfig
is a programatic interface that is used by the
.B XFree86
.B __xservername__
server to get configuration information about video hardware when
operating without an
.B XF86Config
.B __xconfigfile__
file.
.PP
This implementation of
@ -29,7 +28,7 @@ the file format version number. The signature string is
.PP
.RS 4
.nf
"XFree86 Project getconfig rules file.\ \ Version: "
"Xorg getconfig rules file.\ \ Version: "
.fi
.RE
.PP
@ -44,10 +43,10 @@ continuation convention ('\e' at the end of the line). The first logical
line of each rule is a perl expression. It may be any valid perl
expression whose evaluated (with 'eval') result may be used as the
argument to a perl 'if' statement. The second logical line should be
the name of the XFree86 video driver to use when the rule is true, and
the name of the __xservername__ video driver to use when the rule is true, and
subsequent logical lines of each rule, if present, are additional
configuration output for the video device's
.B XF86Config
.B __xconfigfile__
.B Device
section. The driver name and additional lines of configuration information
are written to standard output when the rule is chosen as the successful
@ -70,12 +69,12 @@ They include:
.BR "$subsys " "PCI subsystem ID"
.BR "$subsysVendor " "PCI subsystem vendor ID"
.BR "$class " "PCI class"
.BR "$XFree86Version " "XFree86 version, as a 'v' string"
.BR "$XFree86VersionNumeric " "XFree86 numeric version"
.BR "$XFree86VersionMajor " "XFree86 major version"
.BR "$XFree86VersionMinor " "XFree86 minor version"
.BR "$XFree86VersionPatch " "XFree86 patch version"
.BR "$XFree86VersionSnap " "XFree86 snap version"
.BR "$XorgVersion " "Xorg version, as a 'v' string"
.BR "$XorgVersionNumeric " "Xorg numeric version"
.BR "$XorgVersionMajor " "Xorg major version"
.BR "$XorgVersionMinor " "Xorg minor version"
.BR "$XorgVersionPatch " "Xorg patch version"
.BR "$XorgVersionSnap " "Xorg snap version"
.BR "$weight " "current rule weight"
.fi
.RE
@ -99,7 +98,7 @@ rule that evaluates to true.
.I .cfg
files located in the search path. The search path typically specified
by the
.B XFree86
.B __xservername__
server is:
.PP
.RS 4
@ -114,11 +113,11 @@ server is:
where
.I <modulepath>
is the
.B XFree86
.B __xservername__
server's module search path.
.PP
.TP 30
.I __projectroot__/lib/X11/getconfig/xfree86.cfg
.I __projectroot__/lib/X11/getconfig/xorg.cfg
Default rules file that gets installed. This file doesn't contain any
rules by default.
.TP 30
@ -128,11 +127,11 @@ appear in rules files.
.SH "SEE ALSO"
getconfig(1),
XFree86(1),
XF86Config(__filemansuffix__).
__xservername__(__appmansuffix__),
__xconfigfile__(__filemansuffix__).
.SH AUTHORS
The XFree86 automatic configuration support and the
The __xservername__ automatic configuration support and the
.B getconfig
interface was written by David H. Dawes, with the support of X-Oz
Technologies.
Technologies for XFree86.

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.1 2003/10/08 14:58:29 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$
.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/xf86i2cmodule.c
View File

@ -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/xf86int10module.c
View File

@ -31,7 +31,7 @@ static XF86ModuleVersionInfo NAME(VersRec) =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
XF86_VERSION_CURRENT,
XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_VIDEODRV, /* needs the video driver ABI */
ABI_VIDEODRV_VERSION,

4
hw/xfree86/loader/dixsym.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.1.4.3 2003/12/18 19:29:14 kaleb Exp $ */
/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03
* 17:11:29 tsi Exp $ */
@ -171,7 +171,7 @@ LOOKUP dixLookupTab[] = {
SYMVAR(EventCallback)
SYMVAR(inputInfo)
SYMVAR(SetCriticalEvent)
#ifdef XINERAMA
#ifdef PANORAMIX
SYMVAR(XineramaGetCursorScreen)
#endif
/* property.c */

28
hw/xfree86/loader/elfloader.c
View File

@ -922,7 +922,7 @@ ELFCreateGOT(ELFModulePtr elffile, int maxalign)
ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
return FALSE;
}
# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
# if defined(linux) || defined(__OpenBSD__)
{
unsigned long page_size = getpagesize();
unsigned long round;
@ -1097,6 +1097,18 @@ ELFCreatePLT(ELFModulePtr elffile)
ErrorF("ELFCreatePLT() Unable to allocate memory!!!!\n");
return;
}
# if defined(linux) || defined(__OpenBSD__)
{
unsigned long page_size = getpagesize();
unsigned long round;
round = (unsigned long)elffile->plt & (page_size - 1);
mprotect(elffile->plt - round,
(elffile->pltsize + round + page_size - 1) & ~(page_size - 1),
PROT_READ | PROT_WRITE | PROT_EXEC);
}
# endif
elffile->sections[elffile->pltndx].sh_size = elffile->pltsize;
# ifdef ELFDEBUG
ELFDEBUG("ELFCreatePLT: PLT address %lx\n", elffile->plt);
@ -2763,10 +2775,16 @@ ELFCollectSections(ELFModulePtr elffile, int pass, int *totalsize,
elffile->lsection[j].size = SecSize(i);
elffile->lsection[j].flags = flags;
switch (SecType(i)) {
#ifdef __OpenBSD__
#if defined(linux) || defined(__OpenBSD__)
case SHT_PROGBITS:
mprotect(elffile->lsection[j].saddr, SecSize(i),
PROT_READ | PROT_WRITE | PROT_EXEC);
{
unsigned long page_size = getpagesize();
unsigned long round;
round = (unsigned long)elffile->lsection[j].saddr & (page_size -1);
mprotect( (char *)elffile->lsection[j].saddr - round,
SecSize(i) + round, PROT_READ | PROT_WRITE | PROT_EXEC);
}
break;
#endif
case SHT_SYMTAB:
@ -2961,7 +2979,7 @@ ELFLoadModule(loaderPtr modrec, int elffd, LOOKUP **ppLookup)
ErrorF("Unable to allocate ELF sections\n");
return NULL;
}
# if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
# if defined(linux) || defined(__OpenBSD__)
{
unsigned long page_size = getpagesize();
unsigned long round;

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