Skip to content

N
nx-libs
Commit 52872a0d authored by Mike Gabriel's avatar Mike Gabriel
2 Browse files
Options

dix: Move AddScreen() over into dispatch.c and introduce init_screen()

Partially pruned out of X.org commits: commit 987579c930bda803427a28cb82773c389f5110d6 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Apr 22 13:26:40 2009 +1000 dix: remove all but main() from main.c 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: 's avatarPeter Hutterer <peter.hutterer@who-t.net> commit 3478af3374abffa0c226ee077fda1fcfc0751e74 Author: Dave Airlie <airlied@redhat.com> Date: Tue Jun 5 17:01:21 2012 +0100 screen: split out screen init code. (v2) This is a precursor for reusing this code to init gpu screens. v2: fixup int check as per Keith's review. Reviewed-by: 's avatarKeith Packard <keithp@keithp.com> Signed-off-by: 's avatarDave Airlie <airlied@redhat.com> Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de>
parent f5e7d555
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 215 deletions
nx-X11/programs/Xserver/dix/dispatch.c
View file @ 52872a0d
......@@ -125,6 +125,8 @@ int ProcInitialConnection();
extern xConnSetupPrefix connSetupPrefix;
extern char *ConnectionInfo;
extern int screenPrivateCount;
Selection *CurrentSelections;
int NumCurrentSelections;
CallbackListPtr SelectionCallback = NULL;
......@@ -3976,3 +3978,213 @@ 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 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 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 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
static int init_screen(ScreenPtr pScreen, int i)
{
int scanlinepad, format, depth, bitsPerPixel, j, k;
#ifdef DEBUG
void (**jNI) ();
#endif /* DEBUG */
pScreen->myNum = i;
pScreen->WindowPrivateLen = 0;
pScreen->WindowPrivateSizes = (unsigned *)NULL;
pScreen->totalWindowSize =
((sizeof(WindowRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
pScreen->GCPrivateLen = 0;
pScreen->GCPrivateSizes = (unsigned *)NULL;
pScreen->totalGCSize =
((sizeof(GC) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
#ifdef PIXPRIV
pScreen->PixmapPrivateLen = 0;
pScreen->PixmapPrivateSizes = (unsigned *)NULL;
pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
#endif
pScreen->ClipNotify = 0; /* for R4 ddx compatibility */
pScreen->CreateScreenResources = 0;
#ifdef DEBUG
for (jNI = &pScreen->QueryBestSize;
jNI < (void (**) ()) &pScreen->SendGraphicsExpose;
jNI++)
*jNI = NotImplemented;
#endif /* DEBUG */
/*
* 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;
}
}
return 0;
}
void FreeScreen(ScreenPtr);
int
AddScreen(Bool (*pfnInit) (ScreenPtr /*pScreen */ ,
int /*argc */ ,
char ** /*argv */
), int argc, char **argv)
{
int i;
ScreenPtr pScreen;
Bool ret;
i = screenInfo.numScreens;
if (i == MAXSCREENS)
return -1;
pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
if (!pScreen)
return -1;
pScreen->devPrivates = (DevUnion *)calloc(sizeof(DevUnion),
screenPrivateCount);
if (!pScreen->devPrivates && screenPrivateCount)
return -1;
ret = init_screen(pScreen, i);
if (ret != 0) {
free(pScreen);
return ret;
}
/* 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*/
screenInfo.screens[i] = pScreen;
screenInfo.numScreens++;
if (!(*pfnInit)(pScreen, argc, argv))
{
FreeScreen(pScreen);
screenInfo.numScreens--;
return -1;
}
return i;
}
void
FreeScreen(ScreenPtr pScreen)
{
pScreen->root = NullWindow;
free(pScreen->WindowPrivateSizes);
free(pScreen->GCPrivateSizes);
#ifdef PIXPRIV
free(pScreen->PixmapPrivateSizes);
#endif
free(pScreen->devPrivates);
free(pScreen);
}
nx-X11/programs/Xserver/dix/main.c
View file @ 52872a0d
......@@ -121,18 +121,17 @@ extern void Dispatch(void);
xConnSetupPrefix connSetupPrefix;
extern FontPtr defaultFont;
extern int screenPrivateCount;
extern void InitProcVectors(void);
extern Bool CreateGCperDepthArray(void);
extern void FreeScreen(ScreenPtr pScreen);
#ifndef PANORAMIX
static
#endif
Bool CreateConnectionBlock(void);
static void FreeScreen(ScreenPtr);
PaddingInfo PixmapWidthPaddingInfo[33];
int connBlockScreenStart;
......@@ -159,85 +158,6 @@ ReplyNotSwappd(
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
int
main(int argc, char *argv[], char *envp[])
{
......@@ -658,136 +578,3 @@ CreateConnectionBlock()
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;
#ifdef DEBUG
void (**jNI) ();
#endif /* DEBUG */
i = screenInfo.numScreens;
if (i == MAXSCREENS)
return -1;
pScreen = (ScreenPtr) calloc(1, sizeof(ScreenRec));
if (!pScreen)
return -1;
pScreen->devPrivates = (DevUnion *)calloc(sizeof(DevUnion),
screenPrivateCount);
if (!pScreen->devPrivates && screenPrivateCount)
{
free(pScreen);
return -1;
}
pScreen->myNum = i;
pScreen->WindowPrivateLen = 0;
pScreen->WindowPrivateSizes = (unsigned *)NULL;
pScreen->totalWindowSize =
((sizeof(WindowRec) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
pScreen->GCPrivateLen = 0;
pScreen->GCPrivateSizes = (unsigned *)NULL;
pScreen->totalGCSize =
((sizeof(GC) + sizeof(long) - 1) / sizeof(long)) * sizeof(long);
#ifdef PIXPRIV
pScreen->PixmapPrivateLen = 0;
pScreen->PixmapPrivateSizes = (unsigned *)NULL;
pScreen->totalPixmapSize = BitmapBytePad(sizeof(PixmapRec)*8);
#endif
pScreen->ClipNotify = 0; /* for R4 ddx compatibility */
pScreen->CreateScreenResources = 0;
#ifdef DEBUG
for (jNI = &pScreen->QueryBestSize;
jNI < (void (**) ()) &pScreen->SendGraphicsExpose;
jNI++)
*jNI = NotImplemented;
#endif /* DEBUG */
/*
* 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*/
screenInfo.screens[i] = pScreen;
screenInfo.numScreens++;
if (!(*pfnInit)(i, pScreen, argc, argv))
{
FreeScreen(pScreen);
screenInfo.numScreens--;
return -1;
}
return i;
}
static void
FreeScreen(ScreenPtr pScreen)
{
pScreen->root = NullWindow;
free(pScreen->WindowPrivateSizes);
free(pScreen->GCPrivateSizes);
#ifdef PIXPRIV
free(pScreen->PixmapPrivateSizes);
#endif
free(pScreen->devPrivates);
free(pScreen);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment