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

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

This commit is contained in:
Ian Romanick 2006-06-09 15:16:50 -07:00
parent dcfaa9f4f8 caad8b724b
commit 7810d87cd6
12 changed files with 242 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

217
.gitignore vendored
View File

@ -23,6 +23,199 @@ xorg-server.pc
stamp-h? stamp-h?
do-not-use-config.h do-not-use-config.h
do-not-use-config.h.in do-not-use-config.h.in
XpConfig/C/print/Xprinters.ghostscript
Xprint/Xprt
Xprint/doc/Xprt.1x
Xprint/doc/Xprt.man
Xprint/dpmsstubs-wrapper.c
Xprint/miinitext-wrapper.c
afb/afbbltC.c
afb/afbbltCI.c
afb/afbbltG.c
afb/afbbltO.c
afb/afbbltX.c
afb/afbseg.c
afb/afbtileC.c
afb/afbtileG.c
cfb/cfb8lineCO.c
cfb/cfb8lineCP.c
cfb/cfb8lineG.c
cfb/cfb8lineX.c
cfb/cfb8segC.c
cfb/cfb8segCS.c
cfb/cfb8segX.c
cfb/cfb8setG.c
cfb/cfbbltC.c
cfb/cfbbltG.c
cfb/cfbbltO.c
cfb/cfbbltX.c
cfb/cfbfillarcC.c
cfb/cfbfillarcG.c
cfb/cfbglrop8.c
cfb/cfbply1rctC.c
cfb/cfbply1rctG.c
cfb/cfbseg.c
cfb/cfbsolidC.c
cfb/cfbsolidG.c
cfb/cfbsolidX.c
cfb/cfbtile32C.c
cfb/cfbtile32G.c
cfb/cfbtileoddC.c
cfb/cfbtileoddG.c
cfb/cfbzerarcC.c
cfb/cfbzerarcG.c
cfb/cfbzerarcX.c
cfb32/cfb8lineCO.c
cfb32/cfb8lineCP.c
cfb32/cfb8lineG.c
cfb32/cfb8lineX.c
cfb32/cfb8segC.c
cfb32/cfb8segCS.c
cfb32/cfb8segX.c
cfb32/cfb8setG.c
cfb32/cfbbltC.c
cfb32/cfbbltG.c
cfb32/cfbbltO.c
cfb32/cfbbltX.c
cfb32/cfbfillarcC.c
cfb32/cfbfillarcG.c
cfb32/cfbply1rctC.c
cfb32/cfbply1rctG.c
cfb32/cfbseg.c
cfb32/cfbsolidC.c
cfb32/cfbsolidG.c
cfb32/cfbsolidX.c
cfb32/cfbtile32C.c
cfb32/cfbtile32G.c
cfb32/cfbtileoddC.c
cfb32/cfbtileoddG.c
cfb32/cfbzerarcC.c
cfb32/cfbzerarcG.c
cfb32/cfbzerarcX.c
doc/Xserver.1x
doc/Xserver.man
hw/dmx/Xdmx
hw/dmx/Xdmx.1x
hw/dmx/config/dmxtodmx
hw/dmx/config/dmxtodmx.1x
hw/dmx/config/parser.c
hw/dmx/config/parser.h
hw/dmx/config/scanner.c
hw/dmx/config/vdltodmx
hw/dmx/config/vdltodmx.1x
hw/dmx/config/xdmxconfig
hw/dmx/config/xdmxconfig.1x
hw/dmx/examples/dmxaddinput
hw/dmx/examples/dmxaddscreen
hw/dmx/examples/dmxreconfig
hw/dmx/examples/dmxresize
hw/dmx/examples/dmxrminput
hw/dmx/examples/dmxrmscreen
hw/dmx/examples/dmxwininfo
hw/dmx/examples/ev
hw/dmx/examples/evi
hw/dmx/examples/res
hw/dmx/examples/xbell
hw/dmx/examples/xdmx
hw/dmx/examples/xinput
hw/dmx/examples/xled
hw/dmx/examples/xtest
hw/vfb/Xvfb
hw/vfb/Xvfb.1x
hw/vfb/Xvfb.man
hw/xfree86/Xorg
hw/xfree86/common/xf86Build.h
hw/xfree86/common/xf86DefModeSet.c
hw/xfree86/doc/man/Xorg.1x
hw/xfree86/doc/man/Xorg.man
hw/xfree86/doc/man/xorg.conf.5x
hw/xfree86/doc/man/xorg.conf.man
hw/xfree86/fbdevhw/fbdevhw.4x
hw/xfree86/fbdevhw/fbdevhw.man
hw/xfree86/getconfig/cfg.man
hw/xfree86/getconfig/getconfig.1x
hw/xfree86/getconfig/getconfig.5x
hw/xfree86/getconfig/getconfig.man
hw/xfree86/os-support/xorgos.c
hw/xfree86/osandcommon.c
hw/xfree86/ramdac/xf86BitOrder.c
hw/xfree86/scanpci/xf86PciData.c
hw/xfree86/scanpci/xf86PciIds.h
hw/xfree86/utils/cvt/cvt
hw/xfree86/utils/cvt/cvt.man
hw/xfree86/utils/gtf/gtf
hw/xfree86/utils/gtf/gtf.1x
hw/xfree86/utils/gtf/gtf.man
hw/xfree86/utils/ioport/inb
hw/xfree86/utils/ioport/inl
hw/xfree86/utils/ioport/inw
hw/xfree86/utils/ioport/ioport
hw/xfree86/utils/ioport/outb
hw/xfree86/utils/ioport/outl
hw/xfree86/utils/ioport/outw
hw/xfree86/utils/pcitweak/pcitweak
hw/xfree86/utils/pcitweak/pcitweak.1x
hw/xfree86/utils/pcitweak/pcitweak.man
hw/xfree86/utils/scanpci/scanpci
hw/xfree86/utils/scanpci/scanpci.1x
hw/xfree86/utils/scanpci/scanpci.man
hw/xfree86/utils/xorgcfg/XOrgCfg
hw/xfree86/utils/xorgcfg/xorgcfg
hw/xfree86/utils/xorgcfg/xorgcfg.1x
hw/xfree86/utils/xorgcfg/xorgcfg.man
hw/xfree86/utils/xorgconfig/xorgconfig
hw/xfree86/utils/xorgconfig/xorgconfig.1x
hw/xfree86/utils/xorgconfig/xorgconfig.man
hw/xfree86/xaa/l-xaaBitmap.c
hw/xfree86/xaa/l-xaaStipple.c
hw/xfree86/xaa/l-xaaTEGlyph.c
hw/xfree86/xaa/l3-xaaBitmap.c
hw/xfree86/xaa/l3-xaaStipple.c
hw/xfree86/xaa/lf-xaaBitmap.c
hw/xfree86/xaa/lf-xaaStipple.c
hw/xfree86/xaa/lf-xaaTEGlyph.c
hw/xfree86/xaa/lf3-xaaBitmap.c
hw/xfree86/xaa/lf3-xaaStipple.c
hw/xfree86/xaa/m-xaaBitmap.c
hw/xfree86/xaa/m-xaaStipple.c
hw/xfree86/xaa/m-xaaTEGlyph.c
hw/xfree86/xaa/m3-xaaBitmap.c
hw/xfree86/xaa/m3-xaaStipple.c
hw/xfree86/xaa/mf-xaaBitmap.c
hw/xfree86/xaa/mf-xaaStipple.c
hw/xfree86/xaa/mf-xaaTEGlyph.c
hw/xfree86/xaa/mf3-xaaBitmap.c
hw/xfree86/xaa/mf3-xaaStipple.c
hw/xfree86/xaa/s-xaaDashLine.c
hw/xfree86/xaa/s-xaaLine.c
hw/xfree86/xf1bpp/mfbbltC.c
hw/xfree86/xf1bpp/mfbbltCI.c
hw/xfree86/xf1bpp/mfbbltG.c
hw/xfree86/xf1bpp/mfbbltO.c
hw/xfree86/xf1bpp/mfbbltX.c
hw/xfree86/xf1bpp/mfbigbblak.c
hw/xfree86/xf1bpp/mfbigbwht.c
hw/xfree86/xf1bpp/mfbpablack.c
hw/xfree86/xf1bpp/mfbpainv.c
hw/xfree86/xf1bpp/mfbpawhite.c
hw/xfree86/xf1bpp/mfbpgbblak.c
hw/xfree86/xf1bpp/mfbpgbinv.c
hw/xfree86/xf1bpp/mfbpgbwht.c
hw/xfree86/xf1bpp/mfbplyblack.c
hw/xfree86/xf1bpp/mfbplyinv.c
hw/xfree86/xf1bpp/mfbplywhite.c
hw/xfree86/xf1bpp/mfbseg.c
hw/xfree86/xf1bpp/mfbteblack.c
hw/xfree86/xf1bpp/mfbtewhite.c
hw/xfree86/xf1bpp/mfbtileC.c
hw/xfree86/xf1bpp/mfbtileG.c
hw/xfree86/xf4bpp/mfbseg.c
hw/xfree86/xf8_32bpp/cfbgc32.c
hw/xfree86/xf8_32bpp/cfbgc8.c
hw/xfree86/xorg.c
hw/xnest/Xnest
hw/xnest/Xnest.1x
hw/xnest/Xnest.man
include/dix-config.h include/dix-config.h
include/kdrive-config.h include/kdrive-config.h
include/xgl-config.h include/xgl-config.h
@ -30,6 +223,24 @@ include/xkb-config.h
include/xorg-config.h include/xorg-config.h
include/xorg-server.h include/xorg-server.h
include/xwin-config.h include/xwin-config.h
hw/dmx/config/parser.c mfb/mfbbltC.c
hw/dmx/config/parser.h mfb/mfbbltCI.c
hw/dmx/config/scanner.c mfb/mfbbltG.c
mfb/mfbbltO.c
mfb/mfbbltX.c
mfb/mfbigbblak.c
mfb/mfbigbwht.c
mfb/mfbpablack.c
mfb/mfbpainv.c
mfb/mfbpawhite.c
mfb/mfbpgbblak.c
mfb/mfbpgbinv.c
mfb/mfbpgbwht.c
mfb/mfbplyblack.c
mfb/mfbplyinv.c
mfb/mfbplywhite.c
mfb/mfbseg.c
mfb/mfbteblack.c
mfb/mfbtewhite.c
mfb/mfbtileC.c
mfb/mfbtileG.c

2
Xext/shape.c
View File

@ -146,7 +146,7 @@ typedef struct _ShapeEvent {
****************/ ****************/
void void
ShapeExtensionInit(INITARGS) ShapeExtensionInit(void)
{ {
ExtensionEntry *extEntry; ExtensionEntry *extEntry;

3
Xprint/ddxInit.c
View File

@ -295,8 +295,7 @@ ddxProcessArgument (
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "XIstubs.h" #include "XIstubs.h"
#include "exglobals.h"
extern int BadDevice;
int int
ChangePointerDevice ( ChangePointerDevice (

2
Xprint/ps/PsWindow.c
View File

@ -89,8 +89,6 @@ in this Software without prior written authorization from The Open Group.
#include "Ps.h" #include "Ps.h"
extern WindowPtr *WindowTable;
/* /*
* The following list of strings defines the properties which will be * The following list of strings defines the properties which will be
* placed on the screen's root window if the property was defined in * placed on the screen's root window if the property was defined in

4
Xprint/ps/psout.c
View File

@ -82,6 +82,7 @@ in this Software without prior written authorization from The Open Group.
#include <stdio.h> #include <stdio.h>
#include "os.h" #include "os.h"
#define USE_PSOUT_PRIVATE 1 #define USE_PSOUT_PRIVATE 1
#include "Ps.h"
#include "psout.h" #include "psout.h"
#ifdef XP_USE_FREETYPE #ifdef XP_USE_FREETYPE
#include <ft2build.h> #include <ft2build.h>
@ -90,9 +91,6 @@ in this Software without prior written authorization from The Open Group.
/* For VENDOR_STRING and VENDOR_RELEASE */ /* For VENDOR_STRING and VENDOR_RELEASE */
#include "site.h" #include "site.h"
extern PsElmPtr PsCloneFillElementList(int nElms, PsElmPtr elms);
extern void PsDestroyFillElementList(int nElms, PsElmPtr elms);
/* /*
* Standard definitions * Standard definitions
*/ */

1
hw/xfree86/dixmods/extmod/modinit.h
View File

@ -10,7 +10,6 @@
#endif #endif
#ifdef SHAPE #ifdef SHAPE
extern void ShapeExtensionInit(INITARGS);
#define _SHAPE_SERVER_ /* don't want Xlib structures */ #define _SHAPE_SERVER_ /* don't want Xlib structures */
#include <X11/extensions/shapestr.h> #include <X11/extensions/shapestr.h>
#endif #endif

1
hw/xfree86/loader/loaderProcs.h
View File

@ -56,6 +56,7 @@
#ifndef _LOADERPROCS_H #ifndef _LOADERPROCS_H
#define _LOADERPROCS_H #define _LOADERPROCS_H
#undef IN_LOADER
#define IN_LOADER #define IN_LOADER
#include "xf86Module.h" #include "xf86Module.h"
#include <X11/fonts/fontmod.h> #include <X11/fonts/fontmod.h>

2
hw/xfree86/loader/loadmod.c
View File

@ -434,8 +434,6 @@ FindModule(const char *module, const char *dir, const char **subdirlist,
strcat(buf, *s); strcat(buf, *s);
/*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf); */ /*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf); */
if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) { if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
int i;
if (buf[dirlen - 1] != '/') { if (buf[dirlen - 1] != '/') {
buf[dirlen++] = '/'; buf[dirlen++] = '/';
} }

3
hw/xnest/Keyboard.c
View File

@ -202,9 +202,6 @@ XkbError:
xnestBell, xnestChangeKeyboardControl); xnestBell, xnestChangeKeyboardControl);
#ifdef XKB #ifdef XKB
} else { } else {
FILE *file;
XkbConfigRtrnRec config;
XkbComponentNamesRec names; XkbComponentNamesRec names;
char *rules, *model, *layout, *variants, *options; char *rules, *model, *layout, *variants, *options;

2
include/window.h
View File

@ -256,6 +256,8 @@ void ResizeChildrenWinSize(
int /*dw*/, int /*dw*/,
int /*dh*/); int /*dh*/);
extern void ShapeExtensionInit(void);
extern void SendShapeNotify( extern void SendShapeNotify(
WindowPtr /* pWin */, WindowPtr /* pWin */,
int /* which */ ); int /* which */ );

3
mi/miinitext.c
View File

@ -258,9 +258,6 @@ typedef void (*InitExtension)(INITARGS);
#endif #endif
/* FIXME: this whole block of externs should be from the appropriate headers */ /* FIXME: this whole block of externs should be from the appropriate headers */
#ifdef SHAPE
extern void ShapeExtensionInit(INITARGS);
#endif
#ifdef EVI #ifdef EVI
extern void EVIExtensionInit(INITARGS); extern void EVIExtensionInit(INITARGS);
#endif #endif

74
record/set.c
View File

@ -95,9 +95,7 @@ void *Xcalloc(size)
#include "set.h" #include "set.h"
static int static int
maxMemberInInterval(pIntervals, nIntervals) maxMemberInInterval(RecordSetInterval *pIntervals, int nIntervals)
RecordSetInterval *pIntervals;
int nIntervals;
{ {
int i; int i;
int maxMember = -1; int maxMember = -1;
@ -110,8 +108,7 @@ maxMemberInInterval(pIntervals, nIntervals)
} }
static void static void
NoopDestroySet(pSet) NoopDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
} }
@ -128,16 +125,13 @@ typedef struct {
#define BITS_PER_LONG (sizeof(unsigned long) * 8) #define BITS_PER_LONG (sizeof(unsigned long) * 8)
static void static void
BitVectorDestroySet(pSet) BitVectorDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
xfree(pSet); xfree(pSet);
} }
static unsigned long static unsigned long
BitVectorIsMemberOfSet(pSet, pm) BitVectorIsMemberOfSet(RecordSetPtr pSet, int pm)
RecordSetPtr pSet;
int pm;
{ {
BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet;
unsigned long *pbitvec; unsigned long *pbitvec;
@ -149,10 +143,7 @@ BitVectorIsMemberOfSet(pSet, pm)
static int static int
BitVectorFindBit(pSet, iterbit, bitval) BitVectorFindBit(RecordSetPtr pSet, int iterbit, Bool bitval)
RecordSetPtr pSet;
int iterbit;
Bool bitval;
{ {
BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet;
unsigned long *pbitvec = (unsigned long *)(&pbvs[1]); unsigned long *pbitvec = (unsigned long *)(&pbvs[1]);
@ -198,10 +189,8 @@ BitVectorFindBit(pSet, iterbit, bitval)
static RecordSetIteratePtr static RecordSetIteratePtr
BitVectorIterateSet(pSet, pIter, pInterval) BitVectorIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter,
RecordSetPtr pSet; RecordSetInterval *pInterval)
RecordSetIteratePtr pIter;
RecordSetInterval *pInterval;
{ {
int iterbit = (int)(long)pIter; int iterbit = (int)(long)pIter;
int b; int b;
@ -222,11 +211,8 @@ RecordSetOperations BitVectorNoFreeOperations = {
NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet }; NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet };
static int static int
BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) BitVectorSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; int maxMember, int *alignment)
int nIntervals;
int maxMember;
int *alignment;
{ {
int nlongs; int nlongs;
@ -236,11 +222,8 @@ BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment)
} }
static RecordSetPtr static RecordSetPtr
BitVectorCreateSet(pIntervals, nIntervals, pMem, memsize) BitVectorCreateSet(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; void *pMem, int memsize)
int nIntervals;
void *pMem;
int memsize;
{ {
BitVectorSetPtr pbvs; BitVectorSetPtr pbvs;
int i, j; int i, j;
@ -288,16 +271,13 @@ typedef struct {
} IntervalListSet, *IntervalListSetPtr; } IntervalListSet, *IntervalListSetPtr;
static void static void
IntervalListDestroySet(pSet) IntervalListDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
xfree(pSet); xfree(pSet);
} }
static unsigned long static unsigned long
IntervalListIsMemberOfSet(pSet, pm) IntervalListIsMemberOfSet(RecordSetPtr pSet, int pm)
RecordSetPtr pSet;
int pm;
{ {
IntervalListSetPtr prls = (IntervalListSetPtr)pSet; IntervalListSetPtr prls = (IntervalListSetPtr)pSet;
RecordSetInterval *pInterval = (RecordSetInterval *)(&prls[1]); RecordSetInterval *pInterval = (RecordSetInterval *)(&prls[1]);
@ -317,10 +297,8 @@ IntervalListIsMemberOfSet(pSet, pm)
static RecordSetIteratePtr static RecordSetIteratePtr
IntervalListIterateSet(pSet, pIter, pIntervalReturn) IntervalListIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter,
RecordSetPtr pSet; RecordSetInterval *pIntervalReturn)
RecordSetIteratePtr pIter;
RecordSetInterval *pIntervalReturn;
{ {
RecordSetInterval *pInterval = (RecordSetInterval *)pIter; RecordSetInterval *pInterval = (RecordSetInterval *)pIter;
IntervalListSetPtr prls = (IntervalListSetPtr)pSet; IntervalListSetPtr prls = (IntervalListSetPtr)pSet;
@ -346,22 +324,16 @@ RecordSetOperations IntervalListNoFreeOperations = {
NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet }; NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet };
static int static int
IntervalListMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) IntervalListMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; int maxMember, int *alignment)
int nIntervals;
int maxMember;
int *alignment;
{ {
*alignment = sizeof(unsigned long); *alignment = sizeof(unsigned long);
return sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval); return sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval);
} }
static RecordSetPtr static RecordSetPtr
IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize) IntervalListCreateSet(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; void *pMem, int memsize)
int nIntervals;
void *pMem;
int memsize;
{ {
IntervalListSetPtr prls; IntervalListSetPtr prls;
int i, j, k; int i, j, k;
@ -454,11 +426,9 @@ typedef RecordSetPtr (*RecordCreateSetProcPtr)(
); );
static int static int
_RecordSetMemoryRequirements(pIntervals, nIntervals, alignment, ppCreateSet) _RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; int *alignment,
int nIntervals; RecordCreateSetProcPtr *ppCreateSet)
int *alignment;
RecordCreateSetProcPtr *ppCreateSet;
{ {
int bmsize, rlsize, bma, rla; int bmsize, rlsize, bma, rla;
int maxMember; int maxMember;