andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: remove all but main() from main.c

Browse Source 
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-04-22 13:26:40 +10:00
parent 2a2a7fa685
commit 987579c930
11 changed files with 376 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -1153,6 +1153,10 @@ else
DIX_LIB='$(top_builddir)/dix/libdix.la'
OS_LIB='$(top_builddir)/os/libos.la'
fi
MAIN_LIB='$(top_builddir)/dix/libmain.la'
AC_SUBST([MAIN_LIB])
MI_LIB='$(top_builddir)/mi/libmi.la'
MI_EXT_LIB='$(top_builddir)/mi/libmiext.la'
MI_INC='-I$(top_srcdir)/mi'
@ -1271,7 +1275,7 @@ AC_MSG_RESULT([$XNEST])
AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
if test "x$XNEST" = xyes; then
XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $OS_LIB $CONFIG_LIB"
XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB"
XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
AC_SUBST([XNEST_LIBS])
AC_SUBST([XNEST_SYS_LIBS])
@ -1643,7 +1647,7 @@ if test "x$XQUARTZ" = xyes; then
AC_DEFINE(XQUARTZ,1,[Have Quartz])
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
AC_SUBST([DARWIN_LIBS])
AC_CHECK_LIB([Xplugin],[xp_init],[:])
@ -1828,7 +1832,7 @@ if test "$KDRIVE" = yes; then
;;
esac
KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
KDRIVE_LOCAL_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
KDRIVE_LOCAL_LIBS="$DIX_LIB $MAIN_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
KDRIVE_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS"

6
dix/Makefile.am
View File

@ -1,7 +1,10 @@
noinst_LTLIBRARIES = libdix.la
noinst_LTLIBRARIES = libdix.la libmain.la
AM_CFLAGS = $(DIX_CFLAGS)
libmain_la_SOURCES = \
main.c
libdix_la_SOURCES = \
atom.c \
colormap.c \
@ -26,7 +29,6 @@ libdix_la_SOURCES = \
grabs.c \
initatoms.c \
inpututils.c \
main.c \
pixmap.c \
privates.c \
property.c \

341
dix/dispatch.c
View File

@ -107,6 +107,7 @@ Equipment Corporation.
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#include <version-config.h>
#endif
#ifdef PANORAMIX_DEBUG
@ -134,6 +135,7 @@ int ProcInitialConnection();
#include "xace.h"
#include "inputstr.h"
#include "xkbsrv.h"
#include "site.h"
#ifdef XSERVER_DTRACE
#include "registry.h"
@ -150,7 +152,9 @@ typedef const char *string;
#define BITCLEAR(buf, i) MASKWORD(buf, i) &= ~BITMASK(i)
#define GETBIT(buf, i) (MASKWORD(buf, i) & BITMASK(i))
extern xConnSetupPrefix connSetupPrefix;
xConnSetupPrefix connSetupPrefix;
PaddingInfo PixmapWidthPaddingInfo[33];
static ClientPtr grabClient;
#define GrabNone 0
@ -160,7 +164,7 @@ static int grabState = GrabNone;
static long grabWaiters[mskcnt];
CallbackListPtr ServerGrabCallback = NULL;
HWEventQueuePtr checkForInput[2];
extern int connBlockScreenStart;
int connBlockScreenStart;
static void KillAllClients(void);
@ -461,6 +465,166 @@ Dispatch(void)
#undef MAJOROP
static int VendorRelease = VENDOR_RELEASE;
static char *VendorString = VENDOR_NAME;
static const int padlength[4] = {0, 3, 2, 1};
void
SetVendorRelease(int release)
{
VendorRelease = release;
}
void
SetVendorString(char *string)
{
VendorString = string;
}
Bool
CreateConnectionBlock(void)
{
xConnSetup setup;
xWindowRoot root;
xDepth depth;
xVisualType visual;
xPixmapFormat format;
unsigned long vid;
int i, j, k,
lenofblock,
sizesofar = 0;
char *pBuf;
memset(&setup, 0, sizeof(xConnSetup));
/* Leave off the ridBase and ridMask, these must be sent with
connection */
setup.release = VendorRelease;
/*
* per-server image and bitmap parameters are defined in Xmd.h
*/
setup.imageByteOrder = screenInfo.imageByteOrder;
setup.bitmapScanlineUnit = screenInfo.bitmapScanlineUnit;
setup.bitmapScanlinePad = screenInfo.bitmapScanlinePad;
setup.bitmapBitOrder = screenInfo.bitmapBitOrder;
setup.motionBufferSize = NumMotionEvents();
setup.numRoots = screenInfo.numScreens;
setup.nbytesVendor = strlen(VendorString);
setup.numFormats = screenInfo.numPixmapFormats;
setup.maxRequestSize = MAX_REQUEST_SIZE;
QueryMinMaxKeyCodes(&setup.minKeyCode, &setup.maxKeyCode);
lenofblock = sizeof(xConnSetup) +
((setup.nbytesVendor + 3) & ~3) +
(setup.numFormats * sizeof(xPixmapFormat)) +
(setup.numRoots * sizeof(xWindowRoot));
ConnectionInfo = xalloc(lenofblock);
if (!ConnectionInfo)
return FALSE;
memmove(ConnectionInfo, (char *)&setup, sizeof(xConnSetup));
sizesofar = sizeof(xConnSetup);
pBuf = ConnectionInfo + sizeof(xConnSetup);
memmove(pBuf, VendorString, (int)setup.nbytesVendor);
sizesofar += setup.nbytesVendor;
pBuf += setup.nbytesVendor;
i = padlength[setup.nbytesVendor & 3];
sizesofar += i;
while (--i >= 0)
*pBuf++ = 0;
memset(&format, 0, sizeof(xPixmapFormat));
for (i=0; i<screenInfo.numPixmapFormats; i++)
{
format.depth = screenInfo.formats[i].depth;
format.bitsPerPixel = screenInfo.formats[i].bitsPerPixel;
format.scanLinePad = screenInfo.formats[i].scanlinePad;
memmove(pBuf, (char *)&format, sizeof(xPixmapFormat));
pBuf += sizeof(xPixmapFormat);
sizesofar += sizeof(xPixmapFormat);
}
connBlockScreenStart = sizesofar;
memset(&depth, 0, sizeof(xDepth));
memset(&visual, 0, sizeof(xVisualType));
for (i=0; i<screenInfo.numScreens; i++)
{
ScreenPtr pScreen;
DepthPtr pDepth;
VisualPtr pVisual;
pScreen = screenInfo.screens[i];
root.windowId = WindowTable[i]->drawable.id;
root.defaultColormap = pScreen->defColormap;
root.whitePixel = pScreen->whitePixel;
root.blackPixel = pScreen->blackPixel;
root.currentInputMask = 0; /* filled in when sent */
root.pixWidth = pScreen->width;
root.pixHeight = pScreen->height;
root.mmWidth = pScreen->mmWidth;
root.mmHeight = pScreen->mmHeight;
root.minInstalledMaps = pScreen->minInstalledCmaps;
root.maxInstalledMaps = pScreen->maxInstalledCmaps;
root.rootVisualID = pScreen->rootVisual;
root.backingStore = pScreen->backingStoreSupport;
root.saveUnders = FALSE;
root.rootDepth = pScreen->rootDepth;
root.nDepths = pScreen->numDepths;
memmove(pBuf, (char *)&root, sizeof(xWindowRoot));
sizesofar += sizeof(xWindowRoot);
pBuf += sizeof(xWindowRoot);
pDepth = pScreen->allowedDepths;
for(j = 0; j < pScreen->numDepths; j++, pDepth++)
{
lenofblock += sizeof(xDepth) +
(pDepth->numVids * sizeof(xVisualType));
pBuf = (char *)xrealloc(ConnectionInfo, lenofblock);
if (!pBuf)
{
xfree(ConnectionInfo);
return FALSE;
}
ConnectionInfo = pBuf;
pBuf += sizesofar;
depth.depth = pDepth->depth;
depth.nVisuals = pDepth->numVids;
memmove(pBuf, (char *)&depth, sizeof(xDepth));
pBuf += sizeof(xDepth);
sizesofar += sizeof(xDepth);
for(k = 0; k < pDepth->numVids; k++)
{
vid = pDepth->vids[k];
for (pVisual = pScreen->visuals;
pVisual->vid != vid;
pVisual++)
;
visual.visualID = vid;
visual.class = pVisual->class;
visual.bitsPerRGB = pVisual->bitsPerRGBValue;
visual.colormapEntries = pVisual->ColormapEntries;
visual.redMask = pVisual->redMask;
visual.greenMask = pVisual->greenMask;
visual.blueMask = pVisual->blueMask;
memmove(pBuf, (char *)&visual, sizeof(xVisualType));
pBuf += sizeof(xVisualType);
sizesofar += sizeof(xVisualType);
}
}
}
connSetupPrefix.success = xTrue;
connSetupPrefix.length = lenofblock/4;
connSetupPrefix.majorVersion = X_PROTOCOL;
connSetupPrefix.minorVersion = X_PROTOCOL_REVISION;
return TRUE;
}
int
ProcBadRequest(ClientPtr client)
{
@ -3700,3 +3864,176 @@ MarkClientException(ClientPtr client)
{
client->noClientException = -1;
}
/*
* This array encodes the answer to the question "what is the log base 2
* of the number of pixels that fit in a scanline pad unit?"
* Note that ~0 is an invalid entry (mostly for the benefit of the reader).
*/
static int answer[6][4] = {
/* pad pad pad pad*/
/* 8 16 32 64 */
{ 3, 4, 5 , 6 }, /* 1 bit per pixel */
{ 1, 2, 3 , 4 }, /* 4 bits per pixel */
{ 0, 1, 2 , 3 }, /* 8 bits per pixel */
{ ~0, 0, 1 , 2 }, /* 16 bits per pixel */
{ ~0, ~0, 0 , 1 }, /* 24 bits per pixel */
{ ~0, ~0, 0 , 1 } /* 32 bits per pixel */
};
/*
* This array gives the answer to the question "what is the first index for
* the answer array above given the number of bits per pixel?"
* Note that ~0 is an invalid entry (mostly for the benefit of the reader).
*/
static int indexForBitsPerPixel[ 33 ] = {
~0, 0, ~0, ~0, /* 1 bit per pixel */
1, ~0, ~0, ~0, /* 4 bits per pixel */
2, ~0, ~0, ~0, /* 8 bits per pixel */
~0,~0, ~0, ~0,
3, ~0, ~0, ~0, /* 16 bits per pixel */
~0,~0, ~0, ~0,
4, ~0, ~0, ~0, /* 24 bits per pixel */
~0,~0, ~0, ~0,
5 /* 32 bits per pixel */
};
/*
* This array gives the bytesperPixel value for cases where the number
* of bits per pixel is a multiple of 8 but not a power of 2.
*/
static int answerBytesPerPixel[ 33 ] = {
~0, 0, ~0, ~0, /* 1 bit per pixel */
0, ~0, ~0, ~0, /* 4 bits per pixel */
0, ~0, ~0, ~0, /* 8 bits per pixel */
~0,~0, ~0, ~0,
0, ~0, ~0, ~0, /* 16 bits per pixel */
~0,~0, ~0, ~0,
3, ~0, ~0, ~0, /* 24 bits per pixel */
~0,~0, ~0, ~0,
0 /* 32 bits per pixel */
};
/*
* This array gives the answer to the question "what is the second index for
* the answer array above given the number of bits per scanline pad unit?"
* Note that ~0 is an invalid entry (mostly for the benefit of the reader).
*/
static int indexForScanlinePad[ 65 ] = {
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
0, ~0, ~0, ~0, /* 8 bits per scanline pad unit */
~0, ~0, ~0, ~0,
1, ~0, ~0, ~0, /* 16 bits per scanline pad unit */
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
2, ~0, ~0, ~0, /* 32 bits per scanline pad unit */
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
3 /* 64 bits per scanline pad unit */
};
#ifndef MIN
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
/*
grow the array of screenRecs if necessary.
call the device-supplied initialization procedure
with its screen number, a pointer to its ScreenRec, argc, and argv.
return the number of successfully installed screens.
*/
int
AddScreen(
Bool (* pfnInit)(
int /*index*/,
ScreenPtr /*pScreen*/,
int /*argc*/,
char ** /*argv*/
),
int argc,
char **argv)
{
int i;
int scanlinepad, format, depth, bitsPerPixel, j, k;
ScreenPtr pScreen;
i = screenInfo.numScreens;
if (i == MAXSCREENS)
return -1;
pScreen = (ScreenPtr) xcalloc(1, sizeof(ScreenRec));
if (!pScreen)
return -1;
pScreen->devPrivates = NULL;
pScreen->myNum = i;
pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
pScreen->ClipNotify = 0; /* for R4 ddx compatibility */
pScreen->CreateScreenResources = 0;
/*
* This loop gets run once for every Screen that gets added,
* but thats ok. If the ddx layer initializes the formats
* one at a time calling AddScreen() after each, then each
* iteration will make it a little more accurate. Worst case
* we do this loop N * numPixmapFormats where N is # of screens.
* Anyway, this must be called after InitOutput and before the
* screen init routine is called.
*/
for (format=0; format<screenInfo.numPixmapFormats; format++)
{
depth = screenInfo.formats[format].depth;
bitsPerPixel = screenInfo.formats[format].bitsPerPixel;
scanlinepad = screenInfo.formats[format].scanlinePad;
j = indexForBitsPerPixel[ bitsPerPixel ];
k = indexForScanlinePad[ scanlinepad ];
PixmapWidthPaddingInfo[ depth ].padPixelsLog2 = answer[j][k];
PixmapWidthPaddingInfo[ depth ].padRoundUp =
(scanlinepad/bitsPerPixel) - 1;
j = indexForBitsPerPixel[ 8 ]; /* bits per byte */
PixmapWidthPaddingInfo[ depth ].padBytesLog2 = answer[j][k];
PixmapWidthPaddingInfo[ depth ].bitsPerPixel = bitsPerPixel;
if (answerBytesPerPixel[bitsPerPixel])
{
PixmapWidthPaddingInfo[ depth ].notPower2 = 1;
PixmapWidthPaddingInfo[ depth ].bytesPerPixel =
answerBytesPerPixel[bitsPerPixel];
}
else
{
PixmapWidthPaddingInfo[ depth ].notPower2 = 0;
}
}
/* This is where screen specific stuff gets initialized. Load the
screen structure, call the hardware, whatever.
This is also where the default colormap should be allocated and
also pixel values for blackPixel, whitePixel, and the cursor
Note that InitScreen is NOT allowed to modify argc, argv, or
any of the strings pointed to by argv. They may be passed to
multiple screens.
*/
pScreen->rgf = ~0L; /* there are no scratch GCs yet*/
WindowTable[i] = NullWindow;
screenInfo.screens[i] = pScreen;
screenInfo.numScreens++;
if (!(*pfnInit)(i, pScreen, argc, argv))
{
dixFreePrivates(pScreen->devPrivates);
xfree(pScreen);
screenInfo.numScreens--;
return -1;
}
return i;
}

6
dix/events.c
View File

@ -273,6 +273,12 @@ static struct {
static xEvent* swapEvent = NULL;
static int swapEventLen = 0;
void
NotImplemented(xEvent *from, xEvent *to)
{
FatalError("Not implemented");
}
/**
* Convert the given event type from an XI event to a core event.
* @param[in] The XI 1.x event type.

368
dix/main.c
View File

@ -118,120 +118,7 @@ Equipment Corporation.
extern void Dispatch(void);
xConnSetupPrefix connSetupPrefix;
extern FontPtr defaultFont;
extern void InitProcVectors(void);
extern Bool CreateGCperDepthArray(void);
#ifndef PANORAMIX
static
#endif
Bool CreateConnectionBlock(void);
PaddingInfo PixmapWidthPaddingInfo[33];
int connBlockScreenStart;
void
NotImplemented(xEvent *from, xEvent *to)
{
FatalError("Not implemented");
}
/*
* Dummy entry for ReplySwapVector[]
*/
void
ReplyNotSwappd(
ClientPtr pClient ,
int size ,
void * pbuf
)
{
FatalError("Not implemented");
}
/*
* This array encodes the answer to the question "what is the log base 2
* of the number of pixels that fit in a scanline pad unit?"
* Note that ~0 is an invalid entry (mostly for the benefit of the reader).
*/
static int answer[6][4] = {
/* pad pad pad pad*/
/* 8 16 32 64 */
{ 3, 4, 5 , 6 }, /* 1 bit per pixel */
{ 1, 2, 3 , 4 }, /* 4 bits per pixel */
{ 0, 1, 2 , 3 }, /* 8 bits per pixel */
{ ~0, 0, 1 , 2 }, /* 16 bits per pixel */
{ ~0, ~0, 0 , 1 }, /* 24 bits per pixel */
{ ~0, ~0, 0 , 1 } /* 32 bits per pixel */
};
/*
* This array gives the answer to the question "what is the first index for
* the answer array above given the number of bits per pixel?"
* Note that ~0 is an invalid entry (mostly for the benefit of the reader).
*/
static int indexForBitsPerPixel[ 33 ] = {
~0, 0, ~0, ~0, /* 1 bit per pixel */
1, ~0, ~0, ~0, /* 4 bits per pixel */
2, ~0, ~0, ~0, /* 8 bits per pixel */
~0,~0, ~0, ~0,
3, ~0, ~0, ~0, /* 16 bits per pixel */
~0,~0, ~0, ~0,
4, ~0, ~0, ~0, /* 24 bits per pixel */
~0,~0, ~0, ~0,
5 /* 32 bits per pixel */
};
/*
* This array gives the bytesperPixel value for cases where the number
* of bits per pixel is a multiple of 8 but not a power of 2.
*/
static int answerBytesPerPixel[ 33 ] = {
~0, 0, ~0, ~0, /* 1 bit per pixel */
0, ~0, ~0, ~0, /* 4 bits per pixel */
0, ~0, ~0, ~0, /* 8 bits per pixel */
~0,~0, ~0, ~0,
0, ~0, ~0, ~0, /* 16 bits per pixel */
~0,~0, ~0, ~0,
3, ~0, ~0, ~0, /* 24 bits per pixel */
~0,~0, ~0, ~0,
0 /* 32 bits per pixel */
};
/*
* This array gives the answer to the question "what is the second index for
* the answer array above given the number of bits per scanline pad unit?"
* Note that ~0 is an invalid entry (mostly for the benefit of the reader).
*/
static int indexForScanlinePad[ 65 ] = {
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
0, ~0, ~0, ~0, /* 8 bits per scanline pad unit */
~0, ~0, ~0, ~0,
1, ~0, ~0, ~0, /* 16 bits per scanline pad unit */
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
2, ~0, ~0, ~0, /* 32 bits per scanline pad unit */
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
~0, ~0, ~0, ~0,
3 /* 64 bits per scanline pad unit */
};
#ifndef MIN
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifdef XQUARTZ
#include <pthread.h>
@ -456,258 +343,3 @@ int main(int argc, char *argv[], char *envp[])
return(0);
}
static int VendorRelease = VENDOR_RELEASE;
static char *VendorString = VENDOR_NAME;
void
SetVendorRelease(int release)
{
VendorRelease = release;
}
void
SetVendorString(char *string)
{
VendorString = string;
}
static const int padlength[4] = {0, 3, 2, 1};
#ifndef PANORAMIX
static
#endif
Bool
CreateConnectionBlock(void)
{
xConnSetup setup;
xWindowRoot root;
xDepth depth;
xVisualType visual;
xPixmapFormat format;
unsigned long vid;
int i, j, k,
lenofblock,
sizesofar = 0;
char *pBuf;
memset(&setup, 0, sizeof(xConnSetup));
/* Leave off the ridBase and ridMask, these must be sent with
connection */
setup.release = VendorRelease;
/*
* per-server image and bitmap parameters are defined in Xmd.h
*/
setup.imageByteOrder = screenInfo.imageByteOrder;
setup.bitmapScanlineUnit = screenInfo.bitmapScanlineUnit;
setup.bitmapScanlinePad = screenInfo.bitmapScanlinePad;
setup.bitmapBitOrder = screenInfo.bitmapBitOrder;
setup.motionBufferSize = NumMotionEvents();
setup.numRoots = screenInfo.numScreens;
setup.nbytesVendor = strlen(VendorString);
setup.numFormats = screenInfo.numPixmapFormats;
setup.maxRequestSize = MAX_REQUEST_SIZE;
QueryMinMaxKeyCodes(&setup.minKeyCode, &setup.maxKeyCode);
lenofblock = sizeof(xConnSetup) +
((setup.nbytesVendor + 3) & ~3) +
(setup.numFormats * sizeof(xPixmapFormat)) +
(setup.numRoots * sizeof(xWindowRoot));
ConnectionInfo = xalloc(lenofblock);
if (!ConnectionInfo)
return FALSE;
memmove(ConnectionInfo, (char *)&setup, sizeof(xConnSetup));
sizesofar = sizeof(xConnSetup);
pBuf = ConnectionInfo + sizeof(xConnSetup);
memmove(pBuf, VendorString, (int)setup.nbytesVendor);
sizesofar += setup.nbytesVendor;
pBuf += setup.nbytesVendor;
i = padlength[setup.nbytesVendor & 3];
sizesofar += i;
while (--i >= 0)
*pBuf++ = 0;
memset(&format, 0, sizeof(xPixmapFormat));
for (i=0; i<screenInfo.numPixmapFormats; i++)
{
format.depth = screenInfo.formats[i].depth;
format.bitsPerPixel = screenInfo.formats[i].bitsPerPixel;
format.scanLinePad = screenInfo.formats[i].scanlinePad;
memmove(pBuf, (char *)&format, sizeof(xPixmapFormat));
pBuf += sizeof(xPixmapFormat);
sizesofar += sizeof(xPixmapFormat);
}
connBlockScreenStart = sizesofar;
memset(&depth, 0, sizeof(xDepth));
memset(&visual, 0, sizeof(xVisualType));
for (i=0; i<screenInfo.numScreens; i++)
{
ScreenPtr pScreen;
DepthPtr pDepth;
VisualPtr pVisual;
pScreen = screenInfo.screens[i];
root.windowId = WindowTable[i]->drawable.id;
root.defaultColormap = pScreen->defColormap;
root.whitePixel = pScreen->whitePixel;
root.blackPixel = pScreen->blackPixel;
root.currentInputMask = 0; /* filled in when sent */
root.pixWidth = pScreen->width;
root.pixHeight = pScreen->height;
root.mmWidth = pScreen->mmWidth;
root.mmHeight = pScreen->mmHeight;
root.minInstalledMaps = pScreen->minInstalledCmaps;
root.maxInstalledMaps = pScreen->maxInstalledCmaps;
root.rootVisualID = pScreen->rootVisual;
root.backingStore = pScreen->backingStoreSupport;
root.saveUnders = FALSE;
root.rootDepth = pScreen->rootDepth;
root.nDepths = pScreen->numDepths;
memmove(pBuf, (char *)&root, sizeof(xWindowRoot));
sizesofar += sizeof(xWindowRoot);
pBuf += sizeof(xWindowRoot);
pDepth = pScreen->allowedDepths;
for(j = 0; j < pScreen->numDepths; j++, pDepth++)
{
lenofblock += sizeof(xDepth) +
(pDepth->numVids * sizeof(xVisualType));
pBuf = (char *)xrealloc(ConnectionInfo, lenofblock);
if (!pBuf)
{
xfree(ConnectionInfo);
return FALSE;
}
ConnectionInfo = pBuf;
pBuf += sizesofar;
depth.depth = pDepth->depth;
depth.nVisuals = pDepth->numVids;
memmove(pBuf, (char *)&depth, sizeof(xDepth));
pBuf += sizeof(xDepth);
sizesofar += sizeof(xDepth);
for(k = 0; k < pDepth->numVids; k++)
{
vid = pDepth->vids[k];
for (pVisual = pScreen->visuals;
pVisual->vid != vid;
pVisual++)
;
visual.visualID = vid;
visual.class = pVisual->class;
visual.bitsPerRGB = pVisual->bitsPerRGBValue;
visual.colormapEntries = pVisual->ColormapEntries;
visual.redMask = pVisual->redMask;
visual.greenMask = pVisual->greenMask;
visual.blueMask = pVisual->blueMask;
memmove(pBuf, (char *)&visual, sizeof(xVisualType));
pBuf += sizeof(xVisualType);
sizesofar += sizeof(xVisualType);
}
}
}
connSetupPrefix.success = xTrue;
connSetupPrefix.length = lenofblock/4;
connSetupPrefix.majorVersion = X_PROTOCOL;
connSetupPrefix.minorVersion = X_PROTOCOL_REVISION;
return TRUE;
}
/*
grow the array of screenRecs if necessary.
call the device-supplied initialization procedure
with its screen number, a pointer to its ScreenRec, argc, and argv.
return the number of successfully installed screens.
*/
int
AddScreen(
Bool (* pfnInit)(
int /*index*/,
ScreenPtr /*pScreen*/,
int /*argc*/,
char ** /*argv*/
),
int argc,
char **argv)
{
int i;
int scanlinepad, format, depth, bitsPerPixel, j, k;
ScreenPtr pScreen;
i = screenInfo.numScreens;
if (i == MAXSCREENS)
return -1;
pScreen = (ScreenPtr) xcalloc(1, sizeof(ScreenRec));
if (!pScreen)
return -1;
pScreen->devPrivates = NULL;
pScreen->myNum = i;
pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
pScreen->ClipNotify = 0; /* for R4 ddx compatibility */
pScreen->CreateScreenResources = 0;
/*
* This loop gets run once for every Screen that gets added,
* but thats ok. If the ddx layer initializes the formats
* one at a time calling AddScreen() after each, then each
* iteration will make it a little more accurate. Worst case
* we do this loop N * numPixmapFormats where N is # of screens.
* Anyway, this must be called after InitOutput and before the
* screen init routine is called.
*/
for (format=0; format<screenInfo.numPixmapFormats; format++)
{
depth = screenInfo.formats[format].depth;
bitsPerPixel = screenInfo.formats[format].bitsPerPixel;
scanlinepad = screenInfo.formats[format].scanlinePad;
j = indexForBitsPerPixel[ bitsPerPixel ];
k = indexForScanlinePad[ scanlinepad ];
PixmapWidthPaddingInfo[ depth ].padPixelsLog2 = answer[j][k];
PixmapWidthPaddingInfo[ depth ].padRoundUp =
(scanlinepad/bitsPerPixel) - 1;
j = indexForBitsPerPixel[ 8 ]; /* bits per byte */
PixmapWidthPaddingInfo[ depth ].padBytesLog2 = answer[j][k];
PixmapWidthPaddingInfo[ depth ].bitsPerPixel = bitsPerPixel;
if (answerBytesPerPixel[bitsPerPixel])
{
PixmapWidthPaddingInfo[ depth ].notPower2 = 1;
PixmapWidthPaddingInfo[ depth ].bytesPerPixel =
answerBytesPerPixel[bitsPerPixel];
}
else
{
PixmapWidthPaddingInfo[ depth ].notPower2 = 0;
}
}
/* This is where screen specific stuff gets initialized. Load the
screen structure, call the hardware, whatever.
This is also where the default colormap should be allocated and
also pixel values for blackPixel, whitePixel, and the cursor
Note that InitScreen is NOT allowed to modify argc, argv, or
any of the strings pointed to by argv. They may be passed to
multiple screens.
*/
pScreen->rgf = ~0L; /* there are no scratch GCs yet*/
WindowTable[i] = NullWindow;
screenInfo.screens[i] = pScreen;
screenInfo.numScreens++;
if (!(*pfnInit)(i, pScreen, argc, argv))
{
dixFreePrivates(pScreen->devPrivates);
xfree(pScreen);
screenInfo.numScreens--;
return -1;
}
return i;
}

15
dix/swaprep.c
View File

@ -1291,3 +1291,18 @@ WriteSConnSetupPrefix(ClientPtr pClient, xConnSetupPrefix *pcsp)
SwapConnSetupPrefix(pcsp, &cspT);
(void)WriteToClient(pClient, sizeof(cspT), (char *) &cspT);
}
/*
* Dummy entry for ReplySwapVector[]
*/
void
ReplyNotSwappd(
ClientPtr pClient ,
int size ,
void * pbuf
)
{
FatalError("Not implemented");
}

1
hw/dmx/Makefile.am
View File

@ -85,6 +85,7 @@ XDMX_LIBS = \
$(GLX_LIBS) \
input/libdmxinput.a \
config/libdmxconfig.a \
$(MAIN_LIB) \
$(XSERVER_LIBS)
Xdmx_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

1
hw/vfb/Makefile.am
View File

@ -22,6 +22,7 @@ Xvfb_SOURCES = $(SRCS)
XVFB_LIBS = \
@XVFB_LIBS@ \
libfbcmap.a \
$(MAIN_LIB) \
$(XSERVER_LIBS)
Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)

2
hw/xfree86/Makefile.am
View File

@ -56,7 +56,7 @@ libxorg.c xorg.c:
DISTCLEANFILES = libxorg.c xorg.c
Xorg_DEPENDENCIES = libxorg.la
Xorg_LDADD = libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
Xorg_LDADD = $(MAIN_LIB) libxorg.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)

2
hw/xquartz/mach-startup/Makefile.am
View File

@ -19,7 +19,7 @@ X11_bin_LDADD = \
$(top_builddir)/dix/dixfonts.lo \
$(top_builddir)/miext/rootless/librootless.la \
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
$(DARWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin
X11_bin_LDFLAGS = \
-XCClinker -Objc \

1
include/dix.h
View File

@ -170,6 +170,7 @@ extern _X_EXPORT void SendErrorToClient(
extern _X_EXPORT void MarkClientException(
ClientPtr /*client*/);
extern _X_HIDDEN Bool CreateConnectionBlock(void);
/* dixutils.c */
extern _X_EXPORT void CopyISOLatin1Lowered(